September 2010 - FFmpeg-soc - lists.ffmpeg.org

G.723.1 Encoder: Compute adaptive codebook contribution, obtain residual
by Mohamed Naufal 30 Sep '10

30 Sep '10

--- libavcodec/g723_1.c | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 145 insertions(+), 0 deletions(-) diff --git a/libavcodec/g723_1.c b/libavcodec/g723_1.c index d71fa60..fa57527 100755 --- a/libavcodec/g723_1.c +++ b/libavcodec/g723_1.c @@ -1654,6 +1654,145 @@ static void synth_percept_filter(int16_t *qnt_lpc, int16_t *perf_lpc, } } +/** + * Compute the adaptive codebook contribution. + * + * @param buf input signal + * @param index the current subframe index + */ +static void acb_search(G723_1_Context *p, int16_t *residual, + int16_t *impulse_resp, int16_t *buf, + int index) +{ + + int16_t flt_buf[PITCH_ORDER][SUBFRAME_LEN]; + + const int16_t *cb_tbl = adaptive_cb_gain85; + + int ccr_buf[PITCH_ORDER * SUBFRAMES << 2]; + + int pitch_lag = p->pitch_lag[index >> 1]; + int acb_lag = 1; + int acb_gain = 0; + int odd_frame = index & 1; + int iter = 3 + odd_frame; + int count = 0; + int tbl_size = 85; + + int i, j, k, l, max; + int64_t temp; + + if(!odd_frame) { + if (pitch_lag == PITCH_MIN) + pitch_lag++; + else + pitch_lag = FFMIN(pitch_lag, PITCH_MAX - 5); + } + + /* Compute crosscorrelations and energies */ + for (i = 0; i < iter; i++) { + get_residual(residual, p->prev_excitation, pitch_lag + i - 1); + + for (j = 0; j < SUBFRAME_LEN; j++) { + temp = 0; + for (k = 0; k <= j; k++) + temp += residual[PITCH_ORDER - 1 + k] * impulse_resp[j - k]; + flt_buf[PITCH_ORDER - 1][j] = av_clipl_int32((temp << 1) + + (1 << 15)) >> 16; + } + + for (j = PITCH_ORDER - 2; j >= 0; j--) { + flt_buf[j][0] = ((residual[j] << 13) + (1 << 14)) >> 15; + for (k = 1; k < SUBFRAME_LEN; k++) { + temp = (flt_buf[j + 1][k - 1] << 15) + + residual[j] * impulse_resp[k]; + flt_buf[j][k] = av_clipl_int32((temp << 1) + (1 << 15)) >> 16; + } + } + + for (j = 0; j < PITCH_ORDER; j++) { + temp = dot_product(buf, flt_buf[j], SUBFRAME_LEN, 0); + ccr_buf[count++] = av_clipl_int32(temp << 1); + } + + for (j = 0; j < PITCH_ORDER; j++) { + ccr_buf[count++] = dot_product(flt_buf[j], flt_buf[j], + SUBFRAME_LEN, 1); + } + + for (j = 1; j < PITCH_ORDER; j++) { + for (k = 0; k < j; k++) { + temp = dot_product(flt_buf[j], flt_buf[k], SUBFRAME_LEN, 0); + ccr_buf[count++] = av_clipl_int32(temp << 2); + } + } + } + + /* Normalize and shorten */ + max = 0; + for (i = 0; i < 20 * iter; i++) + max = FFMAX(max, FFABS(ccr_buf[i])); + + temp = normalize_bits_int32(max); + + for (i = 0; i < 20 * iter; i++){ + ccr_buf[i] = av_clipl_int32((int64_t)(ccr_buf[i] << temp) + + (1 << 15)) >> 16; + } + + max = 0; + for (i = 0; i < iter; i++) { + /* Select quantization table */ + if ((!odd_frame && pitch_lag + i - 1 >= SUBFRAME_LEN - 2) || + (odd_frame && pitch_lag >= SUBFRAME_LEN - 2)) { + cb_tbl = adaptive_cb_gain170; + tbl_size = 170; + } + + for (j = 0, k = 0; j < tbl_size; j++, k += 20) { + temp = 0; + for (l = 0; l < 20; l++) + temp += ccr_buf[20 * i + l] * cb_tbl[k + l]; + temp = av_clipl_int32(temp); + + if (temp > max) { + max = temp; + acb_gain = j; + acb_lag = i; + } + } + } + + if (!odd_frame) { + pitch_lag += acb_lag - 1; + acb_lag = 1; + } + + p->pitch_lag[index >> 1] = pitch_lag; + p->subframe[index].ad_cb_lag = acb_lag; + p->subframe[index].ad_cb_gain = acb_gain; +} + +/** + * Subtract the adaptive codebook contribution from the input + * to obtain the residual. + * + * @param buf target vector + */ +static void sub_acb_contrib(int16_t *residual, int16_t *impulse_resp, + int16_t *buf) +{ + int i, j; + + for (i = 0; i < SUBFRAME_LEN; i++) { + int64_t temp = buf[i] << 14; + for (j = 0; j <= i; j++){ + temp -= residual[j] * impulse_resp[i - j]; + } + buf[i] = av_clipl_int32((temp << 2) + (1 << 15)) >> 16; + } +} + static int g723_1_encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data) { @@ -1712,6 +1851,7 @@ static int g723_1_encode_frame(AVCodecContext *avctx, unsigned char *buf, offset = 0; for (i = 0; i < SUBFRAMES; i++) { int16_t impulse_resp[SUBFRAME_LEN]; + int16_t residual[SUBFRAME_LEN + PITCH_ORDER - 1]; int16_t flt_in[SUBFRAME_LEN]; int16_t zero[LPC_ORDER]; @@ -1736,6 +1876,11 @@ static int g723_1_encode_frame(AVCodecContext *avctx, unsigned char *buf, zero, vector + PITCH_MAX, 0); harmonic_noise_sub(hf + i, vector + PITCH_MAX, in); + acb_search(p, residual, impulse_resp, in, i); + gen_acb_excitation(residual, p->prev_excitation,p->pitch_lag[i >> 1], + p->subframe[i], p->cur_rate); + sub_acb_contrib(residual, impulse_resp, in); + offset += LPC_ORDER; in += SUBFRAME_LEN; } --

4 4

G.723.1 Muxer
by Mohamed Naufal 30 Sep '10

30 Sep '10

--- libavformat/Makefile | 1 + libavformat/allformats.c | 2 +- libavformat/g723_1.c | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+), 1 deletions(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 794aa49..cbe9a15 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -80,6 +80,7 @@ OBJS-$(CONFIG_FOURXM_DEMUXER) += 4xm.o OBJS-$(CONFIG_FRAMECRC_MUXER) += framecrcenc.o OBJS-$(CONFIG_FRAMEMD5_MUXER) += md5enc.o OBJS-$(CONFIG_G723_1_DEMUXER) += g723_1.o +OBJS-$(CONFIG_G723_1_MUXER) += g723_1.o OBJS-$(CONFIG_GIF_MUXER) += gif.o OBJS-$(CONFIG_GSM_DEMUXER) += raw.o id3v2.o OBJS-$(CONFIG_GXF_DEMUXER) += gxf.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 437d9d3..34327b3 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -90,7 +90,7 @@ void av_register_all(void) REGISTER_DEMUXER (FOURXM, fourxm); REGISTER_MUXER (FRAMECRC, framecrc); REGISTER_MUXER (FRAMEMD5, framemd5); - REGISTER_DEMUXER (G723_1, g723_1); + REGISTER_MUXDEMUX (G723_1, g723_1); REGISTER_MUXER (GIF, gif); REGISTER_DEMUXER (GSM, gsm); REGISTER_MUXDEMUX (GXF, gxf); diff --git a/libavformat/g723_1.c b/libavformat/g723_1.c index 10125e6..9f4de36 100755 --- a/libavformat/g723_1.c +++ b/libavformat/g723_1.c @@ -80,3 +80,24 @@ AVInputFormat g723_1_demuxer = { g723_1_read_packet, .extensions = "tco", }; + +#if CONFIG_G723_1_MUXER +static int g723_1_write_packet(AVFormatContext *s, AVPacket *pkt) +{ + put_buffer(s->pb, pkt->data, pkt->size); + put_flush_packet(s->pb); + return 0; +} + +AVOutputFormat g723_1_muxer = { + "g723_1", + NULL_IF_CONFIG_SMALL("G.723.1 format"), + "audio/g723", + "tco", + 0, + CODEC_ID_G723_1, + CODEC_ID_NONE, + NULL, + g723_1_write_packet, +}; +#endif --

2 2

[soc]: r5935 - in libavfilter: checkout.sh diffs/00_configure.diff diffs/01_build.diff diffs/03_doc_filters.diff vf_drawbox.c vf_overlay.c
by stefano 28 Sep '10

28 Sep '10

Author: stefano Date: Tue Sep 28 15:54:10 2010 New Revision: 5935 Log: Update to FFmpeg r25245 / libswscale r32395. In particular remove the drawbox filter, which is now integrated into the main SVN repository. Deleted: libavfilter/vf_drawbox.c Modified: libavfilter/checkout.sh libavfilter/diffs/00_configure.diff libavfilter/diffs/01_build.diff libavfilter/diffs/03_doc_filters.diff libavfilter/vf_overlay.c Modified: libavfilter/checkout.sh ============================================================================== --- libavfilter/checkout.sh Sat Sep 25 23:33:19 2010 (r5934) +++ libavfilter/checkout.sh Tue Sep 28 15:54:10 2010 (r5935) @@ -1,11 +1,11 @@ #! /bin/sh echo "checking out pristine ffmpeg" -svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r25200 +svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r25245 echo "downloading the corresponding version of swscale" cd ffmpeg/libswscale -svn up -r32265 +svn up -r32395 cd ../.. echo "patching ffmpeg" @@ -13,7 +13,6 @@ for diff in $(ls $(pwd)/diffs/*.diff); d echo "copying files to libavfilter" cp \ - vf_drawbox.c \ vf_drawtext.c \ vf_fade.c \ vf_fps.c \ Modified: libavfilter/diffs/00_configure.diff ============================================================================== --- libavfilter/diffs/00_configure.diff Sat Sep 25 23:33:19 2010 (r5934) +++ libavfilter/diffs/00_configure.diff Tue Sep 28 15:54:10 2010 (r5935) @@ -1,6 +1,6 @@ Index: configure =================================================================== ---- configure (revision 25200) +--- configure (revision 25245) +++ configure (working copy) @@ -170,6 +170,7 @@ and libraw1394 [no] @@ -26,16 +26,17 @@ Index: configure log2 log2f loongson -@@ -1401,6 +1404,8 @@ - udp_protocol_deps="network" +@@ -1399,7 +1402,9 @@ # filters + blackframe_filter_deps="gpl" +drawtext_filter_deps="libfreetype" + frei0r_filter_deps="frei0r dlopen strtok_r" +movie_filter_deps="avformat" ocv_smooth_filter_deps="libopencv" yadif_filter_deps="gpl" -@@ -2649,6 +2654,7 @@ +@@ -2657,6 +2662,7 @@ check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss check_func inet_aton $network_extralibs check_func isatty @@ -43,7 +44,7 @@ Index: configure check_func ${malloc_prefix}memalign && enable memalign check_func mkstemp check_func ${malloc_prefix}posix_memalign && enable posix_memalign -@@ -2733,6 +2739,7 @@ +@@ -2741,6 +2747,7 @@ require libdirac libdirac_decoder/dirac_parser.h dirac_decoder_init $(pkg-config --libs dirac) && require libdirac libdirac_encoder/dirac_encoder.h dirac_encoder_init $(pkg-config --libs dirac) enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac Modified: libavfilter/diffs/01_build.diff ============================================================================== --- libavfilter/diffs/01_build.diff Sat Sep 25 23:33:19 2010 (r5934) +++ libavfilter/diffs/01_build.diff Tue Sep 28 15:54:10 2010 (r5935) @@ -1,6 +1,6 @@ Index: libavfilter/Makefile =================================================================== ---- libavfilter/Makefile (revision 25200) +--- libavfilter/Makefile (revision 25245) +++ libavfilter/Makefile (working copy) @@ -3,8 +3,9 @@ NAME = avfilter @@ -13,11 +13,10 @@ Index: libavfilter/Makefile OBJS = allfilters.o \ avfilter.o \ -@@ -22,18 +23,28 @@ - - OBJS-$(CONFIG_ASPECT_FILTER) += vf_aspect.o +@@ -24,24 +25,34 @@ + OBJS-$(CONFIG_BLACKFRAME_FILTER) += vf_blackframe.o OBJS-$(CONFIG_CROP_FILTER) += vf_crop.o -+OBJS-$(CONFIG_DRAWBOX_FILTER) += vf_drawbox.o + OBJS-$(CONFIG_DRAWBOX_FILTER) += vf_drawbox.o +OBJS-$(CONFIG_DRAWTEXT_FILTER) += vf_drawtext.o +OBJS-$(CONFIG_FADE_FILTER) += vf_fade.o OBJS-$(CONFIG_FIFO_FILTER) += vf_fifo.o @@ -42,7 +41,6 @@ Index: libavfilter/Makefile OBJS-$(CONFIG_UNSHARP_FILTER) += vf_unsharp.o OBJS-$(CONFIG_VFLIP_FILTER) += vf_vflip.o OBJS-$(CONFIG_YADIF_FILTER) += vf_yadif.o -@@ -42,6 +53,7 @@ OBJS-$(CONFIG_BUFFER_FILTER) += vsrc_buffer.o OBJS-$(CONFIG_COLOR_FILTER) += vf_pad.o @@ -52,13 +50,12 @@ Index: libavfilter/Makefile OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o Index: libavfilter/allfilters.c =================================================================== ---- libavfilter/allfilters.c (revision 25200) +--- libavfilter/allfilters.c (revision 25245) +++ libavfilter/allfilters.c (working copy) -@@ -42,24 +42,35 @@ - - REGISTER_FILTER (ASPECT, aspect, vf); +@@ -44,24 +44,34 @@ + REGISTER_FILTER (BLACKFRAME, blackframe, vf); REGISTER_FILTER (CROP, crop, vf); -+ REGISTER_FILTER (DRAWBOX, drawbox, vf); + REGISTER_FILTER (DRAWBOX, drawbox, vf); + REGISTER_FILTER (DRAWTEXT, drawtext, vf); + REGISTER_FILTER (FADE, fade, vf); REGISTER_FILTER (FIFO, fifo, vf); Modified: libavfilter/diffs/03_doc_filters.diff ============================================================================== --- libavfilter/diffs/03_doc_filters.diff Sat Sep 25 23:33:19 2010 (r5934) +++ libavfilter/diffs/03_doc_filters.diff Tue Sep 28 15:54:10 2010 (r5935) @@ -1,20 +1,11 @@ Index: doc/filters.texi =================================================================== ---- doc/filters.texi (revision 25200) +--- doc/filters.texi (revision 25245) +++ doc/filters.texi (working copy) -@@ -169,6 +169,108 @@ - "crop=in_w/2:in_h/2:y:10+10*sin(n/10)" +@@ -222,6 +222,99 @@ + drawbox=10:20:200:60:red@@0.5" @end example -+@section drawbox -+ -+@example -+./ffmpeg -i in.avi -vf "drawbox=10:20:200:60:red" out.avi -+@end example -+ -+Draw a box with @var{x}:@var{y}:@var{width}:@var{height}:@var{color} -+dimensions in a chosen color. -+ +@section drawtext + +Draw text string or text from specified file on top of video using the @@ -111,7 +102,7 @@ Index: doc/filters.texi @section fifo Buffer input images and send them when they are requested. -@@ -245,6 +347,14 @@ +@@ -298,6 +391,14 @@ For more information see: @url{http://piksel.org/frei0r} @@ -126,7 +117,7 @@ Index: doc/filters.texi @section hflip Flip the input video horizontally. -@@ -255,6 +365,14 @@ +@@ -308,6 +409,14 @@ ffmpeg -i in.avi -vf "hflip" out.avi @end example @@ -141,7 +132,7 @@ Index: doc/filters.texi @section noformat Force libavfilter not to use any of the specified pixel formats for the -@@ -303,6 +421,56 @@ +@@ -356,6 +465,56 @@ documentation for the exact meaning of the parameters: @url{http://opencv.willowgarage.com/documentation/c/image_filtering.html} @@ -198,7 +189,7 @@ Index: doc/filters.texi @section pad Add paddings to the input image, and places the original input at the -@@ -350,6 +518,14 @@ +@@ -403,6 +562,14 @@ can be used to test the monowhite pixel format descriptor definition. @@ -213,7 +204,7 @@ Index: doc/filters.texi @section scale Scale the input video to @var{width}:@var{height} and/or convert the image format. -@@ -375,6 +551,24 @@ +@@ -428,6 +595,24 @@ The default value of @var{width} and @var{height} is 0. @@ -238,7 +229,7 @@ Index: doc/filters.texi @section slicify Pass the images of input video on to next video filter as multiple -@@ -390,6 +584,19 @@ +@@ -443,6 +628,19 @@ Adding this in the beginning of filter chains should make filtering faster due to better use of the memory cache. @@ -258,7 +249,7 @@ Index: doc/filters.texi @section unsharp Sharpen or blur the input video. -@@ -564,6 +771,27 @@ +@@ -617,6 +815,27 @@ "color=red@@0.2:qcif:10 [color]; [in][color] overlay [out]" @end example Modified: libavfilter/vf_overlay.c ============================================================================== --- libavfilter/vf_overlay.c Sat Sep 25 23:33:19 2010 (r5934) +++ libavfilter/vf_overlay.c Tue Sep 28 15:54:10 2010 (r5935) @@ -172,13 +172,13 @@ static void start_frame(AVFilterLink *li { OverlayContext *over = link->dst->priv; /* There shouldn't be any previous queued frame in this queue */ - assert(!over->pics[link->dstpad][1]); - if (over->pics[link->dstpad][0]) { + assert(!over->pics[link->dstpad - link->dst->input_pads][1]); + if (over->pics[link->dstpad - link->dst->input_pads][0]) { /* Queue the new frame */ - over->pics[link->dstpad][1] = picref; + over->pics[link->dstpad - link->dst->input_pads][1] = picref; } else { /* No previous unused frame, take this one into use directly */ - over->pics[link->dstpad][0] = picref; + over->pics[link->dstpad - link->dst->input_pads][0] = picref; } }

1 0

Re: [FFmpeg-soc] Watermark positioning
by Денис Нагорский 26 Sep '10

26 Sep '10

Now i have updated to ffmpeg-soc r5934. But i have the same problem. Is it a bug?

1 0

[soc]: r5934 - in libavfilter: checkout.sh diffs/00_configure.diff diffs/01_build.diff diffs/03_doc_filters.diff
by stefano 25 Sep '10

25 Sep '10

Author: stefano Date: Sat Sep 25 23:33:19 2010 New Revision: 5934 Log: Update to FFmpeg r25200 / libswscale r32265. Modified: libavfilter/checkout.sh libavfilter/diffs/00_configure.diff libavfilter/diffs/01_build.diff libavfilter/diffs/03_doc_filters.diff Modified: libavfilter/checkout.sh ============================================================================== --- libavfilter/checkout.sh Tue Sep 14 15:59:07 2010 (r5933) +++ libavfilter/checkout.sh Sat Sep 25 23:33:19 2010 (r5934) @@ -1,11 +1,11 @@ #! /bin/sh echo "checking out pristine ffmpeg" -svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r25118 +svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r25200 echo "downloading the corresponding version of swscale" cd ffmpeg/libswscale -svn up -r32241 +svn up -r32265 cd ../.. echo "patching ffmpeg" Modified: libavfilter/diffs/00_configure.diff ============================================================================== --- libavfilter/diffs/00_configure.diff Tue Sep 14 15:59:07 2010 (r5933) +++ libavfilter/diffs/00_configure.diff Sat Sep 25 23:33:19 2010 (r5934) @@ -1,8 +1,8 @@ Index: configure =================================================================== ---- configure (revision 25118) +--- configure (revision 25200) +++ configure (working copy) -@@ -169,6 +169,7 @@ +@@ -170,6 +170,7 @@ and libraw1394 [no] --enable-libdirac enable Dirac support via libdirac [no] --enable-libfaac enable FAAC support via libfaac [no] @@ -10,7 +10,7 @@ Index: configure --enable-libgsm enable GSM support via libgsm [no] --enable-libmp3lame enable MP3 encoding via libmp3lame [no] --enable-libnut enable NUT (de)muxing via libnut, -@@ -883,6 +884,7 @@ +@@ -885,6 +886,7 @@ libdc1394 libdirac libfaac @@ -18,7 +18,7 @@ Index: configure libgsm libmp3lame libnut -@@ -1026,6 +1028,7 @@ +@@ -1029,6 +1031,7 @@ llrintf local_aligned_16 local_aligned_8 @@ -26,16 +26,16 @@ Index: configure log2 log2f loongson -@@ -1393,6 +1396,8 @@ +@@ -1401,6 +1404,8 @@ udp_protocol_deps="network" # filters +drawtext_filter_deps="libfreetype" +movie_filter_deps="avformat" ocv_smooth_filter_deps="libopencv" + yadif_filter_deps="gpl" - # libraries -@@ -2631,6 +2636,7 @@ +@@ -2649,6 +2654,7 @@ check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss check_func inet_aton $network_extralibs check_func isatty @@ -43,11 +43,11 @@ Index: configure check_func ${malloc_prefix}memalign && enable memalign check_func mkstemp check_func ${malloc_prefix}posix_memalign && enable posix_memalign -@@ -2713,6 +2719,7 @@ +@@ -2733,6 +2739,7 @@ require libdirac libdirac_decoder/dirac_parser.h dirac_decoder_init $(pkg-config --libs dirac) && require libdirac libdirac_encoder/dirac_encoder.h dirac_encoder_init $(pkg-config --libs dirac) enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac +enabled libfreetype && add_cflags $(pkg-config --cflags freetype2) && require libfreetype ft2build.h FT_Init_FreeType -lfreetype -lz enabled libgsm && require libgsm gsm/gsm.h gsm_create -lgsm - enabled libmp3lame && require libmp3lame lame/lame.h lame_init -lmp3lame + enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h hip_decode_init -lmp3lame enabled libnut && require libnut libnut.h nut_demuxer_init -lnut Modified: libavfilter/diffs/01_build.diff ============================================================================== --- libavfilter/diffs/01_build.diff Tue Sep 14 15:59:07 2010 (r5933) +++ libavfilter/diffs/01_build.diff Sat Sep 25 23:33:19 2010 (r5934) @@ -1,6 +1,6 @@ Index: libavfilter/Makefile =================================================================== ---- libavfilter/Makefile (revision 25118) +--- libavfilter/Makefile (revision 25200) +++ libavfilter/Makefile (working copy) @@ -3,8 +3,9 @@ NAME = avfilter @@ -13,7 +13,7 @@ Index: libavfilter/Makefile OBJS = allfilters.o \ avfilter.o \ -@@ -18,22 +19,33 @@ +@@ -22,18 +23,28 @@ OBJS-$(CONFIG_ASPECT_FILTER) += vf_aspect.o OBJS-$(CONFIG_CROP_FILTER) += vf_crop.o @@ -22,6 +22,7 @@ Index: libavfilter/Makefile +OBJS-$(CONFIG_FADE_FILTER) += vf_fade.o OBJS-$(CONFIG_FIFO_FILTER) += vf_fifo.o OBJS-$(CONFIG_FORMAT_FILTER) += vf_format.o + OBJS-$(CONFIG_FREI0R_FILTER) += vf_frei0r.o +OBJS-$(CONFIG_FPS_FILTER) += vf_fps.o OBJS-$(CONFIG_HFLIP_FILTER) += vf_hflip.o +OBJS-$(CONFIG_NEGATE_FILTER) += vf_negate.o @@ -40,6 +41,8 @@ Index: libavfilter/Makefile +OBJS-$(CONFIG_TRANSPOSE_FILTER) += vf_transpose.o OBJS-$(CONFIG_UNSHARP_FILTER) += vf_unsharp.o OBJS-$(CONFIG_VFLIP_FILTER) += vf_vflip.o + OBJS-$(CONFIG_YADIF_FILTER) += vf_yadif.o +@@ -42,6 +53,7 @@ OBJS-$(CONFIG_BUFFER_FILTER) += vsrc_buffer.o OBJS-$(CONFIG_COLOR_FILTER) += vf_pad.o @@ -49,9 +52,9 @@ Index: libavfilter/Makefile OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o Index: libavfilter/allfilters.c =================================================================== ---- libavfilter/allfilters.c (revision 25118) +--- libavfilter/allfilters.c (revision 25200) +++ libavfilter/allfilters.c (working copy) -@@ -38,22 +38,33 @@ +@@ -42,24 +42,35 @@ REGISTER_FILTER (ASPECT, aspect, vf); REGISTER_FILTER (CROP, crop, vf); @@ -60,6 +63,7 @@ Index: libavfilter/allfilters.c + REGISTER_FILTER (FADE, fade, vf); REGISTER_FILTER (FIFO, fifo, vf); REGISTER_FILTER (FORMAT, format, vf); + REGISTER_FILTER (FREI0R, frei0r, vf); + REGISTER_FILTER (FPS, fps, vf); REGISTER_FILTER (HFLIP, hflip, vf); + REGISTER_FILTER (NEGATE, negate, vf); @@ -78,6 +82,7 @@ Index: libavfilter/allfilters.c + REGISTER_FILTER (TRANSPOSE, transpose, vf); REGISTER_FILTER (UNSHARP, unsharp, vf); REGISTER_FILTER (VFLIP, vflip, vf); + REGISTER_FILTER (YADIF, yadif, vf); REGISTER_FILTER (BUFFER, buffer, vsrc); REGISTER_FILTER (COLOR, color, vsrc); Modified: libavfilter/diffs/03_doc_filters.diff ============================================================================== --- libavfilter/diffs/03_doc_filters.diff Tue Sep 14 15:59:07 2010 (r5933) +++ libavfilter/diffs/03_doc_filters.diff Sat Sep 25 23:33:19 2010 (r5934) @@ -1,10 +1,10 @@ Index: doc/filters.texi =================================================================== ---- doc/filters.texi (revision 25118) +--- doc/filters.texi (revision 25200) +++ doc/filters.texi (working copy) -@@ -55,6 +55,108 @@ - - The default value of @var{width} and @var{height} is 0. +@@ -169,6 +169,108 @@ + "crop=in_w/2:in_h/2:y:10+10*sin(n/10)" + @end example +@section drawbox + @@ -111,9 +111,9 @@ Index: doc/filters.texi @section fifo Buffer input images and send them when they are requested. -@@ -81,6 +183,14 @@ - - will convert the input video to the format ``yuv420p''. +@@ -245,6 +347,14 @@ + For more information see: + @url{http://piksel.org/frei0r} +@section fps + @@ -126,7 +126,7 @@ Index: doc/filters.texi @section hflip Flip the input video horizontally. -@@ -91,6 +201,14 @@ +@@ -255,6 +365,14 @@ ffmpeg -i in.avi -vf "hflip" out.avi @end example @@ -141,7 +141,7 @@ Index: doc/filters.texi @section noformat Force libavfilter not to use any of the specified pixel formats for the -@@ -139,6 +257,56 @@ +@@ -303,6 +421,56 @@ documentation for the exact meaning of the parameters: @url{http://opencv.willowgarage.com/documentation/c/image_filtering.html} @@ -198,7 +198,7 @@ Index: doc/filters.texi @section pad Add paddings to the input image, and places the original input at the -@@ -186,6 +354,14 @@ +@@ -350,6 +518,14 @@ can be used to test the monowhite pixel format descriptor definition. @@ -213,7 +213,7 @@ Index: doc/filters.texi @section scale Scale the input video to @var{width}:@var{height} and/or convert the image format. -@@ -211,6 +387,24 @@ +@@ -375,6 +551,24 @@ The default value of @var{width} and @var{height} is 0. @@ -238,7 +238,7 @@ Index: doc/filters.texi @section slicify Pass the images of input video on to next video filter as multiple -@@ -226,6 +420,19 @@ +@@ -390,6 +584,19 @@ Adding this in the beginning of filter chains should make filtering faster due to better use of the memory cache. @@ -258,7 +258,7 @@ Index: doc/filters.texi @section unsharp Sharpen or blur the input video. -@@ -370,6 +577,27 @@ +@@ -564,6 +771,27 @@ "color=red@@0.2:qcif:10 [color]; [in][color] overlay [out]" @end example

1 0

Watermark positioning
by Денис Нагорский 25 Sep '10

25 Sep '10

Hi everybody. Please help me. I download ffmpeg+libavfilter from svn://svn.ffmpeg.org/soc/libavfilter. I need to watermark my video. I use this command and it is work for me "/usr/local/bin/ffmpeg -i out.avi -vf "movie=0:png:logo_small.png [wm];[in][wm] overlay=0:0:1 [out]" 555.avi " BUT if i try to change margin of my watermark (overlay=10:10:1) its broke my video (see screen - http://img163.imageshack.us/img163/1006/sreene.png) You can see green streaks. I try another video, but result was the same. Also i try "overlay=main_w-overlay_w-10:main_h-overlay_h-10" but it still make green streaks. How i can place logo in the bottom right corner of the input video? root@/home/daraba/public_html/ffmpeg# /usr/local/bin/ffmpeg -i out.avi -vf "movie=0:png:logo_small.png [wm];[in][wm] overlay=10:10:1 [out]" 555.avi FFmpeg version SVN-r25118, Copyright (c) 2000-2010 the FFmpeg developers built on Sep 23 2010 10:13:30 with gcc 4.4.3 configuration: --enable-avfilter --enable-filter=movie --enable-gpl --enable-libx264 libavutil 50.26. 0 / 50.26. 0 libavcore 0. 9. 0 / 0. 9. 0 libavcodec 52.89. 0 / 52.89. 0 libavformat 52.78. 5 / 52.78. 5 libavdevice 52. 2. 2 / 52. 2. 2 libavfilter 1.39. 0 / 1.39. 0 libswscale 0.11. 0 / 0.11. 0 Input #0, avi, from 'out.avi': Metadata: ISFT : Lavf52.31.0 Duration: 00:00:18.50, start: 0.000000, bitrate: 413 kb/s Stream #0.0: Video: mpeg4, yuv420p, 740x528 [PAR 1:1 DAR 185:132], 4 fps, 4 tbr, 4 tbn, 4 tbc File '555.avi' already exists. Overwrite ? [y/N] y [buffer @ 0xabc5af0] w:740 h:528 pixfmt:yuv420p [overlay @ 0xabc5f90] auto-inserting filter 'auto-inserted scaler 0' between the filter 'Filter 0 movie' and the filter 'Filter 1 overlay' [scale @ 0xac16f90] w:180 h:74 fmt:bgra -> w:180 h:74 fmt:yuva420p flags:0xa0000004 Output #0, avi, to '555.avi': Metadata: ISFT : Lavf52.78.5 Stream #0.0: Video: mpeg4, yuv420p, 740x528 [PAR 1:1 DAR 185:132], q=2-31, 200 kb/s, 4 tbn, 4 tbc Stream mapping: Stream #0.0 -> #0.0 Press [q] to stop encoding frame= 74 fps= 0 q=4.2 Lsize= 951kB time=18.50 bitrate= 421.2kbits/s video:944kB audio:0kB global headers:0kB muxing overhead 0.783307%

1 0

[PATCH] AMR-WB Decoder
by Marcelo Galvão Póvoa 18 Sep '10

18 Sep '10

Hello, Here is my floating point AMR-WB Decoder. The output quality seems reasonable compared to the reference and libopencore decoders. There are some tests available (1kHz sine wave and high-band output) in [1]. Most of the code hasn't been reviewed yet, so I'd appreciate if someone does. There is some annotations throughout the code marked with "XXX:" used to remark cases of discrepancy between the specification and the reference source and some general issues that ought to be analyzed. This patch was generated against an old ffmpeg revision in which I started programming. I don't know if this would create a problem in applying the patch to Makefile and allcodecs.c. Please tell me if it would. [1] http://www.students.ic.unicamp.br/~ra082115/amrwb_tests.zip Regards, Marcelo

5 48

[soc]: r5933 - libavfilter/README
by stefano 14 Sep '10

14 Sep '10

Author: stefano Date: Tue Sep 14 15:59:07 2010 New Revision: 5933 Log: Remove outdate information regarding the use of --enable-avfilter-lavf. Modified: libavfilter/README Modified: libavfilter/README ============================================================================== --- libavfilter/README Tue Sep 14 15:43:40 2010 (r5932) +++ libavfilter/README Tue Sep 14 15:59:07 2010 (r5933) @@ -7,9 +7,6 @@ Here is what to do to try it out: 3) make 4) run it! -Note: in order to enable the movie filter you need to add the ---enable-avfilter-lavf to the configure command. - ffmpeg -filters will show you the list of filters/sources/sinks enabled.

