diff options
| author | Anssi Hannula <anssi.hannula@iki.fi> | 2010-12-29 18:48:32 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2010-12-29 18:48:32 +0000 |
| commit | d8e481bb860747808220d2baf0cdec5a70c54c1e (patch) | |
| tree | 7e92564d36a9255747469dc236569d4ab8a57c4e /libavformat/spdif.h | |
| parent | ee1ba9c32608a7a8ac2770b3c636fa5d4067dd0a (diff) | |
s/IEC958/IEC 61937 - IEC958 is a lower level format.
Patch by Anssi Hannula, anssi d hannula a iki d fi
Originally committed as revision 26141 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/spdif.h')
| -rw-r--r-- | libavformat/spdif.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/libavformat/spdif.h b/libavformat/spdif.h index 252eda9643..ac5be7c31a 100644 --- a/libavformat/spdif.h +++ b/libavformat/spdif.h @@ -25,27 +25,27 @@ #define SYNCWORD2 0x4E1F #define BURST_HEADER_SIZE 0x8 -enum IEC958DataType { - IEC958_AC3 = 0x01, ///< AC-3 data - IEC958_MPEG1_LAYER1 = 0x04, ///< MPEG-1 layer 1 - IEC958_MPEG1_LAYER23 = 0x05, ///< MPEG-1 layer 2 or 3 data or MPEG-2 without extension - IEC958_MPEG2_EXT = 0x06, ///< MPEG-2 data with extension - IEC958_MPEG2_AAC = 0x07, ///< MPEG-2 AAC ADTS - IEC958_MPEG2_LAYER1_LSF = 0x08, ///< MPEG-2, layer-1 low sampling frequency - IEC958_MPEG2_LAYER2_LSF = 0x09, ///< MPEG-2, layer-2 low sampling frequency - IEC958_MPEG2_LAYER3_LSF = 0x0A, ///< MPEG-2, layer-3 low sampling frequency - IEC958_DTS1 = 0x0B, ///< DTS type I (512 samples) - IEC958_DTS2 = 0x0C, ///< DTS type II (1024 samples) - IEC958_DTS3 = 0x0D, ///< DTS type III (2048 samples) - IEC958_ATRAC = 0x0E, ///< Atrac data - IEC958_ATRAC3 = 0x0F, ///< Atrac 3 data - IEC958_ATRACX = 0x10, ///< Atrac 3 plus data - IEC958_DTSHD = 0x11, ///< DTS HD data - IEC958_WMAPRO = 0x12, ///< WMA 9 Professional data - IEC958_MPEG2_AAC_LSF_2048 = 0x13, ///< MPEG-2 AAC ADTS half-rate low sampling frequency - IEC958_MPEG2_AAC_LSF_4096 = 0x13 | 0x20, ///< MPEG-2 AAC ADTS quarter-rate low sampling frequency - IEC958_EAC3 = 0x15, ///< E-AC-3 data - IEC958_TRUEHD = 0x16, ///< TrueHD data +enum IEC61937DataType { + IEC61937_AC3 = 0x01, ///< AC-3 data + IEC61937_MPEG1_LAYER1 = 0x04, ///< MPEG-1 layer 1 + IEC61937_MPEG1_LAYER23 = 0x05, ///< MPEG-1 layer 2 or 3 data or MPEG-2 without extension + IEC61937_MPEG2_EXT = 0x06, ///< MPEG-2 data with extension + IEC61937_MPEG2_AAC = 0x07, ///< MPEG-2 AAC ADTS + IEC61937_MPEG2_LAYER1_LSF = 0x08, ///< MPEG-2, layer-1 low sampling frequency + IEC61937_MPEG2_LAYER2_LSF = 0x09, ///< MPEG-2, layer-2 low sampling frequency + IEC61937_MPEG2_LAYER3_LSF = 0x0A, ///< MPEG-2, layer-3 low sampling frequency + IEC61937_DTS1 = 0x0B, ///< DTS type I (512 samples) + IEC61937_DTS2 = 0x0C, ///< DTS type II (1024 samples) + IEC61937_DTS3 = 0x0D, ///< DTS type III (2048 samples) + IEC61937_ATRAC = 0x0E, ///< Atrac data + IEC61937_ATRAC3 = 0x0F, ///< Atrac 3 data + IEC61937_ATRACX = 0x10, ///< Atrac 3 plus data + IEC61937_DTSHD = 0x11, ///< DTS HD data + IEC61937_WMAPRO = 0x12, ///< WMA 9 Professional data + IEC61937_MPEG2_AAC_LSF_2048 = 0x13, ///< MPEG-2 AAC ADTS half-rate low sampling frequency + IEC61937_MPEG2_AAC_LSF_4096 = 0x13 | 0x20, ///< MPEG-2 AAC ADTS quarter-rate low sampling frequency + IEC61937_EAC3 = 0x15, ///< E-AC-3 data + IEC61937_TRUEHD = 0x16, ///< TrueHD data }; static const uint16_t spdif_mpeg_pkt_offset[2][3] = { |