diff options
author | Aurelien Jacobs <aurel@gnuage.org> | 2007-05-19 00:30:15 +0000 |
---|---|---|
committer | Aurelien Jacobs <aurel@gnuage.org> | 2007-05-19 00:30:15 +0000 |
commit | cd7105e6a0e10f5ff759e98147c2aeb05b0238a0 (patch) | |
tree | c65dfb24d0a804d8a54ddb1e767887152793e714 /libavcodec | |
parent | a975d9e288ab3ba37f84342ad45e24916c2604ec (diff) | |
download | ffmpeg-cd7105e6a0e10f5ff759e98147c2aeb05b0238a0.tar.gz |
move noise bitstream filter in its own file
Originally committed as revision 9064 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/Makefile | 2 | ||||
-rw-r--r-- | libavcodec/bitstream_filter.c | 26 | ||||
-rw-r--r-- | libavcodec/noise_bsf.c | 46 |
3 files changed, 47 insertions, 27 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 1cdb66b5cd..445d627a0b 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -306,7 +306,7 @@ OBJS-$(CONFIG_VC1_PARSER) += vc1_parser.o 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 diff --git a/libavcodec/bitstream_filter.c b/libavcodec/bitstream_filter.c index 7c6ebf6fa7..c055ea867d 100644 --- a/libavcodec/bitstream_filter.c +++ b/libavcodec/bitstream_filter.c @@ -106,24 +106,6 @@ static int remove_extradata(AVBitStreamFilterContext *bsfc, AVCodecContext *avct 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 diff --git a/libavcodec/noise_bsf.c b/libavcodec/noise_bsf.c new file mode 100644 index 0000000000..6085a5bba4 --- /dev/null +++ b/libavcodec/noise_bsf.c @@ -0,0 +1,46 @@ +/* + * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at> + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "avcodec.h" + + +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; +} + +AVBitStreamFilter noise_bsf={ + "noise", + sizeof(int), + noise, +}; |