Mercurial > libavcodec.hg
comparison mpegaudiodec.c @ 12041:6681ac7bc917 libavcodec
adu and mp3on4 functions are also needed by their respective float decoders
author | aurel |
---|---|
date | Thu, 01 Jul 2010 21:08:20 +0000 |
parents | b4888704c11e |
children | f9a0bd0888a4 |
comparison
equal
deleted
inserted
replaced
12040:b4888704c11e | 12041:6681ac7bc917 |
---|---|
2122 MPADecodeContext *s = avctx->priv_data; | 2122 MPADecodeContext *s = avctx->priv_data; |
2123 memset(s->synth_buf, 0, sizeof(s->synth_buf)); | 2123 memset(s->synth_buf, 0, sizeof(s->synth_buf)); |
2124 s->last_buf_size= 0; | 2124 s->last_buf_size= 0; |
2125 } | 2125 } |
2126 | 2126 |
2127 #if CONFIG_MP3ADU_DECODER | 2127 #if CONFIG_MP3ADU_DECODER || CONFIG_MP3ADUFLOAT_DECODER |
2128 static int decode_frame_adu(AVCodecContext * avctx, | 2128 static int decode_frame_adu(AVCodecContext * avctx, |
2129 void *data, int *data_size, | 2129 void *data, int *data_size, |
2130 AVPacket *avpkt) | 2130 AVPacket *avpkt) |
2131 { | 2131 { |
2132 const uint8_t *buf = avpkt->data; | 2132 const uint8_t *buf = avpkt->data; |
2172 } | 2172 } |
2173 | 2173 |
2174 *data_size = out_size; | 2174 *data_size = out_size; |
2175 return buf_size; | 2175 return buf_size; |
2176 } | 2176 } |
2177 #endif /* CONFIG_MP3ADU_DECODER */ | 2177 #endif /* CONFIG_MP3ADU_DECODER || CONFIG_MP3ADUFLOAT_DECODER */ |
2178 | 2178 |
2179 #if CONFIG_MP3ON4_DECODER | 2179 #if CONFIG_MP3ON4_DECODER || CONFIG_MP3ON4FLOAT_DECODER |
2180 | 2180 |
2181 /** | 2181 /** |
2182 * Context for MP3On4 decoder | 2182 * Context for MP3On4 decoder |
2183 */ | 2183 */ |
2184 typedef struct MP3On4DecodeContext { | 2184 typedef struct MP3On4DecodeContext { |
2338 avctx->sample_rate = s->mp3decctx[0]->sample_rate; | 2338 avctx->sample_rate = s->mp3decctx[0]->sample_rate; |
2339 | 2339 |
2340 *data_size = out_size; | 2340 *data_size = out_size; |
2341 return buf_size; | 2341 return buf_size; |
2342 } | 2342 } |
2343 #endif /* CONFIG_MP3ON4_DECODER */ | 2343 #endif /* CONFIG_MP3ON4_DECODER || CONFIG_MP3ON4FLOAT_DECODER */ |
2344 | 2344 |
2345 #if !CONFIG_FLOAT | 2345 #if !CONFIG_FLOAT |
2346 #if CONFIG_MP1_DECODER | 2346 #if CONFIG_MP1_DECODER |
2347 AVCodec mp1_decoder = | 2347 AVCodec mp1_decoder = |
2348 { | 2348 { |