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

[PATCH] updated! vf_overlay alpha patch and watermarking using PNG with alpha
by Artur Bodera 15 May '10

15 May '10

For those that have given up on ffmpeg and +libavfilter -vhook debacle. Here's a "just add water" solution to all your trouble: transparent PNG's and watermarks in recent ffmpeg compilations. I'm attaching a working patch that will enable alpha-transparency in overlay filter. This, on the other hand, will let you use overlay filter to superimpose a video clip or transparent png watermark on another video. This has been tested with recent revisions of svn:// svn.ffmpeg.org/soc/libavfilter rev. 5387 and ffmpeg rev. 19868 (16 Sep 2009). Compiled and running under both x86 and x86_64 on linux. Example 1 - insert transparent PNG watermark in bottom left corner of the video: -vfilters "movie=0:png:logo.png [wm];[in][wm] overlay=10:mainH-overlayH-10:1 [out]" Notice the last parameter to overlay ":1" - this enables alpha blending. Example 2 - insert 2 different transparent PNG watermarks (second watermark on bottom right corner): -vfilters "movie=0:png:logo.png [wm];movie=0:png:logo2.png [awm];[in][wm] overlay=10:mainH-overlayH-10:1 [int];[int][awm] overlay=mainW-overlayW-10:mainH-overlayH-10:1 [out]" You could chain and add more overlays this way but the efficiency of such approach is yet to be tested. This should save you a lot of time and you can continue to use your favorite transcoder for web video publishing! With best regards. -- __ /.)\ +48 695 600 936 \(./ abodera(a)gmail.com

6 23

[soc]: r5633 - libavfilter/README
by stefano 25 Feb '10

25 Feb '10

Author: stefano Date: Thu Feb 25 22:31:35 2010 New Revision: 5633 Log: Add notice regarding the fact that the -pad* options look do not work properly if libavfilter compilation is enabled. Modified: libavfilter/README Modified: libavfilter/README ============================================================================== --- libavfilter/README Thu Feb 25 22:27:10 2010 (r5632) +++ libavfilter/README Thu Feb 25 22:31:35 2010 (r5633) @@ -76,6 +76,11 @@ multiple video streams to the filter sys streams. KNOWN ISSUES: +- the -padtop, -padbottom, -padleft, -padright, -padcolor options of + ffmgeg do not work correctly when libavfilter is enabled, and they + are going to be deprecated/dropped when libavfilter will be + integrated in the main repository. Use the pad filter instead. + - if for some reason the filter chain cannot be setup (due to an unknown filter, bad parameters to a filter, or for some reason two filters cannot be linked together successfully, for example), ffplay will not display any

1 0

[soc]: r5632 - in libavfilter: checkout.sh diffs/01_ffplay_filters.diff diffs/02_ffmpeg_filters.diff diffs/03_libavfilter_doc.diff
by stefano 25 Feb '10

25 Feb '10

