diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-04-28 12:45:32 +0400 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-04-28 12:45:32 +0400 |
| commit | 91b782720fd0df5571775b6591bc41797d6ecf78 (patch) | |
| tree | e53a8bc0dd01508966e57082f1f9cc003ccbd069 /libavformat/caf.c | |
| parent | 0665199e438fcdd2000717352fc665a8cf017f7c (diff) | |
Move channel chunk reading function to isom.c.
Move ff_read_chan_chunk() to isom.c and rename it as ff_mov_read_chan().
Diffstat (limited to 'libavformat/caf.c')
| -rw-r--r-- | libavformat/caf.c | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/libavformat/caf.c b/libavformat/caf.c index 3aec1d7203..fd916746d8 100644 --- a/libavformat/caf.c +++ b/libavformat/caf.c @@ -57,62 +57,3 @@ const AVCodecTag ff_codec_caf_tags[] = { { CODEC_ID_NONE, 0 }, }; -typedef struct CafChannelLayout { - int64_t channel_layout; - uint32_t layout_tag; -} CafChannelLayout; - -static const CafChannelLayout caf_channel_layout[] = { - { AV_CH_LAYOUT_MONO, (100<<16) | 1}, //< kCAFChannelLayoutTag_Mono - { AV_CH_LAYOUT_STEREO, (101<<16) | 2}, //< kCAFChannelLayoutTag_Stereo - { AV_CH_LAYOUT_STEREO, (102<<16) | 2}, //< kCAFChannelLayoutTag_StereoHeadphones - { AV_CH_LAYOUT_2_1, (131<<16) | 3}, //< kCAFChannelLayoutTag_ITU_2_1 - { AV_CH_LAYOUT_QUAD, (132<<16) | 4}, //< kCAFChannelLayoutTag_ITU_2_2 - { AV_CH_LAYOUT_2_2, (132<<16) | 4}, //< kCAFChannelLayoutTag_ITU_2_2 - { AV_CH_LAYOUT_QUAD, (108<<16) | 4}, //< kCAFChannelLayoutTag_Quadraphonic - { AV_CH_LAYOUT_SURROUND, (113<<16) | 3}, //< kCAFChannelLayoutTag_MPEG_3_0_A - { AV_CH_LAYOUT_4POINT0, (115<<16) | 4}, //< kCAFChannelLayoutTag_MPEG_4_0_A - { AV_CH_LAYOUT_5POINT0_BACK, (117<<16) | 5}, //< kCAFChannelLayoutTag_MPEG_5_0_A - { AV_CH_LAYOUT_5POINT0, (117<<16) | 5}, //< kCAFChannelLayoutTag_MPEG_5_0_A - { AV_CH_LAYOUT_5POINT1_BACK, (121<<16) | 6}, //< kCAFChannelLayoutTag_MPEG_5_1_A - { AV_CH_LAYOUT_5POINT1, (121<<16) | 6}, //< kCAFChannelLayoutTag_MPEG_5_1_A - { AV_CH_LAYOUT_7POINT1, (128<<16) | 8}, //< kCAFChannelLayoutTag_MPEG_7_1_C - { AV_CH_LAYOUT_7POINT1_WIDE, (126<<16) | 8}, //< kCAFChannelLayoutTag_MPEG_7_1_A - { AV_CH_LAYOUT_STEREO|AV_CH_LOW_FREQUENCY, (133<<16) | 3}, //< kCAFChannelLayoutTag_DVD_4 - { AV_CH_LAYOUT_2_1|AV_CH_LOW_FREQUENCY, (134<<16) | 4}, //< kCAFChannelLayoutTag_DVD_5 - { AV_CH_LAYOUT_QUAD|AV_CH_LOW_FREQUENCY, (135<<16) | 4}, //< kCAFChannelLayoutTag_DVD_6 - { AV_CH_LAYOUT_2_2|AV_CH_LOW_FREQUENCY, (135<<16) | 4}, //< kCAFChannelLayoutTag_DVD_6 - { AV_CH_LAYOUT_SURROUND|AV_CH_LOW_FREQUENCY, (136<<16) | 4}, //< kCAFChannelLayoutTag_DVD_10 - { AV_CH_LAYOUT_4POINT0|AV_CH_LOW_FREQUENCY, (137<<16) | 5}, //< kCAFChannelLayoutTag_DVD_11 - { 0, 0}, -}; - -void ff_read_chan_chunk(AVFormatContext *s, int64_t size, AVCodecContext *codec) -{ - uint32_t layout_tag; - AVIOContext *pb = s->pb; - const CafChannelLayout *caf_layout = caf_channel_layout; - if (size != 12) { - // Channel descriptions not implemented - av_log_ask_for_sample(s, "Unimplemented channel layout.\n"); - avio_skip(pb, size); - return; - } - layout_tag = avio_rb32(pb); - if (layout_tag == 0x10000) { //< kCAFChannelLayoutTag_UseChannelBitmap - codec->channel_layout = avio_rb32(pb); - avio_skip(pb, 4); - return; - } - while (caf_layout->channel_layout) { - if (layout_tag == caf_layout->layout_tag) { - codec->channel_layout = caf_layout->channel_layout; - break; - } - caf_layout++; - } - if (!codec->channel_layout) - av_log(s, AV_LOG_WARNING, "Unknown channel layout.\n"); - avio_skip(pb, 8); -} - |