diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-05 23:06:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-05 23:06:53 +0100 |
| commit | 7b3c78b5e6ded82ea9f264806bf4e3068f37f4cf (patch) | |
| tree | 5ed6d41054f6f658b6796078603d10bef1e58d4c /libavcodec/ac3.h | |
| parent | 85b424a45e3846bf48b8e53bc107bb4ead8216c6 (diff) | |
| parent | 13345fc1f86fc3615789e196d5a339c1c27c9068 (diff) | |
| download | ffmpeg-7b3c78b5e6ded82ea9f264806bf4e3068f37f4cf.tar.gz | |
Merge commit '13345fc1f86fc3615789e196d5a339c1c27c9068'
* commit '13345fc1f86fc3615789e196d5a339c1c27c9068':
(e)ac3: parse and store the Dolby Surround, Surround EX and Headphone mode flags.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ac3.h')
| -rw-r--r-- | libavcodec/ac3.h | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/libavcodec/ac3.h b/libavcodec/ac3.h index e609bb51ce..c6851fd97d 100644 --- a/libavcodec/ac3.h +++ b/libavcodec/ac3.h @@ -82,6 +82,30 @@ typedef enum { AC3_CHMODE_3F2R } AC3ChannelMode; +/** Dolby Surround mode */ +typedef enum AC3DolbySurroundMode { + AC3_DSURMOD_NOTINDICATED = 0, + AC3_DSURMOD_OFF, + AC3_DSURMOD_ON, + AC3_DSURMOD_RESERVED +} AC3DolbySurroundMode; + +/** Dolby Surround EX mode */ +typedef enum AC3DolbySurroundEXMode { + AC3_DSUREXMOD_NOTINDICATED = 0, + AC3_DSUREXMOD_OFF, + AC3_DSUREXMOD_ON, + AC3_DSUREXMOD_PLIIZ +} AC3DolbySurroundEXMode; + +/** Dolby Headphone mode */ +typedef enum AC3DolbyHeadphoneMode { + AC3_DHEADPHONMOD_NOTINDICATED = 0, + AC3_DHEADPHONMOD_OFF, + AC3_DHEADPHONMOD_ON, + AC3_DHEADPHONMOD_RESERVED +} AC3DolbyHeadphoneMode; + typedef struct AC3BitAllocParameters { int sr_code; int sr_shift; @@ -110,6 +134,7 @@ typedef struct AC3HeaderInfo { int surround_mix_level; ///< Surround mix level index uint16_t channel_map; int num_blocks; ///< number of audio blocks + int dolby_surround_mode; /** @} */ /** @name Derived values |