March 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

libavfilter audio work - qualification task
by S.N. Hemanth Meenakshisundaram 10 May '10

10 May '10

Hi All, I would like to take up the libavfilter audio work for gsoc. What would be a good qualification task for this? The wiki says the mentor is yet to be determined, so am asking on this list. I was thinking of taking up the vf_imlib2 work or Cedric's blending routines from the interesting patches list. Is someone else already working on these or is there a more suitable qualification task I can take up? Thanks, Hemanth

10 54

G723.1 Frame Parser
by Mohamed Naufal 23 Apr '10

23 Apr '10

Hi Here is the code for a frame parser i wrote for the g723.1 codec as my GSoC qualification task #include <stdint.h> #include "libavutil/intreadwrite.h" #include "avcodec.h" #include "get_bits.h" #define PITCH_MIN 18 #define FRM_LEN 240 #define SFRM_LEN (FRM_LEN/4) #define AD_CB_SIZE_HIGH_RATE 85 ///< 85 entry codebook for Frame6k3s #define AD_CB_SIZE_LOW_RATE 170 ///< 170 entry codebook for Frame5k3s /* * G723.1 frame types */ typedef enum { Frame6k3, ///< 6.3 kbps frame rate Frame5k3, ///< 5.3 kbps frame rate FrameSID, ///< silence insertion descriptor frame FrameUntransmitted } FrameType; typedef enum { Rate6k3, Rate5k3 } Rate; /* * G723.1 unpacked data subframe */ typedef struct { uint16_t ad_cb_lag; ///< adaptive codebook lag uint16_t pitch_lag; uint16_t combined_gain; uint16_t pulse_pos; uint16_t pulse_sign; uint16_t grid_index; uint16_t amp_index; ///< for SID frames } G723_1_Subframe; /* * G723.1 unpacked data frame */ typedef struct { uint32_t lsp_index; G723_1_Subframe subframe[4]; } G723_1_Frame; typedef struct g723_1_context { G723_1_Frame frame; FrameType cur_frame_type; Rate cur_rate; int is_bad_frame; } G723_1_Context; /* * Unpack the frame into parameters * * @param p the context * @param buf pointer to the input buffer * @param buf_size size of the input buffer */ static void unpack_bitstream(G723_1_Context *p, const uint8_t *buf, int buf_size) { GetBitContext gb; G723_1_Frame *frame = &p->frame; uint32_t temp; init_get_bits(&gb, buf, buf_size * 8); // Extract frame type and rate info p->cur_frame_type = get_bits(&gb, 2); if (p->cur_frame_type == FrameUntransmitted) return; frame->lsp_index = get_bits(&gb, 24); if (p->cur_frame_type == FrameSID) { frame->subframe[0].amp_index = get_bits(&gb, 6); return; } // Extract the info common to both rates p->cur_rate = (p->cur_frame_type == 0) ? Rate6k3 : Rate5k3; temp = get_bits(&gb, 7); if (temp <= 123) { // test if forbidden code frame->subframe[0].pitch_lag = temp + PITCH_MIN; }else { p->is_bad_frame = 1; // transmission error return; } frame->subframe[1].ad_cb_lag = get_bits(&gb, 2); temp = get_bits(&gb, 7); if (temp <= 123) { frame->subframe[1].pitch_lag = temp + PITCH_MIN; }else { p->is_bad_frame = 1; return; } frame->subframe[3].ad_cb_lag = get_bits(&gb, 2); frame->subframe[0].ad_cb_lag = 1; frame->subframe[2].ad_cb_lag = 1; frame->subframe[0].combined_gain = get_bits(&gb, 12); frame->subframe[1].combined_gain = get_bits(&gb, 12); frame->subframe[2].combined_gain = get_bits(&gb, 12); frame->subframe[3].combined_gain = get_bits(&gb, 12); frame->subframe[0].grid_index = get_bits(&gb, 1); frame->subframe[1].grid_index = get_bits(&gb, 1); frame->subframe[2].grid_index = get_bits(&gb, 1); frame->subframe[3].grid_index = get_bits(&gb, 1); if (p->cur_frame_type == Frame6k3) { skip_bits(&gb, 1); // skip reserved bit // Compute pulse_pos index using the 13bit combined position index temp = get_bits(&gb, 13); frame->subframe[0].pulse_pos = (temp / 90) / 9; frame->subframe[1].pulse_pos = (temp / 90) % 9; frame->subframe[2].pulse_pos = (temp % 90) / 9; frame->subframe[3].pulse_pos = (temp % 90) % 9; frame->subframe[0].pulse_pos = (frame->subframe[0].pulse_pos << 16) + get_bits(&gb, 16); frame->subframe[1].pulse_pos = (frame->subframe[1].pulse_pos << 14) + get_bits(&gb, 14); frame->subframe[2].pulse_pos = (frame->subframe[2].pulse_pos << 16) + get_bits(&gb, 16); frame->subframe[3].pulse_pos = (frame->subframe[3].pulse_pos << 14) + get_bits(&gb, 14); frame->subframe[0].pulse_sign = get_bits(&gb, 6); frame->subframe[1].pulse_sign = get_bits(&gb, 5); frame->subframe[2].pulse_sign = get_bits(&gb, 6); frame->subframe[3].pulse_sign = get_bits(&gb, 5); }else { // Frame5k3 frame->subframe[0].pulse_pos = get_bits(&gb, 12); frame->subframe[1].pulse_pos = get_bits(&gb, 12); frame->subframe[2].pulse_pos = get_bits(&gb, 12); frame->subframe[3].pulse_pos = get_bits(&gb, 12); frame->subframe[0].pulse_sign = get_bits(&gb, 4); frame->subframe[1].pulse_sign = get_bits(&gb, 4); frame->subframe[2].pulse_sign = get_bits(&gb, 4); frame->subframe[3].pulse_sign = get_bits(&gb, 4); } } static int g723_1_parse_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt) { G723_1_Context *p = avctx->priv_data; const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; unpack_bitstream(p, buf, buf_size); if (p->is_bad_frame) { av_log_error(avctx, AV_LOG_ERROR, "Bad frame\n"); return AVERROR_INVALIDDATA; } return 0; } AVCodec g723_1_decoder = { .name = "g723_1", .type = CODEC_TYPE_AUDIO, .id = CODEC_ID_G723_1, .priv_data_size = sizeof(G723_1_Context), .decode = g723_1_parse_frame, .long_name = NULL_IF_CONFIG_SMALL("G.723.1"), }; Naufal