Author: stefano Date: Thu Feb 25 22:27:10 2010 New Revision: 5632 Log: Update to FFmpeg r22063 / libswscale r30730. Modified: libavfilter/checkout.sh libavfilter/diffs/01_ffplay_filters.diff libavfilter/diffs/02_ffmpeg_filters.diff libavfilter/diffs/03_libavfilter_doc.diff Modified: libavfilter/checkout.sh ============================================================================== --- libavfilter/checkout.sh Thu Feb 25 22:04:26 2010 (r5631) +++ libavfilter/checkout.sh Thu Feb 25 22:27:10 2010 (r5632) @@ -1,11 +1,11 @@ #! /bin/sh echo "checking out pristine ffmpeg" -svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r21854 +svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r22063 echo "downloading the corresponding version of swscale" cd ffmpeg/libswscale -svn up -r30520 +svn up -r30730 cd ../.. echo "patching ffmpeg" Modified: libavfilter/diffs/01_ffplay_filters.diff ============================================================================== --- libavfilter/diffs/01_ffplay_filters.diff Thu Feb 25 22:04:26 2010 (r5631) +++ libavfilter/diffs/01_ffplay_filters.diff Thu Feb 25 22:27:10 2010 (r5632) @@ -1,6 +1,6 @@ Index: ffplay.c =================================================================== ---- ffplay.c (revision 21854) +--- ffplay.c (revision 22063) +++ ffplay.c (working copy) @@ -32,6 +32,12 @@ #include "libavcodec/opt.h" @@ -57,7 +57,7 @@ Index: ffplay.c } VideoState; static void show_help(void); -@@ -232,6 +250,9 @@ +@@ -234,6 +252,9 @@ static int error_concealment = 3; static int decoder_reorder_pts= -1; static int autoexit; @@ -67,7 +67,7 @@ Index: ffplay.c /* current context */ static int is_full_screen; -@@ -666,6 +687,13 @@ +@@ -668,6 +689,13 @@ vp = &is->pictq[is->pictq_rindex]; if (vp->bmp) { @@ -81,7 +81,7 @@ Index: ffplay.c /* XXX: use variable in the frame */ if (is->video_st->sample_aspect_ratio.num) aspect_ratio = av_q2d(is->video_st->sample_aspect_ratio); -@@ -673,9 +701,10 @@ +@@ -675,9 +703,10 @@ aspect_ratio = av_q2d(is->video_st->codec->sample_aspect_ratio); else aspect_ratio = 0; @@ -93,7 +93,7 @@ Index: ffplay.c /* if an active format is indicated, then it overrides the mpeg format */ #if 0 -@@ -925,9 +954,15 @@ +@@ -927,9 +956,15 @@ } else if(!is_full_screen && screen_width){ w = screen_width; h = screen_height; @@ -109,7 +109,7 @@ Index: ffplay.c } else { w = 640; h = 480; -@@ -1239,12 +1274,23 @@ +@@ -1241,12 +1276,23 @@ if (vp->bmp) SDL_FreeYUVOverlay(vp->bmp); @@ -137,7 +137,7 @@ Index: ffplay.c SDL_LockMutex(is->pictq_mutex); vp->allocated = 1; -@@ -1260,7 +1306,9 @@ +@@ -1262,7 +1308,9 @@ { VideoPicture *vp; int dst_pix_fmt; @@ -148,7 +148,7 @@ Index: ffplay.c /* wait until we have space to put a new picture */ SDL_LockMutex(is->pictq_mutex); while (is->pictq_size >= VIDEO_PICTURE_QUEUE_SIZE && -@@ -1276,8 +1324,13 @@ +@@ -1278,8 +1326,13 @@ /* alloc or resize hardware picture buffer */ if (!vp->bmp || @@ -162,7 +162,7 @@ Index: ffplay.c SDL_Event event; vp->allocated = 0; -@@ -1302,6 +1355,11 @@ +@@ -1304,6 +1357,11 @@ /* if the frame is not skipped, then display it */ if (vp->bmp) { AVPicture pict; @@ -174,7 +174,7 @@ Index: ffplay.c /* get a pointer on the bitmap */ SDL_LockYUVOverlay (vp->bmp); -@@ -1315,18 +1373,30 @@ +@@ -1317,18 +1375,30 @@ pict.linesize[0] = vp->bmp->pitches[0]; pict.linesize[1] = vp->bmp->pitches[2]; pict.linesize[2] = vp->bmp->pitches[1]; @@ -209,7 +209,7 @@ Index: ffplay.c /* update the bitmap content */ SDL_UnlockYUVOverlay(vp->bmp); -@@ -1384,89 +1454,308 @@ +@@ -1386,89 +1456,308 @@ return queue_picture(is, src_frame, pts, pos); } @@ -581,7 +581,7 @@ Index: ffplay.c av_free(frame); return 0; } -@@ -2251,6 +2540,12 @@ +@@ -2265,6 +2554,12 @@ /* free all pictures */ for(i=0;i<VIDEO_PICTURE_QUEUE_SIZE; i++) { vp = &is->pictq[i]; @@ -594,7 +594,7 @@ Index: ffplay.c if (vp->bmp) { SDL_FreeYUVOverlay(vp->bmp); vp->bmp = NULL; -@@ -2260,8 +2555,10 @@ +@@ -2274,8 +2569,10 @@ SDL_DestroyCond(is->pictq_cond); SDL_DestroyMutex(is->subpq_mutex); SDL_DestroyCond(is->subpq_cond); @@ -605,7 +605,7 @@ Index: ffplay.c av_free(is); } -@@ -2353,6 +2650,9 @@ +@@ -2367,6 +2664,9 @@ av_free(avcodec_opts[i]); av_free(avformat_opts); av_free(sws_opts); @@ -615,7 +615,7 @@ Index: ffplay.c if (show_status) printf("\n"); SDL_Quit(); -@@ -2623,6 +2923,9 @@ +@@ -2637,6 +2937,9 @@ { "sync", HAS_ARG | OPT_FUNC2 | OPT_EXPERT, {(void*)opt_sync}, "set audio-video sync. type (type=audio/video/ext)", "type" }, { "threads", HAS_ARG | OPT_FUNC2 | OPT_EXPERT, {(void*)opt_thread_count}, "thread count", "count" }, { "autoexit", OPT_BOOL | OPT_EXPERT, {(void*)&autoexit}, "exit at the end", "" }, @@ -625,7 +625,7 @@ Index: ffplay.c { "default", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" }, { NULL, }, }; -@@ -2670,13 +2973,18 @@ +@@ -2684,13 +2987,18 @@ /* register all codecs, demux and protocols */ avcodec_register_all(); avdevice_register_all(); Modified: libavfilter/diffs/02_ffmpeg_filters.diff ============================================================================== --- libavfilter/diffs/02_ffmpeg_filters.diff Thu Feb 25 22:04:26 2010 (r5631) +++ libavfilter/diffs/02_ffmpeg_filters.diff Thu Feb 25 22:27:10 2010 (r5632) @@ -1,6 +1,6 @@ Index: ffmpeg.c =================================================================== ---- ffmpeg.c (revision 21854) +--- ffmpeg.c (revision 22063) +++ ffmpeg.c (working copy) @@ -42,6 +42,13 @@ #include "libavutil/avstring.h" @@ -15,8 +15,8 @@ Index: ffmpeg.c + #if HAVE_SYS_RESOURCE_H #include <sys/types.h> - #include <sys/resource.h> -@@ -144,6 +151,10 @@ + #include <sys/time.h> +@@ -149,6 +156,10 @@ static int loop_input = 0; static int loop_output = AVFMT_NOOUTPUTLOOP; static int qp_hist = 0; @@ -27,7 +27,7 @@ Index: ffmpeg.c static int intra_only = 0; static int audio_sample_rate = 44100; -@@ -302,6 +313,13 @@ +@@ -307,6 +318,13 @@ int is_start; /* is 1 at the start and after a discontinuity */ int showed_multi_packet_warning; int is_past_recording_time; @@ -41,7 +41,7 @@ Index: ffmpeg.c } AVInputStream; typedef struct AVInputFile { -@@ -317,6 +335,184 @@ +@@ -322,6 +340,184 @@ static struct termios oldtty; #endif @@ -226,7 +226,7 @@ Index: ffmpeg.c static void term_exit(void) { #if HAVE_TERMIOS_H -@@ -461,6 +657,10 @@ +@@ -466,6 +662,10 @@ allocated_audio_buf_size= allocated_audio_out_size= 0; av_free(samples); @@ -237,7 +237,7 @@ Index: ffmpeg.c if (received_sigterm) { fprintf(stderr, "Received signal %d: terminating.\n", -@@ -893,7 +1093,9 @@ +@@ -898,7 +1098,9 @@ int *frame_size) { int nb_frames, i, ret; @@ -247,7 +247,7 @@ Index: ffmpeg.c AVFrame *final_picture, *formatted_picture, *resampling_dst, *padding_src; AVFrame picture_crop_temp, picture_pad_temp; AVCodecContext *enc, *dec; -@@ -939,6 +1141,9 @@ +@@ -944,6 +1146,9 @@ if (nb_frames <= 0) return; @@ -257,7 +257,7 @@ Index: ffmpeg.c if (ost->video_crop) { if (av_picture_crop((AVPicture *)&picture_crop_temp, (AVPicture *)in_picture, dec->pix_fmt, ost->topBand, ost->leftBand) < 0) { fprintf(stderr, "error cropping picture\n"); -@@ -950,6 +1155,7 @@ +@@ -955,6 +1160,7 @@ } else { formatted_picture = in_picture; } @@ -265,7 +265,7 @@ Index: ffmpeg.c final_picture = formatted_picture; padding_src = formatted_picture; -@@ -976,6 +1182,7 @@ +@@ -981,6 +1187,7 @@ av_exit(1); } @@ -273,7 +273,7 @@ Index: ffmpeg.c if (ost->video_resample) { padding_src = NULL; final_picture = &ost->pict_tmp; -@@ -1023,6 +1230,7 @@ +@@ -1028,6 +1235,7 @@ sws_scale(ost->img_resample_ctx, formatted_picture->data, formatted_picture->linesize, 0, ost->resample_height, resampling_dst->data, resampling_dst->linesize); } @@ -281,7 +281,7 @@ Index: ffmpeg.c if (ost->video_pad) { av_picture_pad((AVPicture*)final_picture, (AVPicture *)padding_src, -@@ -1288,6 +1496,10 @@ +@@ -1293,6 +1501,10 @@ static unsigned int samples_size= 0; AVSubtitle subtitle, *subtitle_to_free; int got_subtitle; @@ -292,7 +292,7 @@ Index: ffmpeg.c AVPacket avpkt; int bps = av_get_bits_per_sample_format(ist->st->codec->sample_fmt)>>3; -@@ -1415,6 +1627,15 @@ +@@ -1420,6 +1632,15 @@ &buffer_to_free); } @@ -308,7 +308,7 @@ Index: ffmpeg.c // preprocess audio (volume) if (ist->st->codec->codec_type == CODEC_TYPE_AUDIO) { if (audio_volume != 256) { -@@ -1436,10 +1657,18 @@ +@@ -1441,10 +1662,18 @@ if (pts > now) usleep(pts - now); } @@ -328,7 +328,7 @@ Index: ffmpeg.c for(i=0;i<nb_ostreams;i++) { int frame_size; -@@ -1457,6 +1686,9 @@ +@@ -1462,6 +1691,9 @@ do_audio_out(os, ost, ist, decoded_data_buf, decoded_data_size); break; case CODEC_TYPE_VIDEO: @@ -338,7 +338,7 @@ Index: ffmpeg.c do_video_out(os, ost, ist, &picture, &frame_size); if (vstats_filename && frame_size) do_video_stats(os, ost, frame_size); -@@ -1525,7 +1757,17 @@ +@@ -1530,7 +1762,17 @@ av_free_packet(&opkt); } } @@ -356,7 +356,7 @@ Index: ffmpeg.c av_free(buffer_to_free); /* XXX: allocate the subtitles in the codec ? */ if (subtitle_to_free) { -@@ -1979,9 +2221,10 @@ +@@ -1967,9 +2209,10 @@ av_exit(1); } @@ -368,7 +368,7 @@ Index: ffmpeg.c codec->bits_per_raw_sample= 0; } ost->resample_height = icodec->height - (frame_topBand + frame_bottomBand); -@@ -1989,6 +2232,13 @@ +@@ -1977,6 +2220,13 @@ ost->resample_pix_fmt= icodec->pix_fmt; ost->encoding_needed = 1; ist->decoding_needed = 1; @@ -382,7 +382,7 @@ Index: ffmpeg.c break; case CODEC_TYPE_SUBTITLE: ost->encoding_needed = 1; -@@ -2374,6 +2624,12 @@ +@@ -2364,6 +2614,12 @@ avcodec_close(ist->st->codec); } } @@ -395,7 +395,7 @@ Index: ffmpeg.c /* finished ! */ ret = 0; -@@ -3928,6 +4184,9 @@ +@@ -3953,6 +4209,9 @@ { "psnr", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_psnr}, "calculate PSNR of compressed frames" }, { "vstats", OPT_EXPERT | OPT_VIDEO, {(void*)&opt_vstats}, "dump video coding statistics to file" }, { "vstats_file", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_vstats_file}, "dump video coding statistics to file", "file" }, @@ -405,7 +405,7 @@ Index: ffmpeg.c { "intra_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_intra_matrix}, "specify intra matrix coeffs", "matrix" }, { "inter_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_inter_matrix}, "specify inter matrix coeffs", "matrix" }, { "top", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_top_field_first}, "top=1/bottom=0/auto=-1 field first", "" }, -@@ -3988,6 +4247,9 @@ +@@ -4013,6 +4272,9 @@ avcodec_register_all(); avdevice_register_all(); Modified: libavfilter/diffs/03_libavfilter_doc.diff ============================================================================== --- libavfilter/diffs/03_libavfilter_doc.diff Thu Feb 25 22:04:26 2010 (r5631) +++ libavfilter/diffs/03_libavfilter_doc.diff Thu Feb 25 22:27:10 2010 (r5632) @@ -1,8 +1,8 @@ Index: doc/libavfilter.texi =================================================================== ---- doc/libavfilter.texi (revision 21854) +--- doc/libavfilter.texi (revision 22063) +++ doc/libavfilter.texi (working copy) -@@ -111,6 +111,20 @@ +@@ -139,6 +139,20 @@ The default value of ``width'' and ``height'' is 0. @@ -23,7 +23,7 @@ Index: doc/libavfilter.texi @section format Convert the input video to one of the specified pixel formats. -@@ -128,6 +142,30 @@ +@@ -156,6 +170,30 @@ will convert the input video to the format ``yuv420p''. @@ -54,7 +54,7 @@ Index: doc/libavfilter.texi @section noformat Force libavfilter not to use any of the specified pixel formats for the -@@ -149,6 +187,98 @@ +@@ -177,6 +215,98 @@ Pass the source unchanged to the output. @@ -153,7 +153,7 @@ Index: doc/libavfilter.texi @section scale Scale the input video to width:height and/or convert the image format. -@@ -174,6 +304,24 @@ +@@ -202,6 +332,24 @@ The default value of ``width'' and ``height'' is 0. @@ -178,7 +178,7 @@ Index: doc/libavfilter.texi @section slicify Pass the images of input video on to next video filter as multiple -@@ -189,6 +337,19 @@ +@@ -217,6 +365,19 @@ Adding this in the beginning of filter chains should make filtering faster due to better use of the memory cache. @@ -198,7 +198,7 @@ Index: doc/libavfilter.texi @section vflip Flip the input video vertically. -@@ -201,6 +362,32 @@ +@@ -229,6 +390,32 @@ Below is a description of the currently available video sources.

