January 2017 - ffmpeg-cvslog - lists.ffmpeg.org

lavc/mjpegdec: Do not overread too short JFIF tags.
by git＠videolan.org 01 Jan '17

01 Jan '17

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Sun Jan 1 14:19:48 2017 +0100| [4acea512f36b96256535b45b1a7e723c61c89c31] | committer: Carl Eugen Hoyos lavc/mjpegdec: Do not overread too short JFIF tags. Fixes ticket #6055. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4acea512f36b96256… --- libavcodec/mjpegdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index eee8d58..e0b22ec 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1670,6 +1670,8 @@ static int mjpeg_decode_app(MJpegDecodeContext *s) if (id == AV_RB32("JFIF")) { int t_w, t_h, v1, v2; + if (len < 8) + goto out; skip_bits(&s->gb, 8); /* the trailing zero-byte */ v1 = get_bits(&s->gb, 8); v2 = get_bits(&s->gb, 8);

1 0

avfilter/avf_aphasemeter: make video output optional
by git＠videolan.org 01 Jan '17

01 Jan '17

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Dec 28 16:52:32 2016 +0100| [49abd5dbb8d1aea03e713bef4706e5171ea313da] | committer: Paul B Mahol avfilter/avf_aphasemeter: make video output optional Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=49abd5dbb8d1aea03… --- libavfilter/avf_aphasemeter.c | 117 ++++++++++++++------- tests/fate/filter-video.mak | 4 +- .../ref/fate/filter-metadata-avf-aphase-meter-mono | 64 +++++++---- .../filter-metadata-avf-aphase-meter-out-of-phase | 30 ++---- 4 files changed, 131 insertions(+), 84 deletions(-) diff --git a/libavfilter/avf_aphasemeter.c b/libavfilter/avf_aphasemeter.c index 8e8b292..fb5c1d4 100644 --- a/libavfilter/avf_aphasemeter.c +++ b/libavfilter/avf_aphasemeter.c @@ -37,6 +37,7 @@ typedef struct AudioPhaseMeterContext { const AVClass *class; AVFrame *out; + int do_video; int w, h; AVRational frame_rate; int contrast[4]; @@ -57,6 +58,7 @@ static const AVOption aphasemeter_options[] = { { "gc", "set green contrast", OFFSET(contrast[1]), AV_OPT_TYPE_INT, {.i64=7}, 0, 255, FLAGS }, { "bc", "set blue contrast", OFFSET(contrast[2]), AV_OPT_TYPE_INT, {.i64=1}, 0, 255, FLAGS }, { "mpc", "set median phase color", OFFSET(mpc_str), AV_OPT_TYPE_STRING, {.str = "none"}, 0, 0, FLAGS }, + { "video", "set video output", OFFSET(do_video), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, FLAGS }, { NULL } }; @@ -64,6 +66,7 @@ AVFILTER_DEFINE_CLASS(aphasemeter); static int query_formats(AVFilterContext *ctx) { + AudioPhaseMeterContext *s = ctx->priv; AVFilterFormats *formats = NULL; AVFilterChannelLayouts *layout = NULL; AVFilterLink *inlink = ctx->inputs[0]; @@ -74,17 +77,24 @@ static int query_formats(AVFilterContext *ctx) formats = ff_make_format_list(sample_fmts); if ((ret = ff_formats_ref (formats, &inlink->out_formats )) < 0 || + (ret = ff_formats_ref (formats, &outlink->in_formats )) < 0 || (ret = ff_add_channel_layout (&layout, AV_CH_LAYOUT_STEREO )) < 0 || - (ret = ff_channel_layouts_ref (layout , &inlink->out_channel_layouts)) < 0) + (ret = ff_channel_layouts_ref (layout , &inlink->out_channel_layouts)) < 0 || + (ret = ff_channel_layouts_ref (layout , &outlink->in_channel_layouts)) < 0) return ret; formats = ff_all_samplerates(); - if ((ret = ff_formats_ref(formats, &inlink->out_samplerates)) < 0) + if ((ret = ff_formats_ref(formats, &inlink->out_samplerates)) < 0 || + (ret = ff_formats_ref(formats, &outlink->in_samplerates)) < 0) return ret; - formats = ff_make_format_list(pix_fmts); - if ((ret = ff_formats_ref(formats, &outlink->in_formats)) < 0) - return ret; + if (s->do_video) { + AVFilterLink *outlink = ctx->outputs[1]; + + formats = ff_make_format_list(pix_fmts); + if ((ret = ff_formats_ref(formats, &outlink->in_formats)) < 0) + return ret; + } return 0; } @@ -95,15 +105,17 @@ static int config_input(AVFilterLink *inlink) AudioPhaseMeterContext *s = ctx->priv; int nb_samples; - nb_samples = FFMAX(1024, ((double)inlink->sample_rate / av_q2d(s->frame_rate)) + 0.5); - inlink->partial_buf_size = - inlink->min_samples = - inlink->max_samples = nb_samples; + if (s->do_video) { + nb_samples = FFMAX(1024, ((double)inlink->sample_rate / av_q2d(s->frame_rate)) + 0.5); + inlink->partial_buf_size = + inlink->min_samples = + inlink->max_samples = nb_samples; + } return 0; } -static int config_output(AVFilterLink *outlink) +static int config_video_output(AVFilterLink *outlink) { AVFilterContext *ctx = outlink->src; AudioPhaseMeterContext *s = ctx->priv; @@ -131,8 +143,9 @@ static inline int get_x(float phase, int w) static int filter_frame(AVFilterLink *inlink, AVFrame *in) { AVFilterContext *ctx = inlink->dst; - AVFilterLink *outlink = ctx->outputs[0]; AudioPhaseMeterContext *s = ctx->priv; + AVFilterLink *outlink = s->do_video ? ctx->outputs[1] : NULL; + AVFilterLink *aoutlink = ctx->outputs[0]; AVDictionary **metadata; const int rc = s->contrast[0]; const int gc = s->contrast[1]; @@ -142,8 +155,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) uint8_t *dst; int i; - if (!s->out || s->out->width != outlink->w || - s->out->height != outlink->h) { + if (s->do_video && (!s->out || s->out->width != outlink->w || + s->out->height != outlink->h)) { av_frame_free(&s->out); s->out = ff_get_video_buffer(outlink, outlink->w, outlink->h); if (!s->out) { @@ -154,7 +167,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) out = s->out; for (i = 0; i < outlink->h; i++) memset(out->data[0] + i * out->linesize[0], 0, outlink->w * 4); - } else { + } else if (s->do_video) { out = s->out; for (i = outlink->h - 1; i >= 10; i--) memmove(out->data[0] + (i ) * out->linesize[0], @@ -163,7 +176,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) for (i = 0; i < outlink->w; i++) AV_WL32(out->data[0] + i * 4, 0); } - s->out->pts = in->pts; for (i = 0; i < in->nb_samples; i++) { const float *src = (float *)in->data[0] + i * 2; @@ -171,24 +183,28 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) const float phase = isnan(f) ? 1 : f; const int x = get_x(phase, s->w); - dst = out->data[0] + x * 4; - dst[0] = FFMIN(255, dst[0] + rc); - dst[1] = FFMIN(255, dst[1] + gc); - dst[2] = FFMIN(255, dst[2] + bc); - dst[3] = 255; + if (s->do_video) { + dst = out->data[0] + x * 4; + dst[0] = FFMIN(255, dst[0] + rc); + dst[1] = FFMIN(255, dst[1] + gc); + dst[2] = FFMIN(255, dst[2] + bc); + dst[3] = 255; + } fphase += phase; } fphase /= in->nb_samples; - if (s->draw_median_phase) { - dst = out->data[0] + get_x(fphase, s->w) * 4; - AV_WL32(dst, AV_RL32(s->mpc)); - } + if (s->do_video) { + if (s->draw_median_phase) { + dst = out->data[0] + get_x(fphase, s->w) * 4; + AV_WL32(dst, AV_RL32(s->mpc)); + } - for (i = 1; i < 10 && i < outlink->h; i++) - memcpy(out->data[0] + i * out->linesize[0], out->data[0], outlink->w * 4); + for (i = 1; i < 10 && i < outlink->h; i++) + memcpy(out->data[0] + i * out->linesize[0], out->data[0], outlink->w * 4); + } - metadata = avpriv_frame_get_metadatap(out); + metadata = avpriv_frame_get_metadatap(in); if (metadata) { uint8_t value[128]; @@ -196,8 +212,11 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) av_dict_set(metadata, "lavfi.aphasemeter.phase", value, 0); } - av_frame_free(&in); - return ff_filter_frame(outlink, av_frame_clone(s->out)); + if (s->do_video) { + s->out->pts = in->pts; + ff_filter_frame(outlink, av_frame_clone(s->out)); + } + return ff_filter_frame(aoutlink, in); } static av_cold void uninit(AVFilterContext *ctx) @@ -207,6 +226,33 @@ static av_cold void uninit(AVFilterContext *ctx) av_frame_free(&s->out); } +static av_cold int init(AVFilterContext *ctx) +{ + AudioPhaseMeterContext *s = ctx->priv; + AVFilterPad pad; + + pad = (AVFilterPad){ + .name = av_strdup("out0"), + .type = AVMEDIA_TYPE_AUDIO, + }; + if (!pad.name) + return AVERROR(ENOMEM); + ff_insert_outpad(ctx, 0, &pad); + + if (s->do_video) { + pad = (AVFilterPad){ + .name = av_strdup("out1"), + .type = AVMEDIA_TYPE_VIDEO, + .config_props = config_video_output, + }; + if (!pad.name) + return AVERROR(ENOMEM); + ff_insert_outpad(ctx, 1, &pad); + } + + return 0; +} + static const AVFilterPad inputs[] = { { .name = "default", @@ -217,22 +263,15 @@ static const AVFilterPad inputs[] = { { NULL } }; -static const AVFilterPad outputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .config_props = config_output, - }, - { NULL } -}; - AVFilter ff_avf_aphasemeter = { .name = "aphasemeter", .description = NULL_IF_CONFIG_SMALL("Convert input audio to phase meter video output."), + .init = init, .uninit = uninit, .query_formats = query_formats, .priv_size = sizeof(AudioPhaseMeterContext), .inputs = inputs, - .outputs = outputs, + .outputs = NULL, .priv_class = &aphasemeter_class, + .flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS, }; diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index a9094b4..c57c9c7 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -665,11 +665,11 @@ fate-filter-metadata-readvitc-thr: CMD = run $(FILTER_METADATA_COMMAND) "movie=' AVF_PHASE_METER_DEPS = FFPROBE AVDEVICE LAVFI_INDEV AMOVIE_FILTER FLAC_DEMUXER FLAC_DECODER SINE_FILTER APHASEMETER_FILTER FATE_METADATA_FILTER-$(call ALLYES, $(AVF_PHASE_METER_DEPS)) += fate-filter-metadata-avf-aphase-meter-mono -fate-filter-metadata-avf-aphase-meter-mono: CMD = run $(FILTER_METADATA_COMMAND) sine="frequency=1000:sample_rate=48000:duration=1,aphasemeter" +fate-filter-metadata-avf-aphase-meter-mono: CMD = run $(FILTER_METADATA_COMMAND) sine="frequency=1000:sample_rate=48000:duration=1,aphasemeter=video=0" FATE_METADATA_FILTER-$(call ALLYES, $(AVF_PHASE_METER_DEPS)) += fate-filter-metadata-avf-aphase-meter-out-of-phase fate-filter-metadata-avf-aphase-meter-out-of-phase: SRC = $(TARGET_SAMPLES)/filter/out-of-phase-1000hz.flac -fate-filter-metadata-avf-aphase-meter-out-of-phase: CMD = run $(FILTER_METADATA_COMMAND) "amovie='$(SRC)',aphasemeter" +fate-filter-metadata-avf-aphase-meter-out-of-phase: CMD = run $(FILTER_METADATA_COMMAND) "amovie='$(SRC)',aphasemeter=video=0" tests/data/file4560-override2rotate0.mov: TAG = GEN tests/data/file4560-override2rotate0.mov: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data diff --git a/tests/ref/fate/filter-metadata-avf-aphase-meter-mono b/tests/ref/fate/filter-metadata-avf-aphase-meter-mono index 3c72375..4a53755 100644 --- a/tests/ref/fate/filter-metadata-avf-aphase-meter-mono +++ b/tests/ref/fate/filter-metadata-avf-aphase-meter-mono @@ -1,25 +1,47 @@ pkt_pts=0|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=1920|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=3840|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=5760|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=7680|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=9600|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=11520|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=13440|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=1024|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=2048|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=3072|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=4096|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=5120|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=6144|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=7168|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=8192|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=9216|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=10240|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=11264|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=12288|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=13312|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=14336|tag:lavfi.aphasemeter.phase=1.000000 pkt_pts=15360|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=17280|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=19200|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=21120|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=23040|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=24960|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=26880|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=28800|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=16384|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=17408|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=18432|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=19456|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=20480|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=21504|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=22528|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=23552|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=24576|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=25600|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=26624|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=27648|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=28672|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=29696|tag:lavfi.aphasemeter.phase=1.000000 pkt_pts=30720|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=32640|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=34560|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=36480|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=38400|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=40320|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=42240|tag:lavfi.aphasemeter.phase=1.000000 -pkt_pts=44160|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=31744|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=32768|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=33792|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=34816|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=35840|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=36864|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=37888|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=38912|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=39936|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=40960|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=41984|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=43008|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=44032|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=45056|tag:lavfi.aphasemeter.phase=1.000000 pkt_pts=46080|tag:lavfi.aphasemeter.phase=1.000000 +pkt_pts=47104|tag:lavfi.aphasemeter.phase=1.000000 diff --git a/tests/ref/fate/filter-metadata-avf-aphase-meter-out-of-phase b/tests/ref/fate/filter-metadata-avf-aphase-meter-out-of-phase index 425b2ae..a200e93 100644 --- a/tests/ref/fate/filter-metadata-avf-aphase-meter-out-of-phase +++ b/tests/ref/fate/filter-metadata-avf-aphase-meter-out-of-phase @@ -1,25 +1,11 @@ pkt_pts=0|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=1920|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=3840|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=5760|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=7680|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=9600|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=11520|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=13440|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=15360|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=17280|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=19200|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=21120|tag:lavfi.aphasemeter.phase=-1.000000 +pkt_pts=4608|tag:lavfi.aphasemeter.phase=-1.000000 +pkt_pts=9216|tag:lavfi.aphasemeter.phase=-1.000000 +pkt_pts=13824|tag:lavfi.aphasemeter.phase=-1.000000 +pkt_pts=18432|tag:lavfi.aphasemeter.phase=-1.000000 pkt_pts=23040|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=24960|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=26880|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=28800|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=30720|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=32640|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=34560|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=36480|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=38400|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=40320|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=42240|tag:lavfi.aphasemeter.phase=-1.000000 -pkt_pts=44160|tag:lavfi.aphasemeter.phase=-1.000000 +pkt_pts=27648|tag:lavfi.aphasemeter.phase=-1.000000 +pkt_pts=32256|tag:lavfi.aphasemeter.phase=-1.000000 +pkt_pts=36864|tag:lavfi.aphasemeter.phase=-1.000000 +pkt_pts=41472|tag:lavfi.aphasemeter.phase=-1.000000 pkt_pts=46080|tag:lavfi.aphasemeter.phase=-1.000000

