September 2016 - ffmpeg-cvslog

swscale/tests/swscale: add cpuflags option
by git＠videolan.org 02 Sep '16

02 Sep '16

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Fri Sep 2 14:55:27 2016 +0200| [7a6c288c2b5b1653d3a70f8d5511b31cf5156894] | committer: Michael Niedermayer swscale/tests/swscale: add cpuflags option Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7a6c288c2b5b1653d… --- libswscale/tests/swscale.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libswscale/tests/swscale.c b/libswscale/tests/swscale.c index 58c2114..da6a41b 100644 --- a/libswscale/tests/swscale.c +++ b/libswscale/tests/swscale.c @@ -25,6 +25,7 @@ #include <stdarg.h> #undef HAVE_AV_CONFIG_H +#include "libavutil/cpu.h" #include "libavutil/imgutils.h" #include "libavutil/mem.h" #include "libavutil/avutil.h" @@ -382,6 +383,14 @@ int main(int argc, char **argv) fprintf(stderr, "could not open '%s'\n", argv[i + 1]); goto error; } + } else if (!strcmp(argv[i], "-cpuflags")) { + unsigned flags = av_get_cpu_flags(); + int ret = av_parse_cpu_caps(&flags, argv[i + 1]); + if (ret < 0) { + fprintf(stderr, "invalid cpu flags %s\n", argv[i + 1]); + return ret; + } + av_force_cpu_flags(flags); } else if (!strcmp(argv[i], "-src")) { srcFormat = av_get_pix_fmt(argv[i + 1]); if (srcFormat == AV_PIX_FMT_NONE) {

1 0

avfilter/vf_zscale: make possible to change chroma location
by git＠videolan.org 02 Sep '16