1 0

[soc]: r5631 - libavfilter/Makefile
by stefano 25 Feb '10

25 Feb '10

Author: stefano Date: Thu Feb 25 22:04:26 2010 New Revision: 5631 Log: Add avfiltergraph.h to the public headers, it is intended to be part of the public API. Modified: libavfilter/Makefile Modified: libavfilter/Makefile ============================================================================== --- libavfilter/Makefile Mon Feb 22 23:15:29 2010 (r5630) +++ libavfilter/Makefile Thu Feb 25 22:04:26 2010 (r5631) @@ -5,7 +5,7 @@ FFLIBS = avcodec avutil FFLIBS-$(CONFIG_SCALE_FILTER) += swscale FFLIBS-$(CONFIG_AVFILTER_LAVF) += avformat -HEADERS = avfilter.h +HEADERS = avfilter.h avfiltergraph.h OBJS = allfilters.o \ avfilter.o \

1 0

[soc]: r5630 - libavfilter/README
by stefano 22 Feb '10

22 Feb '10

Author: stefano Date: Mon Feb 22 23:15:29 2010 New Revision: 5630 Log: Do not tell the user there is no documentation as this is not anymore true, and point to doc/libavfilter.html. Modified: libavfilter/README Modified: libavfilter/README ============================================================================== --- libavfilter/README Mon Feb 22 23:10:48 2010 (r5629) +++ libavfilter/README Mon Feb 22 23:15:29 2010 (r5630) @@ -67,9 +67,8 @@ could use this command: ./ffplay -vfilters scale=640:480 input_video.avi Be aware that some filters, notably the crop filter, interpret the parameters -differently than mplayer does. There's currently no documentation about this -except the source of those particular filters. Sorry. Play around with some -of the filters. +differently than mplayer does. Documentation for each filter is provided in the +doc/libavfilter.html file. One of the interesting features of libavfilter is the ability for filters to have multiple inputs and multiple outputs. Unfortunately, ffplay cannot feed

