August 2015 - ffmpeg-cvslog - lists.ffmpeg.org

mux: warn if the encoders bitexact flag is set, but not the muxers
by git＠videolan.org 30 Aug '15

30 Aug '15

ffmpeg | branch: master | Andreas Cadhalpun <Andreas.Cadhalpun(a)googlemail.com> | Tue Aug 25 00:37:04 2015 +0200| [c34363acd21c4431a59db41f08dbae637097773a] | committer: Andreas Cadhalpun mux: warn if the encoders bitexact flag is set, but not the muxers Based-on-patch-by: Michael Niedermayer <michael(a)niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun(a)googlemail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c34363acd21c4431a… --- libavformat/mux.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index 81c4676..8d5867c 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -250,10 +250,23 @@ static int init_muxer(AVFormatContext *s, AVDictionary **options) (ret = av_opt_set_dict2(s->priv_data, &tmp, AV_OPT_SEARCH_CHILDREN)) < 0) goto fail; + if (s->nb_streams && s->streams[0]->codec->flags & AV_CODEC_FLAG_BITEXACT) { + if (!(s->flags & AVFMT_FLAG_BITEXACT)) { #if FF_API_LAVF_BITEXACT - if (s->nb_streams && s->streams[0]->codec->flags & AV_CODEC_FLAG_BITEXACT) - s->flags |= AVFMT_FLAG_BITEXACT; + av_log(s, AV_LOG_WARNING, + "Setting the AVFormatContext to bitexact mode, because " + "the AVCodecContext is in that mode. This behavior will " + "change in the future. To keep the current behavior, set " + "AVFormatContext.flags |= AVFMT_FLAG_BITEXACT.\n"); + s->flags |= AVFMT_FLAG_BITEXACT; +#else + av_log(s, AV_LOG_WARNING, + "The AVFormatContext is not in set to bitexact mode, only " + "the AVCodecContext. If this is not intended, set " + "AVFormatContext.flags |= AVFMT_FLAG_BITEXACT.\n"); #endif + } + } // some sanity checks if (s->nb_streams == 0 && !(of->flags & AVFMT_NOSTREAMS)) {

1 0

avfilter/vf_separatefields: use the name 's' for the pointer to the private context
by git＠videolan.org 30 Aug '15

30 Aug '15

ffmpeg | branch: master | Ganesh Ajjanagadde <gajjanagadde(a)gmail.com> | Sun Aug 30 08:46:08 2015 -0700| [0169c4dc818bd88e9c203afb51de2afda49c657c] | committer: Paul B Mahol avfilter/vf_separatefields: use the name 's' for the pointer to the private context Signed-off-by: Ganesh Ajjanagadde <gajjanagadde(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0169c4dc818bd88e9… --- libavfilter/vf_separatefields.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/libavfilter/vf_separatefields.c b/libavfilter/vf_separatefields.c index 42ce682..3ea5eb6 100644 --- a/libavfilter/vf_separatefields.c +++ b/libavfilter/vf_separatefields.c @@ -30,10 +30,10 @@ typedef struct { static int config_props_output(AVFilterLink *outlink) { AVFilterContext *ctx = outlink->src; - SeparateFieldsContext *sf = ctx->priv; + SeparateFieldsContext *s = ctx->priv; AVFilterLink *inlink = ctx->inputs[0]; - sf->nb_planes = av_pix_fmt_count_planes(inlink->format); + s->nb_planes = av_pix_fmt_count_planes(inlink->format); if (inlink->h & 1) { av_log(ctx, AV_LOG_ERROR, "height must be even\n"); @@ -64,19 +64,19 @@ static void extract_field(AVFrame *frame, int nb_planes, int type) static int filter_frame(AVFilterLink *inlink, AVFrame *inpicref) { AVFilterContext *ctx = inlink->dst; - SeparateFieldsContext *sf = ctx->priv; + SeparateFieldsContext *s = ctx->priv; AVFilterLink *outlink = ctx->outputs[0]; int ret; inpicref->height = outlink->h; inpicref->interlaced_frame = 0; - if (!sf->second) { + if (!s->second) { goto clone; } else { - AVFrame *second = sf->second; + AVFrame *second = s->second; - extract_field(second, sf->nb_planes, second->top_field_first); + extract_field(second, s->nb_planes, second->top_field_first); if (second->pts != AV_NOPTS_VALUE && inpicref->pts != AV_NOPTS_VALUE) @@ -88,12 +88,12 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *inpicref) if (ret < 0) return ret; clone: - sf->second = av_frame_clone(inpicref); - if (!sf->second) + s->second = av_frame_clone(inpicref); + if (!s->second) return AVERROR(ENOMEM); } - extract_field(inpicref, sf->nb_planes, !inpicref->top_field_first); + extract_field(inpicref, s->nb_planes, !inpicref->top_field_first); if (inpicref->pts != AV_NOPTS_VALUE) inpicref->pts *= 2; @@ -104,15 +104,15 @@ clone: static int request_frame(AVFilterLink *outlink) { AVFilterContext *ctx = outlink->src; - SeparateFieldsContext *sf = ctx->priv; + SeparateFieldsContext *s = ctx->priv; int ret; ret = ff_request_frame(ctx->inputs[0]); - if (ret == AVERROR_EOF && sf->second) { - sf->second->pts *= 2; - extract_field(sf->second, sf->nb_planes, sf->second->top_field_first); - ret = ff_filter_frame(outlink, sf->second); - sf->second = 0; + if (ret == AVERROR_EOF && s->second) { + s->second->pts *= 2; + extract_field(s->second, s->nb_planes, s->second->top_field_first); + ret = ff_filter_frame(outlink, s->second); + s->second = 0; } return ret;

1 0

avcodec/qsv : Added look ahead rate control mode
by git＠videolan.org 30 Aug '15

30 Aug '15

ffmpeg | branch: master | Sven Dueking <sven(a)nablet.com> | Fri Aug 21 09:17:35 2015 +0100| [67e87f8050cb8cc61e016cb77be137c18653cbfe] | committer: Michael Niedermayer avcodec/qsv : Added look ahead rate control mode Reviewed-by: Ivan Uskov <ivan.uskov(a)nablet.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=67e87f8050cb8cc61… --- libavcodec/qsvenc.c | 31 +++++++++++++++++++++++++++++-- libavcodec/qsvenc.h | 8 ++++++++ libavcodec/qsvenc_h264.c | 12 ++++++++++++ 3 files changed, 49 insertions(+), 2 deletions(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 1532258..1aeab03 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -107,8 +107,16 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) q->param.mfx.RateControlMethod = MFX_RATECONTROL_CBR; ratecontrol_desc = "constant bitrate (CBR)"; } else if (!avctx->rc_max_rate) { - q->param.mfx.RateControlMethod = MFX_RATECONTROL_AVBR; - ratecontrol_desc = "average variable bitrate (AVBR)"; +#if QSV_VERSION_ATLEAST(1,7) + if (q->look_ahead) { + q->param.mfx.RateControlMethod = MFX_RATECONTROL_LA; + ratecontrol_desc = "lookahead (LA)"; + } else +#endif + { + q->param.mfx.RateControlMethod = MFX_RATECONTROL_AVBR; + ratecontrol_desc = "average variable bitrate (AVBR)"; + } } else { q->param.mfx.RateControlMethod = MFX_RATECONTROL_VBR; ratecontrol_desc = "variable bitrate (VBR)"; @@ -132,6 +140,9 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) break; case MFX_RATECONTROL_AVBR: +#if QSV_VERSION_ATLEAST(1,7) + case MFX_RATECONTROL_LA: +#endif q->param.mfx.TargetKbps = avctx->bit_rate / 1000; q->param.mfx.Convergence = q->avbr_convergence; q->param.mfx.Accuracy = q->avbr_accuracy; @@ -151,6 +162,22 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) q->extparam[0] = (mfxExtBuffer *)&q->extco; +#if QSV_VERSION_ATLEAST(1,6) + q->extco2.Header.BufferId = MFX_EXTBUFF_CODING_OPTION2; + q->extco2.Header.BufferSz = sizeof(q->extco2); + +#if QSV_VERSION_ATLEAST(1,7) + // valid value range is from 10 to 100 inclusive + // to instruct the encoder to use the default value this should be set to zero + q->extco2.LookAheadDepth = q->look_ahead_depth != 0 ? FFMAX(10, q->look_ahead_depth) : 0; +#endif +#if QSV_VERSION_ATLEAST(1,8) + q->extco2.LookAheadDS = q->look_ahead_downsampling; +#endif + + q->extparam[1] = (mfxExtBuffer *)&q->extco2; + +#endif q->param.ExtParam = q->extparam; q->param.NumExtParam = FF_ARRAY_ELEMS(q->extparam); } diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index 2316488..2a21f82 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -50,7 +50,12 @@ typedef struct QSVEncContext { mfxFrameAllocRequest req; mfxExtCodingOption extco; +#if QSV_VERSION_ATLEAST(1,6) + mfxExtCodingOption2 extco2; + mfxExtBuffer *extparam[2]; +#else mfxExtBuffer *extparam[1]; +#endif AVFifoBuffer *async_fifo; @@ -62,6 +67,9 @@ typedef struct QSVEncContext { int avbr_accuracy; int avbr_convergence; int pic_timing_sei; + int look_ahead; + int look_ahead_depth; + int look_ahead_downsampling; char *load_plugins; } QSVEncContext; diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index b15f6b2..b569efe 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -71,6 +71,18 @@ static const AVOption options[] = { { "avbr_convergence", "Convergence of the AVBR ratecontrol", OFFSET(qsv.avbr_convergence), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE }, { "pic_timing_sei", "Insert picture timing SEI with pic_struct_syntax element", OFFSET(qsv.pic_timing_sei), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, VE }, +#if QSV_VERSION_ATLEAST(1,7) + { "look_ahead", "Use VBR algorithm with look ahead", OFFSET(qsv.look_ahead), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, VE }, + { "look_ahead_depth", "Depth of look ahead in number frames", OFFSET(qsv.look_ahead_depth), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 100, VE }, +#endif + +#if QSV_VERSION_ATLEAST(1,8) + { "look_ahead_downsampling", NULL, OFFSET(qsv.look_ahead_downsampling), AV_OPT_TYPE_INT, { .i64 = MFX_LOOKAHEAD_DS_UNKNOWN }, MFX_LOOKAHEAD_DS_UNKNOWN, MFX_LOOKAHEAD_DS_2x, VE, "look_ahead_downsampling" }, + { "unknown" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_LOOKAHEAD_DS_UNKNOWN }, INT_MIN, INT_MAX, VE, "look_ahead_downsampling" }, + { "off" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_LOOKAHEAD_DS_OFF }, INT_MIN, INT_MAX, VE, "look_ahead_downsampling" }, + { "2x" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_LOOKAHEAD_DS_2x }, INT_MIN, INT_MAX, VE, "look_ahead_downsampling" }, +#endif + { "profile", NULL, OFFSET(qsv.profile), AV_OPT_TYPE_INT, { .i64 = MFX_PROFILE_UNKNOWN }, 0, INT_MAX, VE, "profile" }, { "unknown" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_PROFILE_UNKNOWN }, INT_MIN, INT_MAX, VE, "profile" }, { "baseline", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_PROFILE_AVC_BASELINE }, INT_MIN, INT_MAX, VE, "profile" },

1 0

avfilter/vf_vectorscope: make color mode more useful
by git＠videolan.org 30 Aug '15

30 Aug '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sun Aug 30 13:34:17 2015 +0000| [dead1964ea8c4a87adb098c2c1abb2778b01831f] | committer: Paul B Mahol avfilter/vf_vectorscope: make color mode more useful Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dead1964ea8c4a87a… --- libavfilter/vf_vectorscope.c | 22 ++++++++++++---------- tests/ref/fate/filter-vectorscope_color | 6 +++--- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/libavfilter/vf_vectorscope.c b/libavfilter/vf_vectorscope.c index b1967a2..5b09376 100644 --- a/libavfilter/vf_vectorscope.c +++ b/libavfilter/vf_vectorscope.c @@ -305,16 +305,6 @@ static void vectorscope(VectorscopeContext *s, AVFrame *in, AVFrame *out, int pd } } } - if (s->mode == COLOR) { - for (i = 0; i < out->height; i++) { - for (j = 0; j < out->width; j++) { - if (!dpd[i * out->linesize[pd] + j]) { - dpx[i * out->linesize[px] + j] = j; - dpy[i * out->linesize[py] + j] = i; - } - } - } - } break; case COLOR2: if (s->is_yuv) { @@ -393,6 +383,18 @@ static void vectorscope(VectorscopeContext *s, AVFrame *in, AVFrame *out, int pd } envelope(s, out); + + if (s->mode == COLOR) { + for (i = 0; i < out->height; i++) { + for (j = 0; j < out->width; j++) { + if (!dpd[i * out->linesize[pd] + j]) { + dpx[i * out->linesize[px] + j] = j; + dpy[i * out->linesize[py] + j] = i; + dpd[i * out->linesize[pd] + j] = 128; + } + } + } + } } static int filter_frame(AVFilterLink *inlink, AVFrame *in) diff --git a/tests/ref/fate/filter-vectorscope_color b/tests/ref/fate/filter-vectorscope_color index 40165b6..3d184f6 100644 --- a/tests/ref/fate/filter-vectorscope_color +++ b/tests/ref/fate/filter-vectorscope_color @@ -1,4 +1,4 @@ #tb 0: 1/25 -0, 0, 0, 1, 196608, 0x9d705c63 -0, 1, 1, 1, 196608, 0x9fbf6f2c -0, 2, 2, 1, 196608, 0x257b7290 +0, 0, 0, 1, 196608, 0x1890aa30 +0, 1, 1, 1, 196608, 0xa490acf9 +0, 2, 2, 1, 196608, 0x404a775d

1 0

swresample/swresample-test: Make layouts static const
by git＠videolan.org 30 Aug '15

30 Aug '15

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sun Aug 30 12:45:53 2015 +0200| [fb42e775163400a01d277764a7865f8d7e7b825b] | committer: Michael Niedermayer swresample/swresample-test: Make layouts static const Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fb42e775163400a01… --- libswresample/swresample-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libswresample/swresample-test.c b/libswresample/swresample-test.c index 7e2854d..47c54a1 100644 --- a/libswresample/swresample-test.c +++ b/libswresample/swresample-test.c @@ -108,7 +108,7 @@ static const int rates[] = { 48000, }; -uint64_t layouts[]={ +static const uint64_t layouts[]={ AV_CH_LAYOUT_MONO , AV_CH_LAYOUT_STEREO , AV_CH_LAYOUT_2_1 ,

1 0

avdevice/libdc1394: Make dc1394_frame_format and dc1394_frame_rate, static
by git＠videolan.org 30 Aug '15

30 Aug '15

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sun Aug 30 12:42:42 2015 +0200| [ab800add7b85a7aa9d82e3ad4a7ff81026cfa8e3] | committer: Michael Niedermayer avdevice/libdc1394: Make dc1394_frame_format and dc1394_frame_rate, static These are not used outside nor are in installed headers Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ab800add7b85a7aa9… --- libavdevice/libdc1394.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c index 5f49c5e..6868e9c 100644 --- a/libavdevice/libdc1394.c +++ b/libavdevice/libdc1394.c @@ -71,7 +71,7 @@ typedef struct dc1394_data { AVPacket packet; } dc1394_data; -struct dc1394_frame_format { +static const struct dc1394_frame_format { int width; int height; enum AVPixelFormat pix_fmt; @@ -84,7 +84,7 @@ struct dc1394_frame_format { { 0, 0, 0, 0 } /* gotta be the last one */ }; -struct dc1394_frame_rate { +static const struct dc1394_frame_rate { int frame_rate; int frame_rate_id; } dc1394_frame_rates[] = {

1 0

avcodec/options: Make dummy_v?_encoder static
by git＠videolan.org 30 Aug '15

30 Aug '15

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sun Aug 30 11:56:41 2015 +0200| [845fb3d4a5f48b5e3859c469a84e053346a1af90] | committer: Michael Niedermayer avcodec/options: Make dummy_v?_encoder static It does not need to be non static Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=845fb3d4a5f48b5e3… --- libavcodec/options.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/options.c b/libavcodec/options.c index 7154c9c..ea2563b 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -372,7 +372,7 @@ static const AVClass dummy_v2_class = { }; /* codec with options */ -AVCodec dummy_v1_encoder = { +static AVCodec dummy_v1_encoder = { .name = "dummy_v1_codec", .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_NONE - 1, @@ -384,7 +384,7 @@ AVCodec dummy_v1_encoder = { }; /* codec with options, different class */ -AVCodec dummy_v2_encoder = { +static AVCodec dummy_v2_encoder = { .name = "dummy_v2_codec", .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_NONE - 2, @@ -396,7 +396,7 @@ AVCodec dummy_v2_encoder = { }; /* codec with priv data, but no class */ -AVCodec dummy_v3_encoder = { +static AVCodec dummy_v3_encoder = { .name = "dummy_v3_codec", .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_NONE - 3, @@ -407,7 +407,7 @@ AVCodec dummy_v3_encoder = { }; /* codec without priv data */ -AVCodec dummy_v4_encoder = { +static AVCodec dummy_v4_encoder = { .name = "dummy_v4_codec", .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_NONE - 4,

1 0

doc/filters: mention all short names for vectorscope options
by git＠videolan.org 30 Aug '15

30 Aug '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sun Aug 30 08:35:02 2015 +0000| [a902bebdab754266c5b361e5dcd60923abcd4dfa] | committer: Paul B Mahol doc/filters: mention all short names for vectorscope options Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a902bebdab754266c… --- doc/filters.texi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 0d87978..b78cf90 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -10566,7 +10566,7 @@ a vectorscope). This filter accepts the following options: @table @option -@item mode +@item mode, m Set vectorscope mode. It accepts the following values: @@ -10600,7 +10600,7 @@ Set which color component will be represented on X-axis. Default is @code{1}. @item y Set which color component will be represented on Y-axis. Default is @code{2}. -@item intensity +@item intensity, i Set intensity, used by modes: gray, color and color3 for increasing brightness of color component which represents frequency of (X, Y) location in graph.

1 0

avfilter/vf_vectorscope: implement envelope support
by git＠videolan.org 30 Aug '15

30 Aug '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sat Aug 29 21:18:53 2015 +0000| [7516aa9a4afcfd3c0b1a326045669ad615f39f37] | committer: Paul B Mahol avfilter/vf_vectorscope: implement envelope support Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7516aa9a4afcfd3c0… --- doc/filters.texi | 16 ++++++++ libavfilter/vf_vectorscope.c | 87 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 95 insertions(+), 8 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 3b5f817..0d87978 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -10603,6 +10603,22 @@ Set which color component will be represented on Y-axis. Default is @code{2}. @item intensity Set intensity, used by modes: gray, color and color3 for increasing brightness of color component which represents frequency of (X, Y) location in graph. + +@item envelope, e +@table @samp +@item none +No envelope, this is default. + +@item instant +Instant envelope, even darkest single pixel will be clearly highlighted. + +@item peak +Hold maximum and minimum values presented in graph over time. This way you +can still spot out of range values without constantly looking at vectorscope. + +@item peak+instant +Peak and instant envelope combined together. +@end table @end table @anchor{vidstabdetect} diff --git a/libavfilter/vf_vectorscope.c b/libavfilter/vf_vectorscope.c index 88d69b7..b1967a2 100644 --- a/libavfilter/vf_vectorscope.c +++ b/libavfilter/vf_vectorscope.c @@ -45,6 +45,8 @@ typedef struct VectorscopeContext { int planeheight[4]; int x, y, pd; int is_yuv; + int envelope; + uint8_t peak[256][256]; } VectorscopeContext; #define OFFSET(x) offsetof(VectorscopeContext, x) @@ -53,15 +55,21 @@ typedef struct VectorscopeContext { static const AVOption vectorscope_options[] = { { "mode", "set vectorscope mode", OFFSET(mode), AV_OPT_TYPE_INT, {.i64=0}, 0, MODE_NB-1, FLAGS, "mode"}, { "m", "set vectorscope mode", OFFSET(mode), AV_OPT_TYPE_INT, {.i64=0}, 0, MODE_NB-1, FLAGS, "mode"}, - { "gray", 0, 0, AV_OPT_TYPE_CONST, {.i64=GRAY}, 0, 0, FLAGS, "mode" }, - { "color", 0, 0, AV_OPT_TYPE_CONST, {.i64=COLOR}, 0, 0, FLAGS, "mode" }, - { "color2", 0, 0, AV_OPT_TYPE_CONST, {.i64=COLOR2}, 0, 0, FLAGS, "mode" }, - { "color3", 0, 0, AV_OPT_TYPE_CONST, {.i64=COLOR3}, 0, 0, FLAGS, "mode" }, - { "color4", 0, 0, AV_OPT_TYPE_CONST, {.i64=COLOR4}, 0, 0, FLAGS, "mode" }, + { "gray", 0, 0, AV_OPT_TYPE_CONST, {.i64=GRAY}, 0, 0, FLAGS, "mode" }, + { "color", 0, 0, AV_OPT_TYPE_CONST, {.i64=COLOR}, 0, 0, FLAGS, "mode" }, + { "color2", 0, 0, AV_OPT_TYPE_CONST, {.i64=COLOR2}, 0, 0, FLAGS, "mode" }, + { "color3", 0, 0, AV_OPT_TYPE_CONST, {.i64=COLOR3}, 0, 0, FLAGS, "mode" }, + { "color4", 0, 0, AV_OPT_TYPE_CONST, {.i64=COLOR4}, 0, 0, FLAGS, "mode" }, { "x", "set color component on X axis", OFFSET(x), AV_OPT_TYPE_INT, {.i64=1}, 0, 2, FLAGS}, { "y", "set color component on Y axis", OFFSET(y), AV_OPT_TYPE_INT, {.i64=2}, 0, 2, FLAGS}, { "intensity", "set intensity", OFFSET(intensity), AV_OPT_TYPE_INT, {.i64=1}, 1, 255, FLAGS}, { "i", "set intensity", OFFSET(intensity), AV_OPT_TYPE_INT, {.i64=1}, 1, 255, FLAGS}, + { "envelope", "set envelope", OFFSET(envelope), AV_OPT_TYPE_INT, {.i64=0}, 0, 3, FLAGS, "envelope"}, + { "e", "set envelope", OFFSET(envelope), AV_OPT_TYPE_INT, {.i64=0}, 0, 3, FLAGS, "envelope"}, + { "none", 0, 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, FLAGS, "envelope" }, + { "instant", 0, 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, FLAGS, "envelope" }, + { "peak", 0, 0, AV_OPT_TYPE_CONST, {.i64=2}, 0, 0, FLAGS, "envelope" }, + { "peak+instant", 0, 0, AV_OPT_TYPE_CONST, {.i64=3}, 0, 0, FLAGS, "envelope" }, { NULL } }; @@ -143,7 +151,9 @@ static int config_input(AVFilterLink *inlink) const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); VectorscopeContext *s = inlink->dst->priv; - if (s->mode == GRAY) + s->is_yuv = !(desc->flags & AV_PIX_FMT_FLAG_RGB); + + if (s->mode == GRAY && s->is_yuv) s->pd = 0; else { if ((s->x == 1 && s->y == 2) || (s->x == 2 && s->y == 1)) @@ -173,16 +183,75 @@ static int config_input(AVFilterLink *inlink) static int config_output(AVFilterLink *outlink) { - VectorscopeContext *s = outlink->src->priv; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(outlink->format); int depth = desc->comp[0].depth_minus1 + 1; - s->is_yuv = !(desc->flags & AV_PIX_FMT_FLAG_RGB); outlink->h = outlink->w = 1 << depth; outlink->sample_aspect_ratio = (AVRational){1,1}; return 0; } +static void envelope_instant(VectorscopeContext *s, AVFrame *out) +{ + const int dlinesize = out->linesize[0]; + uint8_t *dpd = s->mode == COLOR || !s->is_yuv ? out->data[s->pd] : out->data[0]; + int i, j; + + for (i = 0; i < out->height; i++) { + for (j = 0; j < out->width; j++) { + int pos = i * dlinesize + j; + int poa = (i - 1) * dlinesize + j; + int pob = (i + 1) * dlinesize + j; + + if (dpd[pos] && (((!j || !dpd[pos - 1]) || ((j == (out->width - 1)) || !dpd[pos + 1])) + || ((!i || !dpd[poa]) || ((i == (out->height - 1)) || !dpd[pob])))) { + dpd[pos] = 255; + } + } + } +} + +static void envelope_peak(VectorscopeContext *s, AVFrame *out) +{ + const int dlinesize = out->linesize[0]; + uint8_t *dpd = s->mode == COLOR || !s->is_yuv ? out->data[s->pd] : out->data[0]; + int i, j; + + for (i = 0; i < out->height; i++) { + for (j = 0; j < out->width; j++) { + int pos = i * dlinesize + j; + + if (dpd[pos]) + s->peak[i][j] = 255; + } + } + + if (s->envelope == 3) + envelope_instant(s, out); + + for (i = 0; i < out->height; i++) { + for (j = 0; j < out->width; j++) { + int pos = i * dlinesize + j; + + if (s->peak[i][j] && (((!j || !s->peak[i][j-1]) || ((j == (out->width - 1)) || !s->peak[i][j + 1])) + || ((!i || !s->peak[i-1][j]) || ((i == (out->height - 1)) || !s->peak[i + 1][j])))) { + dpd[pos] = 255; + } + } + } +} + +static void envelope(VectorscopeContext *s, AVFrame *out) +{ + if (!s->envelope) { + return; + } else if (s->envelope == 1) { + envelope_instant(s, out); + } else { + envelope_peak(s, out); + } +} + static void vectorscope(VectorscopeContext *s, AVFrame *in, AVFrame *out, int pd) { const uint8_t * const *src = (const uint8_t * const *)in->data; @@ -322,6 +391,8 @@ static void vectorscope(VectorscopeContext *s, AVFrame *in, AVFrame *out, int pd default: av_assert0(0); } + + envelope(s, out); } static int filter_frame(AVFilterLink *inlink, AVFrame *in)

1 0

avcodec/snowenc: Support setting the iterative dia size separately
by git＠videolan.org 30 Aug '15

30 Aug '15

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Fri Jul 24 20:50:55 2015 +0200| [4bd99f715de3ea54319d54f848d16186dd00b039] | committer: Michael Niedermayer avcodec/snowenc: Support setting the iterative dia size separately Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4bd99f715de3ea543… --- doc/encoders.texi | 9 +++++++++ libavcodec/snow.h | 1 + libavcodec/snowenc.c | 4 +++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index 6e50a90..f9fe331 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -1357,6 +1357,15 @@ allows to store non-rgb pix_fmts. @end table +@section snow + +@subsection Options + +@table @option +@item iterative_dia_size +dia size for the iterative motion estimation +@end table + @section libtheora libtheora Theora encoder wrapper. diff --git a/libavcodec/snow.h b/libavcodec/snow.h index a16ca0c..a09b622 100644 --- a/libavcodec/snow.h +++ b/libavcodec/snow.h @@ -177,6 +177,7 @@ typedef struct SnowContext{ int no_bitstream; int intra_penalty; int motion_est; + int iterative_dia_size; MpegEncContext m; // needed for motion estimation, should not be used for anything else, the idea is to eventually make the motion estimation independent of MpegEncContext, so this will be removed then (FIXME/XXX) diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index 9b5a488..5e5dc35 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -1120,8 +1120,9 @@ static void iterative_me(SnowContext *s){ do{ int newx = block->mx; int newy = block->my; + int dia_size = s->iterative_dia_size ? s->iterative_dia_size : FFMAX(s->avctx->dia_size, 1); dia_change=0; - for(i=0; i<FFMAX(s->avctx->dia_size, 1); i++){ + for(i=0; i < dia_size; i++){ for(j=0; j<i; j++){ dia_change |= check_block_inter(s, mb_x, mb_y, newx+4*(i-j), newy+(4*j), obmc_edged, &best_rd); dia_change |= check_block_inter(s, mb_x, mb_y, newx-4*(i-j), newy-(4*j), obmc_edged, &best_rd); @@ -1898,6 +1899,7 @@ static const AVOption options[] = { { "memc_only", "Only do ME/MC (I frames -> ref, P frame -> ME+MC).", OFFSET(memc_only), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, { "no_bitstream", "Skip final bitstream writeout.", OFFSET(no_bitstream), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, { "intra_penalty", "Penalty for intra blocks in block decission", OFFSET(intra_penalty), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE }, + { "iterative_dia_size", "Dia size for the iterative ME", OFFSET(iterative_dia_size), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE }, { NULL }, };

1 0