[FFmpeg-cvslog] r9066 - in trunk/libavcodec: Makefile bitstream_filter.c dump_extradata_bsf.c
aurel
subversion
Sat May 19 02:35:28 CEST 2007
Author: aurel
Date: Sat May 19 02:35:27 2007
New Revision: 9066
Log:
move dump_extradata bitstream filter in it's own file
Added:
trunk/libavcodec/dump_extradata_bsf.c
- copied, changed from r9065, /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:35:27 2007
@@ -304,7 +304,7 @@ OBJS-$(CONFIG_MPEGVIDEO_PARSER) +
OBJS-$(CONFIG_PNM_PARSER) += pnm_parser.o pnm.o
OBJS-$(CONFIG_VC1_PARSER) += vc1_parser.o
-OBJS-$(CONFIG_DUMP_EXTRADATA_BSF) += bitstream_filter.o
+OBJS-$(CONFIG_DUMP_EXTRADATA_BSF) += dump_extradata_bsf.o
OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF) += remove_extradata_bsf.o
OBJS-$(CONFIG_NOISE_BSF) += noise_bsf.o
OBJS-$(CONFIG_MP3_HEADER_COMPRESS_BSF) += mp3_header_compress_bsf.o
Modified: trunk/libavcodec/bitstream_filter.c
==============================================================================
--- trunk/libavcodec/bitstream_filter.c (original)
+++ trunk/libavcodec/bitstream_filter.c Sat May 19 02:35:27 2007
@@ -56,33 +56,3 @@ int av_bitstream_filter_filter(AVBitStre
*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;
-}
-
-#ifdef CONFIG_DUMP_EXTRADATA_BSF
-AVBitStreamFilter dump_extradata_bsf={
- "dump_extra",
- 0,
- dump_extradata,
-};
-#endif
Copied: trunk/libavcodec/dump_extradata_bsf.c (from r9065, /trunk/libavcodec/bitstream_filter.c)
==============================================================================
--- /trunk/libavcodec/bitstream_filter.c (original)
+++ trunk/libavcodec/dump_extradata_bsf.c Sat May 19 02:35:27 2007
@@ -20,42 +20,6 @@
#include "avcodec.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,
@@ -79,10 +43,8 @@ static int dump_extradata(AVBitStreamFil
return 0;
}
-#ifdef CONFIG_DUMP_EXTRADATA_BSF
AVBitStreamFilter dump_extradata_bsf={
"dump_extra",
0,
dump_extradata,
};
-#endif
More information about the ffmpeg-cvslog
mailing list