1 0

[soc]: r5629 - libavfilter/README
by stefano 22 Feb '10

22 Feb '10

Author: stefano Date: Mon Feb 22 23:10:48 2010 New Revision: 5629 Log: Add a note telling how to enable the movie filter, and how to see the list of currently enabled filters. Modified: libavfilter/README Modified: libavfilter/README ============================================================================== --- libavfilter/README Sun Feb 21 15:54:52 2010 (r5628) +++ libavfilter/README Mon Feb 22 23:10:48 2010 (r5629) @@ -7,6 +7,12 @@ 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. + WRITING FILTERS: There is some documentation on writing basic filters over at the multimedia

1 0

[soc]: r5628 - in libavfilter: Makefile allfilters.c
by stefano 21 Feb '10

21 Feb '10

Author: stefano Date: Sun Feb 21 15:54:52 2010 New Revision: 5628 Log: Register and compile the nullsrc source and the nullsink sink. Modified: libavfilter/Makefile libavfilter/allfilters.c Modified: libavfilter/Makefile ============================================================================== --- libavfilter/Makefile Sun Feb 21 11:28:27 2010 (r5627) +++ libavfilter/Makefile Sun Feb 21 15:54:52 2010 (r5628) @@ -36,5 +36,8 @@ OBJS-$(CONFIG_VFLIP_FILTER) += vf_v OBJS-$(CONFIG_BUFFER_FILTER) += vsrc_buffer.o OBJS-$(CONFIG_MOVIE_FILTER) += vsrc_movie.o +OBJS-$(CONFIG_NULLSRC_FILTER) += vsrc_nullsrc.o + +OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o include $(SUBDIR)../subdir.mak Modified: libavfilter/allfilters.c ============================================================================== --- libavfilter/allfilters.c Sun Feb 21 11:28:27 2010 (r5627) +++ libavfilter/allfilters.c Sun Feb 21 15:54:52 2010 (r5628) @@ -55,4 +55,7 @@ void avfilter_register_all(void) REGISTER_FILTER(BUFFER,buffer,vsrc); REGISTER_FILTER(MOVIE,movie,vsrc); + REGISTER_FILTER(NULLSRC, nullsrc, vsrc); + + REGISTER_FILTER(NULLSINK, nullsink, vsink); }