5 11

Help needed with new concatenate filter
by Brandon Mintern 05 Apr '10

05 Apr '10

I'm trying to add a filter to concatenate multiple inputs together. The idea is that the inputs should already be the same size and frame rate, but I don't actually enforce that, I just ensure that the output buffer is big enough to hold the biggest height/width. Here is a sample usage: ./ffmpeg_g -y -i input1.wmv -vfilters "movie=0:wmv3:input2.wmv [in2]; [in][in2] concatenate" -r 15 out.wmv Where input1.wmv and input2.wmv are both 15 fps and 800x600. As written now, out.wmv seems to only be input1.wmv. I would appreciate any insight into what I'm doing wrong. The patch is located at http://bmintern.homeunix.com/~brandon/vf_concatenate.patch and is included below. Thanks, Brandon Index: allfilters.c =================================================================== --- allfilters.c (revision 5726) +++ allfilters.c (working copy) @@ -35,6 +35,7 @@ initialized = 1; REGISTER_FILTER (ASPECT, aspect, vf); + REGISTER_FILTER (CONCATENATE, concatenate, vf); REGISTER_FILTER (CROP, crop, vf); REGISTER_FILTER (DRAWBOX, drawbox, vf); REGISTER_FILTER (FIFO, fifo, vf); Index: vf_concatenate.c =================================================================== --- vf_concatenate.c (revision 0) +++ vf_concatenate.c (revision 0) @@ -0,0 +1,109 @@ +/* + * video concatenate filter + * 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 + */ + +#include "avfilter.h" + +typedef struct { + int first_input_consumed; + AVFilterPicRef *pic; +} ConcatenateContext; + +static av_cold void uninit(AVFilterContext *ctx) +{ + ConcatenateContext *con = ctx->priv; + if (con->pic) + avfilter_unref_pic(con->pic); +} + +static int config_props(AVFilterLink *link) +{ + if (link->src->inputs[0]->w > link->src->inputs[1]->w) + link->w = link->src->inputs[0]->w; + else + link->w = link->src->inputs[1]->w; + if (link->src->inputs[1]->h > link->src->inputs[1]->h) + link->h = link->src->inputs[0]->h; + else + link->h = link->src->inputs[1]->h; + return 0; +} + +static void start_frame(AVFilterLink *link, AVFilterPicRef *picref) +{ + ConcatenateContext *con = link->dst->priv; + con->pic = picref; +} + +static void end_frame(AVFilterLink *link) +{ +} + +static int poll_frame(AVFilterLink *link) +{ + ConcatenateContext *con = link->src->priv; + if (con->first_input_consumed) + return avfilter_poll_frame(link->src->inputs[1]); + return avfilter_poll_frame(link->src->inputs[0]); +} + +static int request_frame(AVFilterLink *link) +{ + ConcatenateContext *con = link->src->priv; + if(!con->first_input_consumed && + avfilter_request_frame(link->src->inputs[0])) + con->first_input_consumed = 1; + if(con->first_input_consumed && + avfilter_request_frame(link->src->inputs[1])) + return AVERROR_EOF; + avfilter_start_frame(link, con->pic); + avfilter_draw_slice(link, 0, con->pic->h, 1); + avfilter_end_frame(link); + con->pic = NULL; + return 0; +} + +AVFilter avfilter_vf_concatenate = +{ + .name = "concatenate", + + .uninit = uninit, + + .priv_size = sizeof(ConcatenateContext), + + .inputs = (AVFilterPad[]) {{ .name = "default", + .type = CODEC_TYPE_VIDEO, + .start_frame = start_frame, + .end_frame = end_frame, + .get_video_buffer= avfilter_null_get_video_buffer, }, + { .name = "default2", + .type = CODEC_TYPE_VIDEO, + .start_frame = start_frame, + .end_frame = end_frame, + .get_video_buffer= avfilter_null_get_video_buffer, }, + { .name = NULL}}, + .outputs = (AVFilterPad[]) {{ .name = "default", + .type = CODEC_TYPE_VIDEO, + .config_props = config_props, + .poll_frame = poll_frame, + .request_frame = request_frame, }, + { .name = NULL}}, +}; + Index: Makefile =================================================================== --- Makefile (revision 5726) +++ Makefile (working copy) @@ -16,6 +16,7 @@ parseutils.o \ OBJS-$(CONFIG_ASPECT_FILTER) += vf_aspect.o +OBJS-$(CONFIG_CONCATENATE_FILTER) += vf_concatenate.o OBJS-$(CONFIG_CROP_FILTER) += vf_crop.o OBJS-$(CONFIG_DRAWBOX_FILTER) += vf_drawbox.o OBJS-$(CONFIG_FIFO_FILTER) += vf_fifo.o

