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

libavfilter - filter for .ass subtitle rendering using libass
by Alexey Lebedeff 02 Mar '09

02 Mar '09

I've made a simple filter which renders subtitles using libass, and now using ffmpeg with it to create .mp4 files for streaming onto PS3. Before that, I made half a dozen of unsuccessful attempts using mplayer/mencoder. So for me it is the only working method for making .ass hardsubs on linux server. However, there is some license problems: libass is under GPL, not LGPL as the rest of libavfilter/ffmpeg. If there is any interest in it, I'll do some cleanup to code, properly integrate it into build process, and share the results.

7 14

[soc]: r4139 - libavfilter/diffs/01_ffplay_filters.diff
by stefano 24 Feb '09

24 Feb '09

Author: stefano Date: Tue Feb 24 01:17:18 2009 New Revision: 4139 Log: Set in the filter graph the scale_sws_opts (currently hardcoded). Modified: libavfilter/diffs/01_ffplay_filters.diff Modified: libavfilter/diffs/01_ffplay_filters.diff ============================================================================== --- libavfilter/diffs/01_ffplay_filters.diff Tue Feb 24 01:14:39 2009 (r4138) +++ libavfilter/diffs/01_ffplay_filters.diff Tue Feb 24 01:17:18 2009 (r4139) @@ -211,7 +211,7 @@ Index: ffplay.c /* update the bitmap content */ SDL_UnlockYUVOverlay(vp->bmp); -@@ -1346,54 +1417,266 @@ +@@ -1346,54 +1417,267 @@ return queue_picture(is, src_frame, pts); } @@ -404,6 +404,7 @@ Index: ffplay.c +#if CONFIG_AVFILTER + AVFilterContext *filt_src = NULL, *filt_out = NULL; + AVFilterGraph *graph = av_mallocz(sizeof(AVFilterGraph)); ++ graph->scale_sws_opts = av_strdup("sws_flags=bilinear"); + + avfilter_register_all(); + @@ -509,7 +510,7 @@ Index: ffplay.c av_free(frame); return 0; } -@@ -2189,6 +2472,12 @@ +@@ -2189,6 +2473,12 @@ /* free all pictures */ for(i=0;i<VIDEO_PICTURE_QUEUE_SIZE; i++) { vp = &is->pictq[i]; @@ -522,7 +523,7 @@ Index: ffplay.c if (vp->bmp) { SDL_FreeYUVOverlay(vp->bmp); vp->bmp = NULL; -@@ -2527,6 +2816,9 @@ +@@ -2527,6 +2817,9 @@ { "ec", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&error_concealment}, "set error concealment options", "bit_mask" }, { "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" }, @@ -532,7 +533,7 @@ Index: ffplay.c { "default", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" }, { NULL, }, }; -@@ -2575,7 +2867,9 @@ +@@ -2575,7 +2868,9 @@ avctx_opts[i]= avcodec_alloc_context2(i); } avformat_opts = avformat_alloc_context();

1 0

[soc]: r4138 - libavfilter/diffs/02_ffmpeg_filters.diff
by stefano 24 Feb '09

24 Feb '09

