September 2017 - ffmpeg-cvslog

avfilter: add vmafmotion filter
by Ashish Singh 06 Oct '17

06 Oct '17

ffmpeg | branch: master | Ashish Singh <ashk43712(a)gmail.com> | Sat Sep 16 02:35:58 2017 +0530| [148c8e88c43cfbabd6aee9f01ef30942cee9d359] | committer: Ronald S. Bultje avfilter: add vmafmotion filter Signed-off-by: Ashish Singh <ashk43712(a)gmail.com> Signed-off-by: Ronald S. Bultje <rsbultje(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=148c8e88c43cfbabd… --- Changelog | 1 + doc/filters.texi | 14 ++ libavfilter/Makefile | 1 + libavfilter/allfilters.c | 1 + libavfilter/vf_vmafmotion.c | 365 ++++++++++++++++++++++++++++++++++++++++++++ libavfilter/vmaf_motion.h | 58 +++++++ 6 files changed, 440 insertions(+) diff --git a/Changelog b/Changelog index c64cef4c89..03686acef6 100644 --- a/Changelog +++ b/Changelog @@ -51,6 +51,7 @@ version <next>: - CUDA thumbnail filter - V4L2 mem2mem HW assisted codecs - Rockchip MPP hardware decoding +- vmafmotion video filter version 3.3: diff --git a/doc/filters.texi b/doc/filters.texi index b09c3a0538..e87b90b310 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -15570,6 +15570,20 @@ vignette='PI/4+random(1)*PI/50':eval=frame @end itemize +@section vmafmotion + +Obtain the average vmaf motion score of a video. +It is one of the component filters of VMAF. + +The obtained average motion score is printed through the logging system. + +In the below example the input file @file{ref.mpg} is being processed and score +is computed. + +@example +ffmpeg -i ref.mpg -lavfi vmafmotion -f null - +@end example + @section vstack Stack input videos vertically. diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 9eeb7d218f..d2f0495f37 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -331,6 +331,7 @@ OBJS-$(CONFIG_VFLIP_FILTER) += vf_vflip.o OBJS-$(CONFIG_VIDSTABDETECT_FILTER) += vidstabutils.o vf_vidstabdetect.o OBJS-$(CONFIG_VIDSTABTRANSFORM_FILTER) += vidstabutils.o vf_vidstabtransform.o OBJS-$(CONFIG_VIGNETTE_FILTER) += vf_vignette.o +OBJS-$(CONFIG_VMAFMOTION_FILTER) += vf_vmafmotion.o framesync.o OBJS-$(CONFIG_VSTACK_FILTER) += vf_stack.o framesync.o OBJS-$(CONFIG_W3FDIF_FILTER) += vf_w3fdif.o OBJS-$(CONFIG_WAVEFORM_FILTER) += vf_waveform.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index baa84a3e72..9b672a7a7e 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -342,6 +342,7 @@ static void register_all(void) REGISTER_FILTER(VIDSTABDETECT, vidstabdetect, vf); REGISTER_FILTER(VIDSTABTRANSFORM, vidstabtransform, vf); REGISTER_FILTER(VIGNETTE, vignette, vf); + REGISTER_FILTER(VMAFMOTION, vmafmotion, vf); REGISTER_FILTER(VSTACK, vstack, vf); REGISTER_FILTER(W3FDIF, w3fdif, vf); REGISTER_FILTER(WAVEFORM, waveform, vf); diff --git a/libavfilter/vf_vmafmotion.c b/libavfilter/vf_vmafmotion.c new file mode 100644 index 0000000000..6b6150a931 --- /dev/null +++ b/libavfilter/vf_vmafmotion.c @@ -0,0 +1,365 @@ +/* + * Copyright (c) 2017 Ronald S. Bultje <rsbultje(a)gmail.com> + * Copyright (c) 2017 Ashish Pratap Singh <ashk43712(a)gmail.com> + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * Calculate VMAF Motion score. + */ + +#include "libavutil/opt.h" +#include "libavutil/pixdesc.h" +#include "avfilter.h" +#include "drawutils.h" +#include "formats.h" +#include "internal.h" +#include "vmaf_motion.h" + +#define BIT_SHIFT 15 + +static const float FILTER_5[5] = { + 0.054488685, + 0.244201342, + 0.402619947, + 0.244201342, + 0.054488685 +}; + +typedef struct VMAFMotionContext { + const AVClass *class; + VMAFMotionData data; + FILE *stats_file; + char *stats_file_str; +} VMAFMotionContext; + +#define OFFSET(x) offsetof(VMAFMotionContext, x) +#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM + +static const AVOption vmafmotion_options[] = { + {"stats_file", "Set file where to store per-frame difference information", OFFSET(stats_file_str), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, FLAGS }, + { NULL } +}; + +AVFILTER_DEFINE_CLASS(vmafmotion); + +static uint64_t image_sad(const uint16_t *img1, const uint16_t *img2, int w, + int h, ptrdiff_t _img1_stride, ptrdiff_t _img2_stride) +{ + ptrdiff_t img1_stride = _img1_stride / sizeof(*img1); + ptrdiff_t img2_stride = _img2_stride / sizeof(*img2); + uint64_t sum = 0; + int i, j; + + for (i = 0; i < h; i++) { + for (j = 0; j < w; j++) { + sum += abs(img1[j] - img2[j]); + } + img1 += img1_stride; + img2 += img2_stride; + } + + return sum; +} + +static void convolution_x(const uint16_t *filter, int filt_w, const uint16_t *src, + uint16_t *dst, int w, int h, ptrdiff_t _src_stride, + ptrdiff_t _dst_stride) +{ + ptrdiff_t src_stride = _src_stride / sizeof(*src); + ptrdiff_t dst_stride = _dst_stride / sizeof(*dst); + int radius = filt_w / 2; + int borders_left = radius; + int borders_right = w - (filt_w - radius); + int i, j, k; + int sum = 0; + + for (i = 0; i < h; i++) { + for (j = 0; j < borders_left; j++) { + sum = 0; + for (k = 0; k < filt_w; k++) { + int j_tap = FFABS(j - radius + k); + if (j_tap >= w) { + j_tap = w - (j_tap - w + 1); + } + sum += filter[k] * src[i * src_stride + j_tap]; + } + dst[i * dst_stride + j] = sum >> BIT_SHIFT; + } + + for (j = borders_left; j < borders_right; j++) { + int sum = 0; + for (k = 0; k < filt_w; k++) { + sum += filter[k] * src[i * src_stride + j - radius + k]; + } + dst[i * dst_stride + j] = sum >> BIT_SHIFT; + } + + for (j = borders_right; j < w; j++) { + sum = 0; + for (k = 0; k < filt_w; k++) { + int j_tap = FFABS(j - radius + k); + if (j_tap >= w) { + j_tap = w - (j_tap - w + 1); + } + sum += filter[k] * src[i * src_stride + j_tap]; + } + dst[i * dst_stride + j] = sum >> BIT_SHIFT; + } + } +} + +#define conv_y_fn(type, bits) \ +static void convolution_y_##bits##bit(const uint16_t *filter, int filt_w, \ + const uint8_t *_src, uint16_t *dst, \ + int w, int h, ptrdiff_t _src_stride, \ + ptrdiff_t _dst_stride) \ +{ \ + const type *src = (const type *) _src; \ + ptrdiff_t src_stride = _src_stride / sizeof(*src); \ + ptrdiff_t dst_stride = _dst_stride / sizeof(*dst); \ + int radius = filt_w / 2; \ + int borders_top = radius; \ + int borders_bottom = h - (filt_w - radius); \ + int i, j, k; \ + int sum = 0; \ + \ + for (i = 0; i < borders_top; i++) { \ + for (j = 0; j < w; j++) { \ + sum = 0; \ + for (k = 0; k < filt_w; k++) { \ + int i_tap = FFABS(i - radius + k); \ + if (i_tap >= h) { \ + i_tap = h - (i_tap - h + 1); \ + } \ + sum += filter[k] * src[i_tap * src_stride + j]; \ + } \ + dst[i * dst_stride + j] = sum >> bits; \ + } \ + } \ + for (i = borders_top; i < borders_bottom; i++) { \ + for (j = 0; j < w; j++) { \ + sum = 0; \ + for (k = 0; k < filt_w; k++) { \ + sum += filter[k] * src[(i - radius + k) * src_stride + j]; \ + } \ + dst[i * dst_stride + j] = sum >> bits; \ + } \ + } \ + for (i = borders_bottom; i < h; i++) { \ + for (j = 0; j < w; j++) { \ + sum = 0; \ + for (k = 0; k < filt_w; k++) { \ + int i_tap = FFABS(i - radius + k); \ + if (i_tap >= h) { \ + i_tap = h - (i_tap - h + 1); \ + } \ + sum += filter[k] * src[i_tap * src_stride + j]; \ + } \ + dst[i * dst_stride + j] = sum >> bits; \ + } \ + } \ +} + +conv_y_fn(uint8_t, 8); +conv_y_fn(uint16_t, 10); + +static void vmafmotiondsp_init(VMAFMotionDSPContext *dsp, int bpp) { + dsp->convolution_x = convolution_x; + dsp->convolution_y = bpp == 10 ? convolution_y_10bit : convolution_y_8bit; + dsp->sad = image_sad; +} + +double ff_vmafmotion_process(VMAFMotionData *s, AVFrame *ref) +{ + double score; + + s->vmafdsp.convolution_y(s->filter, 5, ref->data[0], s->temp_data, + s->width, s->height, ref->linesize[0], s->stride); + s->vmafdsp.convolution_x(s->filter, 5, s->temp_data, s->blur_data[0], + s->width, s->height, s->stride, s->stride); + + if (!s->nb_frames) { + score = 0.0; + } else { + uint64_t sad = s->vmafdsp.sad(s->blur_data[1], s->blur_data[0], + s->width, s->height, s->stride, s->stride); + // the output score is always normalized to 8 bits + score = (double) (sad * 1.0 / (s->width * s->height << (BIT_SHIFT - 8))); + } + + FFSWAP(uint16_t *, s->blur_data[0], s->blur_data[1]); + s->nb_frames++; + s->motion_sum += score; + + return score; +} + +static void set_meta(AVDictionary **metadata, const char *key, float d) +{ + char value[128]; + snprintf(value, sizeof(value), "%0.2f", d); + av_dict_set(metadata, key, value, 0); +} + +static void do_vmafmotion(AVFilterContext *ctx, AVFrame *ref) +{ + VMAFMotionContext *s = ctx->priv; + double score; + + score = ff_vmafmotion_process(&s->data, ref); + set_meta(&ref->metadata, "lavfi.vmafmotion.score", score); + if (s->stats_file) { + fprintf(s->stats_file, + "n:%"PRId64" motion:%0.2lf\n", s->data.nb_frames, score); + } +} + + +int ff_vmafmotion_init(VMAFMotionData *s, + int w, int h, enum AVPixelFormat fmt) +{ + size_t data_sz; + int i; + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(fmt); + + s->width = w; + s->height = h; + s->stride = FFALIGN(w * sizeof(uint16_t), 32); + + data_sz = (size_t) s->stride * h; + if (!(s->blur_data[0] = av_malloc(data_sz)) || + !(s->blur_data[1] = av_malloc(data_sz)) || + !(s->temp_data = av_malloc(data_sz))) { + return AVERROR(ENOMEM); + } + + for (i = 0; i < 5; i++) { + s->filter[i] = lrint(FILTER_5[i] * (1 << BIT_SHIFT)); + } + + vmafmotiondsp_init(&s->vmafdsp, desc->comp[0].depth); + + return 0; +} + +static int query_formats(AVFilterContext *ctx) +{ + static const enum AVPixelFormat pix_fmts[] = { + AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P, + AV_PIX_FMT_YUV444P10, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV420P10, + AV_PIX_FMT_NONE + }; + + AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); + if (!fmts_list) + return AVERROR(ENOMEM); + return ff_set_common_formats(ctx, fmts_list); +} + +static int config_input_ref(AVFilterLink *inlink) +{ + AVFilterContext *ctx = inlink->dst; + VMAFMotionContext *s = ctx->priv; + + return ff_vmafmotion_init(&s->data, ctx->inputs[0]->w, + ctx->inputs[0]->h, ctx->inputs[0]->format); +} + +double ff_vmafmotion_uninit(VMAFMotionData *s) +{ + av_free(s->blur_data[0]); + av_free(s->blur_data[1]); + av_free(s->temp_data); + + return s->nb_frames > 0 ? s->motion_sum / s->nb_frames : 0.0; +} + +static int filter_frame(AVFilterLink *inlink, AVFrame *ref) +{ + AVFilterContext *ctx = inlink->dst; + do_vmafmotion(ctx, ref); + return ff_filter_frame(ctx->outputs[0], ref); +} + +static av_cold int init(AVFilterContext *ctx) +{ + VMAFMotionContext *s = ctx->priv; + + if (s->stats_file_str) { + if (!strcmp(s->stats_file_str, "-")) { + s->stats_file = stdout; + } else { + s->stats_file = fopen(s->stats_file_str, "w"); + if (!s->stats_file) { + int err = AVERROR(errno); + char buf[128]; + av_strerror(err, buf, sizeof(buf)); + av_log(ctx, AV_LOG_ERROR, "Could not open stats file %s: %s\n", + s->stats_file_str, buf); + return err; + } + } + } + + return 0; +} + +static av_cold void uninit(AVFilterContext *ctx) +{ + VMAFMotionContext *s = ctx->priv; + double avg_motion = ff_vmafmotion_uninit(&s->data); + + if (s->data.nb_frames > 0) { + av_log(ctx, AV_LOG_INFO, "VMAF Motion avg: %.3f\n", avg_motion); + } + + if (s->stats_file && s->stats_file != stdout) + fclose(s->stats_file); +} + +static const AVFilterPad vmafmotion_inputs[] = { + { + .name = "reference", + .type = AVMEDIA_TYPE_VIDEO, + .filter_frame = filter_frame, + .config_props = config_input_ref, + }, + { NULL } +}; + +static const AVFilterPad vmafmotion_outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + }, + { NULL } +}; + +AVFilter ff_vf_vmafmotion = { + .name = "vmafmotion", + .description = NULL_IF_CONFIG_SMALL("Calculate the VMAF Motion score."), + .init = init, + .uninit = uninit, + .query_formats = query_formats, + .priv_size = sizeof(VMAFMotionContext), + .priv_class = &vmafmotion_class, + .inputs = vmafmotion_inputs, + .outputs = vmafmotion_outputs, +}; diff --git a/libavfilter/vmaf_motion.h b/libavfilter/vmaf_motion.h new file mode 100644 index 0000000000..0c71182f95 --- /dev/null +++ b/libavfilter/vmaf_motion.h @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2017 Ronald S. Bultje <rsbultje(a)gmail.com> + * Copyright (c) 2017 Ashish Pratap Singh <ashk43712(a)gmail.com> + * + * 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 + */ + +#ifndef AVFILTER_VMAFMOTION_H +#define AVFILTER_VMAFMOTION_H + +#include <stddef.h> +#include <stdint.h> +#include "video.h" + +typedef struct VMAFMotionDSPContext { + uint64_t (*sad)(const uint16_t *img1, const uint16_t *img2, int w, int h, + ptrdiff_t img1_stride, ptrdiff_t img2_stride); + void (*convolution_x)(const uint16_t *filter, int filt_w, const uint16_t *src, + uint16_t *dst, int w, int h, ptrdiff_t src_stride, + ptrdiff_t dst_stride); + void (*convolution_y)(const uint16_t *filter, int filt_w, const uint8_t *src, + uint16_t *dst, int w, int h, ptrdiff_t src_stride, + ptrdiff_t dst_stride); +} VMAFMotionDSPContext; + +void ff_vmafmotion_init_x86(VMAFMotionDSPContext *dsp); + +typedef struct VMAFMotionData { + uint16_t filter[5]; + int width; + int height; + ptrdiff_t stride; + uint16_t *blur_data[2 /* cur, prev */]; + uint16_t *temp_data; + double motion_sum; + uint64_t nb_frames; + VMAFMotionDSPContext vmafdsp; +} VMAFMotionData; + +int ff_vmafmotion_init(VMAFMotionData *data, int w, int h, enum AVPixelFormat fmt); +double ff_vmafmotion_process(VMAFMotionData *data, AVFrame *frame); +double ff_vmafmotion_uninit(VMAFMotionData *data); + +#endif /* AVFILTER_VMAFMOTION_H */

3 2

lavf/bit: Fix the G.729 bit auto-detection.
by Carl Eugen Hoyos 30 Sep '17

30 Sep '17

ffmpeg | branch: master | Carl Eugen Hoyos <ceffmpeg(a)gmail.com> | Fri Sep 29 19:10:46 2017 +0200| [e9f9175db60ac67e906f8ad0709129843ab41d14] | committer: Carl Eugen Hoyos lavf/bit: Fix the G.729 bit auto-detection. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e9f9175db60ac67e9… --- libavformat/bit.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/libavformat/bit.c b/libavformat/bit.c index d742a5b363..76aae2d4a1 100644 --- a/libavformat/bit.c +++ b/libavformat/bit.c @@ -32,20 +32,23 @@ #if CONFIG_BIT_DEMUXER static int probe(AVProbeData *p) { - int i, j; + int i = 0, j, valid = 0; - if(p->buf_size < 0x40) - return 0; - - for(i=0; i+3<p->buf_size && i< 10*0x50; ){ - if(AV_RL16(&p->buf[0]) != SYNC_WORD) + while (2 * i + 3 < p->buf_size){ + if (AV_RL16(&p->buf[2 * i++]) != SYNC_WORD) return 0; - j=AV_RL16(&p->buf[2]); - if(j!=0x40 && j!=0x50) + j = AV_RL16(&p->buf[2 * i++]); + if (j != 0 && j != 0x10 && j != 0x40 && j != 0x50 && j != 0x76) return 0; - i+=j; + if (j) + valid++; + i += j; } - return AVPROBE_SCORE_EXTENSION; + if (valid > 10) + return AVPROBE_SCORE_MAX; + if (valid > 2) + return AVPROBE_SCORE_EXTENSION - 1; + return 0; } static int read_header(AVFormatContext *s)

1 0

avfilter/vmaf_motion: use correct header guards
by James Almer 30 Sep '17

30 Sep '17

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Sat Sep 30 15:38:09 2017 -0300| [67057aaeb23d84144b2b371547fd46e915be238f] | committer: James Almer avfilter/vmaf_motion: use correct header guards Fixes fate-source Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=67057aaeb23d84144… --- libavfilter/vmaf_motion.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavfilter/vmaf_motion.h b/libavfilter/vmaf_motion.h index 0c71182f95..0998450682 100644 --- a/libavfilter/vmaf_motion.h +++ b/libavfilter/vmaf_motion.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVFILTER_VMAFMOTION_H -#define AVFILTER_VMAFMOTION_H +#ifndef AVFILTER_VMAF_MOTION_H +#define AVFILTER_VMAF_MOTION_H #include <stddef.h> #include <stdint.h> @@ -55,4 +55,4 @@ int ff_vmafmotion_init(VMAFMotionData *data, int w, int h, enum AVPixelFormat fm double ff_vmafmotion_process(VMAFMotionData *data, AVFrame *frame); double ff_vmafmotion_uninit(VMAFMotionData *data); -#endif /* AVFILTER_VMAFMOTION_H */ +#endif /* AVFILTER_VMAF_MOTION_H */

1 0

build: fix cleaning compiled unstripped examples
by James Almer 30 Sep '17

30 Sep '17

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Sat Sep 30 01:40:08 2017 -0300| [450cee522ec16a4375c02d3836de4893dfff26aa] | committer: James Almer build: fix cleaning compiled unstripped examples Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=450cee522ec16a437… --- doc/examples/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/examples/Makefile b/doc/examples/Makefile index fe33b1768a..f0c4f7969e 100644 --- a/doc/examples/Makefile +++ b/doc/examples/Makefile @@ -21,8 +21,9 @@ DOC_EXAMPLES-$(CONFIG_TRANSCODE_AAC_EXAMPLE) += transcode_aac DOC_EXAMPLES-$(CONFIG_TRANSCODING_EXAMPLE) += transcoding DOC_EXAMPLES := $(DOC_EXAMPLES-yes:%=doc/examples/%$(PROGSSUF)$(EXESUF)) +DOC_EXAMPLES_G := $(DOC_EXAMPLES-yes:%=doc/examples/%$(PROGSSUF)_g$(EXESUF)) ALL_DOC_EXAMPLES := $(DOC_EXAMPLES) $(DOC_EXAMPLES-:%=doc/examples/%$(PROGSSUF)$(EXESUF)) -ALL_DOC_EXAMPLES_G := $(DOC_EXAMPLES) $(DOC_EXAMPLES-:%=doc/examples/%$(PROGSSUF)_g$(EXESUF)) +ALL_DOC_EXAMPLES_G := $(DOC_EXAMPLES_G) $(DOC_EXAMPLES-:%=doc/examples/%$(PROGSSUF)_g$(EXESUF)) PROGS += $(DOC_EXAMPLES) EXAMPLES_FILES := $(wildcard $(SRC_PATH)/doc/examples/*.c) $(SRC_PATH)/doc/examples/README

1 0

MAINTAINERS: add myself to the general developers list
by Jan Ekström 30 Sep '17

30 Sep '17

ffmpeg | branch: master | Jan Ekström <jeebjp(a)gmail.com> | Fri Sep 29 03:03:23 2017 +0300| [0275bdbd2c006ca6f4af470000188f81ea626ee1] | committer: Michael Niedermayer MAINTAINERS: add myself to the general developers list Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0275bdbd2c006ca6f… --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 77f48b984b..412680abac 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -547,6 +547,7 @@ Ganesh Ajjanagadde Henrik Gramner Ivan Uskov James Darnley +Jan Ekström Joakim Plate Kieran Kunhya Kirill Gavrilov

1 0

avcodec/hevc_sei: Support HEVC paired fields.
by Brian Matherly 30 Sep '17

30 Sep '17

ffmpeg | branch: master | Brian Matherly <brian.matherly-at-yahoo.com(a)ffmpeg.org> | Wed Sep 27 20:48:42 2017 -0500| [876dada0b58b5ecc80b2a25eb5c33974a71c8eb2] | committer: Michael Niedermayer avcodec/hevc_sei: Support HEVC paired fields. Correctly set the interlaced_frame and top_field_first fields when pic_struct indicates paired fields. Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=876dada0b58b5ecc8… --- libavcodec/hevc_sei.c | 4 ++-- tests/fate/hevc.mak | 6 +++++- tests/ref/fate/hevc-paired-fields | 16 ++++++++++++++++ 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c index cd55d50212..d0f9966a29 100644 --- a/libavcodec/hevc_sei.c +++ b/libavcodec/hevc_sei.c @@ -137,10 +137,10 @@ static int decode_nal_sei_pic_timing(HEVCSEIContext *s, GetBitContext *gb, const if (sps->vui.frame_field_info_present_flag) { int pic_struct = get_bits(gb, 4); h->picture_struct = AV_PICTURE_STRUCTURE_UNKNOWN; - if (pic_struct == 2) { + if (pic_struct == 2 || pic_struct == 10 || pic_struct == 12) { av_log(logctx, AV_LOG_DEBUG, "BOTTOM Field\n"); h->picture_struct = AV_PICTURE_STRUCTURE_BOTTOM_FIELD; - } else if (pic_struct == 1) { + } else if (pic_struct == 1 || pic_struct == 9 || pic_struct == 11) { av_log(logctx, AV_LOG_DEBUG, "TOP Field\n"); h->picture_struct = AV_PICTURE_STRUCTURE_TOP_FIELD; } diff --git a/tests/fate/hevc.mak b/tests/fate/hevc.mak index d23d1ba9fe..140fa2a72e 100644 --- a/tests/fate/hevc.mak +++ b/tests/fate/hevc.mak @@ -225,6 +225,9 @@ $(foreach N,$(HEVC_SAMPLES_444_12BIT),$(eval $(call FATE_HEVC_TEST_444_12BIT,$(N fate-hevc-paramchange-yuv420p-yuv420p10: CMD = framecrc -vsync 0 -i $(TARGET_SAMPLES)/hevc/paramchange_yuv420p_yuv420p10.hevc -sws_flags area+accurate_rnd+bitexact FATE_HEVC += fate-hevc-paramchange-yuv420p-yuv420p10 +fate-hevc-paired-fields: CMD = probeframes -show_entries frame=interlaced_frame,top_field_first $(TARGET_SAMPLES)/hevc/paired_fields.hevc +FATE_HEVC_FFPROBE-$(call DEMDEC, HEVC, HEVC) += fate-hevc-paired-fields + tests/data/hevc-mp4.mov: TAG = GEN tests/data/hevc-mp4.mov: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \ @@ -244,5 +247,6 @@ FATE_HEVC-$(call DEMDEC, MOV, HEVC) += fate-hevc-extradata-reload fate-hevc-extradata-reload: CMD = framemd5 -i $(TARGET_SAMPLES)/hevc/extradata-reload-multi-stsd.mov -sws_flags bitexact FATE_SAMPLES_AVCONV += $(FATE_HEVC-yes) +FATE_SAMPLES_FFPROBE += $(FATE_HEVC_FFPROBE-yes) -fate-hevc: $(FATE_HEVC-yes) +fate-hevc: $(FATE_HEVC-yes) $(FATE_HEVC_FFPROBE-yes) diff --git a/tests/ref/fate/hevc-paired-fields b/tests/ref/fate/hevc-paired-fields new file mode 100644 index 0000000000..f2223e770b --- /dev/null +++ b/tests/ref/fate/hevc-paired-fields @@ -0,0 +1,16 @@ +[FRAME] +interlaced_frame=1 +top_field_first=1 +[/FRAME] +[FRAME] +interlaced_frame=1 +top_field_first=0 +[/FRAME] +[FRAME] +interlaced_frame=1 +top_field_first=1 +[/FRAME] +[FRAME] +interlaced_frame=1 +top_field_first=0 +[/FRAME]

1 0

build: add missing changes to ensure examples build with progs-suffix
by James Almer 29 Sep '17

29 Sep '17

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Fri Sep 29 17:42:42 2017 -0300| [3df437c2d1950239de1e20b213e7a24b78a6825a] | committer: James Almer build: add missing changes to ensure examples build with progs-suffix > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3df437c2d1950239d… --- doc/examples/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/examples/Makefile b/doc/examples/Makefile index 9792e1f911..fe33b1768a 100644 --- a/doc/examples/Makefile +++ b/doc/examples/Makefile @@ -33,10 +33,10 @@ $(DOC_EXAMPLES): %$(PROGSSUF)$(EXESUF): %.o examples: $(DOC_EXAMPLES) -$(DOC_EXAMPLES:%$(EXESUF)=%.o): | doc/examples +$(DOC_EXAMPLES:%$(PROGSSUF)$(EXESUF)=%.o): | doc/examples OBJDIRS += doc/examples -DOXY_INPUT += $(DOC_EXAMPLES:%$(EXESUF)=%.c) +DOXY_INPUT += $(DOC_EXAMPLES:%$(PROGSSUF)$(EXESUF)=%.c) examplesclean: $(RM) $(ALL_DOC_EXAMPLES) $(ALL_DOC_EXAMPLES_G)

1 0

Merge commit 'ab566cc96bc0c31b34d944214bc06cec8ae8b640'
by James Almer 29 Sep '17

29 Sep '17

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Fri Sep 29 17:09:46 2017 -0300| [eace20a8623d041676f7705ceee61cabaf8bc584] | committer: James Almer Merge commit 'ab566cc96bc0c31b34d944214bc06cec8ae8b640' * commit 'ab566cc96bc0c31b34d944214bc06cec8ae8b640': build: Separate logic for building examples from that for building avtools Merged-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eace20a8623d04167… --- Makefile | 2 +- doc/examples/Makefile | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2c7b0d54f1..6de5a3d145 100644 --- a/Makefile +++ b/Makefile @@ -129,7 +129,7 @@ $(1)$(PROGSSUF)_g$(EXESUF): FF_EXTRALIBS += $(EXTRALIBS-$(1)) -include $$(OBJS-$(1):.o=.d) endef -$(foreach P,$(PROGS),$(eval $(call DOPROG,$(P:$(PROGSSUF)$(EXESUF)=)))) +$(foreach P,$(AVPROGS-yes),$(eval $(call DOPROG,$(P)))) ffprobe.o cmdutils.o libavcodec/utils.o libavformat/utils.o libavdevice/avdevice.o libavfilter/avfilter.o libavutil/utils.o libpostproc/postprocess.o libswresample/swresample.o libswscale/utils.o : libavutil/ffversion.h diff --git a/doc/examples/Makefile b/doc/examples/Makefile index 277d4b0a18..9792e1f911 100644 --- a/doc/examples/Makefile +++ b/doc/examples/Makefile @@ -28,6 +28,9 @@ PROGS += $(DOC_EXAMPLES) EXAMPLES_FILES := $(wildcard $(SRC_PATH)/doc/examples/*.c) $(SRC_PATH)/doc/examples/README EXAMPLE_MAKEFILE := $(SRC_PATH)/doc/examples/Makefile +$(foreach P,$(DOC_EXAMPLES),$(eval OBJS-$(P:%$(PROGSSUF)$(EXESUF)=%) = $(P:%$(PROGSSUF)$(EXESUF)=%).o)) +$(DOC_EXAMPLES): %$(PROGSSUF)$(EXESUF): %.o + examples: $(DOC_EXAMPLES) $(DOC_EXAMPLES:%$(EXESUF)=%.o): | doc/examples @@ -41,4 +44,6 @@ examplesclean: docclean:: examplesclean +-include $(wildcard $(DOC_EXAMPLES:%$(PROGSSUF)$(EXESUF)=%.d)) + .PHONY: examples ====================================================================== diff --cc Makefile index 2c7b0d54f1,2932e6e04c..6de5a3d145 --- a/Makefile +++ b/Makefile @@@ -129,25 -165,20 +129,25 @@@ $(1)$(PROGSSUF)_g$(EXESUF): FF_EXTRALIB -include $$(OBJS-$(1):.o=.d) endef - $(foreach P,$(PROGS),$(eval $(call DOPROG,$(P:$(PROGSSUF)$(EXESUF)=)))) + $(foreach P,$(AVPROGS-yes),$(eval $(call DOPROG,$(P)))) -$(PROGS): %$(EXESUF): %.o $(FF_DEP_LIBS) +ffprobe.o cmdutils.o libavcodec/utils.o libavformat/utils.o libavdevice/avdevice.o libavfilter/avfilter.o libavutil/utils.o libpostproc/postprocess.o libswresample/swresample.o libswscale/utils.o : libavutil/ffversion.h + +$(PROGS): %$(PROGSSUF)$(EXESUF): %$(PROGSSUF)_g$(EXESUF) + $(CP) $< $@ + $(STRIP) $@ + +%$(PROGSSUF)_g$(EXESUF): %.o $(FF_DEP_LIBS) $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS) -VERSION_SH = $(SRC_PATH)/avbuild/version.sh +VERSION_SH = $(SRC_PATH)/ffbuild/version.sh GIT_LOG = $(SRC_PATH)/.git/logs/HEAD -.version: $(wildcard $(GIT_LOG)) $(VERSION_SH) avbuild/config.mak +.version: $(wildcard $(GIT_LOG)) $(VERSION_SH) ffbuild/config.mak .version: M=@ -cmdutils.o libavutil/utils.o: avversion.h -avversion.h .version: - $(M)$(VERSION_SH) $(SRC_PATH) avversion.h $(EXTRA_VERSION) +libavutil/ffversion.h .version: + $(M)$(VERSION_SH) $(SRC_PATH) libavutil/ffversion.h $(EXTRA_VERSION) $(Q)touch .version # force version.sh to run whenever version might have changed diff --cc doc/examples/Makefile index 277d4b0a18,c42c68fd54..9792e1f911 --- a/doc/examples/Makefile +++ b/doc/examples/Makefile @@@ -1,44 -1,31 +1,49 @@@ -DOC_EXAMPLES-$(CONFIG_DECODE_AUDIO_EXAMPLE) += decode_audio -DOC_EXAMPLES-$(CONFIG_DECODE_VIDEO_EXAMPLE) += decode_video -DOC_EXAMPLES-$(CONFIG_ENCODE_AUDIO_EXAMPLE) += encode_audio -DOC_EXAMPLES-$(CONFIG_ENCODE_VIDEO_EXAMPLE) += encode_video -DOC_EXAMPLES-$(CONFIG_FILTER_AUDIO_EXAMPLE) += filter_audio -DOC_EXAMPLES-$(CONFIG_METADATA_EXAMPLE) += metadata -DOC_EXAMPLES-$(CONFIG_OUTPUT_EXAMPLE) += output -DOC_EXAMPLES-$(CONFIG_QSVDEC_EXAMPLE) += qsvdec -DOC_EXAMPLES-$(CONFIG_TRANSCODE_AAC_EXAMPLE) += transcode_aac - -DOC_EXAMPLES := $(DOC_EXAMPLES-yes:%=doc/examples/%$(EXESUF)) -ALL_DOC_EXAMPLES := $(DOC_EXAMPLES) $(DOC_EXAMPLES-:%=doc/examples/%$(EXESUF)) -PROGS += $(DOC_EXAMPLES) - -$(foreach P,$(DOC_EXAMPLES),$(eval OBJS-$(P:%$(EXESUF)=%) = $(P:%$(EXESUF)=%).o)) -$(DOC_EXAMPLES): %$(EXESUF): %.o +DOC_EXAMPLES-$(CONFIG_AVIO_DIR_CMD_EXAMPLE) += avio_dir_cmd +DOC_EXAMPLES-$(CONFIG_AVIO_READING_EXAMPLE) += avio_reading +DOC_EXAMPLES-$(CONFIG_DECODE_AUDIO_EXAMPLE) += decode_audio +DOC_EXAMPLES-$(CONFIG_DECODE_VIDEO_EXAMPLE) += decode_video +DOC_EXAMPLES-$(CONFIG_DEMUXING_DECODING_EXAMPLE) += demuxing_decoding +DOC_EXAMPLES-$(CONFIG_ENCODE_AUDIO_EXAMPLE) += encode_audio +DOC_EXAMPLES-$(CONFIG_ENCODE_VIDEO_EXAMPLE) += encode_video +DOC_EXAMPLES-$(CONFIG_EXTRACT_MVS_EXAMPLE) += extract_mvs +DOC_EXAMPLES-$(CONFIG_FILTER_AUDIO_EXAMPLE) += filter_audio +DOC_EXAMPLES-$(CONFIG_FILTERING_AUDIO_EXAMPLE) += filtering_audio +DOC_EXAMPLES-$(CONFIG_FILTERING_VIDEO_EXAMPLE) += filtering_video +DOC_EXAMPLES-$(CONFIG_HTTP_MULTICLIENT_EXAMPLE) += http_multiclient +DOC_EXAMPLES-$(CONFIG_HW_DECODE_EXAMPLE) += hw_decode +DOC_EXAMPLES-$(CONFIG_METADATA_EXAMPLE) += metadata +DOC_EXAMPLES-$(CONFIG_MUXING_EXAMPLE) += muxing +DOC_EXAMPLES-$(CONFIG_QSVDEC_EXAMPLE) += qsvdec +DOC_EXAMPLES-$(CONFIG_REMUXING_EXAMPLE) += remuxing +DOC_EXAMPLES-$(CONFIG_RESAMPLING_AUDIO_EXAMPLE) += resampling_audio +DOC_EXAMPLES-$(CONFIG_SCALING_VIDEO_EXAMPLE) += scaling_video +DOC_EXAMPLES-$(CONFIG_TRANSCODE_AAC_EXAMPLE) += transcode_aac +DOC_EXAMPLES-$(CONFIG_TRANSCODING_EXAMPLE) += transcoding + +DOC_EXAMPLES := $(DOC_EXAMPLES-yes:%=doc/examples/%$(PROGSSUF)$(EXESUF)) +ALL_DOC_EXAMPLES := $(DOC_EXAMPLES) $(DOC_EXAMPLES-:%=doc/examples/%$(PROGSSUF)$(EXESUF)) +ALL_DOC_EXAMPLES_G := $(DOC_EXAMPLES) $(DOC_EXAMPLES-:%=doc/examples/%$(PROGSSUF)_g$(EXESUF)) +PROGS += $(DOC_EXAMPLES) + +EXAMPLES_FILES := $(wildcard $(SRC_PATH)/doc/examples/*.c) $(SRC_PATH)/doc/examples/README +EXAMPLE_MAKEFILE := $(SRC_PATH)/doc/examples/Makefile + ++$(foreach P,$(DOC_EXAMPLES),$(eval OBJS-$(P:%$(PROGSSUF)$(EXESUF)=%) = $(P:%$(PROGSSUF)$(EXESUF)=%).o)) ++$(DOC_EXAMPLES): %$(PROGSSUF)$(EXESUF): %.o + examples: $(DOC_EXAMPLES) $(DOC_EXAMPLES:%$(EXESUF)=%.o): | doc/examples OBJDIRS += doc/examples -DOXY_INPUT += $(addprefix $(SRC_PATH)/, $(DOC_EXAMPLES:%$(EXESUF)=%.c)) +DOXY_INPUT += $(DOC_EXAMPLES:%$(EXESUF)=%.c) -clean:: - $(RM) $(ALL_DOC_EXAMPLES) +examplesclean: + $(RM) $(ALL_DOC_EXAMPLES) $(ALL_DOC_EXAMPLES_G) $(RM) $(CLEANSUFFIXES:%=doc/examples/%) --include $(wildcard $(DOC_EXAMPLES:%$(EXESUF)=%.d)) +docclean:: examplesclean + ++-include $(wildcard $(DOC_EXAMPLES:%$(PROGSSUF)$(EXESUF)=%.d)) + .PHONY: examples

1 0

build: Separate logic for building examples from that for building avtools
by Diego Biurrun 29 Sep '17

29 Sep '17

ffmpeg | branch: master | Diego Biurrun <diego(a)biurrun.de> | Tue Feb 14 13:15:25 2017 +0100| [ab566cc96bc0c31b34d944214bc06cec8ae8b640] | committer: Diego Biurrun build: Separate logic for building examples from that for building avtools > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ab566cc96bc0c31b3… --- Makefile | 2 +- doc/examples/Makefile | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c96e07916d..2932e6e04c 100644 --- a/Makefile +++ b/Makefile @@ -165,7 +165,7 @@ $(1)$(EXESUF): FF_EXTRALIBS += $(EXTRALIBS-$(1)) -include $$(OBJS-$(1):.o=.d) endef -$(foreach P,$(PROGS),$(eval $(call DOPROG,$(P:$(EXESUF)=)))) +$(foreach P,$(AVPROGS-yes),$(eval $(call DOPROG,$(P)))) $(PROGS): %$(EXESUF): %.o $(FF_DEP_LIBS) $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS) diff --git a/doc/examples/Makefile b/doc/examples/Makefile index b24ca28aff..c42c68fd54 100644 --- a/doc/examples/Makefile +++ b/doc/examples/Makefile @@ -12,6 +12,9 @@ DOC_EXAMPLES := $(DOC_EXAMPLES-yes:%=doc/examples/%$(EXESUF)) ALL_DOC_EXAMPLES := $(DOC_EXAMPLES) $(DOC_EXAMPLES-:%=doc/examples/%$(EXESUF)) PROGS += $(DOC_EXAMPLES) +$(foreach P,$(DOC_EXAMPLES),$(eval OBJS-$(P:%$(EXESUF)=%) = $(P:%$(EXESUF)=%).o)) +$(DOC_EXAMPLES): %$(EXESUF): %.o + examples: $(DOC_EXAMPLES) $(DOC_EXAMPLES:%$(EXESUF)=%.o): | doc/examples @@ -23,4 +26,6 @@ clean:: $(RM) $(ALL_DOC_EXAMPLES) $(RM) $(CLEANSUFFIXES:%=doc/examples/%) +-include $(wildcard $(DOC_EXAMPLES:%$(EXESUF)=%.d)) + .PHONY: examples

1 0

build: don't call install with the -T option
by James Almer 29 Sep '17

29 Sep '17

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Fri Sep 29 16:13:51 2017 -0300| [72da8491ca055f0211f64b160a8e16b9fb179457] | committer: James Almer build: don't call install with the -T option It's not available on macOS. Should fix a regression instroduced by b25d6290c67e193b91becab12e6c88df134cee81. Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=72da8491ca055f021… --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 43ce03130a..2c7b0d54f1 100644 --- a/Makefile +++ b/Makefile @@ -172,7 +172,7 @@ install-data: $(DATA_FILES) $(EXAMPLES_FILES) $(EXAMPLE_MAKEFILE) $(Q)mkdir -p "$(DATADIR)/examples" $(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)" $(INSTALL) -m 644 $(EXAMPLES_FILES) "$(DATADIR)/examples" - $(INSTALL) -m 644 -T $(EXAMPLE_MAKEFILE:%=%.example) "$(DATADIR)/examples/Makefile" + $(INSTALL) -m 644 $(EXAMPLE_MAKEFILE:%=%.example) "$(DATADIR)/examples/Makefile" uninstall: uninstall-libs uninstall-headers uninstall-progs uninstall-data

1 0