November 2018 - ffmpeg-cvslog

avformat/ac3dec: always skip junk bytes before sync bytes
by Paul B Mahol 30 Nov '18

30 Nov '18

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sun Nov 25 12:15:51 2018 +0100| [f09bbb8f087dc1780ce1fe236a7e27ae4e49fb14] | committer: Paul B Mahol avformat/ac3dec: always skip junk bytes before sync bytes Fixes #7278. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f09bbb8f087dc1780… --- libavcodec/ac3dec.c | 20 +++++++++++++++++--- libavformat/ac3dec.c | 2 +- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 43b22b7654..71419458fa 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -1467,7 +1467,7 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data, int buf_size, full_buf_size = avpkt->size; AC3DecodeContext *s = avctx->priv_data; int blk, ch, err, offset, ret; - int got_independent_frame = 0; + int skip = 0, got_independent_frame = 0; const uint8_t *channel_map; uint8_t extended_channel_map[EAC3_MAX_CHANNELS]; const SHORTFLOAT *output[AC3_MAX_CHANNELS]; @@ -1477,6 +1477,14 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data, s->superframe_size = 0; buf_size = full_buf_size; + while (buf_size > 2) { + if (AV_RB16(buf) != 0x770B && AV_RL16(buf) != 0x770B) { + buf += 1; + buf_size -= 1; + continue; + } + break; + } /* copy input buffer to decoder context to avoid reading past the end of the buffer, which can be caused by a damaged input stream. */ if (buf_size >= 2 && AV_RB16(buf) == 0x770B) { @@ -1637,6 +1645,11 @@ dependent_frame: AC3HeaderInfo hdr; int err; + if (buf_size - s->frame_size <= 16) { + skip = buf_size - s->frame_size; + goto skip; + } + if ((ret = init_get_bits8(&s->gbc, buf + s->frame_size, buf_size - s->frame_size)) < 0) return ret; @@ -1657,6 +1670,7 @@ dependent_frame: } } } +skip: frame->decode_error_flags = err ? FF_DECODE_ERROR_INVALID_BITSTREAM : 0; @@ -1796,9 +1810,9 @@ dependent_frame: *got_frame_ptr = 1; if (!s->superframe_size) - return FFMIN(full_buf_size, s->frame_size); + return FFMIN(full_buf_size, s->frame_size + skip); - return FFMIN(full_buf_size, s->superframe_size); + return FFMIN(full_buf_size, s->superframe_size + skip); } /** diff --git a/libavformat/ac3dec.c b/libavformat/ac3dec.c index 6f423ff7eb..2718061bdc 100644 --- a/libavformat/ac3dec.c +++ b/libavformat/ac3dec.c @@ -47,7 +47,7 @@ static int ac3_eac3_probe(AVProbeData *p, enum AVCodecID expected_codec_id) uint16_t frame_size; int i, ret; - if(!memcmp(buf2, "\x1\x10\0\0\0\0\0\0", 8)) { + if(!memcmp(buf2, "\x1\x10", 2)) { if (buf2 + 16 > end) break; buf2+=16;

1 0

lavc/qsvenc: assert uninitialized pict_type
by Linjie Fu 30 Nov '18

30 Nov '18