2 6

soc qualification
by Sumit Sarkar 02 Apr '10

02 Apr '10

Hi , I would like to do the "rtp demuxer support rtcp BYE packets" project as a qualification task. If some one could please give me some details to the project , the experimental setup (what server should I be using?, what movie to stream) I could start working on it. When the server sends the bye packet what should be the action of the ffmpeg client ? Suggestions are welcome. Thanks, -GS

6 12

[PATCH] Add fade filter to libavfilter
by Brandon Mintern 01 Apr '10

01 Apr '10

I am happy to present my first-ever open source code contribution, a "fade" filter for libavfilter! Here is some example usage: # Fade in first 30 frames of video ffmpeg -i input.avi -vfilters fade=in:1:30 output.avi # Fade out last 45 frames of a 200-frame video ffmpeg -i input.avi -vfilters fade=out:156:45 output.avi # Fade in first 25 frames and fade out last 25 frames of a 1000-frame video ffmpeg -i input.avi -vfilters "fade=in:1:25, fade=out:976:25" output.avi # Make first 5 frames black, then fade in from frame 6-25 ffmpeg -i input.avi -vfilters "fade=in:6:20" output.avi That is, the arguments to fade are "fade=in/out:start_frame:fade_length". The fade_length is simply the number of frames that the fade occurs over. Any remaining frames after a fade=out is completed are black, and any frames preceding start_frame on a fade=in are black. If fade_length is shorter than total_video_frames - start_frame, then the fade will not be all the way to/from black before the end of the video. I am open to changing the API although I rather like the fade=in/out argument as it is; I think it makes the command line readable. In particular, the programmer in me feels like counting should begin at 0, but if there's not yet a precedent I think it makes more sense for a filter to begin counting frames from 1; this is definitely something I'm unsure about. And I am definitely open to criticism on my code quality -- I am not expecting anyone to go easy on me. The patch follows, and it is currently also available at http://bmintern.homeunix.com/~brandon/vf_fade.patch Brandon Index: allfilters.c =================================================================== --- allfilters.c (revision 5726) +++ allfilters.c (working copy) @@ -37,6 +37,7 @@ REGISTER_FILTER (ASPECT, aspect, vf); REGISTER_FILTER (CROP, crop, vf); REGISTER_FILTER (DRAWBOX, drawbox, vf); + REGISTER_FILTER (FADE, fade, vf); REGISTER_FILTER (FIFO, fifo, vf); REGISTER_FILTER (FORMAT, format, vf); REGISTER_FILTER (FPS, fps, vf); Index: vf_fade.c =================================================================== --- vf_fade.c (revision 0) +++ vf_fade.c (revision 0) @@ -0,0 +1,169 @@ +/* + * video fade filter + * copyright (c) 2010 Brandon Mintern + * based heavily on vf_negate.c which is 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 + */ + +/* + # A few usage examples follow, usable too as test scenarios. + + # Fade in first 30 frames of video + ffmpeg -i input.avi -vfilters fade=in:1:30 output.avi + + # Fade out last 45 frames of a 200-frame video + ffmpeg -i input.avi -vfilters fade=out:156:45 output.avi + + # Fade in first 25 frames and fade out last 25 frames of a 1000-frame video + ffmpeg -i input.avi -vfilters "fade=in:1:25, fade=out:976:25" output.avi + + # Make first 5 frames black, then fade in from frame 6-25 + ffmpeg -i input.avi -vfilters "fade=in:6:20" output.avi +*/ + +#include "avfilter.h" + +typedef struct +{ + float fade_factor, fade_per_frame; + unsigned int frame_index, start_frame, stop_frame; + int hsub, vsub; +} FadeContext; + +static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque) +{ + FadeContext *fade = ctx->priv; + unsigned int frames; + char in_out[4]; + + if(args && sscanf(args, " %3[^:]:%u:%u", in_out, + &fade->start_frame, &frames) == 3) { + frames = frames ? frames : 1; + fade->fade_per_frame = 1.0 / frames; + if (!strcmp(in_out, "in")) + fade->fade_factor = 0.0; + else if (!strcmp(in_out, "out")) { + fade->fade_per_frame = -fade->fade_per_frame; + fade->fade_factor = 1.0; + } + else { + av_log(ctx, AV_LOG_ERROR, + "init() 1st arg must be 'in' or 'out':'%s'\n", in_out); + return -1; + } + + fade->frame_index = 1; + fade->start_frame = fade->start_frame ? fade->start_frame : 1; + fade->stop_frame = fade->start_frame + frames; + return 0; + } + av_log(ctx, AV_LOG_ERROR, + "init() expected 3 arguments '(in|out):#:#':'%s'\n", args); + return -1; +} + +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_NONE + }; + + avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts)); + return 0; +} + +static int config_props(AVFilterLink *link) +{ + FadeContext *fade = link->dst->priv; + avcodec_get_chroma_sub_sample(link->format, &fade->hsub, &fade->vsub); + return 0; +} + + +static void start_frame(AVFilterLink *link, AVFilterPicRef *picref) +{ + FadeContext *fade = link->dst->priv; + if(fade->frame_index >= fade->start_frame && + fade->frame_index < fade->stop_frame) { + fade->fade_factor += fade->fade_per_frame; + } + fade->frame_index++; + avfilter_default_start_frame(link, picref); +} + +static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir) +{ + FadeContext *fade = link->dst->priv; + AVFilterPicRef *in = link->cur_pic; + AVFilterPicRef *out = link->dst->outputs[0]->outpic; + uint8_t *inrow, *outrow; + int i, j, plane; + + /* luma plane */ + inrow = in-> data[0] + y * in-> linesize[0]; + outrow = out->data[0] + y * out->linesize[0]; + for(i = 0; i < h; i ++) { + for(j = 0; j < link->w; j ++) + outrow[j] = (uint8_t) ((float) inrow[j] * fade->fade_factor + 0.5); + inrow += in-> linesize[0]; + outrow += out->linesize[0]; + } + + /* chroma planes */ + for(plane = 1; plane < 3; plane ++) { + inrow = in-> data[plane] + (y >> fade->vsub) * in-> linesize[plane]; + outrow = out->data[plane] + (y >> fade->vsub) * out->linesize[plane]; + + for(i = 0; i < h >> fade->vsub; i ++) { + for(j = 0; j < link->w >> fade->hsub; j ++) { + outrow[j] = 128 + (int) ((inrow[j]-128) * fade->fade_factor + 0.5); + } + inrow += in-> linesize[plane]; + outrow += out->linesize[plane]; + } + } + + avfilter_draw_slice(link->dst->outputs[0], y, h, slice_dir); +} + +AVFilter avfilter_vf_fade = +{ + .name = "fade", + + .init = init, + + .priv_size = sizeof(FadeContext), + + .query_formats = query_formats, + + .inputs = (AVFilterPad[]) {{ .name = "default", + .type = CODEC_TYPE_VIDEO, + .start_frame = start_frame, + .draw_slice = draw_slice, + .config_props = config_props, + .min_perms = AV_PERM_READ, }, + { .name = NULL}}, + .outputs = (AVFilterPad[]) {{ .name = "default", + .type = CODEC_TYPE_VIDEO, }, + { .name = NULL}}, +}; + Index: Makefile =================================================================== --- Makefile (revision 5726) +++ Makefile (working copy) @@ -18,6 +18,7 @@ OBJS-$(CONFIG_ASPECT_FILTER) += vf_aspect.o OBJS-$(CONFIG_CROP_FILTER) += vf_crop.o OBJS-$(CONFIG_DRAWBOX_FILTER) += vf_drawbox.o +OBJS-$(CONFIG_FADE_FILTER) += vf_fade.o OBJS-$(CONFIG_FIFO_FILTER) += vf_fifo.o OBJS-$(CONFIG_FORMAT_FILTER) += vf_format.o OBJS-$(CONFIG_FPS_FILTER) += vf_fps.o

