April 2012 - ffmpeg-cvslog - lists.ffmpeg.org

aac: reference supported sample rates in encoders.
by git＠videolan.org 06 Nov '12

06 Nov '12

ffmpeg | branch: master | Clément Bœsch <clement.boesch(a)smartjog.com> | Mon Mar 26 22:32:17 2012 +0200| [29679f4a372eb208af31c57177ab49f67c698362] | committer: Clément Bœsch aac: reference supported sample rates in encoders. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=29679f4a372eb208a… --- libavcodec/aacenc.c | 1 + libavcodec/libvo-aacenc.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index cf4aef9..fd72daf 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -816,6 +816,7 @@ AVCodec ff_aac_encoder = { .init = aac_encode_init, .encode2 = aac_encode_frame, .close = aac_encode_end, + .supported_samplerates = avpriv_mpeg4audio_sample_rates, .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY | CODEC_CAP_EXPERIMENTAL, .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_FLT,AV_SAMPLE_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("Advanced Audio Coding"), diff --git a/libavcodec/libvo-aacenc.c b/libavcodec/libvo-aacenc.c index 8f7c581..c5191ec 100644 --- a/libavcodec/libvo-aacenc.c +++ b/libavcodec/libvo-aacenc.c @@ -193,6 +193,7 @@ AVCodec ff_libvo_aacenc_encoder = { .init = aac_encode_init, .encode2 = aac_encode_frame, .close = aac_encode_close, + .supported_samplerates = avpriv_mpeg4audio_sample_rates, .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY, .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("Android VisualOn AAC"),

3 2

lavfi: add a new function av_buffersrc_buffer().
by git＠videolan.org 21 May '12

21 May '12

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Wed Dec 21 20:39:18 2011 +0100| [e1d9dbf2d465448028bf396d7b37dbb642794678] | committer: Anton Khirnov lavfi: add a new function av_buffersrc_buffer(). It can be used to directly pass a AVFilterBufferRef to lavfi, avoiding a memcpy. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e1d9dbf2d46544802… --- libavfilter/Makefile | 2 +- libavfilter/buffersrc.h | 38 ++++++++++++++++++++++++++ libavfilter/vsrc_buffer.c | 66 ++++++++++++++++++++++---------------------- 3 files changed, 72 insertions(+), 34 deletions(-) diff --git a/libavfilter/Makefile b/libavfilter/Makefile index c269db5..78c4692 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -3,7 +3,7 @@ FFLIBS = avutil FFLIBS-$(CONFIG_MOVIE_FILTER) += avformat avcodec FFLIBS-$(CONFIG_SCALE_FILTER) += swscale -HEADERS = avfilter.h avfiltergraph.h vsrc_buffer.h +HEADERS = avfilter.h avfiltergraph.h buffersrc.h vsrc_buffer.h OBJS = allfilters.o \ avfilter.o \ diff --git a/libavfilter/buffersrc.h b/libavfilter/buffersrc.h new file mode 100644 index 0000000..bd82c06 --- /dev/null +++ b/libavfilter/buffersrc.h @@ -0,0 +1,38 @@ +/* + * + * This file is part of Libav. + * + * Libav 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. + * + * Libav 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 Libav; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVFILTER_BUFFERSRC_H +#define AVFILTER_BUFFERSRC_H + +/** + * @file + * Memory buffer source API. + */ + +#include "avfilter.h" + +/** + * Add a buffer to the filtergraph s. + * + * @param buf buffer containing frame data to be passed down the filtergraph. + * This function will take ownership of buf, the user must not free it. + */ +int av_buffersrc_buffer(AVFilterContext *s, AVFilterBufferRef *buf); + +#endif /* AVFILTER_BUFFERSRC_H */ diff --git a/libavfilter/vsrc_buffer.c b/libavfilter/vsrc_buffer.c index 982fed5..7ef19a1 100644 --- a/libavfilter/vsrc_buffer.c +++ b/libavfilter/vsrc_buffer.c @@ -24,13 +24,12 @@ */ #include "avfilter.h" +#include "buffersrc.h" #include "vsrc_buffer.h" #include "libavutil/imgutils.h" typedef struct { - int64_t pts; - AVFrame frame; - int has_frame; + AVFilterBufferRef *buf; int h, w; enum PixelFormat pix_fmt; AVRational time_base; ///< time_base to set in the output link @@ -42,7 +41,7 @@ int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, { BufferSourceContext *c = buffer_filter->priv; - if (c->has_frame) { + if (c->buf) { av_log(buffer_filter, AV_LOG_ERROR, "Buffering several frames is not supported. " "Please consume all available frames before adding a new one.\n" @@ -50,15 +49,31 @@ int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, //return -1; } - memcpy(c->frame.data , frame->data , sizeof(frame->data)); - memcpy(c->frame.linesize, frame->linesize, sizeof(frame->linesize)); - c->frame.interlaced_frame= frame->interlaced_frame; - c->frame.top_field_first = frame->top_field_first; - c->frame.key_frame = frame->key_frame; - c->frame.pict_type = frame->pict_type; - c->pts = pts; - c->pixel_aspect = pixel_aspect; - c->has_frame = 1; + c->buf = avfilter_get_video_buffer(buffer_filter->outputs[0], AV_PERM_WRITE, + c->w, c->h); + av_image_copy(c->buf->data, c->buf->linesize, frame->data, frame->linesize, + c->pix_fmt, c->w, c->h); + + avfilter_copy_frame_props(c->buf, frame); + c->buf->pts = pts; + c->buf->video->pixel_aspect = pixel_aspect; + + return 0; +} + +int av_buffersrc_buffer(AVFilterContext *s, AVFilterBufferRef *buf) +{ + BufferSourceContext *c = s->priv; + + if (c->buf) { + av_log(s, AV_LOG_ERROR, + "Buffering several frames is not supported. " + "Please consume all available frames before adding a new one.\n" + ); + return AVERROR(EINVAL); + } + + c->buf = buf; return 0; } @@ -113,33 +128,18 @@ static int config_props(AVFilterLink *link) static int request_frame(AVFilterLink *link) { BufferSourceContext *c = link->src->priv; - AVFilterBufferRef *picref; - if (!c->has_frame) { + if (!c->buf) { av_log(link->src, AV_LOG_ERROR, "request_frame() called with no available frame!\n"); //return -1; } - /* This picture will be needed unmodified later for decoding the next - * frame */ - picref = avfilter_get_video_buffer(link, AV_PERM_WRITE | AV_PERM_PRESERVE | - AV_PERM_REUSE2, - link->w, link->h); - - av_image_copy(picref->data, picref->linesize, - c->frame.data, c->frame.linesize, - picref->format, link->w, link->h); - - avfilter_copy_frame_props(picref, &c->frame); - picref->pts = c->pts; - picref->video->pixel_aspect = c->pixel_aspect; - avfilter_start_frame(link, avfilter_ref_buffer(picref, ~0)); + avfilter_start_frame(link, avfilter_ref_buffer(c->buf, ~0)); avfilter_draw_slice(link, 0, link->h, 1); avfilter_end_frame(link); - avfilter_unref_buffer(picref); - - c->has_frame = 0; + avfilter_unref_buffer(c->buf); + c->buf = NULL; return 0; } @@ -147,7 +147,7 @@ static int request_frame(AVFilterLink *link) static int poll_frame(AVFilterLink *link) { BufferSourceContext *c = link->src->priv; - return !!(c->has_frame); + return !!(c->buf); } AVFilter avfilter_vsrc_buffer = {

3 3

avfiltergraph: change the syntax of avfilter_graph_parse()
by git＠videolan.org 18 May '12

18 May '12

ffmpeg | branch: master | Stefano Sabatini <stefano.sabatini-lala(a)poste.it> | Sat Jun 11 15:16:02 2011 +0200| [6119b23a3662d1e106cdf69ef3171b2e7e1d495c] | committer: Stefano Sabatini avfiltergraph: change the syntax of avfilter_graph_parse() Make it returns the list of open inputs and outputs, so it can be reused by applications. Breaks API/ABI. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6119b23a3662d1e10… --- doc/APIchanges | 3 +++ ffmpeg.c | 2 +- ffplay.c | 2 +- libavfilter/avfilter.h | 4 ++-- libavfilter/avfiltergraph.h | 8 +++++--- libavfilter/graphparser.c | 20 ++++++++++---------- 6 files changed, 22 insertions(+), 17 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 592c268..40efee8 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,6 +13,9 @@ libavutil: 2011-04-18 API changes, most recent first: +2011-06-12 - xxxxxxx - lavfi 2.16.0 - avfilter_graph_parse() + Change avfilter_graph_parse() signature. + 2011-06-xx - xxxxxxx - lavu 51.6.0 - opt.h Add av_opt_flag_is_set(). diff --git a/ffmpeg.c b/ffmpeg.c index 35395a9..f69c054 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -418,7 +418,7 @@ static int configure_video_filters(AVInputStream *ist, AVOutputStream *ost) inputs->pad_idx = 0; inputs->next = NULL; - if ((ret = avfilter_graph_parse(ost->graph, ost->avfilter, inputs, outputs, NULL)) < 0) + if ((ret = avfilter_graph_parse(ost->graph, ost->avfilter, &inputs, &outputs, NULL)) < 0) return ret; av_freep(&ost->avfilter); } else { diff --git a/ffplay.c b/ffplay.c index ebe9e05..c5f5f75 100644 --- a/ffplay.c +++ b/ffplay.c @@ -1708,7 +1708,7 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c inputs->pad_idx = 0; inputs->next = NULL; - if ((ret = avfilter_graph_parse(graph, vfilters, inputs, outputs, NULL)) < 0) + if ((ret = avfilter_graph_parse(graph, vfilters, &inputs, &outputs, NULL)) < 0) goto the_end; av_freep(&vfilters); } else { diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 64d76cc..fbd1dc4 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -26,8 +26,8 @@ #include "libavutil/samplefmt.h" #define LIBAVFILTER_VERSION_MAJOR 2 -#define LIBAVFILTER_VERSION_MINOR 15 -#define LIBAVFILTER_VERSION_MICRO 1 +#define LIBAVFILTER_VERSION_MINOR 16 +#define LIBAVFILTER_VERSION_MICRO 0 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ diff --git a/libavfilter/avfiltergraph.h b/libavfilter/avfiltergraph.h index 23a7c51..538fd2c 100644 --- a/libavfilter/avfiltergraph.h +++ b/libavfilter/avfiltergraph.h @@ -112,12 +112,14 @@ typedef struct AVFilterInOut { * * @param graph the filter graph where to link the parsed graph context * @param filters string to be parsed - * @param inputs linked list to the inputs of the graph - * @param outputs linked list to the outputs of the graph + * @param inputs linked list to the inputs of the graph, may be NULL. + * It is updated to contain the list of open inputs after the parsing. + * @param outputs linked list to the outputs of the graph, may be NULL. + * It is updated to contain the list of open outputs after the parsing. * @return zero on success, a negative AVERROR code on error */ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, - AVFilterInOut *inputs, AVFilterInOut *outputs, + AVFilterInOut **inputs, AVFilterInOut **outputs, void *log_ctx); #endif /* AVFILTER_AVFILTERGRAPH_H */ diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c index aa1f228..ea0c5dd 100644 --- a/libavfilter/graphparser.c +++ b/libavfilter/graphparser.c @@ -328,8 +328,8 @@ static int parse_outputs(const char **buf, AVFilterInOut **curr_inputs, } int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, - AVFilterInOut *open_inputs, - AVFilterInOut *open_outputs, void *log_ctx) + AVFilterInOut **open_inputs, AVFilterInOut **open_outputs, + void *log_ctx) { int index = 0, ret; char chr = 0; @@ -341,7 +341,7 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, const char *filterchain = filters; filters += strspn(filters, WHITESPACES); - if ((ret = parse_inputs(&filters, &curr_inputs, &open_outputs, log_ctx)) < 0) + if ((ret = parse_inputs(&filters, &curr_inputs, open_outputs, log_ctx)) < 0) goto fail; if ((ret = parse_filter(&filter, &filters, graph, index, log_ctx)) < 0) @@ -350,14 +350,14 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, if (filter->input_count == 1 && !curr_inputs && !index) { /* First input can be omitted if it is "[in]" */ const char *tmp = "[in]"; - if ((ret = parse_inputs(&tmp, &curr_inputs, &open_outputs, log_ctx)) < 0) + if ((ret = parse_inputs(&tmp, &curr_inputs, open_outputs, log_ctx)) < 0) goto fail; } - if ((ret = link_filter_inouts(filter, &curr_inputs, &open_inputs, log_ctx)) < 0) + if ((ret = link_filter_inouts(filter, &curr_inputs, open_inputs, log_ctx)) < 0) goto fail; - if ((ret = parse_outputs(&filters, &curr_inputs, &open_inputs, &open_outputs, + if ((ret = parse_outputs(&filters, &curr_inputs, open_inputs, open_outputs, log_ctx)) < 0) goto fail; @@ -382,10 +382,10 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, goto fail; } - if (open_inputs && !strcmp(open_inputs->name, "out") && curr_inputs) { + if (*open_inputs && !strcmp((*open_inputs)->name, "out") && curr_inputs) { /* Last output can be omitted if it is "[out]" */ const char *tmp = "[out]"; - if ((ret = parse_outputs(&tmp, &curr_inputs, &open_inputs, &open_outputs, + if ((ret = parse_outputs(&tmp, &curr_inputs, open_inputs, open_outputs, log_ctx)) < 0) goto fail; } @@ -396,8 +396,8 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, for (; graph->filter_count > 0; graph->filter_count--) avfilter_free(graph->filters[graph->filter_count - 1]); av_freep(&graph->filters); - free_inout(open_inputs); - free_inout(open_outputs); + free_inout(*open_inputs); + free_inout(*open_outputs); free_inout(curr_inputs); return ret; }

2 1

Fix parsing of -force_key_frames option.
by git＠videolan.org 30 Apr '12

30 Apr '12

ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> | Mon Apr 30 22:48:42 2012 +0200| [4f6a1c974ff69afa5b40ced0c9e39c90da73235a] | committer: Reimar Döffinger Fix parsing of -force_key_frames option. Currently it always exits with an error when more than one position is specified. Fixes trac issue #1266. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4f6a1c974ff69afa5… --- ffmpeg.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index abceb3f..37817cc 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -4380,9 +4380,12 @@ static void parse_forced_key_frames(char *kf, OutputStream *ost) av_log(NULL, AV_LOG_FATAL, "Could not allocate forced key frames array.\n"); exit_program(1); } + p = kf; for (i = 0; i < n; i++) { - p = i ? strchr(p, ',') + 1 : kf; + char *next = strchr(p, ','); + if (next) *next++ = 0; ost->forced_kf_pts[i] = parse_time_or_die("force_key_frames", p, 1); + p = next; } }

1 0

lavfi/tinterlace: support symbolic names for the parameter
by git＠videolan.org 30 Apr '12

30 Apr '12

ffmpeg | branch: master | Stefano Sabatini <stefasab(a)gmail.com> | Sun Apr 29 16:45:35 2012 +0200| [5f161c23573c0756491a132c2a486572bb4b9f62] | committer: Stefano Sabatini lavfi/tinterlace: support symbolic names for the parameter Also deprecate the use of numerical values. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5f161c23573c07564… --- doc/filters.texi | 19 ++++++---- libavfilter/version.h | 2 +- libavfilter/vf_tinterlace.c | 83 +++++++++++++++++++++++++++++++------------ 3 files changed, 72 insertions(+), 32 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 3b5e556..abbf474 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -2778,31 +2778,31 @@ This filter accepts a single parameter specifying the mode. Available modes are: @table @samp -@item 0 +@item merge, 0 Move odd frames into the upper field, even into the lower field, generating a double height frame at half framerate. -@item 1 +@item drop_odd, 1 Only output even frames, odd frames are dropped, generating a frame with unchanged height at half framerate. -@item 2 +@item drop_even, 2 Only output odd frames, even frames are dropped, generating a frame with unchanged height at half framerate. -@item 3 +@item pad, 3 Expand each frame to full height, but pad alternate lines with black, generating a frame with double height at the same input framerate. -@item 4 +@item interleave_top, 4 Interleave the upper field from odd frames with the lower field from even frames, generating a frame with unchanged height at half framerate. -@item 5 +@item interleave_bottom, 5 Interleave the lower field from odd frames with the upper field from even frames, generating a frame with unchanged height at half framerate. -@item 6 +@item interlacex2, 6 Double frame rate with unchanged height. Frames are inserted each containing the second temporal field from the previous input frame and the first temporal field from the next input frame. This mode relies on @@ -2810,7 +2810,10 @@ the top_field_first flag. Useful for interlaced video displays with no field synchronisation. @end table -Default mode is 0. +Numeric values are deprecated but are accepted for backward +compatibility reasons. + +Default mode is @code{merge}. @section transpose diff --git a/libavfilter/version.h b/libavfilter/version.h index c79f37d..13ed66e 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,7 +30,7 @@ #define LIBAVFILTER_VERSION_MAJOR 2 #define LIBAVFILTER_VERSION_MINOR 72 -#define LIBAVFILTER_VERSION_MICRO 101 +#define LIBAVFILTER_VERSION_MICRO 102 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ diff --git a/libavfilter/vf_tinterlace.c b/libavfilter/vf_tinterlace.c index a07c974..adf10b1 100644 --- a/libavfilter/vf_tinterlace.c +++ b/libavfilter/vf_tinterlace.c @@ -29,8 +29,29 @@ #include "avfilter.h" #include "internal.h" +enum TInterlaceMode { + MODE_MERGE = 0, + MODE_DROP_EVEN, + MODE_DROP_ODD, + MODE_PAD, + MODE_INTERLEAVE_TOP, + MODE_INTERLEAVE_BOTTOM, + MODE_INTERLACEX2, +}; + +static const char *tinterlace_mode_str[] = { + "merge", + "drop_even", + "drop_odd", + "pad", + "interleave_top", + "interleave_bottom", + "interlacex2", + NULL +}; + typedef struct { - int mode; ///< interlace mode selected + enum TInterlaceMode mode; ///< interlace mode selected int frame; ///< number of the output frame int vsub; ///< chroma vertical subsampling AVFilterBufferRef *cur; @@ -62,16 +83,32 @@ static int query_formats(AVFilterContext *ctx) static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque) { TInterlaceContext *tinterlace = ctx->priv; - int n; - tinterlace->mode = 0; + int i; + char c; - if (args) { - n = sscanf(args, "%d", &tinterlace->mode); + tinterlace->mode = MODE_MERGE; - if (n != 1 || tinterlace->mode < 0 || tinterlace->mode > 6) { - av_log(ctx, AV_LOG_ERROR, - "Invalid mode '%s', use an integer between 0 and 6\n", args); - return AVERROR(EINVAL); + if (args) { + if (sscanf(args, "%d%c", (int *)&tinterlace->mode, &c) == 1) { + if (tinterlace->mode > 6) { + av_log(ctx, AV_LOG_ERROR, + "Invalid mode '%s', use an integer between 0 and 6\n", args); + return AVERROR(EINVAL); + } + + av_log(ctx, AV_LOG_WARNING, + "Using numeric constant is deprecated, use symbolic values\n"); + } else { + for (i = 0; tinterlace_mode_str[i]; i++) { + if (!strcmp(tinterlace_mode_str[i], args)) { + tinterlace->mode = i; + break; + } + } + if (!tinterlace_mode_str[i]) { + av_log(ctx, AV_LOG_ERROR, "Invalid argument '%s'\n", args); + return AVERROR(EINVAL); + } } } @@ -97,10 +134,10 @@ static int config_out_props(AVFilterLink *outlink) tinterlace->vsub = desc->log2_chroma_h; outlink->w = inlink->w; - outlink->h = tinterlace->mode == 0 || tinterlace->mode == 3 ? + outlink->h = tinterlace->mode == MODE_MERGE || tinterlace->mode == MODE_PAD ? inlink->h*2 : inlink->h; - if (tinterlace->mode == 3) { + if (tinterlace->mode == MODE_PAD) { uint8_t black[4] = { 16, 128, 128, 16 }; int i, ret; if (ff_fmt_is_in(outlink->format, full_scale_yuvj_pix_fmts)) @@ -117,8 +154,8 @@ static int config_out_props(AVFilterLink *outlink) tinterlace->black_linesize[i] * h); } } - av_log(ctx, AV_LOG_INFO, "mode:%d h:%d -> h:%d\n", - tinterlace->mode, inlink->h, outlink->h); + av_log(ctx, AV_LOG_INFO, "mode:%s h:%d -> h:%d\n", + tinterlace_mode_str[tinterlace->mode], inlink->h, outlink->h); return 0; } @@ -185,7 +222,7 @@ static void end_frame(AVFilterLink *inlink) return; switch (tinterlace->mode) { - case 0: /* move the odd frame into the upper field of the new image, even into + case MODE_MERGE: /* move the odd frame into the upper field of the new image, even into * the lower field, generating a double-height video at half framerate */ out = avfilter_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h); avfilter_copy_buffer_ref_props(out, cur); @@ -206,14 +243,14 @@ static void end_frame(AVFilterLink *inlink) avfilter_unref_bufferp(&tinterlace->next); break; - case 1: /* only output even frames, odd frames are dropped; height unchanged, half framerate */ - case 2: /* only output odd frames, even frames are dropped; height unchanged, half framerate */ - out = avfilter_ref_buffer(tinterlace->mode == 2 ? cur : next, AV_PERM_READ); + case MODE_DROP_ODD: /* only output even frames, odd frames are dropped; height unchanged, half framerate */ + case MODE_DROP_EVEN: /* only output odd frames, even frames are dropped; height unchanged, half framerate */ + out = avfilter_ref_buffer(tinterlace->mode == MODE_DROP_EVEN ? cur : next, AV_PERM_READ); avfilter_unref_bufferp(&tinterlace->next); break; - case 3: /* expand each frame to double height, but pad alternate - * lines with black; framerate unchanged */ + case MODE_PAD: /* expand each frame to double height, but pad alternate + * lines with black; framerate unchanged */ out = avfilter_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h); avfilter_copy_buffer_ref_props(out, cur); out->video->h = outlink->h; @@ -233,9 +270,9 @@ static void end_frame(AVFilterLink *inlink) /* interleave upper/lower lines from odd frames with lower/upper lines from even frames, * halving the frame rate and preserving image height */ - case 4: /* top field first */ - case 5: /* bottom field first */ - tff = tinterlace->mode == 4; + case MODE_INTERLEAVE_TOP: /* top field first */ + case MODE_INTERLEAVE_BOTTOM: /* bottom field first */ + tff = tinterlace->mode == MODE_INTERLEAVE_TOP; out = avfilter_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h); avfilter_copy_buffer_ref_props(out, cur); out->video->interlaced = 1; @@ -253,7 +290,7 @@ static void end_frame(AVFilterLink *inlink) tff ? FIELD_LOWER : FIELD_UPPER, 1, tff ? FIELD_LOWER : FIELD_UPPER); avfilter_unref_bufferp(&tinterlace->next); break; - case 6: /* re-interlace preserving image height, double frame rate */ + case MODE_INTERLACEX2: /* re-interlace preserving image height, double frame rate */ /* output current frame first */ out = avfilter_ref_buffer(cur, AV_PERM_READ); out->video->interlaced = 1;

1 0

lavfi/tinterlace: make video as interlaced in mode 6
by git＠videolan.org 30 Apr '12

30 Apr '12

ffmpeg | branch: master | Stefano Sabatini <stefasab(a)gmail.com> | Mon Apr 30 22:17:15 2012 +0200| [837d034787f986ee54e492ef90e78667fe86b4a5] | committer: Stefano Sabatini lavfi/tinterlace: make video as interlaced in mode 6 This is useful for marking progressive video processed by the filter as interlaced, avoiding the interlaced flag to switch back and forth at each frame. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=837d034787f986ee5… --- libavfilter/vf_tinterlace.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/libavfilter/vf_tinterlace.c b/libavfilter/vf_tinterlace.c index 683aa0c..a07c974 100644 --- a/libavfilter/vf_tinterlace.c +++ b/libavfilter/vf_tinterlace.c @@ -256,6 +256,7 @@ static void end_frame(AVFilterLink *inlink) case 6: /* re-interlace preserving image height, double frame rate */ /* output current frame first */ out = avfilter_ref_buffer(cur, AV_PERM_READ); + out->video->interlaced = 1; avfilter_start_frame(outlink, out); avfilter_draw_slice(outlink, 0, outlink->h, 1);

1 0

lavfi/tinterlace: add tinterlace mode 6
by git＠videolan.org 30 Apr '12

30 Apr '12

ffmpeg | branch: master | Stuart Morris <stuart_morris(a)talk21.com> | Sun Apr 29 15:25:57 2012 +0200| [820c023142aa258b4d4a330e9ac2a568a07d491f] | committer: Stefano Sabatini lavfi/tinterlace: add tinterlace mode 6 This new mode is useful for generating frames for interlaced video displays. Typically interlaced video displays have no form of field synchronisation. This new mode guarantees correct field order without any requirement for field synchronisation. Signed-off-by: Stefano Sabatini <stefasab(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=820c023142aa258b4… --- doc/filters.texi | 7 +++++++ libavfilter/version.h | 2 +- libavfilter/vf_tinterlace.c | 29 +++++++++++++++++++++++++++-- 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index f574039..3b5e556 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -2801,6 +2801,13 @@ even frames, generating a frame with unchanged height at half framerate. @item 5 Interleave the lower field from odd frames with the upper field from even frames, generating a frame with unchanged height at half framerate. + +@item 6 +Double frame rate with unchanged height. Frames are inserted each +containing the second temporal field from the previous input frame and +the first temporal field from the next input frame. This mode relies on +the top_field_first flag. Useful for interlaced video displays with no +field synchronisation. @end table Default mode is 0. diff --git a/libavfilter/version.h b/libavfilter/version.h index 0f7ea50..c79f37d 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,7 +30,7 @@ #define LIBAVFILTER_VERSION_MAJOR 2 #define LIBAVFILTER_VERSION_MINOR 72 -#define LIBAVFILTER_VERSION_MICRO 100 +#define LIBAVFILTER_VERSION_MICRO 101 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ diff --git a/libavfilter/vf_tinterlace.c b/libavfilter/vf_tinterlace.c index 62e8d46..683aa0c 100644 --- a/libavfilter/vf_tinterlace.c +++ b/libavfilter/vf_tinterlace.c @@ -68,9 +68,9 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque) if (args) { n = sscanf(args, "%d", &tinterlace->mode); - if (n != 1 || tinterlace->mode < 0 || tinterlace->mode > 5) { + if (n != 1 || tinterlace->mode < 0 || tinterlace->mode > 6) { av_log(ctx, AV_LOG_ERROR, - "Invalid mode '%s', use an integer between 0 and 5\n", args); + "Invalid mode '%s', use an integer between 0 and 6\n", args); return AVERROR(EINVAL); } } @@ -253,6 +253,31 @@ static void end_frame(AVFilterLink *inlink) tff ? FIELD_LOWER : FIELD_UPPER, 1, tff ? FIELD_LOWER : FIELD_UPPER); avfilter_unref_bufferp(&tinterlace->next); break; + case 6: /* re-interlace preserving image height, double frame rate */ + /* output current frame first */ + out = avfilter_ref_buffer(cur, AV_PERM_READ); + + avfilter_start_frame(outlink, out); + avfilter_draw_slice(outlink, 0, outlink->h, 1); + avfilter_end_frame(outlink); + + /* output mix of current and next frame */ + tff = next->video->top_field_first; + out = avfilter_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h); + avfilter_copy_buffer_ref_props(out, next); + out->video->interlaced = 1; + + /* write current frame second field lines into the second field of the new frame */ + copy_picture_field(out->data, out->linesize, + cur->data, cur->linesize, + inlink->format, inlink->w, inlink->h, + tff ? FIELD_LOWER : FIELD_UPPER, 1, tff ? FIELD_LOWER : FIELD_UPPER); + /* write next frame first field lines into the first field of the new frame */ + copy_picture_field(out->data, out->linesize, + next->data, next->linesize, + inlink->format, inlink->w, inlink->h, + tff ? FIELD_UPPER : FIELD_LOWER, 1, tff ? FIELD_UPPER : FIELD_LOWER); + break; } avfilter_start_frame(outlink, out);

1 0

lavu/opt: clarify error message in set_key_value_pair()
by git＠videolan.org 30 Apr '12

30 Apr '12

ffmpeg | branch: master | Stefano Sabatini <stefasab(a)gmail.com> | Wed Apr 25 17:44:19 2012 +0200| [d4f8d717ab458fb673dd3a0ae61112cacf10310e] | committer: Stefano Sabatini lavu/opt: clarify error message in set_key_value_pair() > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d4f8d717ab458fb67… --- libavutil/opt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index 2f8be3b..e14ace9 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -684,7 +684,7 @@ static int parse_key_value_pair(void *ctx, const char **buf, return AVERROR(EINVAL); } - av_log(ctx, AV_LOG_DEBUG, "Setting value '%s' for key '%s'\n", val, key); + av_log(ctx, AV_LOG_DEBUG, "Setting entry with key '%s' to value '%s'\n", key, val); ret = av_opt_set(ctx, key, val, 0); if (ret == AVERROR_OPTION_NOT_FOUND)

1 0

Merge remote-tracking branch 'qatar/master'
by git＠videolan.org 30 Apr '12

30 Apr '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Apr 30 22:05:03 2012 +0200| [39de8343f9274f3c93bf44ecb7dcd832b648365d] | committer: Michael Niedermayer Merge remote-tracking branch 'qatar/master' * qatar/master: mkv: mark corrupted packets and return them mkv: forward EMBL block data error avcodec: introduce YCoCg colorspace avcodec: cosmetic cleanup on header aac sbr: align struct member by 32 byte. Conflicts: libavcodec/avcodec.h libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=39de8343f9274f3c9… ---

1 0

mkv: mark corrupted packets and return them
by git＠videolan.org 30 Apr '12

30 Apr '12

ffmpeg | branch: master | Luca Barbato <lu_zero(a)gentoo.org> | Sun Apr 29 17:55:51 2012 -0700| [0ca4642ec520e315692c4a8b8a98ab390bddfad2] | committer: Luca Barbato mkv: mark corrupted packets and return them Do return error if memory allocation or I/O fails. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0ca4642ec520e3156… --- libavformat/matroskadec.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 5688658..3b78ae3 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2069,6 +2069,11 @@ static int matroska_read_packet(AVFormatContext *s, AVPacket *pkt) ret = matroska_parse_cluster(matroska); } + if (ret == AVERROR_INVALIDDATA) { + pkt->flags |= AV_PKT_FLAG_CORRUPT; + return 0; + } + return ret; }

1 0