2 1

avutil/tests: improved code coverage for atomic
by git＠videolan.org 01 Jan '17

01 Jan '17

ffmpeg | branch: master | Thomas Turner <thomastdt(a)googlemail.com> | Sat Dec 31 20:42:40 2016 -0800| [b7a6d28e5e7ae4dff7c53a2f24e2017220dd6cc1] | committer: Michael Niedermayer avutil/tests: improved code coverage for atomic Signed-off-by: Thomas Turner <thomastdt(a)googlemail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b7a6d28e5e7ae4dff… --- libavutil/tests/atomic.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavutil/tests/atomic.c b/libavutil/tests/atomic.c index c92f220..e41bf5a 100644 --- a/libavutil/tests/atomic.c +++ b/libavutil/tests/atomic.c @@ -21,7 +21,9 @@ int main(void) { - volatile int val = 1; + volatile int val = 1; + void *tmp1 = (int *)&val; + void * volatile *tmp2 = &tmp1; int res; res = avpriv_atomic_int_add_and_fetch(&val, 1); @@ -29,6 +31,8 @@ int main(void) avpriv_atomic_int_set(&val, 3); res = avpriv_atomic_int_get(&val); av_assert0(res == 3); + avpriv_atomic_ptr_cas(tmp2, tmp1, &res); + av_assert0(*tmp2 == &res); return 0; }

