diff options
author | Aurelien Jacobs <aurel@gnuage.org> | 2007-05-19 04:27:43 +0400 |
---|---|---|
committer | Aurelien Jacobs <aurel@gnuage.org> | 2007-05-19 04:27:43 +0400 |
commit | a975d9e288ab3ba37f84342ad45e24916c2604ec (patch) | |
tree | 92114f94a22bf4936b50a9fce764f4c1b7e34c09 /libavcodec/bitstream_filter.c | |
parent | b57eed12da39d8631381d162f900caece82cfba3 (diff) |
move mp3_header_compress bitstream filter in its own file
Originally committed as revision 9063 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/bitstream_filter.c')
-rw-r--r-- | libavcodec/bitstream_filter.c | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/libavcodec/bitstream_filter.c b/libavcodec/bitstream_filter.c index 39dcc48718..7c6ebf6fa7 100644 --- a/libavcodec/bitstream_filter.c +++ b/libavcodec/bitstream_filter.c @@ -19,7 +19,6 @@ */ #include "avcodec.h" -#include "mpegaudio.h" AVBitStreamFilter *first_bitstream_filter= NULL; @@ -125,63 +124,6 @@ static int noise(AVBitStreamFilterContext *bsfc, AVCodecContext *avctx, const ch return 1; } -static int mp3_header_compress(AVBitStreamFilterContext *bsfc, AVCodecContext *avctx, const char *args, - uint8_t **poutbuf, int *poutbuf_size, - const uint8_t *buf, int buf_size, int keyframe){ - uint32_t header, extraheader; - int mode_extension, header_size; - - if(avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL){ - av_log(avctx, AV_LOG_ERROR, "not standards compliant\n"); - return -1; - } - - header = AV_RB32(buf); - mode_extension= (header>>4)&3; - - if(ff_mpa_check_header(header) < 0 || (header&0x60000) != 0x20000){ -output_unchanged: - *poutbuf= (uint8_t *) buf; - *poutbuf_size= buf_size; - - av_log(avctx, AV_LOG_INFO, "cannot compress %08X\n", header); - return 0; - } - - if(avctx->extradata_size == 0){ - avctx->extradata_size=15; - avctx->extradata= av_malloc(avctx->extradata_size); - strcpy(avctx->extradata, "FFCMP3 0.0"); - memcpy(avctx->extradata+11, buf, 4); - } - if(avctx->extradata_size != 15){ - av_log(avctx, AV_LOG_ERROR, "Extradata invalid\n"); - return -1; - } - extraheader = AV_RB32(avctx->extradata+11); - if((extraheader&MP3_MASK) != (header&MP3_MASK)) - goto output_unchanged; - - header_size= (header&0x10000) ? 4 : 6; - - *poutbuf_size= buf_size - header_size; - *poutbuf= av_malloc(buf_size - header_size + FF_INPUT_BUFFER_PADDING_SIZE); - memcpy(*poutbuf, buf + header_size, buf_size - header_size + FF_INPUT_BUFFER_PADDING_SIZE); - - if(avctx->channels==2){ - if((header & (3<<19)) != 3<<19){ - (*poutbuf)[1] &= 0x3F; - (*poutbuf)[1] |= mode_extension<<6; - FFSWAP(int, (*poutbuf)[1], (*poutbuf)[2]); - }else{ - (*poutbuf)[1] &= 0x8F; - (*poutbuf)[1] |= mode_extension<<4; - } - } - - return 1; -} - #ifdef CONFIG_DUMP_EXTRADATA_BSF AVBitStreamFilter dump_extradata_bsf={ "dump_extra", @@ -205,11 +147,3 @@ AVBitStreamFilter noise_bsf={ noise, }; #endif - -#ifdef CONFIG_MP3_HEADER_COMPRESS_BSF -AVBitStreamFilter mp3_header_compress_bsf={ - "mp3comp", - 0, - mp3_header_compress, -}; -#endif |