02 Sep '16

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Fri Sep 2 16:03:58 2016 +0200| [b5cf307d0f85aff434342e41beb33b39df8d553f] | committer: Paul B Mahol avfilter/vf_zscale: make possible to change chroma location > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b5cf307d0f85aff43… --- doc/filters.texi | 28 ++++++++++++++++++++++++++++ libavfilter/vf_zscale.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 70 insertions(+), 1 deletion(-) diff --git a/doc/filters.texi b/doc/filters.texi index 945b9af..df6f997 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -14483,6 +14483,34 @@ Possible value are: @item 2020_ncl @item 2020_cl @end table + +@item chromal, c +Set the output chroma location. + +Possible values are: +@table @var +@item input +@item left +@item center +@item topleft +@item top +@item bottomleft +@item bottom +@end table + +@item chromalin, cin +Set the input chroma location. + +Possible values are: +@table @var +@item input +@item left +@item center +@item topleft +@item top +@item bottomleft +@item bottom +@end table @end table The values of the @option{w} and @option{h} options are expressions diff --git a/libavfilter/vf_zscale.c b/libavfilter/vf_zscale.c index 5a7ffc3..bc88426 100644 --- a/libavfilter/vf_zscale.c +++ b/libavfilter/vf_zscale.c @@ -88,10 +88,12 @@ typedef struct ZScaleContext { int trc; int primaries; int range; + int chromal; int colorspace_in; int trc_in; int primaries_in; int range_in; + int chromal_in; char *size_str; char *w_expr; ///< width expression string @@ -116,6 +118,7 @@ typedef struct ZScaleContext { enum AVColorTransferCharacteristic in_trc, out_trc; enum AVColorPrimaries in_primaries, out_primaries; enum AVColorRange in_range, out_range; + enum AVChromaLocation in_chromal, out_chromal; } ZScaleContext; static av_cold int init_dict(AVFilterContext *ctx, AVDictionary **opts) @@ -316,6 +319,26 @@ static int print_zimg_error(AVFilterContext *ctx) return err_code; } +static int convert_chroma_location(enum AVChromaLocation chroma_location) +{ + switch (chroma_location) { + case AVCHROMA_LOC_UNSPECIFIED: + case AVCHROMA_LOC_LEFT: + return ZIMG_CHROMA_LEFT; + case AVCHROMA_LOC_CENTER: + return ZIMG_CHROMA_CENTER; + case AVCHROMA_LOC_TOPLEFT: + return ZIMG_CHROMA_TOP_LEFT; + case AVCHROMA_LOC_TOP: + return ZIMG_CHROMA_TOP; + case AVCHROMA_LOC_BOTTOMLEFT: + return ZIMG_CHROMA_BOTTOM_LEFT; + case AVCHROMA_LOC_BOTTOM: + return ZIMG_CHROMA_BOTTOM; + } + return ZIMG_CHROMA_LEFT; +} + static int convert_matrix(enum AVColorSpace colorspace) { switch (colorspace) { @@ -420,7 +443,9 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) || s->out_colorspace != out->colorspace || s->out_trc != out->color_trc || s->out_primaries != out->color_primaries - || s->out_range != out->color_range) { + || s->out_range != out->color_range + || s->in_chromal != in->chroma_location + || s->out_chromal != out->chroma_location) { snprintf(buf, sizeof(buf)-1, "%d", outlink->w); av_opt_set(s, "w", buf, 0); snprintf(buf, sizeof(buf)-1, "%d", outlink->h); @@ -456,6 +481,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) s->src_format.transfer_characteristics = s->trc_in == - 1 ? convert_trc(in->color_trc) : s->trc_in; s->src_format.color_primaries = s->primaries_in == -1 ? convert_primaries(in->color_primaries) : s->primaries_in; s->src_format.pixel_range = (desc->flags & AV_PIX_FMT_FLAG_RGB) ? ZIMG_RANGE_FULL : s->range_in == -1 ? convert_range(in->color_range) : s->range_in; + s->src_format.chroma_location = s->chromal_in == -1 ? convert_chroma_location(in->chroma_location) : s->chromal_in; s->dst_format.width = out->width; s->dst_format.height = out->height; @@ -468,6 +494,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) s->dst_format.transfer_characteristics = s->trc == -1 ? convert_trc(out->color_trc) : s->trc; s->dst_format.color_primaries = s->primaries == -1 ? convert_primaries(out->color_primaries) : s->primaries; s->dst_format.pixel_range = (odesc->flags & AV_PIX_FMT_FLAG_RGB) ? ZIMG_RANGE_FULL : s->range == -1 ? convert_range(out->color_range) : s->range; + s->dst_format.chroma_location = s->chromal == -1 ? convert_chroma_location(out->chroma_location) : s->chromal; if (s->colorspace != -1) out->colorspace = (int)s->dst_format.matrix_coefficients; @@ -481,6 +508,9 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) if (s->trc != -1) out->color_trc = (int)s->dst_format.transfer_characteristics; + if (s->chromal != -1) + out->chroma_location = (int)s->dst_format.chroma_location - 1; + zimg_filter_graph_free(s->graph); s->graph = zimg_filter_graph_build(&s->src_format, &s->dst_format, &s->params); if (!s->graph) { @@ -705,6 +735,17 @@ static const AVOption zscale_options[] = { { "tin", "set input transfer characteristic", OFFSET(trc_in), AV_OPT_TYPE_INT, {.i64 = -1}, -1, ZIMG_TRANSFER_2020_12, FLAGS, "transfer" }, { "matrixin", "set input colorspace matrix", OFFSET(colorspace_in), AV_OPT_TYPE_INT, {.i64 = -1}, -1, ZIMG_MATRIX_2020_CL, FLAGS, "matrix" }, { "min", "set input colorspace matrix", OFFSET(colorspace_in), AV_OPT_TYPE_INT, {.i64 = -1}, -1, ZIMG_MATRIX_2020_CL, FLAGS, "matrix" }, + { "chromal", "set output chroma location", OFFSET(chromal), AV_OPT_TYPE_INT, {.i64 = -1}, -1, ZIMG_CHROMA_BOTTOM, FLAGS, "chroma" }, + { "c", "set output chroma location", OFFSET(chromal), AV_OPT_TYPE_INT, {.i64 = -1}, -1, ZIMG_CHROMA_BOTTOM, FLAGS, "chroma" }, + { "input", 0, 0, AV_OPT_TYPE_CONST, {.i64 = -1}, 0, 0, FLAGS, "chroma" }, + { "left", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_CHROMA_LEFT}, 0, 0, FLAGS, "chroma" }, + { "center", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_CHROMA_CENTER}, 0, 0, FLAGS, "chroma" }, + { "topleft", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_CHROMA_TOP_LEFT}, 0, 0, FLAGS, "chroma" }, + { "top", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_CHROMA_TOP}, 0, 0, FLAGS, "chroma" }, + { "bottomleft",0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_CHROMA_BOTTOM_LEFT}, 0, 0, FLAGS, "chroma" }, + { "bottom", 0, 0, AV_OPT_TYPE_CONST, {.i64 = ZIMG_CHROMA_BOTTOM}, 0, 0, FLAGS, "chroma" }, + { "chromalin", "set input chroma location", OFFSET(chromal_in), AV_OPT_TYPE_INT, {.i64 = -1}, -1, ZIMG_CHROMA_BOTTOM, FLAGS, "chroma" }, + { "cin", "set input chroma location", OFFSET(chromal_in), AV_OPT_TYPE_INT, {.i64 = -1}, -1, ZIMG_CHROMA_BOTTOM, FLAGS, "chroma" }, { NULL } };

1 0

avformat/avidec: Fix infinite loop in avi_read_nikon()
by git＠videolan.org 02 Sep '16

02 Sep '16

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Fri Sep 2 12:19:29 2016 +0200| [e4e4a9cad7f21593d4bcb1f2404ea0d373c36c43] | committer: Michael Niedermayer avformat/avidec: Fix infinite loop in avi_read_nikon() Fixes: 360/test.poc Found-by: 连一汉 <lianyihan(a)360.cn> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e4e4a9cad7f21593d… --- libavformat/avidec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 38ea86d..858011c 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -344,14 +344,14 @@ static void avi_metadata_creation_time(AVDictionary **metadata, char *date) static void avi_read_nikon(AVFormatContext *s, uint64_t end) { - while (avio_tell(s->pb) < end) { + while (avio_tell(s->pb) < end && !avio_feof(s->pb)) { uint32_t tag = avio_rl32(s->pb); uint32_t size = avio_rl32(s->pb); switch (tag) { case MKTAG('n', 'c', 't', 'g'): /* Nikon Tags */ { uint64_t tag_end = avio_tell(s->pb) + size; - while (avio_tell(s->pb) < tag_end) { + while (avio_tell(s->pb) < tag_end && !avio_feof(s->pb)) { uint16_t tag = avio_rl16(s->pb); uint16_t size = avio_rl16(s->pb); const char *name = NULL;

1 0

avfilter/vf_minterpolate: rename chroma log vars
by git＠videolan.org 02 Sep '16

02 Sep '16

ffmpeg | branch: master | Davinder Singh <ds.mudhar(a)gmail.com> | Tue Aug 30 06:32:09 2016 +0530| [367577dbe267e71d69f80ec3241ff8e3db0ad6c6] | committer: Paul B Mahol avfilter/vf_minterpolate: rename chroma log vars also use AVPixFmtDescriptor instead of avcodec_get_chroma_sub_sample() for log2_chroma*. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=367577dbe267e71d6… --- libavfilter/vf_minterpolate.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/libavfilter/vf_minterpolate.c b/libavfilter/vf_minterpolate.c index 76a546f..4bb5853 100644 --- a/libavfilter/vf_minterpolate.c +++ b/libavfilter/vf_minterpolate.c @@ -184,10 +184,8 @@ typedef struct MIContext { double prev_mafd; double scd_threshold; - int chroma_height; - int chroma_width; - int chroma_h_shift; - int chroma_v_shift; + int log2_chroma_w; + int log2_chroma_h; int nb_planes; } MIContext; @@ -335,10 +333,8 @@ static int config_input(AVFilterLink *inlink) const int width = inlink->w; int i; - mi_ctx->chroma_height = AV_CEIL_RSHIFT(inlink->h, desc->log2_chroma_h); - mi_ctx->chroma_width = AV_CEIL_RSHIFT(inlink->w, desc->log2_chroma_w); - - avcodec_get_chroma_sub_sample(inlink->format, &mi_ctx->chroma_h_shift, &mi_ctx->chroma_v_shift); + mi_ctx->log2_chroma_h = desc->log2_chroma_h; + mi_ctx->log2_chroma_w = desc->log2_chroma_w; mi_ctx->nb_planes = av_pix_fmt_count_planes(inlink->format); @@ -936,8 +932,8 @@ static void set_frame_data(MIContext *mi_ctx, int alpha, AVFrame *avf_out) for (i = 0; i < pixel->nb; i++) { Frame *frame = &mi_ctx->frames[pixel->refs[i]]; if (chroma) { - x_mv = (x >> mi_ctx->chroma_h_shift) + (pixel->mvs[i][0] / (1 << mi_ctx->chroma_h_shift)); - y_mv = (y >> mi_ctx->chroma_v_shift) + (pixel->mvs[i][1] / (1 << mi_ctx->chroma_v_shift)); + x_mv = (x >> mi_ctx->log2_chroma_w) + pixel->mvs[i][0] / (1 << mi_ctx->log2_chroma_w); + y_mv = (y >> mi_ctx->log2_chroma_h) + pixel->mvs[i][1] / (1 << mi_ctx->log2_chroma_h); } else { x_mv = x + pixel->mvs[i][0]; y_mv = y + pixel->mvs[i][1]; @@ -949,7 +945,7 @@ static void set_frame_data(MIContext *mi_ctx, int alpha, AVFrame *avf_out) val = ROUNDED_DIV(val, weight_sum); if (chroma) - avf_out->data[plane][(x >> mi_ctx->chroma_h_shift) + (y >> mi_ctx->chroma_v_shift) * avf_out->linesize[plane]] = val; + avf_out->data[plane][(x >> mi_ctx->log2_chroma_w) + (y >> mi_ctx->log2_chroma_h) * avf_out->linesize[plane]] = val; else avf_out->data[plane][x + y * avf_out->linesize[plane]] = val; } @@ -1092,8 +1088,8 @@ static void interpolate(AVFilterLink *inlink, AVFrame *avf_out) int height = avf_out->height; if (plane == 1 || plane == 2) { - width = mi_ctx->chroma_width; - height = mi_ctx->chroma_height; + width = AV_CEIL_RSHIFT(width, mi_ctx->log2_chroma_w); + height = AV_CEIL_RSHIFT(height, mi_ctx->log2_chroma_h); } for (y = 0; y < height; y++) {

1 0

avfilter: add weave filter
by git＠videolan.org 02 Sep '16

02 Sep '16

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Apr 18 00:26:28 2013 +0000| [3e1356f790b178531671d1a3864da3ac1ef325fc] | committer: Paul B Mahol avfilter: add weave filter Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3e1356f790b178531… --- Changelog | 1 + doc/filters.texi | 21 +++++++ libavfilter/Makefile | 1 + libavfilter/allfilters.c | 1 + libavfilter/version.h | 2 +- libavfilter/vf_weave.c | 143 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 168 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 7dcec3c..9e1b652 100644 --- a/Changelog +++ b/Changelog @@ -24,6 +24,7 @@ version <next>: - yuvtestsrc filter - vaguedenoiser filter - added threads option per filter instance +- weave filter version 3.1: diff --git a/doc/filters.texi b/doc/filters.texi index 88c6f65..945b9af 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -14104,6 +14104,27 @@ Set scale used for displaying graticule. Default is digital. @end table +@section weave + +The @code{weave} takes a field-based video input and join +each two sequential fields into single frame, producing a new double +height clip with half the frame rate and half the frame count. + +It accepts the following option: + +@table @option +@item first_field +Set first field. Available values are: + +@table @samp +@item top, t +Set the frame as top-field-first. + +@item bottom, b +Set the frame as bottom-field-first. +@end table +@end table + @section xbr Apply the xBR high-quality magnification filter which is designed for pixel art. It follows a set of edge-detection rules, see diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 81b40ac..8bc6b9c 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -295,6 +295,7 @@ OBJS-$(CONFIG_VIGNETTE_FILTER) += vf_vignette.o OBJS-$(CONFIG_VSTACK_FILTER) += vf_stack.o framesync.o OBJS-$(CONFIG_W3FDIF_FILTER) += vf_w3fdif.o OBJS-$(CONFIG_WAVEFORM_FILTER) += vf_waveform.o +OBJS-$(CONFIG_WEAVE_FILTER) += vf_weave.o OBJS-$(CONFIG_XBR_FILTER) += vf_xbr.o OBJS-$(CONFIG_YADIF_FILTER) += vf_yadif.o OBJS-$(CONFIG_ZMQ_FILTER) += f_zmq.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index ee6f9cb..a651bb5 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -311,6 +311,7 @@ void avfilter_register_all(void) REGISTER_FILTER(VSTACK, vstack, vf); REGISTER_FILTER(W3FDIF, w3fdif, vf); REGISTER_FILTER(WAVEFORM, waveform, vf); + REGISTER_FILTER(WEAVE, weave, vf); REGISTER_FILTER(XBR, xbr, vf); REGISTER_FILTER(YADIF, yadif, vf); REGISTER_FILTER(ZMQ, zmq, vf); diff --git a/libavfilter/version.h b/libavfilter/version.h index 1b91d60..5b5f75f 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,7 +30,7 @@ #include "libavutil/version.h" #define LIBAVFILTER_VERSION_MAJOR 6 -#define LIBAVFILTER_VERSION_MINOR 58 +#define LIBAVFILTER_VERSION_MINOR 59 #define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ diff --git a/libavfilter/vf_weave.c b/libavfilter/vf_weave.c new file mode 100644 index 0000000..2f0784e --- /dev/null +++ b/libavfilter/vf_weave.c @@ -0,0 +1,143 @@ +/* + * Copyright (c) 2013 Paul B Mahol + * + * 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 "libavutil/imgutils.h" +#include "libavutil/opt.h" +#include "libavutil/pixdesc.h" +#include "avfilter.h" +#include "internal.h" + +typedef struct WeaveContext { + const AVClass *class; + int first_field; + int nb_planes; + int planeheight[4]; + int linesize[4]; + + AVFrame *prev; +} WeaveContext; + +#define OFFSET(x) offsetof(WeaveContext, x) +#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM + +static const AVOption weave_options[] = { + { "first_field", "set first field", OFFSET(first_field), AV_OPT_TYPE_INT, {.i64=0}, 0, 1, FLAGS, "field"}, + { "top", "set top field first", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, FLAGS, "field"}, + { "t", "set top field first", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, FLAGS, "field"}, + { "bottom", "set bottom field first", 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, FLAGS, "field"}, + { "b", "set bottom field first", 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, FLAGS, "field"}, + { NULL } +}; + +AVFILTER_DEFINE_CLASS(weave); + +static int config_props_output(AVFilterLink *outlink) +{ + AVFilterContext *ctx = outlink->src; + WeaveContext *s = ctx->priv; + AVFilterLink *inlink = ctx->inputs[0]; + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); + int ret; + + outlink->time_base.num = inlink->time_base.num * 2; + outlink->time_base.den = inlink->time_base.den; + outlink->frame_rate.num = inlink->frame_rate.num; + outlink->frame_rate.den = inlink->frame_rate.den * 2; + outlink->w = inlink->w; + outlink->h = inlink->h * 2; + + if ((ret = av_image_fill_linesizes(s->linesize, inlink->format, inlink->w)) < 0) + return ret; + + s->planeheight[1] = s->planeheight[2] = AV_CEIL_RSHIFT(inlink->h, desc->log2_chroma_h); + s->planeheight[0] = s->planeheight[3] = inlink->h; + + s->nb_planes = av_pix_fmt_count_planes(inlink->format); + + return 0; +} + +static int filter_frame(AVFilterLink *inlink, AVFrame *in) +{ + AVFilterContext *ctx = inlink->dst; + WeaveContext *s = ctx->priv; + AVFilterLink *outlink = ctx->outputs[0]; + AVFrame *out; + int i; + + if (!s->prev) { + s->prev = in; + return 0; + } + + out = ff_get_video_buffer(outlink, outlink->w, outlink->h); + if (!out) { + av_frame_free(&in); + av_frame_free(&s->prev); + return AVERROR(ENOMEM); + } + av_frame_copy_props(out, in); + + for (i = 0; i < s->nb_planes; i++) { + av_image_copy_plane(out->data[i] + out->linesize[i] * s->first_field, + out->linesize[i] * 2, + in->data[i], in->linesize[i], + s->linesize[i], s->planeheight[i]); + av_image_copy_plane(out->data[i] + out->linesize[i] * !s->first_field, + out->linesize[i] * 2, + s->prev->data[i], s->prev->linesize[i], + s->linesize[i], s->planeheight[i]); + } + + out->pts = in->pts / 2; + out->interlaced_frame = 1; + out->top_field_first = !s->first_field; + + av_frame_free(&in); + av_frame_free(&s->prev); + return ff_filter_frame(outlink, out); +} + +static const AVFilterPad weave_inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .filter_frame = filter_frame, + }, + { NULL } +}; + +static const AVFilterPad weave_outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .config_props = config_props_output, + }, + { NULL } +}; + +AVFilter ff_vf_weave = { + .name = "weave", + .description = NULL_IF_CONFIG_SMALL("Weave input video fields into frames."), + .priv_size = sizeof(WeaveContext), + .priv_class = &weave_class, + .inputs = weave_inputs, + .outputs = weave_outputs, +};

1 0

ffmpeg: fix broken indent/style in write_frame
by git＠videolan.org 02 Sep '16

02 Sep '16

ffmpeg | branch: master | Clément Bœsch <clement(a)stupeflix.com> | Fri Sep 2 11:01:46 2016 +0200| [1895e3a24fd51509532ef5f51dd09ec2953eb203] | committer: Clément Bœsch ffmpeg: fix broken indent/style in write_frame > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1895e3a24fd515095… --- ffmpeg.c | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index 3229823..d858407 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -718,29 +718,28 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost) - FFMIN3(pkt->pts, pkt->dts, ost->last_mux_dts + 1) - FFMAX3(pkt->pts, pkt->dts, ost->last_mux_dts + 1); } - if( - (avctx->codec_type == AVMEDIA_TYPE_AUDIO || avctx->codec_type == AVMEDIA_TYPE_VIDEO) && - pkt->dts != AV_NOPTS_VALUE && - !(avctx->codec_id == AV_CODEC_ID_VP9 && ost->stream_copy) && - ost->last_mux_dts != AV_NOPTS_VALUE) { - int64_t max = ost->last_mux_dts + !(s->oformat->flags & AVFMT_TS_NONSTRICT); - if (pkt->dts < max) { - int loglevel = max - pkt->dts > 2 || avctx->codec_type == AVMEDIA_TYPE_VIDEO ? AV_LOG_WARNING : AV_LOG_DEBUG; - av_log(s, loglevel, "Non-monotonous DTS in output stream " - "%d:%d; previous: %"PRId64", current: %"PRId64"; ", - ost->file_index, ost->st->index, ost->last_mux_dts, pkt->dts); - if (exit_on_error) { - av_log(NULL, AV_LOG_FATAL, "aborting.\n"); - exit_program(1); + if ((avctx->codec_type == AVMEDIA_TYPE_AUDIO || avctx->codec_type == AVMEDIA_TYPE_VIDEO) && + pkt->dts != AV_NOPTS_VALUE && + !(avctx->codec_id == AV_CODEC_ID_VP9 && ost->stream_copy) && + ost->last_mux_dts != AV_NOPTS_VALUE) { + int64_t max = ost->last_mux_dts + !(s->oformat->flags & AVFMT_TS_NONSTRICT); + if (pkt->dts < max) { + int loglevel = max - pkt->dts > 2 || avctx->codec_type == AVMEDIA_TYPE_VIDEO ? AV_LOG_WARNING : AV_LOG_DEBUG; + av_log(s, loglevel, "Non-monotonous DTS in output stream " + "%d:%d; previous: %"PRId64", current: %"PRId64"; ", + ost->file_index, ost->st->index, ost->last_mux_dts, pkt->dts); + if (exit_on_error) { + av_log(NULL, AV_LOG_FATAL, "aborting.\n"); + exit_program(1); + } + av_log(s, loglevel, "changing to %"PRId64". This may result " + "in incorrect timestamps in the output file.\n", + max); + if (pkt->pts >= pkt->dts) + pkt->pts = FFMAX(pkt->pts, max); + pkt->dts = max; + } } - av_log(s, loglevel, "changing to %"PRId64". This may result " - "in incorrect timestamps in the output file.\n", - max); - if(pkt->pts >= pkt->dts) - pkt->pts = FFMAX(pkt->pts, max); - pkt->dts = max; - } - } } ost->last_mux_dts = pkt->dts;

1 0

libavcodec/opus: Add channel mapping 2 to extradata parser
by git＠videolan.org 01 Sep '16

01 Sep '16

ffmpeg | branch: master | Michael Graczyk <mgraczyk(a)google.com> | Thu Sep 1 11:17:30 2016 -0700| [be07c25896bb608ee84a902e6a470b87c741115b] | committer: Michael Niedermayer libavcodec/opus: Add channel mapping 2 to extradata parser This allows libavcodec/opus to demux ambisonics in an ogg/opus container. Channel mapping family 2 is being added in this standards track IETF draft: tools.ietf.org/html/draft-ietf-codec-ambisonics-00 Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be07c25896bb608ee… --- libavcodec/opus.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libavcodec/opus.c b/libavcodec/opus.c index 29854fc..08d94b6 100644 --- a/libavcodec/opus.c +++ b/libavcodec/opus.c @@ -347,7 +347,7 @@ av_cold int ff_opus_parse_extradata(AVCodecContext *avctx, streams = 1; stereo_streams = channels - 1; channel_map = default_channel_map; - } else if (map_type == 1 || map_type == 255) { + } else if (map_type == 1 || map_type == 2 || map_type == 255) { if (extradata_size < 21 + channels) { av_log(avctx, AV_LOG_ERROR, "Invalid extradata size: %d\n", extradata_size); @@ -371,6 +371,15 @@ av_cold int ff_opus_parse_extradata(AVCodecContext *avctx, } layout = ff_vorbis_channel_layouts[channels - 1]; channel_reorder = channel_reorder_vorbis; + } else if (map_type == 2) { + int ambisonic_order = ff_sqrt(channels) - 1; + if (channels != (ambisonic_order + 1) * (ambisonic_order + 1)) { + av_log(avctx, AV_LOG_ERROR, + "Channel mapping 2 is only specified for channel counts" + " which can be written as (n + 1)^2 for nonnegative integer n\n"); + return AVERROR_INVALIDDATA; + } + layout = 0; } else layout = 0;

1 0

lavu/timestamp: Avoid C++-unfriendly code in user header
by git＠videolan.org 01 Sep '16

01 Sep '16

ffmpeg | branch: master | Mark Thompson <sw(a)jkqxz.net> | Wed Aug 31 20:48:45 2016 +0100| [a2c912c3b6b833f2aacf414264c566f86f0a4e7c] | committer: Mark Thompson lavu/timestamp: Avoid C++-unfriendly code in user header Including this header in a C++11 program (inside extern "C") will throw an error because it looks like a user-defined literal. Add a space between the two tokens to avoid the problem. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a2c912c3b6b833f2a… --- libavutil/timestamp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/timestamp.h b/libavutil/timestamp.h index f010a7e..e082f01 100644 --- a/libavutil/timestamp.h +++ b/libavutil/timestamp.h @@ -43,7 +43,7 @@ static inline char *av_ts_make_string(char *buf, int64_t ts) { if (ts == AV_NOPTS_VALUE) snprintf(buf, AV_TS_MAX_STRING_SIZE, "NOPTS"); - else snprintf(buf, AV_TS_MAX_STRING_SIZE, "%"PRId64, ts); + else snprintf(buf, AV_TS_MAX_STRING_SIZE, "%" PRId64, ts); return buf; }

1 0

libavcodec/opus: Fix spelling in error message
by git＠videolan.org 01 Sep '16

01 Sep '16

ffmpeg | branch: master | Michael Graczyk <mgraczyk(a)google.com> | Thu Sep 1 11:24:31 2016 -0700| [5d054a1ac45248db9fd9ba4ea192147ad35aa54c] | committer: Lou Logan libavcodec/opus: Fix spelling in error message > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5d054a1ac45248db9… --- libavcodec/opus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/opus.c b/libavcodec/opus.c index 703d2e8..29854fc 100644 --- a/libavcodec/opus.c +++ b/libavcodec/opus.c @@ -328,7 +328,7 @@ av_cold int ff_opus_parse_extradata(AVCodecContext *avctx, channels = avctx->extradata ? extradata[9] : (avctx->channels == 1) ? 1 : 2; if (!channels) { - av_log(avctx, AV_LOG_ERROR, "Zero channel count specified in the extadata\n"); + av_log(avctx, AV_LOG_ERROR, "Zero channel count specified in the extradata\n"); return AVERROR_INVALIDDATA; }

1 0

configure: add missing check for LoadLibrary
by git＠videolan.org 01 Sep '16

01 Sep '16

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Thu Sep 1 13:50:38 2016 -0300| [f66abefefecfb7fb08bf5ec6f79d8c558a043d29] | committer: James Almer configure: add missing check for LoadLibrary Commit 2b1d316ff68a3f973d8f342db6bf9755eb78ec10 made nvenc depend on LoadLibrary, but the availability of the latter was never checked. This fixes nvenc on Windows platforms Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f66abefefecfb7fb0… --- configure | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure b/configure index 6741f83..4bed6f2 100755 --- a/configure +++ b/configure @@ -1921,6 +1921,7 @@ SYSTEM_FUNCS=" isatty jack_port_get_latency_range kbhit + LoadLibrary localtime_r lstat lzo1x_999_compress @@ -5493,6 +5494,7 @@ check_func_headers windows.h CoTaskMemFree -lole32 check_func_headers windows.h GetProcessAffinityMask check_func_headers windows.h GetProcessTimes check_func_headers windows.h GetSystemTimeAsFileTime +check_func_headers windows.h LoadLibrary check_func_headers windows.h MapViewOfFile check_func_headers windows.h PeekNamedPipe check_func_headers windows.h SetConsoleTextAttribute

1 0