6 10

Anyone mentoring a J2K codec project?
by Duncan Chan 01 Apr '10

01 Apr '10

Hi there, I'm a Masters student in EE, from Simon Fraser University, in Vancouver, BC, Canada. I am interested in taking up the J2K codec project. Is anyone mentoring this project? What would be a good qualification task for this project? Thanks. Duncan

3 2

[soc]: r5727 - in libavfilter: checkout.sh diffs/02_ffmpeg_filters.diff diffs/03_libavfilter_doc.diff vf_drawbox.c vf_fifo.c vf_fps.c vf_hflip.c vf_negate.c vf_overlay.c vf_pad.c vf_rotate.c vf_set...
by stefano 31 Mar '10

31 Mar '10

Author: stefano Date: Wed Mar 31 21:25:33 2010 New Revision: 5727 Log: Update to FFmpeg r22749 / libswscale r30979. Modified: libavfilter/checkout.sh libavfilter/diffs/02_ffmpeg_filters.diff libavfilter/diffs/03_libavfilter_doc.diff libavfilter/vf_drawbox.c libavfilter/vf_fifo.c libavfilter/vf_fps.c libavfilter/vf_hflip.c libavfilter/vf_negate.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_rotate.c libavfilter/vf_setpts.c libavfilter/vf_split.c libavfilter/vf_transpose.c libavfilter/vsrc_buffer.c libavfilter/vsrc_movie.c Modified: libavfilter/checkout.sh ============================================================================== --- libavfilter/checkout.sh Sat Mar 27 16:59:57 2010 (r5726) +++ libavfilter/checkout.sh Wed Mar 31 21:25:33 2010 (r5727) @@ -1,11 +1,11 @@ #! /bin/sh echo "checking out pristine ffmpeg" -svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r22626 +svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r22749 echo "downloading the corresponding version of swscale" cd ffmpeg/libswscale -svn up -r30945 +svn up -r30979 cd ../.. echo "patching ffmpeg" Modified: libavfilter/diffs/02_ffmpeg_filters.diff ============================================================================== --- libavfilter/diffs/02_ffmpeg_filters.diff Sat Mar 27 16:59:57 2010 (r5726) +++ libavfilter/diffs/02_ffmpeg_filters.diff Wed Mar 31 21:25:33 2010 (r5727) @@ -1,6 +1,6 @@ Index: ffmpeg.c =================================================================== ---- ffmpeg.c (revision 22626) +--- ffmpeg.c (revision 22749) +++ ffmpeg.c (working copy) @@ -43,6 +43,13 @@ #include "libavutil/libm.h" @@ -237,7 +237,7 @@ Index: ffmpeg.c if (received_sigterm) { fprintf(stderr, "Received signal %d: terminating.\n", -@@ -893,7 +1093,9 @@ +@@ -923,7 +1123,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; -@@ -941,6 +1143,9 @@ +@@ -971,6 +1173,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"); -@@ -952,6 +1157,7 @@ +@@ -982,6 +1187,7 @@ } else { formatted_picture = in_picture; } @@ -265,7 +265,7 @@ Index: ffmpeg.c final_picture = formatted_picture; padding_src = formatted_picture; -@@ -978,6 +1184,7 @@ +@@ -1008,6 +1214,7 @@ av_exit(1); } @@ -273,7 +273,7 @@ Index: ffmpeg.c if (ost->video_resample) { padding_src = NULL; final_picture = &ost->pict_tmp; -@@ -1025,6 +1232,7 @@ +@@ -1055,6 +1262,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, -@@ -1290,6 +1498,10 @@ +@@ -1320,6 +1528,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; -@@ -1417,6 +1629,15 @@ +@@ -1447,6 +1659,15 @@ &buffer_to_free); } @@ -306,9 +306,9 @@ Index: ffmpeg.c +#endif + // preprocess audio (volume) - if (ist->st->codec->codec_type == CODEC_TYPE_AUDIO) { + if (ist->st->codec->codec_type == AVMEDIA_TYPE_AUDIO) { if (audio_volume != 256) { -@@ -1438,10 +1659,18 @@ +@@ -1468,10 +1689,18 @@ if (pts > now) usleep(pts - now); } @@ -328,17 +328,17 @@ Index: ffmpeg.c for(i=0;i<nb_ostreams;i++) { int frame_size; -@@ -1459,6 +1688,9 @@ +@@ -1489,6 +1718,9 @@ do_audio_out(os, ost, ist, decoded_data_buf, decoded_data_size); break; - case CODEC_TYPE_VIDEO: + case AVMEDIA_TYPE_VIDEO: +#if CONFIG_AVFILTER + ost->st->codec->sample_aspect_ratio = ist->picref->pixel_aspect; +#endif do_video_out(os, ost, ist, &picture, &frame_size); if (vstats_filename && frame_size) do_video_stats(os, ost, frame_size); -@@ -1527,7 +1759,17 @@ +@@ -1557,7 +1789,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) { -@@ -2009,9 +2251,10 @@ +@@ -2039,9 +2281,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); -@@ -2019,6 +2262,13 @@ +@@ -2049,6 +2292,13 @@ ost->resample_pix_fmt= icodec->pix_fmt; ost->encoding_needed = 1; ist->decoding_needed = 1; @@ -380,9 +380,9 @@ Index: ffmpeg.c + } +#endif break; - case CODEC_TYPE_SUBTITLE: + case AVMEDIA_TYPE_SUBTITLE: ost->encoding_needed = 1; -@@ -2417,6 +2667,12 @@ +@@ -2447,6 +2697,12 @@ avcodec_close(ist->st->codec); } } @@ -395,7 +395,7 @@ Index: ffmpeg.c /* finished ! */ ret = 0; -@@ -4014,6 +4270,9 @@ +@@ -4023,6 +4279,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", "" }, -@@ -4074,6 +4333,9 @@ +@@ -4083,6 +4342,9 @@ avcodec_register_all(); avdevice_register_all(); Modified: libavfilter/diffs/03_libavfilter_doc.diff ============================================================================== --- libavfilter/diffs/03_libavfilter_doc.diff Sat Mar 27 16:59:57 2010 (r5726) +++ libavfilter/diffs/03_libavfilter_doc.diff Wed Mar 31 21:25:33 2010 (r5727) @@ -1,6 +1,6 @@ Index: doc/libavfilter.texi =================================================================== ---- doc/libavfilter.texi (revision 22626) +--- doc/libavfilter.texi (revision 22749) +++ doc/libavfilter.texi (working copy) @@ -139,6 +139,20 @@ Modified: libavfilter/vf_drawbox.c ============================================================================== --- libavfilter/vf_drawbox.c Sat Mar 27 16:59:57 2010 (r5726) +++ libavfilter/vf_drawbox.c Wed Mar 31 21:25:33 2010 (r5727) @@ -137,7 +137,7 @@ AVFilter avfilter_vf_drawbox= .query_formats = query_formats, .inputs = (AVFilterPad[]) {{ .name = "default", - .type = CODEC_TYPE_VIDEO, + .type = AVMEDIA_TYPE_VIDEO, .get_video_buffer= avfilter_null_get_video_buffer, .start_frame = avfilter_null_start_frame, .end_frame = end_frame, @@ -147,6 +147,6 @@ AVFilter avfilter_vf_drawbox= .rej_perms = AV_PERM_PRESERVE }, { .name = NULL}}, .outputs = (AVFilterPad[]) {{ .name = "default", - .type = CODEC_TYPE_VIDEO, }, + .type = AVMEDIA_TYPE_VIDEO, }, { .name = NULL}}, }; Modified: libavfilter/vf_fifo.c ============================================================================== --- libavfilter/vf_fifo.c Sat Mar 27 16:59:57 2010 (r5726) +++ libavfilter/vf_fifo.c Wed Mar 31 21:25:33 2010 (r5727) @@ -106,7 +106,7 @@ AVFilter avfilter_vf_fifo = .priv_size = sizeof(BufferContext), .inputs = (AVFilterPad[]) {{ .name = "default", - .type = CODEC_TYPE_VIDEO, + .type = AVMEDIA_TYPE_VIDEO, .get_video_buffer= avfilter_null_get_video_buffer, .start_frame = start_frame, .draw_slice = draw_slice, @@ -114,7 +114,7 @@ AVFilter avfilter_vf_fifo = .rej_perms = AV_PERM_REUSE2, }, { .name = NULL}}, .outputs = (AVFilterPad[]) {{ .name = "default", - .type = CODEC_TYPE_VIDEO, + .type = AVMEDIA_TYPE_VIDEO, .request_frame = request_frame, }, { .name = NULL}}, }; Modified: libavfilter/vf_fps.c ============================================================================== --- libavfilter/vf_fps.c Sat Mar 27 16:59:57 2010 (r5726) +++ libavfilter/vf_fps.c Wed Mar 31 21:25:33 2010 (r5727) @@ -117,13 +117,13 @@ AVFilter avfilter_vf_fps = .priv_size = sizeof(FPSContext), .inputs = (AVFilterPad[]) {{ .name = "default", - .type = CODEC_TYPE_VIDEO, + .type = AVMEDIA_TYPE_VIDEO, .get_video_buffer= avfilter_null_get_video_buffer, .start_frame = start_frame, .end_frame = end_frame, }, { .name = NULL}}, .outputs = (AVFilterPad[]) {{ .name = "default", - .type = CODEC_TYPE_VIDEO, + .type = AVMEDIA_TYPE_VIDEO, .poll_frame = poll_frame, .request_frame = request_frame, }, { .name = NULL}}, Modified: libavfilter/vf_hflip.c ============================================================================== --- libavfilter/vf_hflip.c Sat Mar 27 16:59:57 2010 (r5726) +++ libavfilter/vf_hflip.c Wed Mar 31 21:25:33 2010 (r5727) @@ -94,13 +94,13 @@ AVFilter avfilter_vf_hflip = .query_formats = query_formats, .inputs = (AVFilterPad[]) {{ .name = "default", - .type = CODEC_TYPE_VIDEO, + .type = AVMEDIA_TYPE_VIDEO, .draw_slice = draw_slice, .config_props = config_props, .min_perms = AV_PERM_READ, }, { .name = NULL}}, .outputs = (AVFilterPad[]) {{ .name = "default", - .type = CODEC_TYPE_VIDEO, }, + .type = AVMEDIA_TYPE_VIDEO, }, { .name = NULL}}, }; Modified: libavfilter/vf_negate.c ============================================================================== --- libavfilter/vf_negate.c Sat Mar 27 16:59:57 2010 (r5726) +++ libavfilter/vf_negate.c Wed Mar 31 21:25:33 2010 (r5727) @@ -118,13 +118,13 @@ AVFilter avfilter_vf_negate = .query_formats = query_formats, .inputs = (AVFilterPad[]) {{ .name = "default", - .type = CODEC_TYPE_VIDEO, + .type = AVMEDIA_TYPE_VIDEO, .draw_slice = draw_slice, .config_props = config_props, .min_perms = AV_PERM_READ, }, { .name = NULL}}, .outputs = (AVFilterPad[]) {{ .name = "default", - .type = CODEC_TYPE_VIDEO, }, + .type = AVMEDIA_TYPE_VIDEO, }, { .name = NULL}}, }; Modified: libavfilter/vf_overlay.c ============================================================================== --- libavfilter/vf_overlay.c Sat Mar 27 16:59:57 2010 (r5726) +++ libavfilter/vf_overlay.c Wed Mar 31 21:25:33 2010 (r5727) @@ -342,7 +342,7 @@ AVFilter avfilter_vf_overlay = .query_formats = query_formats, .inputs = (AVFilterPad[]) {{ .name = "default", - .type = CODEC_TYPE_VIDEO, + .type = AVMEDIA_TYPE_VIDEO, .start_frame = start_frame, .config_props = config_input_main, .draw_slice = draw_slice, @@ -350,7 +350,7 @@ AVFilter avfilter_vf_overlay = .min_perms = AV_PERM_READ, .rej_perms = AV_PERM_REUSE2, }, { .name = "sub", - .type = CODEC_TYPE_VIDEO, + .type = AVMEDIA_TYPE_VIDEO, .start_frame = start_frame, .config_props = config_input_overlay, .draw_slice = draw_slice, @@ -359,7 +359,7 @@ AVFilter avfilter_vf_overlay = .rej_perms = AV_PERM_REUSE2, }, { .name = NULL}}, .outputs = (AVFilterPad[]) {{ .name = "default", - .type = CODEC_TYPE_VIDEO, + .type = AVMEDIA_TYPE_VIDEO, .request_frame = request_frame, }, { .name = NULL}}, }; Modified: libavfilter/vf_pad.c ============================================================================== --- libavfilter/vf_pad.c Sat Mar 27 16:59:57 2010 (r5726) +++ libavfilter/vf_pad.c Wed Mar 31 21:25:33 2010 (r5727) @@ -311,7 +311,7 @@ AVFilter avfilter_vf_pad = { .query_formats = query_formats, .inputs = (AVFilterPad[]) {{ .name = "default", - .type = CODEC_TYPE_VIDEO, + .type = AVMEDIA_TYPE_VIDEO, .config_props = config_input, .get_video_buffer = get_video_buffer, .start_frame = start_frame, @@ -320,7 +320,7 @@ AVFilter avfilter_vf_pad = { { .name = NULL}}, .outputs = (AVFilterPad[]) {{ .name = "default", - .type = CODEC_TYPE_VIDEO, + .type = AVMEDIA_TYPE_VIDEO, .config_props = config_output, }, { .name = NULL}}, }; Modified: libavfilter/vf_rotate.c ============================================================================== --- libavfilter/vf_rotate.c Sat Mar 27 16:59:57 2010 (r5726) +++ libavfilter/vf_rotate.c Wed Mar 31 21:25:33 2010 (r5727) @@ -192,7 +192,7 @@ AVFilter avfilter_vf_rotate = .query_formats = query_formats, .inputs = (AVFilterPad[]) {{ .name = "default", - .type = CODEC_TYPE_VIDEO, + .type = AVMEDIA_TYPE_VIDEO, .start_frame = start_frame, .draw_slice = draw_slice, .end_frame = end_frame, @@ -201,7 +201,7 @@ AVFilter avfilter_vf_rotate = { .name = NULL}}, .outputs = (AVFilterPad[]) {{ .name = "default", .config_props = config_props_output, - .type = CODEC_TYPE_VIDEO, }, + .type = AVMEDIA_TYPE_VIDEO, }, { .name = NULL}}, }; Modified: libavfilter/vf_setpts.c ============================================================================== --- libavfilter/vf_setpts.c Sat Mar 27 16:59:57 2010 (r5726) +++ libavfilter/vf_setpts.c Wed Mar 31 21:25:33 2010 (r5727) @@ -131,11 +131,11 @@ AVFilter avfilter_vf_setpts = .priv_size = sizeof(SetPTSContext), .inputs = (AVFilterPad[]) {{ .name = "default", - .type = CODEC_TYPE_VIDEO, + .type = AVMEDIA_TYPE_VIDEO, .get_video_buffer= get_video_buffer, .start_frame = start_frame,}, { .name = NULL}}, .outputs = (AVFilterPad[]) {{ .name = "default", - .type = CODEC_TYPE_VIDEO,}, + .type = AVMEDIA_TYPE_VIDEO,}, { .name = NULL}}, }; Modified: libavfilter/vf_split.c ============================================================================== --- libavfilter/vf_split.c Sat Mar 27 16:59:57 2010 (r5726) +++ libavfilter/vf_split.c Wed Mar 31 21:25:33 2010 (r5727) @@ -48,16 +48,16 @@ AVFilter avfilter_vf_split = .name = "split", .inputs = (AVFilterPad[]) {{ .name = "default", - .type = CODEC_TYPE_VIDEO, + .type = AVMEDIA_TYPE_VIDEO, .get_video_buffer= avfilter_null_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, }, + .type = AVMEDIA_TYPE_VIDEO, }, { .name = "default2", - .type = CODEC_TYPE_VIDEO, }, + .type = AVMEDIA_TYPE_VIDEO, }, { .name = NULL}}, }; Modified: libavfilter/vf_transpose.c ============================================================================== --- libavfilter/vf_transpose.c Sat Mar 27 16:59:57 2010 (r5726) +++ libavfilter/vf_transpose.c Wed Mar 31 21:25:33 2010 (r5727) @@ -120,7 +120,7 @@ AVFilter avfilter_vf_transpose = .query_formats = query_formats, .inputs = (AVFilterPad[]) {{ .name = "default", - .type = CODEC_TYPE_VIDEO, + .type = AVMEDIA_TYPE_VIDEO, .start_frame = start_frame, .end_frame = end_frame, .config_props = config_props_input, @@ -128,7 +128,7 @@ AVFilter avfilter_vf_transpose = { .name = NULL}}, .outputs = (AVFilterPad[]) {{ .name = "default", .config_props = config_props_output, - .type = CODEC_TYPE_VIDEO, }, + .type = AVMEDIA_TYPE_VIDEO, }, { .name = NULL}}, }; Modified: libavfilter/vsrc_buffer.c ============================================================================== --- libavfilter/vsrc_buffer.c Sat Mar 27 16:59:57 2010 (r5726) +++ libavfilter/vsrc_buffer.c Wed Mar 31 21:25:33 2010 (r5727) @@ -132,7 +132,7 @@ AVFilter avfilter_vsrc_buffer = .inputs = (AVFilterPad[]) {{ .name = NULL }}, .outputs = (AVFilterPad[]) {{ .name = "default", - .type = CODEC_TYPE_VIDEO, + .type = AVMEDIA_TYPE_VIDEO, .request_frame = request_frame, .poll_frame = poll_frame, .config_props = config_props, }, Modified: libavfilter/vsrc_movie.c ============================================================================== --- libavfilter/vsrc_movie.c Sat Mar 27 16:59:57 2010 (r5726) +++ libavfilter/vsrc_movie.c Wed Mar 31 21:25:33 2010 (r5727) @@ -86,7 +86,7 @@ static int movie_init(AVFilterContext *c // TODO: allow to choose the video stream mv->video_stream = -1; for(i = 0; i < mv->format_ctx->nb_streams; i++) - if(mv->format_ctx->streams[i]->codec->codec_type==CODEC_TYPE_VIDEO) { + if(mv->format_ctx->streams[i]->codec->codec_type==AVMEDIA_TYPE_VIDEO) { mv->video_stream = i; break; } @@ -264,7 +264,7 @@ AVFilter avfilter_vsrc_movie = .inputs = (AVFilterPad[]) {{ .name = NULL }}, .outputs = (AVFilterPad[]) {{ .name = "default", - .type = CODEC_TYPE_VIDEO, + .type = AVMEDIA_TYPE_VIDEO, .request_frame = request_frame, .config_props = config_props, }, { .name = NULL}},