1 0

[soc]: r5627 - libavfilter/vf_rotate.c
by stefano 21 Feb '10

21 Feb '10

Author: stefano Date: Sun Feb 21 11:28:27 2010 New Revision: 5627 Log: Make it output slices with the correct size of pad->output_h. Modified: libavfilter/vf_rotate.c Modified: libavfilter/vf_rotate.c ============================================================================== --- libavfilter/vf_rotate.c Sun Feb 21 01:14:39 2010 (r5626) +++ libavfilter/vf_rotate.c Sun Feb 21 11:28:27 2010 (r5627) @@ -154,7 +154,7 @@ static void end_frame(AVFilterLink *link } avfilter_unref_pic(in); - avfilter_draw_slice(link->dst->outputs[0], 0, rot->output_w, 1); + avfilter_draw_slice(link->dst->outputs[0], 0, rot->output_h, 1); avfilter_end_frame(link->dst->outputs[0]); avfilter_unref_pic(out); }

1 0

[soc]: r5626 - libavfilter/vf_pad.c
by stefano 21 Feb '10

21 Feb '10

Author: stefano Date: Sun Feb 21 01:14:39 2010 New Revision: 5626 Log: 10l: move the pad->w initialization/normalization before filling pas->line with color, as when the latter is done the effective pad->w is used. Fix the case when the user provide a value of 0 for the pad width. Thanks to Jarred Nicholls <$name.$surname(a)gmail.com> for helping me to figure this out. Modified: libavfilter/vf_pad.c Modified: libavfilter/vf_pad.c ============================================================================== --- libavfilter/vf_pad.c Fri Feb 19 01:00:18 2010 (r5625) +++ libavfilter/vf_pad.c Sun Feb 21 01:14:39 2010 (r5626) @@ -125,6 +125,19 @@ static int config_input(AVFilterLink *in pad->hsub = pix_desc->log2_chroma_w; pad->vsub = pix_desc->log2_chroma_h; + if (!pad->w) + pad->w = inlink->w; + if (!pad->h) + pad->h = inlink->h; + + pad->w &= ~((1 << pad->hsub) - 1); + pad->h &= ~((1 << pad->vsub) - 1); + pad->x &= ~((1 << pad->hsub) - 1); + pad->y &= ~((1 << pad->vsub) - 1); + + pad->in_w = inlink->w & ~((1 << pad->hsub) - 1); + pad->in_h = inlink->h & ~((1 << pad->vsub) - 1); + memcpy(rgba_color, pad->color, sizeof(rgba_color)); if (is_packed_rgb) { pad->line_step[0] = (av_get_bits_per_pixel(&av_pix_fmt_descriptors[inlink->format]))>>3; @@ -153,19 +166,6 @@ static int config_input(AVFilterLink *in } } - if (!pad->w) - pad->w = inlink->w; - if (!pad->h) - pad->h = inlink->h; - - pad->w &= ~((1 << pad->hsub) - 1); - pad->h &= ~((1 << pad->vsub) - 1); - pad->x &= ~((1 << pad->hsub) - 1); - pad->y &= ~((1 << pad->vsub) - 1); - - pad->in_w = inlink->w & ~((1 << pad->hsub) - 1); - pad->in_h = inlink->h & ~((1 << pad->vsub) - 1); - av_log(ctx, AV_LOG_INFO, "w:%d h:%d x:%d y:%d color:0x%02X%02X%02X%02X[%s]\n", pad->w, pad->h, pad->x, pad->y, pad->color[0], pad->color[1], pad->color[2], pad->color[3],

1 0

[soc]: r5625 - in libavfilter: Makefile allfilters.c diffs/03_libavfilter_doc.diff vf_pad.c
by stefano 19 Feb '10

19 Feb '10

Author: stefano Date: Fri Feb 19 01:00:18 2010 New Revision: 5625 Log: Add pad filter. The filter is currently discussed in ffmpeg-devel, but some problems need to be fixed before it can be committed to the main repo. See the thread: Subject: [FFmpeg-devel] [PATCH] Add pad filter Date: Sun, 8 Nov 2009 21:50:13 +0100 http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/99314/ Added: libavfilter/vf_pad.c Modified: libavfilter/Makefile libavfilter/allfilters.c libavfilter/diffs/03_libavfilter_doc.diff Modified: libavfilter/Makefile ============================================================================== --- libavfilter/Makefile Thu Feb 18 17:54:15 2010 (r5624) +++ libavfilter/Makefile Fri Feb 19 01:00:18 2010 (r5625) @@ -25,6 +25,7 @@ OBJS-$(CONFIG_FIFO_FILTER) += vf_f OBJS-$(CONFIG_FORMAT_FILTER) += vf_format.o OBJS-$(CONFIG_NULL_FILTER) += vf_null.o OBJS-$(CONFIG_OVERLAY_FILTER) += vf_overlay.o +OBJS-$(CONFIG_PAD_FILTER) += vf_pad.o OBJS-$(CONFIG_ROTATE_FILTER) += vf_rotate.o OBJS-$(CONFIG_SCALE_FILTER) += vf_scale.o OBJS-$(CONFIG_SETPTS_FILTER) += vf_setpts.o Modified: libavfilter/allfilters.c ============================================================================== --- libavfilter/allfilters.c Thu Feb 18 17:54:15 2010 (r5624) +++ libavfilter/allfilters.c Fri Feb 19 01:00:18 2010 (r5625) @@ -44,6 +44,7 @@ void avfilter_register_all(void) REGISTER_FILTER(NOFORMAT,noformat,vf); REGISTER_FILTER(NULL,null,vf); REGISTER_FILTER(OVERLAY,overlay,vf); + REGISTER_FILTER(PAD,pad,vf); REGISTER_FILTER(ROTATE,rotate,vf); REGISTER_FILTER(SCALE,scale,vf); REGISTER_FILTER(SETPTS,setpts,vf); Modified: libavfilter/diffs/03_libavfilter_doc.diff ============================================================================== --- libavfilter/diffs/03_libavfilter_doc.diff Thu Feb 18 17:54:15 2010 (r5624) +++ libavfilter/diffs/03_libavfilter_doc.diff Fri Feb 19 01:00:18 2010 (r5625) @@ -54,7 +54,7 @@ Index: doc/libavfilter.texi @section noformat Force libavfilter not to use any of the specified pixel formats for the -@@ -149,6 +187,64 @@ +@@ -149,6 +187,98 @@ Pass the source unchanged to the output. @@ -108,6 +108,40 @@ Index: doc/libavfilter.texi +You could chain and add more overlays this way but the efficiency of +such approach is yet to be tested. + ++@section pad ++ ++Add paddings to the input image, and places the original input at the ++given coordinates x, y. ++ ++It accepts the following parameters: width:height:x:y:color. ++ ++Follows the description of the accepted parameters. ++ ++@table @option ++@item width, height ++ ++Specify the size of the output image with the paddings added. If the ++value for ``width'' or ``height'' is 0, the corresponding input size ++is used for the output. ++ ++The default value of ``width'' and ``height'' is 0. ++ ++@item x, y ++ ++Specify the offsets where to place the input image in the padded area ++with respect to the top/left border of the output image. ++ ++The default value of ``x'' and ``y'' is 0. ++ ++@item color ++ ++Specify the color of the padded area, it can be the name of a color ++(case insensitive match) or a 0xRRGGBB[AA] sequence. ++ ++The default value of ``color'' is ``black''. ++ ++@end table ++ +@section rotate + +@example @@ -119,7 +153,7 @@ Index: doc/libavfilter.texi @section scale Scale the input video to width:height and/or convert the image format. -@@ -174,6 +270,24 @@ +@@ -174,6 +304,24 @@ The default value of ``width'' and ``height'' is 0. @@ -144,7 +178,7 @@ Index: doc/libavfilter.texi @section slicify Pass the images of input video on to next video filter as multiple -@@ -189,6 +303,19 @@ +@@ -189,6 +337,19 @@ Adding this in the beginning of filter chains should make filtering faster due to better use of the memory cache. @@ -164,7 +198,7 @@ Index: doc/libavfilter.texi @section vflip Flip the input video vertically. -@@ -201,6 +328,32 @@ +@@ -201,6 +362,32 @@ Below is a description of the currently available video sources. Added: libavfilter/vf_pad.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ libavfilter/vf_pad.c Fri Feb 19 01:00:18 2010 (r5625) @@ -0,0 +1,326 @@ +/* + * copyright (c) 2008 vmrsss + * copyright (c) 2009 Stefano Sabatini + * + * 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 + */ + +/** + * @file libavfilter/vf_pad.c + * video padding filter + */ + +#include "avfilter.h" +#include "parseutils.h" +#include "libavutil/pixdesc.h" +#include "libavcodec/colorspace.h" + +typedef struct { + int w, h; ///< output dimensions, a value of 0 will result in the input size + int x, y; ///< offsets of the input area with respect to the padded area + int in_w, in_h; ///< width and height for the padded input video, which has to be aligned to the chroma values in order to avoid chroma issues + + uint8_t color[4]; ///< color expressed either in YUVA or RGBA colorspace for the padding area + uint8_t *line[4]; + int line_step[4]; + int hsub, vsub; ///< chroma subsampling values +} PadContext; + +static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque) +{ + PadContext *pad = ctx->priv; + char color_string[128] = "black"; + + if (args) + sscanf(args, "%d:%d:%d:%d:%s", &pad->w, &pad->h, &pad->x, &pad->y, color_string); + + if (av_parse_color(pad->color, color_string, ctx) < 0) + return -1; + + /* sanity check params */ + if (pad->w < 0 || pad->h < 0) { + av_log(ctx, AV_LOG_ERROR, "Negative size values are not acceptable.\n"); + return -1; + } + + return 0; +} + +static av_cold void uninit(AVFilterContext *ctx) +{ + PadContext *pad = ctx->priv; + int i; + + for (i = 0; i < 4; i++) { + av_freep(&pad->line[i]); + pad->line_step[i] = 0; + } +} + +static int query_formats(AVFilterContext *ctx) +{ + static const enum PixelFormat pix_fmts[] = { + PIX_FMT_ARGB, PIX_FMT_RGBA, + PIX_FMT_ABGR, PIX_FMT_BGRA, + PIX_FMT_RGB24, PIX_FMT_BGR24, + + PIX_FMT_YUV444P, PIX_FMT_YUV422P, + PIX_FMT_YUV420P, PIX_FMT_YUV411P, + PIX_FMT_YUV410P, PIX_FMT_YUV440P, + PIX_FMT_YUVJ444P, PIX_FMT_YUVJ422P, + PIX_FMT_YUVJ420P, PIX_FMT_YUVJ440P, + PIX_FMT_YUVA420P, + + PIX_FMT_NONE + }; + + avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts)); + return 0; +} + +enum { RED = 0, GREEN, BLUE, ALPHA }; + +static int config_input(AVFilterLink *inlink) +{ + AVFilterContext *ctx = inlink->dst; + PadContext *pad = ctx->priv; + const AVPixFmtDescriptor *pix_desc = &av_pix_fmt_descriptors[inlink->format]; + uint8_t rgba_color[4]; + uint8_t rgba_map[4]; + int i, is_packed_rgb = 1; + + switch (inlink->format) { + case PIX_FMT_ARGB: + rgba_map[ALPHA] = 0; rgba_map[RED] = 1; rgba_map[GREEN] = 2; rgba_map[BLUE] = 3; + break; + case PIX_FMT_ABGR: + rgba_map[ALPHA] = 0; rgba_map[BLUE] = 1; rgba_map[GREEN] = 2; rgba_map[RED] = 3; + break; + case PIX_FMT_RGBA: + case PIX_FMT_RGB24: + rgba_map[RED] = 0; rgba_map[GREEN] = 1; rgba_map[BLUE] = 2; rgba_map[ALPHA] = 3; + break; + case PIX_FMT_BGRA: + case PIX_FMT_BGR24: + rgba_map[BLUE] = 0; rgba_map[GREEN] = 1; rgba_map[RED] = 2; rgba_map[ALPHA] = 3; + break; + default: + is_packed_rgb = 0; + } + + pad->hsub = pix_desc->log2_chroma_w; + pad->vsub = pix_desc->log2_chroma_h; + + memcpy(rgba_color, pad->color, sizeof(rgba_color)); + if (is_packed_rgb) { + pad->line_step[0] = (av_get_bits_per_pixel(&av_pix_fmt_descriptors[inlink->format]))>>3; + for (i = 0; i < 4; i++) + pad->color[rgba_map[i]] = rgba_color[i]; + + pad->line[0] = av_malloc(pad->w * pad->line_step[0]); + for (i = 0; i < pad->w; i++) + memcpy(pad->line[0] + i * pad->line_step[0], pad->color, pad->line_step[0]); + } else { + int plane; + + pad->color[0] = RGB_TO_Y(rgba_color[0], rgba_color[1], rgba_color[2]); + pad->color[1] = RGB_TO_U(rgba_color[0], rgba_color[1], rgba_color[2], 0); + pad->color[2] = RGB_TO_V(rgba_color[0], rgba_color[1], rgba_color[2], 0); + pad->color[3] = rgba_color[3]; + + for (plane = 0; plane < 4; plane++) { + int line_size; + int hsub = (plane == 1 || plane == 2) ? pad->hsub : 0; + + pad->line_step[plane] = 1; + line_size = (pad->w >> hsub) * pad->line_step[plane]; + pad->line[plane] = av_malloc(line_size); + memset(pad->line[plane], pad->color[plane], line_size); + } + } + + if (!pad->w) + pad->w = inlink->w; + if (!pad->h) + pad->h = inlink->h; + + pad->w &= ~((1 << pad->hsub) - 1); + pad->h &= ~((1 << pad->vsub) - 1); + pad->x &= ~((1 << pad->hsub) - 1); + pad->y &= ~((1 << pad->vsub) - 1); + + pad->in_w = inlink->w & ~((1 << pad->hsub) - 1); + pad->in_h = inlink->h & ~((1 << pad->vsub) - 1); + + av_log(ctx, AV_LOG_INFO, "w:%d h:%d x:%d y:%d color:0x%02X%02X%02X%02X[%s]\n", + pad->w, pad->h, pad->x, pad->y, + pad->color[0], pad->color[1], pad->color[2], pad->color[3], + is_packed_rgb ? "rgba" : "yuva"); + + if (pad->x < 0 || pad->y < 0 || + pad->w <= 0 || pad->h <= 0 || + (unsigned)pad->x + (unsigned)inlink->w > pad->w || + (unsigned)pad->y + (unsigned)inlink->h > pad->h) { + av_log(ctx, AV_LOG_ERROR, + "Input area %d:%d:%d:%d not within the padded area 0:0:%d:%d or zero-sized\n", + pad->x, pad->y, pad->x + inlink->w, pad->y + inlink->h, pad->w, pad->h); + return -1; + } + + return 0; +} + +static int config_output(AVFilterLink *outlink) +{ + PadContext *pad = outlink->src->priv; + + outlink->w = pad->w; + outlink->h = pad->h; + return 0; +} + +static AVFilterPicRef *get_video_buffer(AVFilterLink *inlink, int perms, int w, int h) +{ + PadContext *pad = inlink->dst->priv; + + AVFilterPicRef *picref = avfilter_get_video_buffer(inlink->dst->outputs[0], perms, + w + (pad->w - pad->in_w), + h + (pad->h - pad->in_h)); + + for (int plane = 0; plane < 4 && picref->data[plane]; plane++) { + int hsub = (plane == 1 || plane == 2) ? pad->hsub : 0; + int vsub = (plane == 1 || plane == 2) ? pad->vsub : 0; + + picref->data[plane] += (pad->x >> hsub) * pad->line_step[plane] + + (pad->y >> vsub) * picref->linesize[plane]; + } + + return picref; +} + +static void start_frame(AVFilterLink *inlink, AVFilterPicRef *inpicref) +{ + PadContext *pad = inlink->dst->priv; + AVFilterPicRef *outpicref = avfilter_ref_pic(inpicref, ~0); + inlink->dst->outputs[0]->outpic = outpicref; + + for (int plane = 0; plane < 4 && outpicref->data[plane]; plane++) { + int hsub = (plane == 1 || plane == 2) ? pad->hsub : 0; + int vsub = (plane == 1 || plane == 2) ? pad->vsub : 0; + + outpicref->data[plane] -= (pad->x >> hsub) * pad->line_step[plane] + + (pad->y >> vsub) * outpicref->linesize[plane]; + } + + avfilter_start_frame(inlink->dst->outputs[0], outpicref); +} + +static void end_frame(AVFilterLink *link) +{ + avfilter_end_frame(link->dst->outputs[0]); + avfilter_unref_pic(link->cur_pic); +} + +static void draw_rectangle(AVFilterPicRef *outpic, uint8_t *line[4], int line_step[4], + int hsub, int vsub, int x, int y, int w, int h) +{ + int i, plane; + uint8_t *p; + + for (plane = 0; plane < 4 && outpic->data[plane]; plane++) { + int hsub1 = plane == 1 || plane == 2 ? hsub : 0; + int vsub1 = plane == 1 || plane == 2 ? vsub : 0; + + p = outpic->data[plane] + (y >> vsub1) * outpic->linesize[plane]; + for (i = 0; i < (h >> vsub1); i++) { + memcpy(p + (x >> hsub1) * line_step[plane], line[plane], (w >> hsub1) * line_step[plane]); + p += outpic->linesize[plane]; + } + } +} + +static void draw_send_bar_slice(AVFilterLink *link, int y, int h, int slice_dir, int before_slice) +{ + PadContext *pad = link->dst->priv; + int bar_y, bar_h = 0; + + if (slice_dir * before_slice == 1 && y == pad->y) { + /* top bar */ + bar_y = 0; + bar_h = pad->y; + } else if (slice_dir * before_slice == -1 && (y + h) == (pad->y + pad->in_h)) { + /* bottom bar */ + bar_y = pad->y + pad->in_h; + bar_h = pad->h - pad->in_h - pad->y; + } + + if (bar_h) { + draw_rectangle(link->dst->outputs[0]->outpic, + pad->line, pad->line_step, pad->hsub, pad->vsub, + 0, bar_y, pad->w, bar_h); + avfilter_draw_slice(link->dst->outputs[0], bar_y, bar_h, slice_dir); + } +} + +static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir) +{ + PadContext *pad = link->dst->priv; + AVFilterPicRef *outpic = link->dst->outputs[0]->outpic; + + y += pad->y; + + y &= ~((1 << pad->vsub) - 1); + h &= ~((1 << pad->vsub) - 1); + + if (!h) + return; + draw_send_bar_slice(link, y, h, slice_dir, 1); + + /* left border */ + draw_rectangle(outpic, pad->line, pad->line_step, pad->hsub, pad->vsub, + 0, y, pad->x, h); + /* right border */ + draw_rectangle(outpic, pad->line, pad->line_step, pad->hsub, pad->vsub, + pad->x + pad->in_w, y, pad->w - pad->x - pad->in_w, h); + avfilter_draw_slice(link->dst->outputs[0], y, h, slice_dir); + + draw_send_bar_slice(link, y, h, slice_dir, -1); +} + +AVFilter avfilter_vf_pad = { + .name = "pad", + .description = "Add pads to the input image.", + + .priv_size = sizeof(PadContext), + .init = init, + .uninit = uninit, + .query_formats = query_formats, + + .inputs = (AVFilterPad[]) {{ .name = "default", + .type = CODEC_TYPE_VIDEO, + .config_props = config_input, + .get_video_buffer = get_video_buffer, + .start_frame = start_frame, + .draw_slice = draw_slice, + .end_frame = end_frame, }, + { .name = NULL}}, + + .outputs = (AVFilterPad[]) {{ .name = "default", + .type = CODEC_TYPE_VIDEO, + .config_props = config_output, }, + { .name = NULL}}, +};

1 0