1 0

[soc]: r5932 - in libavfilter: checkout.sh diffs/00_configure.diff diffs/01_build.diff diffs/03_doc_filters.diff
by stefano 14 Sep '10

14 Sep '10

Author: stefano Date: Tue Sep 14 15:43:40 2010 New Revision: 5932 Log: Update to FFmpeg r25118 / libswscale r32241. Modified: libavfilter/checkout.sh libavfilter/diffs/00_configure.diff libavfilter/diffs/01_build.diff libavfilter/diffs/03_doc_filters.diff Modified: libavfilter/checkout.sh ============================================================================== --- libavfilter/checkout.sh Tue Sep 7 22:49:24 2010 (r5931) +++ libavfilter/checkout.sh Tue Sep 14 15:43:40 2010 (r5932) @@ -1,11 +1,11 @@ #! /bin/sh echo "checking out pristine ffmpeg" -svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r24896 +svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r25118 echo "downloading the corresponding version of swscale" cd ffmpeg/libswscale -svn up -r32011 +svn up -r32241 cd ../.. echo "patching ffmpeg" Modified: libavfilter/diffs/00_configure.diff ============================================================================== --- libavfilter/diffs/00_configure.diff Tue Sep 7 22:49:24 2010 (r5931) +++ libavfilter/diffs/00_configure.diff Tue Sep 14 15:43:40 2010 (r5932) @@ -1,8 +1,8 @@ Index: configure =================================================================== ---- configure (revision 24896) +--- configure (revision 25118) +++ configure (working copy) -@@ -168,6 +168,7 @@ +@@ -169,6 +169,7 @@ and libraw1394 [no] --enable-libdirac enable Dirac support via libdirac [no] --enable-libfaac enable FAAC support via libfaac [no] @@ -10,7 +10,7 @@ Index: configure --enable-libgsm enable GSM support via libgsm [no] --enable-libmp3lame enable MP3 encoding via libmp3lame [no] --enable-libnut enable NUT (de)muxing via libnut, -@@ -873,6 +874,7 @@ +@@ -883,6 +884,7 @@ libdc1394 libdirac libfaac @@ -18,7 +18,7 @@ Index: configure libgsm libmp3lame libnut -@@ -1015,6 +1017,7 @@ +@@ -1026,6 +1028,7 @@ llrintf local_aligned_16 local_aligned_8 @@ -26,18 +26,16 @@ Index: configure log2 log2f loongson -@@ -1381,6 +1384,10 @@ - tcp_protocol_deps="network" +@@ -1393,6 +1396,8 @@ udp_protocol_deps="network" -+# filters + # filters +drawtext_filter_deps="libfreetype" +movie_filter_deps="avformat" -+ + ocv_smooth_filter_deps="libopencv" + # libraries - avdevice_deps="avcodec avformat" - avformat_deps="avcodec" -@@ -2604,6 +2611,7 @@ +@@ -2631,6 +2636,7 @@ check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss check_func inet_aton $network_extralibs check_func isatty @@ -45,7 +43,7 @@ Index: configure check_func ${malloc_prefix}memalign && enable memalign check_func mkstemp check_func ${malloc_prefix}posix_memalign && enable posix_memalign -@@ -2686,6 +2694,7 @@ +@@ -2713,6 +2719,7 @@ require libdirac libdirac_decoder/dirac_parser.h dirac_decoder_init $(pkg-config --libs dirac) && require libdirac libdirac_encoder/dirac_encoder.h dirac_encoder_init $(pkg-config --libs dirac) enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac Modified: libavfilter/diffs/01_build.diff ============================================================================== --- libavfilter/diffs/01_build.diff Tue Sep 7 22:49:24 2010 (r5931) +++ libavfilter/diffs/01_build.diff Tue Sep 14 15:43:40 2010 (r5932) @@ -1,6 +1,6 @@ Index: libavfilter/Makefile =================================================================== ---- libavfilter/Makefile (revision 24896) +--- libavfilter/Makefile (revision 25118) +++ libavfilter/Makefile (working copy) @@ -3,8 +3,9 @@ NAME = avfilter @@ -13,7 +13,7 @@ Index: libavfilter/Makefile OBJS = allfilters.o \ avfilter.o \ -@@ -18,21 +19,32 @@ +@@ -18,22 +19,33 @@ OBJS-$(CONFIG_ASPECT_FILTER) += vf_aspect.o OBJS-$(CONFIG_CROP_FILTER) += vf_crop.o @@ -27,6 +27,7 @@ Index: libavfilter/Makefile +OBJS-$(CONFIG_NEGATE_FILTER) += vf_negate.o OBJS-$(CONFIG_NOFORMAT_FILTER) += vf_format.o OBJS-$(CONFIG_NULL_FILTER) += vf_null.o + OBJS-$(CONFIG_OCV_SMOOTH_FILTER) += vf_libopencv.o +OBJS-$(CONFIG_OVERLAY_FILTER) += vf_overlay.o OBJS-$(CONFIG_PAD_FILTER) += vf_pad.o OBJS-$(CONFIG_PIXDESCTEST_FILTER) += vf_pixdesctest.o @@ -48,9 +49,9 @@ Index: libavfilter/Makefile OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o Index: libavfilter/allfilters.c =================================================================== ---- libavfilter/allfilters.c (revision 24896) +--- libavfilter/allfilters.c (revision 25118) +++ libavfilter/allfilters.c (working copy) -@@ -38,21 +38,32 @@ +@@ -38,22 +38,33 @@ REGISTER_FILTER (ASPECT, aspect, vf); REGISTER_FILTER (CROP, crop, vf); @@ -64,6 +65,7 @@ Index: libavfilter/allfilters.c + REGISTER_FILTER (NEGATE, negate, vf); REGISTER_FILTER (NOFORMAT, noformat, vf); REGISTER_FILTER (NULL, null, vf); + REGISTER_FILTER (OCV_SMOOTH, ocv_smooth, vf); + REGISTER_FILTER (OVERLAY, overlay, vf); REGISTER_FILTER (PAD, pad, vf); REGISTER_FILTER (PIXDESCTEST, pixdesctest, vf); Modified: libavfilter/diffs/03_doc_filters.diff ============================================================================== --- libavfilter/diffs/03_doc_filters.diff Tue Sep 7 22:49:24 2010 (r5931) +++ libavfilter/diffs/03_doc_filters.diff Tue Sep 14 15:43:40 2010 (r5932) @@ -1,6 +1,6 @@ Index: doc/filters.texi =================================================================== ---- doc/filters.texi (revision 24896) +--- doc/filters.texi (revision 25118) +++ doc/filters.texi (working copy) @@ -55,6 +55,108 @@ @@ -141,9 +141,9 @@ Index: doc/filters.texi @section noformat Force libavfilter not to use any of the specified pixel formats for the -@@ -112,6 +230,56 @@ - - Pass the video source unchanged to the output. +@@ -139,6 +257,56 @@ + documentation for the exact meaning of the parameters: + @url{http://opencv.willowgarage.com/documentation/c/image_filtering.html} +@section overlay + @@ -198,7 +198,7 @@ Index: doc/filters.texi @section pad Add paddings to the input image, and places the original input at the -@@ -159,6 +327,14 @@ +@@ -186,6 +354,14 @@ can be used to test the monowhite pixel format descriptor definition. @@ -213,7 +213,7 @@ Index: doc/filters.texi @section scale Scale the input video to @var{width}:@var{height} and/or convert the image format. -@@ -184,6 +360,24 @@ +@@ -211,6 +387,24 @@ The default value of @var{width} and @var{height} is 0. @@ -238,7 +238,7 @@ Index: doc/filters.texi @section slicify Pass the images of input video on to next video filter as multiple -@@ -199,6 +393,19 @@ +@@ -226,6 +420,19 @@ Adding this in the beginning of filter chains should make filtering faster due to better use of the memory cache. @@ -258,7 +258,7 @@ Index: doc/filters.texi @section unsharp Sharpen or blur the input video. -@@ -343,6 +550,27 @@ +@@ -370,6 +577,27 @@ "color=red@@0.2:qcif:10 [color]; [in][color] overlay [out]" @end example

1 0

[soc]: r5931 - libavfilter/vf_fade.c
by bcoudurier 08 Sep '10

08 Sep '10

Author: bcoudurier Date: Tue Sep 7 22:49:24 2010 New Revision: 5931 Log: Fix fade filter with 4:2:0 input, h must not be divided since i is already divided below Modified: libavfilter/vf_fade.c Modified: libavfilter/vf_fade.c ============================================================================== --- libavfilter/vf_fade.c Tue Aug 24 11:02:54 2010 (r5930) +++ libavfilter/vf_fade.c Tue Sep 7 22:49:24 2010 (r5931) @@ -153,7 +153,7 @@ static void draw_slice(AVFilterLink *lin if (outpic->data[0] && outpic->data[1]) { /* chroma planes */ for (plane = 1; plane < 3; plane++) { - for (i = 0; i < h >> fade->vsub; i++) { + for (i = 0; i < h; i++) { p = outpic->data[plane] + ((y+i) >> fade->vsub) * outpic->linesize[plane]; for (j = 0; j < link->w >> fade->hsub; j++) { /* 8421367 = ((128 << 1) + 1) << 15. It is an integer

2 1