[FFmpeg-cvslog] r9063 - in trunk/libavcodec: Makefile bitstream_filter.c mp3_header_compress_bsf.c
aurel
subversion
Sat May 19 02:27:44 CEST 2007
Author: aurel
Date: Sat May 19 02:27:43 2007
New Revision: 9063
Log:
move mp3_header_compress bitstream filter in it's own file
Added:
trunk/libavcodec/mp3_header_compress_bsf.c
- copied, changed from r9062, /trunk/libavcodec/bitstream_filter.c
Modified:
trunk/libavcodec/Makefile
trunk/libavcodec/bitstream_filter.c
Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile (original)
+++ trunk/libavcodec/Makefile Sat May 19 02:27:43 2007
@@ -307,7 +307,7 @@ OBJS-$(CONFIG_VC1_PARSER) +
OBJS-$(CONFIG_DUMP_EXTRADATA_BSF) += bitstream_filter.o
OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF) += bitstream_filter.o
OBJS-$(CONFIG_NOISE_BSF) += bitstream_filter.o
-OBJS-$(CONFIG_MP3_HEADER_COMPRESS_BSF) += bitstream_filter.o
+OBJS-$(CONFIG_MP3_HEADER_COMPRESS_BSF) += mp3_header_compress_bsf.o
OBJS-$(CONFIG_MP3_HEADER_DECOMPRESS_BSF) += mp3_header_decompress_bsf.o mpegaudiodata.o
OBJS-$(CONFIG_MJPEGA_DUMP_HEADER_BSF) += mjpegdec.o mjpeg.o jpeglsdec.o jpegls.o
OBJS-$(CONFIG_IMX_DUMP_HEADER_BSF) += mpeg12.o
Modified: trunk/libavcodec/bitstream_filter.c
==============================================================================
--- trunk/libavcodec/bitstream_filter.c (original)
+++ trunk/libavcodec/bitstream_filter.c Sat May 19 02:27:43 2007
@@ -19,7 +19,6 @@
*/
#include "avcodec.h"
-#include "mpegaudio.h"
AVBitStreamFilter *first_bitstream_filter= NULL;
@@ -125,63 +124,6 @@ static int noise(AVBitStreamFilterContex
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
Copied: trunk/libavcodec/mp3_header_compress_bsf.c (from r9062, /trunk/libavcodec/bitstream_filter.c)
==============================================================================
--- /trunk/libavcodec/bitstream_filter.c (original)
+++ trunk/libavcodec/mp3_header_compress_bsf.c Sat May 19 02:27:43 2007
@@ -21,109 +21,6 @@
#include "avcodec.h"
#include "mpegaudio.h"
-AVBitStreamFilter *first_bitstream_filter= NULL;
-
-void av_register_bitstream_filter(AVBitStreamFilter *bsf){
- bsf->next = first_bitstream_filter;
- first_bitstream_filter= bsf;
-}
-
-AVBitStreamFilterContext *av_bitstream_filter_init(const char *name){
- AVBitStreamFilter *bsf= first_bitstream_filter;
-
- while(bsf){
- if(!strcmp(name, bsf->name)){
- AVBitStreamFilterContext *bsfc= av_mallocz(sizeof(AVBitStreamFilterContext));
- bsfc->filter= bsf;
- bsfc->priv_data= av_mallocz(bsf->priv_data_size);
- return bsfc;
- }
- bsf= bsf->next;
- }
- return NULL;
-}
-
-void av_bitstream_filter_close(AVBitStreamFilterContext *bsfc){
- av_freep(&bsfc->priv_data);
- av_parser_close(bsfc->parser);
- av_free(bsfc);
-}
-
-int av_bitstream_filter_filter(AVBitStreamFilterContext *bsfc,
- AVCodecContext *avctx, const char *args,
- uint8_t **poutbuf, int *poutbuf_size,
- const uint8_t *buf, int buf_size, int keyframe){
- *poutbuf= (uint8_t *) buf;
- *poutbuf_size= buf_size;
- return bsfc->filter->filter(bsfc, avctx, args, poutbuf, poutbuf_size, buf, buf_size, keyframe);
-}
-
-static int dump_extradata(AVBitStreamFilterContext *bsfc, AVCodecContext *avctx, const char *args,
- uint8_t **poutbuf, int *poutbuf_size,
- const uint8_t *buf, int buf_size, int keyframe){
- int cmd= args ? *args : 0;
- /* cast to avoid warning about discarding qualifiers */
- if(avctx->extradata){
- if( (keyframe && (avctx->flags2 & CODEC_FLAG2_LOCAL_HEADER) && cmd=='a')
- ||(keyframe && (cmd=='k' || !cmd))
- ||(cmd=='e')
- /*||(? && (s->flags & PARSER_FLAG_DUMP_EXTRADATA_AT_BEGIN)*/){
- int size= buf_size + avctx->extradata_size;
- *poutbuf_size= size;
- *poutbuf= av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE);
-
- memcpy(*poutbuf, avctx->extradata, avctx->extradata_size);
- memcpy((*poutbuf) + avctx->extradata_size, buf, buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
- return 1;
- }
- }
- return 0;
-}
-
-static int remove_extradata(AVBitStreamFilterContext *bsfc, AVCodecContext *avctx, const char *args,
- uint8_t **poutbuf, int *poutbuf_size,
- const uint8_t *buf, int buf_size, int keyframe){
- int cmd= args ? *args : 0;
- AVCodecParserContext *s;
-
- if(!bsfc->parser){
- bsfc->parser= av_parser_init(avctx->codec_id);
- }
- s= bsfc->parser;
-
- if(s && s->parser->split){
- if( (((avctx->flags & CODEC_FLAG_GLOBAL_HEADER) || (avctx->flags2 & CODEC_FLAG2_LOCAL_HEADER)) && cmd=='a')
- ||(!keyframe && cmd=='k')
- ||(cmd=='e' || !cmd)
- ){
- int i= s->parser->split(avctx, buf, buf_size);
- buf += i;
- buf_size -= i;
- }
- }
- *poutbuf= (uint8_t *) buf;
- *poutbuf_size= buf_size;
-
- return 0;
-}
-
-static int noise(AVBitStreamFilterContext *bsfc, AVCodecContext *avctx, const char *args,
- uint8_t **poutbuf, int *poutbuf_size,
- const uint8_t *buf, int buf_size, int keyframe){
- int amount= args ? atoi(args) : 10000;
- unsigned int *state= bsfc->priv_data;
- int i;
-
- *poutbuf= av_malloc(buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
-
- memcpy(*poutbuf, buf, buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
- for(i=0; i<buf_size; i++){
- (*state) += (*poutbuf)[i] + 1;
- if(*state % amount == 0)
- (*poutbuf)[i] = *state;
- }
- return 1;
-}
static int mp3_header_compress(AVBitStreamFilterContext *bsfc, AVCodecContext *avctx, const char *args,
uint8_t **poutbuf, int *poutbuf_size,
@@ -182,34 +79,8 @@ output_unchanged:
return 1;
}
-#ifdef CONFIG_DUMP_EXTRADATA_BSF
-AVBitStreamFilter dump_extradata_bsf={
- "dump_extra",
- 0,
- dump_extradata,
-};
-#endif
-
-#ifdef CONFIG_REMOVE_EXTRADATA_BSF
-AVBitStreamFilter remove_extradata_bsf={
- "remove_extra",
- 0,
- remove_extradata,
-};
-#endif
-
-#ifdef CONFIG_NOISE_BSF
-AVBitStreamFilter noise_bsf={
- "noise",
- sizeof(int),
- noise,
-};
-#endif
-
-#ifdef CONFIG_MP3_HEADER_COMPRESS_BSF
AVBitStreamFilter mp3_header_compress_bsf={
"mp3comp",
0,
mp3_header_compress,
};
-#endif
More information about the ffmpeg-cvslog
mailing list