1 0

Trying to write a new filter but unclear on callback order
by Brandon Mintern 31 Mar '10

31 Mar '10

I'm trying to build a filter called "clone" (as discussed with Vitor on #ffmpeg-devel). I was modeling my filter after fifo, but apparently I'm wrong about the callback process (sidenote: a more detailed explanation in the wiki documentation would be very helpful!). I think I'm reasonably close with the code I have, but I can't finish it until I better understand the callback order in the filter chain. I would appreciate it if someone could point me in the write direction. My current code is at http://bmintern.homeunix.com/~brandon/vf_clone.c Here's what I'm getting right now: ./ffmpeg_g -i ~/grinderschool/title-sequence/resources/intro-base.wmv -vfilters clone=0:30 test-out.wmv [snip] Stream mapping: Stream #0.1 -> #0.0 Stream #0.0 -> #0.1 Press [q] to stop encoding [buffer @ 0x90b4e60]request_frame() called with no available frame! There is a comment near the top of vf_clone.c which indicates the intended purpose of clone, but the idea is to create a new video which is a frame or a short sequence of frames repeated a given number of times. I'm expecting to use it to duplicate the first/last frame of a video in the filter chain in order to fade the "paused" video in/out for 2 seconds. (I'm also planning on writing the fade filter, which should be MUCH easier than this one has turned out to be.) In case that's not clear enough, here's my expected filter chain: ffmpeg -i video.avi -vfilters "movie=0:wmv3:intro-base.wmv [intro]; \ movie=0:png:title.png [title]; \ movie=0:wmv3:outro-base.wmv [outro]; \ movie=0:png:credits.png [credits]; \ [intro][title] overlay=0:0:1 [intro+title]; \ [outro][credits] overlay=0:0:1, fade=in:0:30 [OC]; \ [intro+title] split [IT], clone=-1:30, fade=out:0:30 [Ifadeout]; \ [in] split [movie], clone=0:30, fade=in:0:30 [Mfadein]; \ [movie] split [M], clone=-1:30, fade=out:0:30 [Mfadeout]; \ [IT][Ifadeout][Mfadein][M][Mfadeout][OC] concatenate [out]" \ final_video.avi (And obviously I'll be writing concatenate as well! (I think it might end up needing to be a 2-input, 1-output filter which gets chained together.)) Thanks in advance for any help you can offer, Brandon

3 6

BSAC AAC Decoder
by David Sanders 29 Mar '10

29 Mar '10

Hello, I was hoping to submit an application for the suggested BSAC AAC decoder project. If I could get into contact with the proposed mentor, Alex Converse, that would be great. This list looks like it's mostly commit logs, but I was pointed in this direction, so I'm hoping Alex or someone else will notice this. Thanks.

2 1