[FFmpeg-cvslog] r9064 - in trunk/libavcodec: Makefile bitstream_filter.c noise_bsf.c
aurel
subversion
Sat May 19 02:30:15 CEST 2007
Author: aurel
Date: Sat May 19 02:30:15 2007
New Revision: 9064
Log:
move noise bitstream filter in it's own file
Added:
trunk/libavcodec/noise_bsf.c
- copied, changed from r9063, /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:30:15 2007
@@ -306,7 +306,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_NOISE_BSF) += noise_bsf.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
Modified: trunk/libavcodec/bitstream_filter.c
==============================================================================
--- trunk/libavcodec/bitstream_filter.c (original)
+++ trunk/libavcodec/bitstream_filter.c Sat May 19 02:30:15 2007
@@ -106,24 +106,6 @@ static int remove_extradata(AVBitStreamF
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;
-}
-
#ifdef CONFIG_DUMP_EXTRADATA_BSF
AVBitStreamFilter dump_extradata_bsf={
"dump_extra",
@@ -139,11 +121,3 @@ AVBitStreamFilter remove_extradata_bsf={
remove_extradata,
};
#endif
-
-#ifdef CONFIG_NOISE_BSF
-AVBitStreamFilter noise_bsf={
- "noise",
- sizeof(int),
- noise,
-};
-#endif
Copied: trunk/libavcodec/noise_bsf.c (from r9063, /trunk/libavcodec/bitstream_filter.c)
==============================================================================
--- /trunk/libavcodec/bitstream_filter.c (original)
+++ trunk/libavcodec/noise_bsf.c Sat May 19 02:30:15 2007
@@ -20,91 +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,
- 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,
@@ -124,26 +39,8 @@ static int noise(AVBitStreamFilterContex
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
More information about the ffmpeg-cvslog
mailing list