February 2011 - ffmpeg-devel - lists.ffmpeg.org

[PATCH] lavfi: add fade filter
by stefano.sabatini-lala＠poste.it 18 Jul '11

18 Jul '11

From: Brandon Mintern <bmintern at gmail.com> Port fade filter from libavfilter soc repo, with minor fixes by Stefano. --- doc/filters.texi | 33 +++++++++ libavfilter/Makefile | 1 + libavfilter/allfilters.c | 1 + libavfilter/vf_fade.c | 170 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 205 insertions(+), 0 deletions(-) create mode 100644 libavfilter/vf_fade.c diff --git a/doc/filters.texi b/doc/filters.texi index 049e2bd..bbc730d 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -465,6 +465,39 @@ within the parameter list. For more information about libfreetype, check: @url{http://www.freetype.org/} + at section fade + +Apply fade-in/out effect to input video. + +It accepts the parameters: + at var{type}:@var{start_frame}:@var{nb_frames} + + at var{type} specifies if the effect type, can be either "in" for +fade-in, or "out" for a fade-out effect. + + at var{start_frame} specifies the number of the start frame for starting +to apply the fade effect. + + at var{nb_frames} specifies the number of frames for which the fade +effect has to last. At the end of the fade-in effect the output video +will have the same intensity as the input video, at the end of the +fade-out transition the output video will be completely black. + +A few usage examples follow, usable too as test scenarios. + at example +# fade in first 30 frames of video +fade=in:0:30 + +# fade out last 45 frames of a 200-frame video +fade=out:155:45 + +# fade in first 25 frames and fade out last 25 frames of a 1000-frame video +fade=in:0:25, fade=out:975:25 + +# make first 5 frames black, then fade in from frame 5-24 +fade=in:5:20 + at end example + @section fifo Buffer input images and send them when they are requested. diff --git a/libavfilter/Makefile b/libavfilter/Makefile index b3f77a0..f116fe5 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -27,6 +27,7 @@ OBJS-$(CONFIG_CROP_FILTER) += vf_crop.o OBJS-$(CONFIG_CROPDETECT_FILTER) += vf_cropdetect.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 OBJS-$(CONFIG_FORMAT_FILTER) += vf_format.o OBJS-$(CONFIG_FREI0R_FILTER) += vf_frei0r.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 347a728..0fdd09b 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -46,6 +46,7 @@ void avfilter_register_all(void) REGISTER_FILTER (CROPDETECT, cropdetect, vf); REGISTER_FILTER (DRAWBOX, drawbox, vf); REGISTER_FILTER (DRAWTEXT, drawtext, vf); + REGISTER_FILTER (FADE, fade, vf); REGISTER_FILTER (FIFO, fifo, vf); REGISTER_FILTER (FORMAT, format, vf); REGISTER_FILTER (FREI0R, frei0r, vf); diff --git a/libavfilter/vf_fade.c b/libavfilter/vf_fade.c new file mode 100644 index 0000000..203a186 --- /dev/null +++ b/libavfilter/vf_fade.c @@ -0,0 +1,170 @@ +/* + * Copyright (c) 2010 Brandon Mintern + * Copyright (c) 2007 Bobby Bingham + * + * 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 + * video fade filter + * based heavily on vf_negate.c by Bobby Bingham + */ + +#include "libavutil/pixdesc.h" +#include "avfilter.h" + +typedef struct { + int factor, fade_per_frame; + unsigned int frame_index, start_frame, stop_frame; + int hsub, vsub, bpp; +} FadeContext; + +static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque) +{ + FadeContext *fade = ctx->priv; + unsigned int nb_frames; + char in_out[4]; + + if (!args || + sscanf(args, " %3[^:]:%u:%u", in_out, &fade->start_frame, &nb_frames) != 3) { + av_log(ctx, AV_LOG_ERROR, + "Expected 3 arguments '(in|out):#:#':'%s'\n", args); + return AVERROR(EINVAL); + } + + nb_frames = nb_frames ? nb_frames : 1; + fade->fade_per_frame = (1 << 16) / nb_frames; + if (!strcmp(in_out, "in")) + fade->factor = 0; + else if (!strcmp(in_out, "out")) { + fade->fade_per_frame = -fade->fade_per_frame; + fade->factor = (1 << 16); + } else { + av_log(ctx, AV_LOG_ERROR, + "first argument must be 'in' or 'out':'%s'\n", in_out); + return AVERROR(EINVAL); + } + fade->stop_frame = fade->start_frame + nb_frames; + + av_log(ctx, AV_LOG_INFO, + "type:%s start_frame:%d nb_frames:%d\n", + in_out, fade->start_frame, nb_frames); + return 0; +} + +static int query_formats(AVFilterContext *ctx) +{ + const static enum PixelFormat pix_fmts[] = { + PIX_FMT_YUV444P, PIX_FMT_YUV422P, PIX_FMT_YUV420P, + PIX_FMT_YUV411P, PIX_FMT_YUV410P, + PIX_FMT_YUVJ444P, PIX_FMT_YUVJ422P, PIX_FMT_YUVJ420P, + PIX_FMT_YUV440P, PIX_FMT_YUVJ440P, + PIX_FMT_RGB24, PIX_FMT_BGR24, + PIX_FMT_NONE + }; + + avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts)); + return 0; +} + +static int config_props(AVFilterLink *inlink) +{ + FadeContext *fade = inlink->dst->priv; + const AVPixFmtDescriptor *pixdesc = &av_pix_fmt_descriptors[inlink->format]; + + fade->hsub = pixdesc->log2_chroma_w; + fade->vsub = pixdesc->log2_chroma_h; + + fade->bpp = av_get_bits_per_pixel(pixdesc) >> 3; + return 0; +} + +static void draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir) +{ + FadeContext *fade = inlink->dst->priv; + AVFilterBufferRef *outpic = inlink->cur_buf; + uint8_t *p; + int i, j, plane; + + if (fade->factor < 65536) { + /* luma or rgb plane */ + for (i = 0; i < h; i++) { + p = outpic->data[0] + (y+i) * outpic->linesize[0]; + for (j = 0; j < inlink->w * fade->bpp; j++) { + /* fade->factor is using 16 lower-order bits for decimal + * places. 32768 = 1 << 15, it is an integer representation + * of 0.5 and is for rounding. */ + *p = (*p * fade->factor + 32768) >> 16; + p++; + } + } + + if (outpic->data[0] && outpic->data[1]) { + /* chroma planes */ + for (plane = 1; plane < 3; plane++) { + for (i = 0; i < h; i++) { + p = outpic->data[plane] + ((y+i) >> fade->vsub) * outpic->linesize[plane]; + for (j = 0; j < inlink->w >> fade->hsub; j++) { + /* 8421367 = ((128 << 1) + 1) << 15. It is an integer + * representation of 128.5. The .5 is for rounding + * purposes. */ + *p = ((*p - 128) * fade->factor + 8421367) >> 16; + p++; + } + } + } + } + } + + avfilter_draw_slice(inlink->dst->outputs[0], y, h, slice_dir); +} + +static void end_frame(AVFilterLink *inlink) +{ + FadeContext *fade = inlink->dst->priv; + + avfilter_end_frame(inlink->dst->outputs[0]); + + if (fade->frame_index >= fade->start_frame && + fade->frame_index <= fade->stop_frame) + fade->factor += fade->fade_per_frame; + fade->factor = av_clip_uint16(fade->factor); + fade->frame_index++; +} + +AVFilter avfilter_vf_fade = { + .name = "fade", + .description = NULL_IF_CONFIG_SMALL("Fade in/out input video"), + .init = init, + .priv_size = sizeof(FadeContext), + .query_formats = query_formats, + + .inputs = (AVFilterPad[]) {{ .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .config_props = config_props, + .get_video_buffer = avfilter_null_get_video_buffer, + .start_frame = avfilter_null_start_frame, + .draw_slice = draw_slice, + .end_frame = end_frame, + .min_perms = AV_PERM_READ | AV_PERM_WRITE, + .rej_perms = AV_PERM_PRESERVE, }, + { .name = NULL}}, + .outputs = (AVFilterPad[]) {{ .name = "default", + .type = AVMEDIA_TYPE_VIDEO, }, + { .name = NULL}}, +}; -- 1.7.2.3

4 12

[PATCH] api-example for libavfilter
by nicolas.george＠normalesup.org 10 Jul '11

10 Jul '11

Hi. The attached patch adds an api-example.c file to libavfilter, to help application programmers get a quick start on how to use the new library. This file imitates what is done inside ffmpeg.c itself; I would like confirmation that everything is done the preferred way though. Regards, -- Nicolas George

7 19

[PATCH] lavfi test pattern generator
by stefano.sabatini-lala＠poste.it 26 Jun '11

26 Jun '11

Hi all, useful for testing, it is based on the test pattern generator by Nicolas George: http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/2007-October/036838.html basically I just stripped the audio signal generator and adapted few things to the lavfi framework, so most credit goes to Nicolas. And it would plenty cool to find some way to get ffmpeg/ffplay take as input such a generator, but I still can't see how to do that. What I can do now is to take as input /dev/null, then overlay the test_pattern over it, but this is rather ugly. Regards. -- FFmpeg = Freak and Fierce Mysterious Proud Erratic Gadget

7 24

[FWD] [PATCH] immediate decoding of dvd stills
by nicola_sabbi＠fastwebnet.it 24 Jun '11

24 Jun '11

Some time ago someone posted this small patch to permit decoding dvd still images without setting LOW_DELAY; unfortunately it seems the patch was forgotten Is it ok to commit? If not, what's the right way to proceed?

5 17

[PATCH] Add negate filter.
by stefano.sabatini-lala＠poste.it 19 Jun '11

19 Jun '11

Ported from the libavfilter-soc repo with some cosmetical change. --- doc/filters.texi | 4 ++ libavfilter/Makefile | 1 + libavfilter/allfilters.c | 1 + libavfilter/vf_negate.c | 135 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 141 insertions(+), 0 deletions(-) create mode 100644 libavfilter/vf_negate.c diff --git a/doc/filters.texi b/doc/filters.texi index 1cba2d6..037ad78 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -360,6 +360,10 @@ The following command: will make libavfilter use a format different from "yuv420p" for the input to the vflip filter. + at section negate + +Convert a video to its negative. + @section null Pass the video source unchanged to the output. diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 210510f..4379e9a 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -27,6 +27,7 @@ OBJS-$(CONFIG_FIFO_FILTER) += vf_fifo.o OBJS-$(CONFIG_FORMAT_FILTER) += vf_format.o OBJS-$(CONFIG_FREI0R_FILTER) += vf_frei0r.o OBJS-$(CONFIG_HFLIP_FILTER) += vf_hflip.o +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 diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 9e3ba14..1a776ca 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -48,6 +48,7 @@ void avfilter_register_all(void) REGISTER_FILTER (FORMAT, format, vf); REGISTER_FILTER (FREI0R, frei0r, vf); REGISTER_FILTER (HFLIP, hflip, vf); + REGISTER_FILTER (NEGATE, negate, vf); REGISTER_FILTER (NOFORMAT, noformat, vf); REGISTER_FILTER (NULL, null, vf); REGISTER_FILTER (OCV_SMOOTH, ocv_smooth, vf); diff --git a/libavfilter/vf_negate.c b/libavfilter/vf_negate.c new file mode 100644 index 0000000..d3c388e --- /dev/null +++ b/libavfilter/vf_negate.c @@ -0,0 +1,135 @@ +/* + * Copyright (c) 2007 Bobby Bingham + * + * 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 + * video negative filter + */ + +#include "libavutil/pixdesc.h" +#include "avfilter.h" + +typedef struct { + int off_y, off_uv; + int hsub, vsub; +} NegContext; + +static int query_formats(AVFilterContext *ctx) +{ + enum PixelFormat pix_fmts[] = { + PIX_FMT_YUV444P, PIX_FMT_YUV422P, PIX_FMT_YUV420P, + PIX_FMT_YUV411P, PIX_FMT_YUV410P, + PIX_FMT_YUVJ444P, PIX_FMT_YUVJ422P, PIX_FMT_YUVJ420P, + PIX_FMT_YUV440P, PIX_FMT_YUVJ440P, + PIX_FMT_MONOWHITE, PIX_FMT_MONOBLACK, + PIX_FMT_NONE + }; + + avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts)); + return 0; +} + +static int config_props(AVFilterLink *inlink) +{ + NegContext *neg = inlink->dst->priv; + + neg->hsub = av_pix_fmt_descriptors[inlink->format].log2_chroma_w; + neg->vsub = av_pix_fmt_descriptors[inlink->format].log2_chroma_h; + + switch (inlink->format) { + case PIX_FMT_YUVJ444P: + case PIX_FMT_YUVJ422P: + case PIX_FMT_YUVJ420P: + case PIX_FMT_YUVJ440P: + neg->off_y = + neg->off_uv = 0; + break; + default: + neg->off_y = -4; + neg->off_uv = 1; + } + + return 0; +} + +static void draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir) +{ + NegContext *neg = inlink->dst->priv; + AVFilterLink *outlink = inlink->dst->outputs[0]; + AVFilterBufferRef *inpic = inlink ->cur_buf; + AVFilterBufferRef *outpic = outlink->out_buf; + uint8_t *inrow, *outrow; + int i, j, plane; + + if (inlink->format == PIX_FMT_MONOWHITE || inlink->format == PIX_FMT_MONOBLACK) { + inrow = inpic ->data[0] + y * inpic ->linesize[0]; + outrow = outpic->data[0] + y * outpic->linesize[0]; + for (i = 0; i < h; i++) { + for (j = 0; j < inlink->w >> 3; j++) + outrow[j] = ~inrow[j]; + inrow += inpic ->linesize[0]; + outrow += outpic->linesize[0]; + } + } else { + /* luma plane */ + inrow = inpic ->data[0] + y * inpic-> linesize[0]; + outrow = outpic->data[0] + y * outpic->linesize[0]; + for (i = 0; i < h; i ++) { + for(j = 0; j < inlink->w; j++) + outrow[j] = 255 - inrow[j] + neg->off_y; + inrow += inpic ->linesize[0]; + outrow += outpic->linesize[0]; + } + + /* chroma planes */ + for (plane = 1; plane < 3; plane++) { + inrow = inpic-> data[plane] + (y >> neg->vsub) * inpic ->linesize[plane]; + outrow = outpic->data[plane] + (y >> neg->vsub) * outpic->linesize[plane]; + + for (i = 0; i < h >> neg->vsub; i++) { + for (j = 0; j < inlink->w >> neg->hsub; j++) + outrow[j] = 255 - inrow[j] + neg->off_uv; + inrow += inpic ->linesize[plane]; + outrow += outpic->linesize[plane]; + } + } + } + + avfilter_draw_slice(outlink, y, h, slice_dir); +} + +AVFilter avfilter_vf_negate = { + .name = "negate", + .description = NULL_IF_CONFIG_SMALL("Negate the input video."), + + .priv_size = sizeof(NegContext), + + .query_formats = query_formats, + + .inputs = (AVFilterPad[]) {{ .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .draw_slice = draw_slice, + .config_props = config_props, + .min_perms = AV_PERM_READ, }, + { .name = NULL}}, + .outputs = (AVFilterPad[]) {{ .name = "default", + .type = AVMEDIA_TYPE_VIDEO, }, + { .name = NULL}}, +}; -- 1.7.1

11 42

[PATCH] oggpagesize option added
by diego＠biurrun.de 18 May '11

18 May '11

On Tue, Jan 25, 2011 at 08:16:30PM +0100, Andres Gonzalez wrote: > > Please let me know if there is something wrong or missing. > > --- a/libavformat/oggenc.c > +++ b/libavformat/oggenc.c > + > +static const AVClass ogg_muxer_class = { > + "OGG muxer", The format is called "Ogg", not "OGG". Diego

10 17

[PATCH] sanity check on over reading buffer (roundup issue 2495)
by daniel.d.kang＠gmail.com 18 May '11

18 May '11

I am a Google Code-In student, and I have zzufed a file. In some cases, for mm files, when buf_size is larger than the height, ffmpeg overreads the buffer. The patch attached adds a sanity check and a warning for this. The roundup issue is 2495. Are there any comments?

2 1

[PATCH] Fix decoding crash on some trashed interlaced MPEG2 streams. This fixes issue 2367.
by anatoly.nenashev＠ovsoft.ru 11 May '11

11 May '11

5 14

[PATCH] encoder for adobe's flash ScreenVideo2 codec
by joshuawarner32＠gmail.com 07 May '11

07 May '11

Hi all, I've developed an encoder for Adobe's Flash ScreenVideo2 format, which is stored in flv files. My encoder currently only supports a large subset of the format. The only player that supports this codec (so far) is Adobe Flash Player itself, but ScreenVideo2 makes dramatic improvement in file size over ScreenVideo (currently in ffmpeg as flashsv) - and should be very useful for uploading screencasts, etc. Most options (block size, etc) now just fall back on defaults because I couldn't find a general algorithm that produced consistantly better results than these. All the code is in place to be able to change these parameters dynamically, so future improvements there should be easy. The patch is attached. The codec is listed as flashsv2 in ffmpeg. Joshua Warner

13 41

[PATCH] fix sonic decoder
by justin.ruggles＠gmail.com 04 May '11

04 May '11

Hi, Just in case the other discussion ends with us keeping Sonic, I thought I should share this patch to make the decoder work like it's supposed to for sample rates other than 44100. Admittedly, it is still bad to rely on floating point calculations to match in the encoder and decoder, but it is what it is... -Justin

3 2