Mercurial > libavformat.hg
comparison flvdec.c @ 680:0f77a8b8f348 libavformat
support adpcm audio, also some more verbose messages
author | alex |
---|---|
date | Mon, 21 Feb 2005 19:28:32 +0000 |
parents | 54d87ed9b3e4 |
children | 095009fc2f35 |
comparison
equal
deleted
inserted
replaced
679:54d87ed9b3e4 | 680:0f77a8b8f348 |
---|---|
122 else | 122 else |
123 st->codec.sample_rate = (44100<<((flags>>2)&3))>>3; | 123 st->codec.sample_rate = (44100<<((flags>>2)&3))>>3; |
124 switch(flags >> 4){/* 0: uncompressed 1: ADPCM 2: mp3 5: Nellymoser 8kHz mono 6: Nellymoser*/ | 124 switch(flags >> 4){/* 0: uncompressed 1: ADPCM 2: mp3 5: Nellymoser 8kHz mono 6: Nellymoser*/ |
125 case 0: if (flags&2) st->codec.codec_id = CODEC_ID_PCM_S16BE; | 125 case 0: if (flags&2) st->codec.codec_id = CODEC_ID_PCM_S16BE; |
126 else st->codec.codec_id = CODEC_ID_PCM_S8; break; | 126 else st->codec.codec_id = CODEC_ID_PCM_S8; break; |
127 case 1: st->codec.codec_id = CODEC_ID_ADPCM_SWF; break; | |
127 case 2: st->codec.codec_id = CODEC_ID_MP3; break; | 128 case 2: st->codec.codec_id = CODEC_ID_MP3; break; |
128 // this is not listed at FLV but at SWF, strange... | 129 // this is not listed at FLV but at SWF, strange... |
129 case 3: if (flags&2) st->codec.codec_id = CODEC_ID_PCM_S16LE; | 130 case 3: if (flags&2) st->codec.codec_id = CODEC_ID_PCM_S16LE; |
130 else st->codec.codec_id = CODEC_ID_PCM_S8; break; | 131 else st->codec.codec_id = CODEC_ID_PCM_S8; break; |
131 default: | 132 default: |
133 av_log(s, AV_LOG_INFO, "Unsupported audio codec (%x)\n", flags >> 4); | |
132 st->codec.codec_tag= (flags >> 4); | 134 st->codec.codec_tag= (flags >> 4); |
133 } | 135 } |
134 } | 136 } |
135 }else{ | 137 }else{ |
136 st->codec.codec_type = CODEC_TYPE_VIDEO; | 138 st->codec.codec_type = CODEC_TYPE_VIDEO; |
137 switch(flags & 0xF){ | 139 switch(flags & 0xF){ |
138 case 2: st->codec.codec_id = CODEC_ID_FLV1; break; | 140 case 2: st->codec.codec_id = CODEC_ID_FLV1; break; |
139 default: | 141 default: |
142 av_log(s, AV_LOG_INFO, "Unsupported video codec (%x)\n", flags & 0xf); | |
140 st->codec.codec_tag= flags & 0xF; | 143 st->codec.codec_tag= flags & 0xF; |
141 } | 144 } |
142 } | 145 } |
143 | 146 |
144 if (av_new_packet(pkt, size) < 0) | 147 if (av_new_packet(pkt, size) < 0) |