Author: stefano Date: Tue Feb 24 01:14:39 2009 New Revision: 4138 Log: Pass to the scale filters the sws_flags set, either through the sws_opts in their args, either trough the filter graph scale_sws_opts field. Fix regressions test. Modified: libavfilter/diffs/02_ffmpeg_filters.diff Modified: libavfilter/diffs/02_ffmpeg_filters.diff ============================================================================== --- libavfilter/diffs/02_ffmpeg_filters.diff Tue Feb 24 00:54:20 2009 (r4137) +++ libavfilter/diffs/02_ffmpeg_filters.diff Tue Feb 24 01:14:39 2009 (r4138) @@ -40,7 +40,7 @@ Index: ffmpeg.c } AVInputStream; typedef struct AVInputFile { -@@ -301,6 +318,176 @@ +@@ -301,6 +318,183 @@ static struct termios oldtty; #endif @@ -164,9 +164,10 @@ Index: ffmpeg.c + (frame_padtop + frame_padbottom))) { + char crop_args[255]; + AVFilterContext *filt_scale; -+ snprintf(crop_args, 255, "%d:%d", ++ snprintf(crop_args, 255, "%d:%d:sws_flags=%d", + codec->width - (frame_padleft + frame_padright), -+ codec->height - (frame_padtop + frame_padbottom)); ++ codec->height - (frame_padtop + frame_padbottom), ++ (int)av_get_int(sws_opts, "sws_flags", NULL)); + filt_scale = avfilter_open(avfilter_get_by_name("scale"), NULL); + if (!filt_scale) + return -1; @@ -199,6 +200,12 @@ Index: ffmpeg.c + return -1; + } + ++ { ++ char scale_sws_opts[128]; ++ snprintf(scale_sws_opts, sizeof(scale_sws_opts), "sws_flags=%d", (int)av_get_int(sws_opts, "sws_flags", NULL)); ++ filt_graph_all->scale_sws_opts = av_strdup(scale_sws_opts); ++ } ++ + /* configure all the filter links */ + if(avfilter_graph_check_validity(filt_graph_all, NULL)) + return -1; @@ -217,7 +224,7 @@ Index: ffmpeg.c static void term_exit(void) { #if HAVE_TERMIOS_H -@@ -886,6 +1073,9 @@ +@@ -886,6 +1080,9 @@ if (nb_frames <= 0) return; @@ -227,7 +234,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"); -@@ -897,6 +1087,7 @@ +@@ -897,6 +1094,7 @@ } else { formatted_picture = in_picture; } @@ -235,7 +242,7 @@ Index: ffmpeg.c final_picture = formatted_picture; padding_src = formatted_picture; -@@ -914,12 +1105,14 @@ +@@ -914,12 +1112,14 @@ } } @@ -250,7 +257,7 @@ Index: ffmpeg.c if (ost->video_pad) { av_picture_pad((AVPicture*)final_picture, (AVPicture *)padding_src, -@@ -1190,6 +1383,9 @@ +@@ -1190,6 +1390,9 @@ static short *samples= NULL; AVSubtitle subtitle, *subtitle_to_free; int got_subtitle; @@ -260,7 +267,7 @@ Index: ffmpeg.c if(ist->next_pts == AV_NOPTS_VALUE) ist->next_pts= ist->pts; -@@ -1307,6 +1503,15 @@ +@@ -1307,6 +1510,15 @@ &buffer_to_free); } @@ -276,7 +283,7 @@ Index: ffmpeg.c // preprocess audio (volume) if (ist->st->codec->codec_type == CODEC_TYPE_AUDIO) { if (audio_volume != 256) { -@@ -1328,10 +1533,18 @@ +@@ -1328,10 +1540,18 @@ if (pts > now) usleep(pts - now); } @@ -296,7 +303,7 @@ Index: ffmpeg.c for(i=0;i<nb_ostreams;i++) { int frame_size; -@@ -1354,6 +1567,9 @@ +@@ -1354,6 +1574,9 @@ do_audio_out(os, ost, ist, data_buf, data_size); break; case CODEC_TYPE_VIDEO: @@ -306,7 +313,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); -@@ -1411,7 +1627,17 @@ +@@ -1411,7 +1634,17 @@ av_free_packet(&opkt); } } @@ -324,7 +331,7 @@ Index: ffmpeg.c av_free(buffer_to_free); /* XXX: allocate the subtitles in the codec ? */ if (subtitle_to_free) { -@@ -1842,10 +2068,21 @@ +@@ -1842,10 +2075,21 @@ fprintf(stderr, "Cannot get resampling context\n"); av_exit(1); } @@ -346,7 +353,7 @@ Index: ffmpeg.c break; case CODEC_TYPE_SUBTITLE: ost->encoding_needed = 1; -@@ -3835,6 +4072,9 @@ +@@ -3835,6 +4079,9 @@ #if CONFIG_VHOOK { "vhook", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)add_frame_hooker}, "insert video processing module", "module" }, #endif

1 0

[soc]: r4137 - in libavfilter: checkout.sh diffs/01_ffplay_filters.diff diffs/02_ffmpeg_filters.diff
by stefano 24 Feb '09

24 Feb '09

Author: stefano Date: Tue Feb 24 00:54:20 2009 New Revision: 4137 Log: Update to FFmpeg SVN r17547. Modified: libavfilter/checkout.sh libavfilter/diffs/01_ffplay_filters.diff libavfilter/diffs/02_ffmpeg_filters.diff Modified: libavfilter/checkout.sh ============================================================================== --- libavfilter/checkout.sh Tue Feb 24 00:35:27 2009 (r4136) +++ libavfilter/checkout.sh Tue Feb 24 00:54:20 2009 (r4137) @@ -1,7 +1,7 @@ #! /bin/sh echo "checking out pristine ffmpeg" -svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r17222 +svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r17547 echo "patching ffmpeg" for diff in $(ls $(pwd)/diffs/*.diff); do patch -d ffmpeg -p0 -i $diff; done Modified: libavfilter/diffs/01_ffplay_filters.diff ============================================================================== --- libavfilter/diffs/01_ffplay_filters.diff Tue Feb 24 00:35:27 2009 (r4136) +++ libavfilter/diffs/01_ffplay_filters.diff Tue Feb 24 00:54:20 2009 (r4137) @@ -1,6 +1,6 @@ Index: ffplay.c =================================================================== ---- ffplay.c (revision 17222) +--- ffplay.c (revision 17547) +++ ffplay.c (working copy) @@ -29,6 +29,12 @@ #include "libavcodec/audioconvert.h" @@ -101,7 +101,7 @@ Index: ffplay.c } else { w = 640; h = 480; -@@ -1180,6 +1214,20 @@ +@@ -1188,6 +1222,20 @@ if (vp->bmp) SDL_FreeYUVOverlay(vp->bmp); @@ -122,7 +122,7 @@ Index: ffplay.c #if 0 /* XXX: use generic function */ /* XXX: disable overlay if no hardware acceleration or if RGB format */ -@@ -1197,12 +1245,9 @@ +@@ -1205,12 +1253,9 @@ break; } #endif @@ -136,7 +136,7 @@ Index: ffplay.c SDL_LockMutex(is->pictq_mutex); vp->allocated = 1; -@@ -1219,8 +1264,11 @@ +@@ -1227,8 +1272,11 @@ VideoPicture *vp; int dst_pix_fmt; AVPicture pict; @@ -149,7 +149,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 && -@@ -1236,8 +1284,13 @@ +@@ -1244,8 +1292,13 @@ /* alloc or resize hardware picture buffer */ if (!vp->bmp || @@ -163,7 +163,7 @@ Index: ffplay.c SDL_Event event; vp->allocated = 0; -@@ -1261,6 +1314,12 @@ +@@ -1269,6 +1322,12 @@ /* if the frame is not skipped, then display it */ if (vp->bmp) { @@ -176,7 +176,7 @@ Index: ffplay.c /* get a pointer on the bitmap */ SDL_LockYUVOverlay (vp->bmp); -@@ -1272,18 +1331,30 @@ +@@ -1280,18 +1339,30 @@ pict.linesize[0] = vp->bmp->pitches[0]; pict.linesize[1] = vp->bmp->pitches[2]; pict.linesize[2] = vp->bmp->pitches[1]; @@ -211,7 +211,7 @@ Index: ffplay.c /* update the bitmap content */ SDL_UnlockYUVOverlay(vp->bmp); -@@ -1338,54 +1409,266 @@ +@@ -1346,54 +1417,266 @@ return queue_picture(is, src_frame, pts); } @@ -509,7 +509,7 @@ Index: ffplay.c av_free(frame); return 0; } -@@ -2181,6 +2464,12 @@ +@@ -2189,6 +2472,12 @@ /* free all pictures */ for(i=0;i<VIDEO_PICTURE_QUEUE_SIZE; i++) { vp = &is->pictq[i]; @@ -522,7 +522,7 @@ Index: ffplay.c if (vp->bmp) { SDL_FreeYUVOverlay(vp->bmp); vp->bmp = NULL; -@@ -2519,6 +2808,9 @@ +@@ -2527,6 +2816,9 @@ { "ec", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&error_concealment}, "set error concealment options", "bit_mask" }, { "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" }, @@ -532,7 +532,7 @@ Index: ffplay.c { "default", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" }, { NULL, }, }; -@@ -2567,7 +2859,9 @@ +@@ -2575,7 +2867,9 @@ avctx_opts[i]= avcodec_alloc_context2(i); } avformat_opts = avformat_alloc_context(); Modified: libavfilter/diffs/02_ffmpeg_filters.diff ============================================================================== --- libavfilter/diffs/02_ffmpeg_filters.diff Tue Feb 24 00:35:27 2009 (r4136) +++ libavfilter/diffs/02_ffmpeg_filters.diff Tue Feb 24 00:54:20 2009 (r4137) @@ -1,6 +1,6 @@ Index: ffmpeg.c =================================================================== ---- ffmpeg.c (revision 17222) +--- ffmpeg.c (revision 17547) +++ ffmpeg.c (working copy) @@ -41,6 +41,13 @@ #include "libavutil/avstring.h" @@ -226,7 +226,7 @@ Index: ffmpeg.c +#else if (ost->video_crop) { if (av_picture_crop((AVPicture *)&picture_crop_temp, (AVPicture *)in_picture, dec->pix_fmt, ost->topBand, ost->leftBand) < 0) { - av_log(NULL, AV_LOG_ERROR, "error cropping picture\n"); + fprintf(stderr, "error cropping picture\n"); @@ -897,6 +1087,7 @@ } else { formatted_picture = in_picture;

1 0

[soc]: r4136 - amr/amrnbfloatdec.c
by kmalaussene 24 Feb '09

24 Feb '09

Author: kmalaussene Date: Tue Feb 24 00:35:27 2009 New Revision: 4136 Log: Remove in lsp2lpc hack that inverses the sign of LPC coefficients in order to use ff_celp_lp_synthesis_filterf. See r17546 in FFmpeg main svn to see changes in ff_celp_lp_synthesis_filterf. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Tue Feb 24 00:24:47 2009 (r4135) +++ amr/amrnbfloatdec.c Tue Feb 24 00:35:27 2009 (r4136) @@ -356,9 +356,6 @@ static void lsp2lpc(float *lsp, float *l lsp_double[i] = lsp[i]; ff_celp_lspf2lpc(lsp_double, lpc_coeffs); - - for(i=0; i<LP_FILTER_ORDER; i++) - lpc_coeffs[i] = -lpc_coeffs[i]; } /// @}

1 0

[soc]: r4135 - libavfilter/vf_scale.c
by stefano 24 Feb '09

24 Feb '09

Author: stefano Date: Tue Feb 24 00:24:47 2009 New Revision: 4135 Log: Make the flags for the SwsContext, used for rescaling, configurable. Add support for parsing a key/value pair sws_flags=VAL in the sws_opts of the args. The value of sws_flags is set in the SwsContext using av_opt_string3(). Modified: libavfilter/vf_scale.c Modified: libavfilter/vf_scale.c ============================================================================== --- libavfilter/vf_scale.c Tue Feb 24 00:12:14 2009 (r4134) +++ libavfilter/vf_scale.c Tue Feb 24 00:24:47 2009 (r4135) @@ -22,6 +22,7 @@ #include <stdio.h> #include "avfilter.h" +#include "libavcodec/opt.h" #include "libswscale/swscale.h" typedef struct @@ -42,6 +43,7 @@ static av_cold int init(AVFilterContext { ScaleContext *scale = ctx->priv; char sws_opts[256]; + char *p; /* default to no scaling */ scale->w = @@ -53,6 +55,22 @@ static av_cold int init(AVFilterContext if(args) sscanf(args, "%d:%d:%255s", &scale->w, &scale->h, sws_opts); + if ((p = strstr(sws_opts, "sws_flags="))) { + char sws_flags[256]; + int i = 0; + p = strchr(sws_opts, '='); + p++; + while (*p && *p != ':' && i < sizeof(sws_flags) - 1) + sws_flags[i++] = *p++; + sws_flags[i] = 0; + + if (av_set_string3(scale->sws, "sws_flags", sws_flags, 1, NULL) < 0) { + sws_freeContext(scale->sws); + scale->sws = NULL; + return -1; + } + } + /* sanity check parms */ if(scale->w < -1 || scale->h < -1) return -1; @@ -98,12 +116,11 @@ static int config_props(AVFilterLink *li if(w == -1) w = scale->h*link->src->inputs[0]->w/link->src->inputs[0]->h; if(h == -1) h = scale->w*link->src->inputs[0]->h/link->src->inputs[0]->w; - /* TODO: make algorithm configurable */ scale->sws = sws_getCachedContext(scale->sws, link->src->inputs[0]->w, link->src->inputs[0]->h, link->src->inputs[0]->format, - w, h, link->format, SWS_BILINEAR, + w, h, link->format, av_get_int(scale->sws, "sws_flags", NULL), NULL, NULL, NULL); link->w = w;

1 0

[soc]: r4134 - libavfilter/vf_scale.c
by stefano 24 Feb '09

24 Feb '09

Author: stefano Date: Tue Feb 24 00:12:14 2009 New Revision: 4134 Log: Extend the syntax for the args, add support for a third argument sws_opts, meant to contain the options for the SwsContext to use for scaling. Modified: libavfilter/vf_scale.c Modified: libavfilter/vf_scale.c ============================================================================== --- libavfilter/vf_scale.c Tue Feb 24 00:07:05 2009 (r4133) +++ libavfilter/vf_scale.c Tue Feb 24 00:12:14 2009 (r4134) @@ -41,6 +41,7 @@ typedef struct static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque) { ScaleContext *scale = ctx->priv; + char sws_opts[256]; /* default to no scaling */ scale->w = @@ -50,7 +51,7 @@ static av_cold int init(AVFilterContext return -1; if(args) - sscanf(args, "%d:%d", &scale->w, &scale->h); + sscanf(args, "%d:%d:%255s", &scale->w, &scale->h, sws_opts); /* sanity check parms */ if(scale->w < -1 || scale->h < -1)

1 0

[soc]: r4133 - libavfilter/vf_scale.c
by stefano 24 Feb '09

24 Feb '09

Author: stefano Date: Tue Feb 24 00:07:05 2009 New Revision: 4133 Log: Apply reindent and cosmetics after the last commit. Modified: libavfilter/vf_scale.c Modified: libavfilter/vf_scale.c ============================================================================== --- libavfilter/vf_scale.c Tue Feb 24 00:05:20 2009 (r4132) +++ libavfilter/vf_scale.c Tue Feb 24 00:07:05 2009 (r4133) @@ -98,11 +98,12 @@ static int config_props(AVFilterLink *li if(h == -1) h = scale->w*link->src->inputs[0]->h/link->src->inputs[0]->w; /* TODO: make algorithm configurable */ - scale->sws = sws_getCachedContext(scale->sws, link->src->inputs[0]->w, - link->src->inputs[0]->h, - link->src->inputs[0]->format, - w, h, link->format, SWS_BILINEAR, - NULL, NULL, NULL); + scale->sws = sws_getCachedContext(scale->sws, + link->src->inputs[0]->w, + link->src->inputs[0]->h, + link->src->inputs[0]->format, + w, h, link->format, SWS_BILINEAR, + NULL, NULL, NULL); link->w = w; link->h = h;

1 0

[soc]: r4132 - libavfilter/vf_scale.c
by stefano 24 Feb '09

24 Feb '09

Author: stefano Date: Tue Feb 24 00:05:20 2009 New Revision: 4132 Log: Allocate a SwsContext in init(), then use sws_getCachedContext() in config_props() against that already allocated context. Modified: libavfilter/vf_scale.c Modified: libavfilter/vf_scale.c ============================================================================== --- libavfilter/vf_scale.c Mon Feb 23 02:25:21 2009 (r4131) +++ libavfilter/vf_scale.c Tue Feb 24 00:05:20 2009 (r4132) @@ -46,6 +46,9 @@ static av_cold int init(AVFilterContext scale->w = scale->h = 0; + if (!(scale->sws = sws_getContext(16,16,0, 16,16,0, SWS_BILINEAR, NULL,NULL,NULL))) + return -1; + if(args) sscanf(args, "%d:%d", &scale->w, &scale->h); @@ -87,9 +90,6 @@ static int config_props(AVFilterLink *li ScaleContext *scale = link->src->priv; int w, h; - if(scale->sws) - sws_freeContext(scale->sws); - w = scale->w; h = scale->h; if(!w) w = link->src->inputs[0]->w; @@ -98,7 +98,7 @@ static int config_props(AVFilterLink *li if(h == -1) h = scale->w*link->src->inputs[0]->h/link->src->inputs[0]->w; /* TODO: make algorithm configurable */ - scale->sws = sws_getContext(link->src->inputs[0]->w, + scale->sws = sws_getCachedContext(scale->sws, link->src->inputs[0]->w, link->src->inputs[0]->h, link->src->inputs[0]->format, w, h, link->format, SWS_BILINEAR,

1 0

[soc]: r4131 - amr/amrnbfloatdec.c
by kmalaussene 23 Feb '09

23 Feb '09

Author: kmalaussene Date: Mon Feb 23 02:25:21 2009 New Revision: 4131 Log: Rename do_phase_dispersion into apply_ir_filter to reflect what it does. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Mon Feb 23 02:24:24 2009 (r4130) +++ amr/amrnbfloatdec.c Mon Feb 23 02:25:21 2009 (r4131) @@ -699,7 +699,7 @@ static float fixed_gain_prediction(float * * @param p the context */ -void do_phase_dispersion(AMRContext *p, float *fixed_vector) +void apply_ir_filter(AMRContext *p, float *fixed_vector) { int ir_filter_strength; @@ -970,7 +970,7 @@ static int amrnb_decode_frame(AVCodecCon } } - do_phase_dispersion(p, p->fixed_vector); + apply_ir_filter(p, p->fixed_vector); /*** end of pre-processing ***/

1 0