1 0

avcodec/nvenc: Add bluray_compat basic implementation
by git＠videolan.org 01 Jan '17

01 Jan '17

ffmpeg | branch: master | Miroslav Slugen <thunder.m(a)email.cz> | Fri Dec 30 22:04:31 2016 +0100| [9b425bd24c48085b0d96bc0698af82bd46e57d03] | committer: Timo Rothenpieler avcodec/nvenc: Add bluray_compat basic implementation Signed-off-by: Timo Rothenpieler <timo(a)rothenpieler.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9b425bd24c48085b0… --- libavcodec/nvenc.c | 15 +++++++++++++++ libavcodec/nvenc.h | 1 + libavcodec/nvenc_h264.c | 1 + libavcodec/nvenc_hevc.c | 1 + libavcodec/version.h | 2 +- 5 files changed, 19 insertions(+), 1 deletion(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 93979f3..4ee99a9 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -958,6 +958,21 @@ static av_cold int nvenc_setup_encoder(AVCodecContext *avctx) ctx->init_encode_params.enableEncodeAsync = 0; ctx->init_encode_params.enablePTD = 1; + if (ctx->bluray_compat) { + ctx->aud = 1; + avctx->refs = FFMIN(FFMAX(avctx->refs, 0), 6); + avctx->max_b_frames = FFMIN(avctx->max_b_frames, 3); + switch (avctx->codec->id) { + case AV_CODEC_ID_H264: + /* maximum level depends on used resolution */ + break; + case AV_CODEC_ID_HEVC: + ctx->level = NV_ENC_LEVEL_HEVC_51; + ctx->tier = NV_ENC_TIER_HEVC_HIGH; + break; + } + } + if (avctx->gop_size > 0) { if (avctx->max_b_frames >= 0) { /* 0 is intra-only, 1 is I/P only, 2 is one B-Frame, 3 two B-frames, and so on. */ diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h index c435e05..ab48cf7 100644 --- a/libavcodec/nvenc.h +++ b/libavcodec/nvenc.h @@ -154,6 +154,7 @@ typedef struct NvencContext int aq_strength; int quality; int aud; + int bluray_compat; } NvencContext; int ff_nvenc_encode_init(AVCodecContext *avctx); diff --git a/libavcodec/nvenc_h264.c b/libavcodec/nvenc_h264.c index cae27aa..76dc48b 100644 --- a/libavcodec/nvenc_h264.c +++ b/libavcodec/nvenc_h264.c @@ -108,6 +108,7 @@ static const AVOption options[] = { { "cq", "Set target quality level (0 to 51, 0 means automatic) for constant quality mode in VBR rate control", OFFSET(quality), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 51, VE }, { "aud", "Use access unit delimiters", OFFSET(aud), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, + { "bluray-compat", "Bluray compatibility workarounds", OFFSET(bluray_compat),AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { NULL } }; diff --git a/libavcodec/nvenc_hevc.c b/libavcodec/nvenc_hevc.c index e44ca7e..cd1dcb9 100644 --- a/libavcodec/nvenc_hevc.c +++ b/libavcodec/nvenc_hevc.c @@ -105,6 +105,7 @@ static const AVOption options[] = { { "cq", "Set target quality level (0 to 51, 0 means automatic) for constant quality mode in VBR rate control", OFFSET(quality), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 51, VE }, { "aud", "Use access unit delimiters", OFFSET(aud), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, + { "bluray-compat", "Bluray compatibility workarounds", OFFSET(bluray_compat),AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { NULL } }; diff --git a/libavcodec/version.h b/libavcodec/version.h index fce4add..8f37ebd 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MINOR 70 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \

1 0

avcodec/nvenc: Make AUD optional for h264_nvenc and hevc_nvenc
by git＠videolan.org 01 Jan '17

01 Jan '17

ffmpeg | branch: master | Miroslav Slugen <thunder.m(a)email.cz> | Fri Dec 30 22:02:42 2016 +0100| [1841eda6796671cc761e446bbca0f73d629ade4e] | committer: Timo Rothenpieler avcodec/nvenc: Make AUD optional for h264_nvenc and hevc_nvenc Signed-off-by: Timo Rothenpieler <timo(a)rothenpieler.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1841eda6796671cc7… --- libavcodec/nvenc.c | 4 ++-- libavcodec/nvenc.h | 1 + libavcodec/nvenc_h264.c | 1 + libavcodec/nvenc_hevc.c | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 3fd8482..93979f3 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -756,7 +756,7 @@ static av_cold int nvenc_setup_h264_config(AVCodecContext *avctx) h264->disableSPSPPS = (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) ? 1 : 0; h264->repeatSPSPPS = (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) ? 0 : 1; - h264->outputAUD = 1; + h264->outputAUD = ctx->aud; if (avctx->refs >= 0) { /* 0 means "let the hardware decide" */ @@ -840,7 +840,7 @@ static av_cold int nvenc_setup_hevc_config(AVCodecContext *avctx) hevc->disableSPSPPS = (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) ? 1 : 0; hevc->repeatSPSPPS = (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) ? 0 : 1; - hevc->outputAUD = 1; + hevc->outputAUD = ctx->aud; if (avctx->refs >= 0) { /* 0 means "let the hardware decide" */ diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h index 5bc0cba..c435e05 100644 --- a/libavcodec/nvenc.h +++ b/libavcodec/nvenc.h @@ -153,6 +153,7 @@ typedef struct NvencContext int strict_gop; int aq_strength; int quality; + int aud; } NvencContext; int ff_nvenc_encode_init(AVCodecContext *avctx); diff --git a/libavcodec/nvenc_h264.c b/libavcodec/nvenc_h264.c index 71e27fd..cae27aa 100644 --- a/libavcodec/nvenc_h264.c +++ b/libavcodec/nvenc_h264.c @@ -107,6 +107,7 @@ static const AVOption options[] = { OFFSET(aq_strength), AV_OPT_TYPE_INT, { .i64 = 8 }, 1, 15, VE }, { "cq", "Set target quality level (0 to 51, 0 means automatic) for constant quality mode in VBR rate control", OFFSET(quality), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 51, VE }, + { "aud", "Use access unit delimiters", OFFSET(aud), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { NULL } }; diff --git a/libavcodec/nvenc_hevc.c b/libavcodec/nvenc_hevc.c index ef739b6..e44ca7e 100644 --- a/libavcodec/nvenc_hevc.c +++ b/libavcodec/nvenc_hevc.c @@ -104,6 +104,7 @@ static const AVOption options[] = { OFFSET(aq_strength), AV_OPT_TYPE_INT, { .i64 = 8 }, 1, 15, VE }, { "cq", "Set target quality level (0 to 51, 0 means automatic) for constant quality mode in VBR rate control", OFFSET(quality), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 51, VE }, + { "aud", "Use access unit delimiters", OFFSET(aud), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { NULL } };

1 0

avcodec/nvenc: round qpIntra and qpInter calculation
by git＠videolan.org 01 Jan '17

01 Jan '17

ffmpeg | branch: master | Miroslav Slugeň <thunder.m(a)email.cz> | Thu Dec 29 22:10:52 2016 +0100| [f8c503d9270eaa16126b93fc41c7ab3b42b4dd2c] | committer: Timo Rothenpieler avcodec/nvenc: round qpIntra and qpInter calculation Round qpIntra and qpInter calculation instead of old floor behavior. Adopted from vaapi_encode_h264.c Signed-off-by: Timo Rothenpieler <timo(a)rothenpieler.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f8c503d9270eaa161… --- libavcodec/nvenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index f64fd8a..3fd8482 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -544,9 +544,9 @@ static av_cold void set_vbr(AVCodecContext *avctx) if (avctx->i_quant_factor != 0.0 && avctx->b_quant_factor != 0.0) { rc->initialRCQP.qpIntra = av_clip( - qp_inter_p * fabs(avctx->i_quant_factor) + avctx->i_quant_offset, 0, 51); + qp_inter_p * fabs(avctx->i_quant_factor) + avctx->i_quant_offset + 0.5, 0, 51); rc->initialRCQP.qpInterB = av_clip( - qp_inter_p * fabs(avctx->b_quant_factor) + avctx->b_quant_offset, 0, 51); + qp_inter_p * fabs(avctx->b_quant_factor) + avctx->b_quant_offset + 0.5, 0, 51); } else { rc->initialRCQP.qpIntra = qp_inter_p; rc->initialRCQP.qpInterB = qp_inter_p;

1 0

avformat/hlsenc: Duplicated segment filenames and use_localtime_mkdir
by git＠videolan.org 01 Jan '17

01 Jan '17

ffmpeg | branch: master | Bela Bodecs <bodecsb(a)vivanet.hu> | Sun Jan 1 20:22:34 2017 +0800| [03a69bd897e49a636a7c2f044f74fb96288955d4] | committer: Bela Bodecs avformat/hlsenc: Duplicated segment filenames and use_localtime_mkdir Current implementation of finding duplicate segment filenames may fail if use_localtime_mkdir and use_localtime are in effect and segment_filename option expression contains subdirectories with date/time specifiers. This patch fixes this false behaviour. Signed-off-by: Bela Bodecs <bodecsb(a)vivanet.hu> Signed-off-by: Steven Liu <lq(a)chinaffmpeg.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=03a69bd897e49a636… --- libavformat/hlsenc.c | 50 ++++++++++++++------------------------------------ 1 file changed, 14 insertions(+), 36 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 57fc9c1..591ab73 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -367,6 +367,16 @@ static int hls_mux_init(AVFormatContext *s) return 0; } +static HLSSegment *find_segment_by_filename(HLSSegment *segment, const char *filename) +{ + while (segment) { + if (!av_strcasecmp(segment->filename,filename)) + return segment; + segment = segment->next; + } + return (HLSSegment *) NULL; +} + /* Create a new segment and append it to the segment list */ static int hls_append_segment(struct AVFormatContext *s, HLSContext *hls, double duration, int64_t pos, int64_t size) @@ -383,6 +393,10 @@ static int hls_append_segment(struct AVFormatContext *s, HLSContext *hls, double if (hls->use_localtime_mkdir) { filename = hls->avf->filename; } + if (find_segment_by_filename(hls->segments, filename) + || find_segment_by_filename(hls->old_segments, en->filename)) { + av_log(hls, AV_LOG_WARNING, "Duplicated segment filename detected: %s\n", filename); + } av_strlcpy(en->filename, filename, sizeof(en->filename)); if(hls->has_subtitle) @@ -659,38 +673,6 @@ fail: return ret; } -static HLSSegment *find_segment_by_filename(HLSSegment *segment, const char *filename) -{ - /* filename may contain rel/abs path, but segments store only basename */ - char *p = NULL, *dirname = NULL, *path = NULL; - int path_size; - HLSSegment *ret_segment = NULL; - dirname = av_strdup(filename); - if (!dirname) - return NULL; - p = (char *)av_basename(dirname); // av_dirname would return . in case of no dir - *p = '\0'; // maybe empty - - while (segment) { - path_size = strlen(dirname) + strlen(segment->filename) + 1; - path = av_malloc(path_size); - if (!path) - goto end; - av_strlcpy(path, dirname, path_size); - av_strlcat(path, segment->filename, path_size); - if (!strcmp(path,filename)) { - ret_segment = segment; - av_free(path); - goto end; - } - av_free(path); - segment = segment->next; - } -end: - av_free(dirname); - return ret_segment; -} - static int hls_start(AVFormatContext *s) { HLSContext *c = s->priv_data; @@ -736,10 +718,6 @@ static int hls_start(AVFormatContext *s) } av_free(filename); } - if (find_segment_by_filename(c->segments, oc->filename) - || find_segment_by_filename(c->old_segments, oc->filename)) { - av_log(c, AV_LOG_WARNING, "Duplicated segment filename detected: %s\n", oc->filename); - } if (c->use_localtime_mkdir) { const char *dir; char *fn_copy = av_strdup(oc->filename);

1 0

libavformat/hlsenc: default segment name and use_localtime
by git＠videolan.org 01 Jan '17

01 Jan '17

ffmpeg | branch: master | Bela Bodecs <bodecsb(a)vivanet.hu> | Sun Jan 1 11:00:45 2017 +0800| [8fd3e02eee87e0830fa7ab1dbb65160e5be76d20] | committer: Bela Bodecs libavformat/hlsenc: default segment name and use_localtime in hlcenc.c, in the hls_write_header() function the default format string for strftime() function contains %s specifier when use_localtime is true. This %s specifier will insert the seconds since EPOCH. But %s is not available on all system/environment. This patch check %s availabilty at runtine and alter the default format string if necessary. Signed-off-by: Bela Bodecs <bodecsb(a)vivanet.hu> Signed-off-by: Steven Liu <lq(a)chinaffmpeg.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8fd3e02eee87e0830… --- libavformat/hlsenc.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index c9d8e3c..57fc9c1 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -829,13 +829,23 @@ fail: return err; } +static const char * get_default_pattern_localtime_fmt(void) +{ + char b[21]; + time_t t = time(NULL); + struct tm *p, tmbuf; + p = localtime_r(&t, &tmbuf); + // no %s support when strftime returned error or left format string unchanged + return (!strftime(b, sizeof(b), "%s", p) || !strcmp(b, "%s")) ? "-%Y%m%d%H%I%S.ts" : "-%s.ts"; +} + static int hls_write_header(AVFormatContext *s) { HLSContext *hls = s->priv_data; int ret, i; char *p; const char *pattern = "%d.ts"; - const char *pattern_localtime_fmt = "-%s.ts"; + const char *pattern_localtime_fmt = get_default_pattern_localtime_fmt(); const char *vtt_pattern = "%d.vtt"; AVDictionary *options = NULL; int basename_size;

1 0