ffmpeg | branch: master | Linjie Fu <linjie.fu(a)intel.com> | Wed Nov 28 10:41:55 2018 +0800| [67cdfcf694f840d215be940f82545c45c9be193a] | committer: Zhong Li lavc/qsvenc: assert uninitialized pict_type Assert in function ff_qsv_encode to avoid using uninitialized value: FF_DISABLE_DEPRECATION_WARNINGS avctx->coded_frame->pict_type = pict_type; FF_ENABLE_DEPRECATION_WARNINGS Signed-off-by: Linjie Fu <linjie.fu(a)intel.com> Signed-off-by: Zhong Li <zhong.li(a)intel.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=67cdfcf694f840d21… --- libavcodec/qsvenc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 3946c1d837..7f4592f878 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -1337,6 +1337,8 @@ int ff_qsv_encode(AVCodecContext *avctx, QSVEncContext *q, pict_type = AV_PICTURE_TYPE_P; else if (bs->FrameType & MFX_FRAMETYPE_B || bs->FrameType & MFX_FRAMETYPE_xB) pict_type = AV_PICTURE_TYPE_B; + else + av_assert0(!"Uninitialized pict_type!"); #if FF_API_CODED_FRAME FF_DISABLE_DEPRECATION_WARNINGS

1 0

lavc/qsvenc: add forced_idr option
by Zhong Li 30 Nov '18

30 Nov '18

ffmpeg | branch: master | Zhong Li <zhong.li(a)intel.com> | Thu Nov 29 16:29:00 2018 +0800| [ac0bcd6b619479d56612b3938e8f00f5b88c0f10] | committer: Zhong Li lavc/qsvenc: add forced_idr option This option can be used to repect original input I/IDR frame type. Reviewed-by: Mark Thompson <sw(a)jkqxz.net> Signed-off-by: Zhong Li <zhong.li(a)intel.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ac0bcd6b619479d56… --- libavcodec/qsvenc.c | 7 +++++++ libavcodec/qsvenc.h | 2 ++ 2 files changed, 9 insertions(+) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 948751daf4..3946c1d837 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -1192,6 +1192,13 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, if (qsv_frame) { surf = &qsv_frame->surface; enc_ctrl = &qsv_frame->enc_ctrl; + memset(enc_ctrl, 0, sizeof(mfxEncodeCtrl)); + + if (frame->pict_type == AV_PICTURE_TYPE_I) { + enc_ctrl->FrameType = MFX_FRAMETYPE_I | MFX_FRAMETYPE_REF; + if (q->forced_idr) + enc_ctrl->FrameType |= MFX_FRAMETYPE_IDR; + } } ret = av_new_packet(&new_pkt, q->packet_size); diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index 055b4a60fa..fbdc19900d 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -87,6 +87,7 @@ { "adaptive_i", "Adaptive I-frame placement", OFFSET(qsv.adaptive_i), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, \ { "adaptive_b", "Adaptive B-frame placement", OFFSET(qsv.adaptive_b), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, \ { "b_strategy", "Strategy to choose between I/P/B-frames", OFFSET(qsv.b_strategy), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, \ +{ "forced_idr", "Forcing I frames as IDR frames", OFFSET(qsv.forced_idr), AV_OPT_TYPE_BOOL,{ .i64 = 0 }, 0, 1, VE }, \ typedef int SetEncodeCtrlCB (AVCodecContext *avctx, const AVFrame *frame, mfxEncodeCtrl* enc_ctrl); @@ -168,6 +169,7 @@ typedef struct QSVEncContext { #endif char *load_plugins; SetEncodeCtrlCB *set_encode_ctrl_cb; + int forced_idr; } QSVEncContext; int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q);

1 0

lavc/qsvenc: enable ICQ and ICQ_LA on Linux
by Zhong Li 30 Nov '18

30 Nov '18

ffmpeg | branch: master | Zhong Li <zhong.li(a)intel.com> | Thu Nov 29 16:28:59 2018 +0800| [518b963d2c99ad03570b3224f76a1224c62e66e9] | committer: Zhong Li lavc/qsvenc: enable ICQ and ICQ_LA on Linux ICQ/ICQ_LA are enabled with MSDK V1.28 Reviewed-by: Mark Thompson <sw(a)jkqxz.net> Signed-off-by: Zhong Li <zhong.li(a)intel.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=518b963d2c99ad035… --- libavcodec/qsvenc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index 50cc4267e7..055b4a60fa 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -53,7 +53,7 @@ #define QSV_HAVE_MF 0 #else #define QSV_HAVE_AVBR 0 -#define QSV_HAVE_ICQ 0 +#define QSV_HAVE_ICQ QSV_VERSION_ATLEAST(1, 28) #define QSV_HAVE_VCM 0 #define QSV_HAVE_QVBR 0 #define QSV_HAVE_MF QSV_VERSION_ATLEAST(1, 25)

1 0

avformat/dashdec: add subtitle stream support
by Steven Liu 30 Nov '18

30 Nov '18

ffmpeg | branch: master | Steven Liu <lq(a)chinaffmpeg.org> | Fri Nov 30 16:39:19 2018 +0800| [ba71ebbbfa16f965477f40cf10ca1af5d6bc477d] | committer: Steven Liu avformat/dashdec: add subtitle stream support Signed-off-by: Steven Liu <lq(a)chinaffmpeg.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ba71ebbbfa16f9654… --- libavformat/dashdec.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 90 insertions(+), 7 deletions(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index cf603bf075..1deb60ff21 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -140,6 +140,8 @@ typedef struct DASHContext { struct representation **videos; int n_audios; struct representation **audios; + int n_subtitles; + struct representation **subtitles; /* MediaPresentationDescription Attribute */ uint64_t media_presentation_duration; @@ -394,6 +396,17 @@ static void free_audio_list(DASHContext *c) c->n_audios = 0; } +static void free_subtitle_list(DASHContext *c) +{ + int i; + for (i = 0; i < c->n_subtitles; i++) { + struct representation *pls = c->subtitles[i]; + free_representation(pls); + } + av_freep(&c->subtitles); + c->n_subtitles = 0; +} + static int open_url(AVFormatContext *s, AVIOContext **pb, const char *url, AVDictionary *opts, AVDictionary *opts2, int *is_http) { @@ -565,6 +578,8 @@ static enum AVMediaType get_content_type(xmlNodePtr node) type = AVMEDIA_TYPE_VIDEO; } else if (av_stristr((const char *)val, "audio")) { type = AVMEDIA_TYPE_AUDIO; + } else if (av_stristr((const char *)val, "text")) { + type = AVMEDIA_TYPE_SUBTITLE; } xmlFree(val); } @@ -818,6 +833,7 @@ static int parse_manifest_representation(AVFormatContext *s, const char *url, xmlNodePtr adaptionset_supplementalproperty_node) { int32_t ret = 0; + int32_t subtitle_rep_idx = 0; int32_t audio_rep_idx = 0; int32_t video_rep_idx = 0; DASHContext *c = s->priv_data; @@ -854,7 +870,7 @@ static int parse_manifest_representation(AVFormatContext *s, const char *url, type = get_content_type(adaptionset_node); if (type == AVMEDIA_TYPE_UNKNOWN) { av_log(s, AV_LOG_VERBOSE, "Parsing '%s' - skipp not supported representation type\n", url); - } else if (type == AVMEDIA_TYPE_VIDEO || type == AVMEDIA_TYPE_AUDIO) { + } else if (type == AVMEDIA_TYPE_VIDEO || type == AVMEDIA_TYPE_AUDIO || type == AVMEDIA_TYPE_SUBTITLE) { // convert selected representation to our internal struct rep = av_mallocz(sizeof(struct representation)); if (!rep) { @@ -1048,18 +1064,29 @@ static int parse_manifest_representation(AVFormatContext *s, const char *url, av_log(s, AV_LOG_VERBOSE, "Ignoring invalid frame rate '%s'\n", rep_framerate_val); } - if (type == AVMEDIA_TYPE_VIDEO) { - rep->rep_idx = video_rep_idx; - dynarray_add(&c->videos, &c->n_videos, rep); - } else { - rep->rep_idx = audio_rep_idx; - dynarray_add(&c->audios, &c->n_audios, rep); + switch (type) { + case AVMEDIA_TYPE_VIDEO: + rep->rep_idx = video_rep_idx; + dynarray_add(&c->videos, &c->n_videos, rep); + break; + case AVMEDIA_TYPE_AUDIO: + rep->rep_idx = audio_rep_idx; + dynarray_add(&c->audios, &c->n_audios, rep); + break; + case AVMEDIA_TYPE_SUBTITLE: + rep->rep_idx = subtitle_rep_idx; + dynarray_add(&c->subtitles, &c->n_subtitles, rep); + break; + default: + av_log(s, AV_LOG_WARNING, "Unsupported the stream type %d\n", type); + break; } } } video_rep_idx += type == AVMEDIA_TYPE_VIDEO; audio_rep_idx += type == AVMEDIA_TYPE_AUDIO; + subtitle_rep_idx += type == AVMEDIA_TYPE_SUBTITLE; end: if (rep_id_val) @@ -1441,6 +1468,8 @@ static int refresh_manifest(AVFormatContext *s) struct representation **videos = c->videos; int n_audios = c->n_audios; struct representation **audios = c->audios; + int n_subtitles = c->n_subtitles; + struct representation **subtitles = c->subtitles; char *base_url = c->base_url; c->base_url = NULL; @@ -1448,6 +1477,8 @@ static int refresh_manifest(AVFormatContext *s) c->videos = NULL; c->n_audios = 0; c->audios = NULL; + c->n_subtitles = 0; + c->subtitles = NULL; ret = parse_manifest(s, s->url, NULL); if (ret) goto finish; @@ -1464,6 +1495,12 @@ static int refresh_manifest(AVFormatContext *s) n_audios, c->n_audios); return AVERROR_INVALIDDATA; } + if (c->n_subtitles != n_subtitles) { + av_log(c, AV_LOG_ERROR, + "new manifest has mismatched no. of subtitles representations, %d -> %d\n", + n_subtitles, c->n_subtitles); + return AVERROR_INVALIDDATA; + } for (i = 0; i < n_videos; i++) { struct representation *cur_video = videos[i]; @@ -1504,10 +1541,16 @@ finish: av_free(base_url); else c->base_url = base_url; + + if (c->subtitles) + free_subtitle_list(c); if (c->audios) free_audio_list(c); if (c->videos) free_video_list(c); + + c->n_subtitles = n_subtitles; + c->subtitles = subtitles; c->n_audios = n_audios; c->audios = audios; c->n_videos = n_videos; @@ -2001,6 +2044,23 @@ static int dash_read_header(AVFormatContext *s) ++stream_index; } + if (c->n_subtitles) + c->is_init_section_common_audio = is_common_init_section_exist(c->subtitles, c->n_subtitles); + + for (i = 0; i < c->n_subtitles; i++) { + struct representation *cur_subtitle = c->subtitles[i]; + if (i > 0 && c->is_init_section_common_audio) { + copy_init_section(cur_subtitle,c->subtitles[0]); + } + ret = open_demux_for_component(s, cur_subtitle); + + if (ret) + goto fail; + cur_subtitle->stream_index = stream_index; + ++stream_index; + } + + if (!stream_index) { ret = AVERROR_INVALIDDATA; goto fail; @@ -2034,6 +2094,14 @@ static int dash_read_header(AVFormatContext *s) if (pls->id[0]) av_dict_set(&pls->assoc_stream->metadata, "id", pls->id, 0); } + for (i = 0; i < c->n_subtitles; i++) { + struct representation *pls = c->subtitles[i]; + av_program_add_stream_index(s, 0, pls->stream_index); + pls->assoc_stream = s->streams[pls->stream_index]; + if (pls->id[0]) + av_dict_set(&pls->assoc_stream->metadata, "id", pls->id, 0); + } + } return 0; @@ -2076,6 +2144,7 @@ static int dash_read_packet(AVFormatContext *s, AVPacket *pkt) recheck_discard_flags(s, c->videos, c->n_videos); recheck_discard_flags(s, c->audios, c->n_audios); + recheck_discard_flags(s, c->subtitles, c->n_subtitles); for (i = 0; i < c->n_videos; i++) { struct representation *pls = c->videos[i]; @@ -2096,6 +2165,16 @@ static int dash_read_packet(AVFormatContext *s, AVPacket *pkt) } } + for (i = 0; i < c->n_subtitles; i++) { + struct representation *pls = c->subtitles[i]; + if (!pls->ctx) + continue; + if (!cur || pls->cur_timestamp < mints) { + cur = pls; + mints = pls->cur_timestamp; + } + } + if (!cur) { return AVERROR_INVALIDDATA; } @@ -2215,6 +2294,10 @@ static int dash_read_seek(AVFormatContext *s, int stream_index, int64_t timestam if (!ret) ret = dash_seek(s, c->audios[i], seek_pos_msec, flags, !c->audios[i]->ctx); } + for (i = 0; i < c->n_subtitles; i++) { + if (!ret) + ret = dash_seek(s, c->subtitles[i], seek_pos_msec, flags, !c->subtitles[i]->ctx); + } return ret; }

1 0

lavc/libaomenc: Add a maximum constraint of 64 encoder threads.
by Jun Zhao 30 Nov '18

30 Nov '18

ffmpeg | branch: master | Jun Zhao <mypopydev(a)gmail.com> | Tue Nov 27 17:18:26 2018 +0800| [b87063c06dde35ef6b56f51df7642661a3b115da] | committer: James Almer lavc/libaomenc: Add a maximum constraint of 64 encoder threads. fixed the error in Intel(R) Xeon(R) Gold 6152 CPU like: [libaom-av1 @ 0x469f340] Failed to initialize encoder: Invalid parameter [libaom-av1 @ 0x469f340] Additional information: g_threads out of range [..MAX_NUM_THREADS] Signed-off-by: Jun Zhao <mypopydev(a)gmail.com> Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b87063c06dde35ef6… --- libavcodec/libaomenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index cb31c55825..17565017b4 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -504,7 +504,8 @@ static av_cold int aom_init(AVCodecContext *avctx, enccfg.g_h = avctx->height; enccfg.g_timebase.num = avctx->time_base.num; enccfg.g_timebase.den = avctx->time_base.den; - enccfg.g_threads = avctx->thread_count ? avctx->thread_count : av_cpu_count(); + enccfg.g_threads = + FFMIN(avctx->thread_count ? avctx->thread_count : av_cpu_count(), 64); if (ctx->lag_in_frames >= 0) enccfg.g_lag_in_frames = ctx->lag_in_frames;

1 0

avcodec/libdav1d: add an option to toggle Film Grain
by James Almer 29 Nov '18

29 Nov '18

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Wed Nov 28 22:54:19 2018 -0300| [e695b0beba4aab5c1197d1bc96eef1f42635c423] | committer: James Almer avcodec/libdav1d: add an option to toggle Film Grain Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e695b0beba4aab5c1… --- libavcodec/libdav1d.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index 9a24a3e408..52a7c10617 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -34,6 +34,7 @@ typedef struct Libdav1dContext { Dav1dData data; int tile_threads; + int apply_grain; } Libdav1dContext; static av_cold int libdav1d_init(AVCodecContext *c) @@ -46,6 +47,7 @@ static av_cold int libdav1d_init(AVCodecContext *c) dav1d_default_settings(&s); s.n_tile_threads = dav1d->tile_threads; + s.apply_grain = dav1d->apply_grain; s.n_frame_threads = FFMIN(c->thread_count ? c->thread_count : av_cpu_count(), DAV1D_MAX_FRAME_THREADS); res = dav1d_open(&dav1d->c, &s); @@ -216,6 +218,7 @@ static av_cold int libdav1d_close(AVCodecContext *c) #define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM static const AVOption libdav1d_options[] = { { "tilethreads", "Tile threads", OFFSET(tile_threads), AV_OPT_TYPE_INT, { .i64 = 1 }, 1, DAV1D_MAX_TILE_THREADS, VD }, + { "filmgrain", "Apply Film Grain", OFFSET(apply_grain), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, VD }, { NULL } };

1 0

avcodec/libdav1d: read profile from the sequence header referenced by the ouput picture
by James Almer 29 Nov '18

29 Nov '18

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Wed Nov 28 22:49:06 2018 -0300| [0fca2f60dac7a294719919ca32813e9fde19cc66] | committer: James Almer avcodec/libdav1d: read profile from the sequence header referenced by the ouput picture Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0fca2f60dac7a2947… --- libavcodec/libdav1d.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index ed2262df7c..9a24a3e408 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -84,14 +84,6 @@ static const enum AVPixelFormat pix_fmt[][2] = { [DAV1D_PIXEL_LAYOUT_I444] = { AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV444P10 }, }; -// TODO: Update once 12bit support is added. -static const int profile[] = { - [DAV1D_PIXEL_LAYOUT_I400] = FF_PROFILE_AV1_MAIN, - [DAV1D_PIXEL_LAYOUT_I420] = FF_PROFILE_AV1_MAIN, - [DAV1D_PIXEL_LAYOUT_I422] = FF_PROFILE_AV1_PROFESSIONAL, - [DAV1D_PIXEL_LAYOUT_I444] = FF_PROFILE_AV1_HIGH, -}; - static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) { Libdav1dContext *dav1d = c->priv_data; @@ -156,7 +148,7 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) frame->linesize[1] = p.stride[1]; frame->linesize[2] = p.stride[1]; - c->profile = profile[p.p.layout]; + c->profile = p.seq_hdr->profile; frame->format = c->pix_fmt = pix_fmt[p.p.layout][p.p.bpc == 10]; frame->width = p.p.w; frame->height = p.p.h;

1 0

avcodec/libdav1d: use constants defined in the public API to limit thread count
by James Almer 29 Nov '18

29 Nov '18

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Wed Nov 28 22:48:13 2018 -0300| [3cd275bcde5c0de509c239fff275e8277cece514] | committer: James Almer avcodec/libdav1d: use constants defined in the public API to limit thread count Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3cd275bcde5c0de50… --- libavcodec/libdav1d.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index cfa014455e..ed2262df7c 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -46,7 +46,7 @@ static av_cold int libdav1d_init(AVCodecContext *c) dav1d_default_settings(&s); s.n_tile_threads = dav1d->tile_threads; - s.n_frame_threads = FFMIN(c->thread_count ? c->thread_count : av_cpu_count(), 256); + s.n_frame_threads = FFMIN(c->thread_count ? c->thread_count : av_cpu_count(), DAV1D_MAX_FRAME_THREADS); res = dav1d_open(&dav1d->c, &s); if (res < 0) @@ -223,7 +223,7 @@ static av_cold int libdav1d_close(AVCodecContext *c) #define OFFSET(x) offsetof(Libdav1dContext, x) #define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM static const AVOption libdav1d_options[] = { - { "tilethreads", "Tile threads", OFFSET(tile_threads), AV_OPT_TYPE_INT, { .i64 = 1 }, 1, 64, VD, NULL }, + { "tilethreads", "Tile threads", OFFSET(tile_threads), AV_OPT_TYPE_INT, { .i64 = 1 }, 1, DAV1D_MAX_TILE_THREADS, VD }, { NULL } };

1 0

avcodec/libdav1d: remove init cleanup internal codec cap
by James Almer 29 Nov '18

29 Nov '18

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Wed Nov 28 22:40:23 2018 -0300| [53ca505acc533edd2e3333f76a324c0ed0a98ee0] | committer: James Almer avcodec/libdav1d: remove init cleanup internal codec cap It's no longer needed now that the AVFifoBuffer was removed. Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=53ca505acc533edd2… --- libavcodec/libdav1d.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index d927f11a9e..cfa014455e 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -245,8 +245,7 @@ AVCodec ff_libdav1d_decoder = { .flush = libdav1d_flush, .receive_frame = libdav1d_receive_frame, .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AUTO_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP | - FF_CODEC_CAP_SETS_PKT_DTS, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_SETS_PKT_DTS, .priv_class = &libdav1d_class, .wrapper_name = "libdav1d", };

1 0