July 2023 - ffmpeg-cvslog - lists.ffmpeg.org

cbs_h266: expand the bit depth range to 16 bits
by Frank Plowman 05 Jul '23

05 Jul '23

ffmpeg | branch: master | Frank Plowman <post(a)frankplowman.com> | Wed Jul 5 19:40:27 2023 +0800| [a8178be3b3f6666aa3501dc146661c120cbe7dfe] | committer: James Almer cbs_h266: expand the bit depth range to 16 bits Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a8178be3b3f6666aa… --- libavcodec/cbs_h266_syntax_template.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index ae44565a54..485c02f590 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -902,7 +902,7 @@ static int FUNC(vps) (CodedBitstreamContext *ctx, RWContext *rw, ues(vps_ols_dpb_pic_width[i], 0, UINT16_MAX, 1, i); ues(vps_ols_dpb_pic_height[i], 0, UINT16_MAX, 1, i); ubs(2, vps_ols_dpb_chroma_format[i], 1, i); - ues(vps_ols_dpb_bitdepth_minus8[i], 0, 2, 1, i); + ues(vps_ols_dpb_bitdepth_minus8[i], 0, 8, 1, i); if (vps_num_dpb_params > 1 && vps_num_dpb_params != num_multi_layer_olss) ues(vps_ols_dpb_params_idx[i], 0, vps_num_dpb_params - 1, 1, i); @@ -1158,7 +1158,7 @@ static int FUNC(sps)(CodedBitstreamContext *ctx, RWContext *rw, } - ue(sps_bitdepth_minus8, 0, 2); + ue(sps_bitdepth_minus8, 0, 8); qp_bd_offset = 6 * current->sps_bitdepth_minus8; flag(sps_entropy_coding_sync_enabled_flag);

1 0

lavfi/tonemap_vaapi: remove HDR metadata
by Haihao Xiang 05 Jul '23

05 Jul '23

ffmpeg | branch: master | Haihao Xiang <haihao.xiang(a)intel.com> | Fri Jun 30 19:51:32 2023 +0800| [ca939ebb4faf6aac343c22702e2f28e3eeed1ba1] | committer: Haihao Xiang lavfi/tonemap_vaapi: remove HDR metadata The HDR metadata should be removed after HDR to SDR conversion, otherwise the output frame still has HDR side data. Signed-off-by: Haihao Xiang <haihao.xiang(a)intel.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ca939ebb4faf6aac3… --- libavfilter/vf_tonemap_vaapi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavfilter/vf_tonemap_vaapi.c b/libavfilter/vf_tonemap_vaapi.c index cd2f4c2195..52303a8b86 100644 --- a/libavfilter/vf_tonemap_vaapi.c +++ b/libavfilter/vf_tonemap_vaapi.c @@ -309,6 +309,9 @@ static int tonemap_vaapi_filter_frame(AVFilterLink *inlink, AVFrame *input_frame av_get_pix_fmt_name(output_frame->format), output_frame->width, output_frame->height, output_frame->pts); + av_frame_remove_side_data(output_frame, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL); + av_frame_remove_side_data(output_frame, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA); + return ff_filter_frame(outlink, output_frame); fail:

1 0

avfilter/adynamicequalizer_template: refactor and improve output
by Paul B Mahol 05 Jul '23

05 Jul '23

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Jul 5 01:11:22 2023 +0200| [8622dcb39b6554dfcb54c2c95c8dcca96b46d60b] | committer: Paul B Mahol avfilter/adynamicequalizer_template: refactor and improve output > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8622dcb39b6554dfc… --- libavfilter/adynamicequalizer_template.c | 46 +++++++++++++------------------- libavfilter/af_adynamicequalizer.c | 12 +-------- 2 files changed, 20 insertions(+), 38 deletions(-) diff --git a/libavfilter/adynamicequalizer_template.c b/libavfilter/adynamicequalizer_template.c index a6b35aa93e..4f7d58c939 100644 --- a/libavfilter/adynamicequalizer_template.c +++ b/libavfilter/adynamicequalizer_template.c @@ -167,13 +167,16 @@ static int fn(filter_channels)(AVFilterContext *ctx, void *arg, int jobnr, int n ftype *dst = (ftype *)out->extended_data[ch]; ftype *state = (ftype *)s->state->extended_data[ch]; const ftype threshold = detection == 0 ? state[5] : s->threshold; + ftype fa[3], fm[3]; if (detection < 0) state[5] = threshold; + memcpy(fa, state + 8, sizeof(fa)); + memcpy(fm, state + 11, sizeof(fm)); + for (int n = 0; n < out->nb_samples; n++) { ftype detect, gain, v, listen; - ftype fa[3], fm[3]; ftype k, g; detect = listen = fn(get_svf)(src[n], dm, da, state); @@ -182,46 +185,32 @@ static int fn(filter_channels)(AVFilterContext *ctx, void *arg, int jobnr, int n if (detection > 0) state[5] = FMAX(state[5], detect); - if (direction == 0) { - if (detect < threshold) { - if (mode == 0) - detect = ONE / CLIP(ONE + makeup + (threshold - detect) * ratio, ONE, range); - else - detect = CLIP(ONE + makeup + (threshold - detect) * ratio, ONE, range); + if (mode >= 0) { + if (direction == 0 && detect < threshold) { + detect = CLIP(ONE + makeup + (threshold - detect) * ratio, ONE, range); + if (!mode) + detect = ONE / detect; + } else if (direction == 1 && detect > threshold) { + detect = CLIP(ONE + makeup + (detect - threshold) * ratio, ONE, range); + if (!mode) + detect = ONE / detect; } else { detect = ONE; } - } else { - if (detect > threshold) { - if (mode == 0) - detect = ONE / CLIP(ONE + makeup + (detect - threshold) * ratio, ONE, range); - else - detect = CLIP(ONE + makeup + (detect - threshold) * ratio, ONE, range); - } else { - detect = ONE; - } - } - if (direction == 0) { - if (detect > state[4]) { - detect = iattack * detect + attack * state[4]; - } else { - detect = irelease * detect + release * state[4]; - } - } else { - if (detect < state[4]) { + if ((direction == 0 && detect > state[4]) || (direction == 1 && detect < state[4])) { detect = iattack * detect + attack * state[4]; } else { detect = irelease * detect + release * state[4]; } } - if (state[4] != detect || n == 0) { + if (state[4] != detect) { state[4] = gain = detect; switch (tftype) { case 0: - k = ONE / (tqfactor * gain); + k = itqfactor / gain; fa[0] = ONE / (ONE + fg * (fg + k)); fa[1] = fg * fa[0]; @@ -262,6 +251,9 @@ static int fn(filter_channels)(AVFilterContext *ctx, void *arg, int jobnr, int n v = mode == -1 ? listen : v; dst[n] = ctx->is_disabled ? src[n] : v; } + + memcpy(state + 8, fa, sizeof(fa)); + memcpy(state + 11, fm, sizeof(fm)); } return 0; diff --git a/libavfilter/af_adynamicequalizer.c b/libavfilter/af_adynamicequalizer.c index a3aeee91c5..5a2c8efb2a 100644 --- a/libavfilter/af_adynamicequalizer.c +++ b/libavfilter/af_adynamicequalizer.c @@ -96,26 +96,16 @@ static int config_input(AVFilterLink *inlink) AudioDynamicEqualizerContext *s = ctx->priv; s->format = inlink->format; - s->state = ff_get_audio_buffer(inlink, 8); + s->state = ff_get_audio_buffer(inlink, 16); if (!s->state) return AVERROR(ENOMEM); switch (s->format) { case AV_SAMPLE_FMT_DBLP: - for (int ch = 0; ch < inlink->ch_layout.nb_channels; ch++) { - double *state = (double *)s->state->extended_data[ch]; - - state[4] = 1.; - } s->filter_prepare = filter_prepare_double; s->filter_channels = filter_channels_double; break; case AV_SAMPLE_FMT_FLTP: - for (int ch = 0; ch < inlink->ch_layout.nb_channels; ch++) { - float *state = (float *)s->state->extended_data[ch]; - - state[4] = 1.; - } s->filter_prepare = filter_prepare_float; s->filter_channels = filter_channels_float; break;

1 0

bwdif_vulkan: clamp the temporarily interpolated sample spatially
by Lynne 03 Jul '23

03 Jul '23

ffmpeg | branch: master | Lynne <dev(a)lynne.ee> | Tue Jul 4 00:48:09 2023 +0200| [9ff834c2a0dbbe5544ec09b56d077a3b21f728c0] | committer: Lynne bwdif_vulkan: clamp the temporarily interpolated sample spatially This makes the filter output match that of the C version. It was left intentionally while we figured out if it was better or not, and while it makes certain samples better, it makes static samples jump around slightly. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ff834c2a0dbbe554… --- libavfilter/vf_bwdif_vulkan.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavfilter/vf_bwdif_vulkan.c b/libavfilter/vf_bwdif_vulkan.c index 1fc74d1544..db916b22cd 100644 --- a/libavfilter/vf_bwdif_vulkan.c +++ b/libavfilter/vf_bwdif_vulkan.c @@ -86,8 +86,7 @@ static const char filter_fn[] = { C(0, ) C(1, bvec4 interpolate_cnd1 = greaterThan(abs(fc - fe), temp_diff[0]); ) C(1, vec4 interpol = mix(interpolate_cur, interpolate_all, interpolate_cnd1); ) - /* Cliping interpol between [fd - diff, fd + diff] is intentionally left out. - * Removing the clipping increases quality. TODO: research and fix the C version to match this. */ + C(1, interpol = clamp(interpol, fd - diff, fd + diff); ) C(1, return mix(interpol, fd, diff_mask); ) C(0, } ) };

1 0

avformat/asfdec_f: fix need_parsing flag for codec mpeg4
by Zhao Zhili 03 Jul '23

03 Jul '23

ffmpeg | branch: master | Zhao Zhili <zhilizhao(a)tencent.com> | Tue Jun 13 15:37:18 2023 +0800| [d4b989c94d7ec2693bd52b286099f02d99e2bc4f] | committer: Zhao Zhili avformat/asfdec_f: fix need_parsing flag for codec mpeg4 AVSTREAM_PARSE_FULL_ONCE is only implemented for H.264. Signed-off-by: Zhao Zhili <zhilizhao(a)tencent.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d4b989c94d7ec2693… --- libavformat/asfdec_f.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c index 1e3eb33fd6..5405956467 100644 --- a/libavformat/asfdec_f.c +++ b/libavformat/asfdec_f.c @@ -460,7 +460,7 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size) if (st->codecpar->codec_id == AV_CODEC_ID_H264) sti->need_parsing = AVSTREAM_PARSE_FULL_ONCE; if (st->codecpar->codec_id == AV_CODEC_ID_MPEG4) - sti->need_parsing = AVSTREAM_PARSE_FULL_ONCE; + sti->need_parsing = AVSTREAM_PARSE_FULL; if (st->codecpar->codec_id == AV_CODEC_ID_HEVC) sti->need_parsing = AVSTREAM_PARSE_FULL; }

1 0

avformat/asfdec_f: support bmp_tags_unofficial
by Zhao Zhili 03 Jul '23

03 Jul '23

ffmpeg | branch: master | Zhao Zhili <zhilizhao(a)tencent.com> | Tue Jun 13 15:37:17 2023 +0800| [3eb7968ed98229e3b44a91b89c7cd5512643b182] | committer: Zhao Zhili avformat/asfdec_f: support bmp_tags_unofficial Signed-off-by: Zhao Zhili <zhilizhao(a)tencent.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3eb7968ed98229e3b… --- libavformat/asfdec_f.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c index bdbd4271c8..1e3eb33fd6 100644 --- a/libavformat/asfdec_f.c +++ b/libavformat/asfdec_f.c @@ -445,6 +445,8 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size) st->codecpar->codec_tag = tag1; st->codecpar->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag1); + if (!st->codecpar->codec_id) + st->codecpar->codec_id = ff_codec_get_id(ff_codec_bmp_tags_unofficial, tag1); if (tag1 == MKTAG('D', 'V', 'R', ' ')) { sti->need_parsing = AVSTREAM_PARSE_FULL; /* issue658 contains wrong w/h and MS even puts a fake seq header @@ -459,6 +461,8 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size) sti->need_parsing = AVSTREAM_PARSE_FULL_ONCE; if (st->codecpar->codec_id == AV_CODEC_ID_MPEG4) sti->need_parsing = AVSTREAM_PARSE_FULL_ONCE; + if (st->codecpar->codec_id == AV_CODEC_ID_HEVC) + sti->need_parsing = AVSTREAM_PARSE_FULL; } pos2 = avio_tell(pb); avio_skip(pb, size - (pos2 - pos1 + 24));

1 0

avcodec/hevc_parse: check the size of hvcC is at least 23
by Zhao Zhili 03 Jul '23

03 Jul '23

ffmpeg | branch: master | Zhao Zhili <zhilizhao(a)tencent.com> | Tue Jun 13 15:37:16 2023 +0800| [bdb4b64f16b75c4d4cd88c0755aa6111cadaa602] | committer: Zhao Zhili avcodec/hevc_parse: check the size of hvcC is at least 23 The code after the check skip 21 bytes and then read two bytes. Signed-off-by: Zhao Zhili <zhilizhao(a)tencent.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bdb4b64f16b75c4d4… --- libavcodec/hevc_parse.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/hevc_parse.c b/libavcodec/hevc_parse.c index 1f3beed183..7bc28fd081 100644 --- a/libavcodec/hevc_parse.c +++ b/libavcodec/hevc_parse.c @@ -88,8 +88,10 @@ int ff_hevc_decode_extradata(const uint8_t *data, int size, HEVCParamSets *ps, /* data[0] == 1 is configurationVersion from 14496-15. * data[0] == 0 is for backward compatibility predates the standard. + * + * Minimum number of bytes of hvcC with 0 numOfArrays is 23. */ - if (size > 3 && ((data[0] == 1) || (data[0] == 0 && (data[1] || data[2] > 1)))) { + if (size >= 23 && ((data[0] == 1) || (data[0] == 0 && (data[1] || data[2] > 1)))) { /* It seems the extradata is encoded as hvcC format. */ int i, j, num_arrays, nal_len_size;

1 0

avcodec/hevc_parse: restrict configurationVersion to 0 and 1
by Zhao Zhili 03 Jul '23

03 Jul '23

ffmpeg | branch: master | Zhao Zhili <zhilizhao(a)tencent.com> | Tue Jun 13 15:37:15 2023 +0800| [372f71cdc76c1e265d5be02de1f7e9f131912e9f] | committer: Zhao Zhili avcodec/hevc_parse: restrict configurationVersion to 0 and 1 The standard only defined configurationVersion 1. configurationVersion 0 is for backward compatibility predates the standard. This patch reduces the chance that some malformated streams being detected as hvcC. Signed-off-by: Zhao Zhili <zhilizhao(a)tencent.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=372f71cdc76c1e265… --- libavcodec/hevc_parse.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/hevc_parse.c b/libavcodec/hevc_parse.c index 29dfd479f3..1f3beed183 100644 --- a/libavcodec/hevc_parse.c +++ b/libavcodec/hevc_parse.c @@ -86,11 +86,11 @@ int ff_hevc_decode_extradata(const uint8_t *data, int size, HEVCParamSets *ps, bytestream2_init(&gb, data, size); - if (size > 3 && (data[0] || data[1] || data[2] > 1)) { - /* It seems the extradata is encoded as hvcC format. - * Temporarily, we support configurationVersion==0 until 14496-15 3rd - * is finalized. When finalized, configurationVersion will be 1 and we - * can recognize hvcC by checking if avctx->extradata[0]==1 or not. */ + /* data[0] == 1 is configurationVersion from 14496-15. + * data[0] == 0 is for backward compatibility predates the standard. + */ + if (size > 3 && ((data[0] == 1) || (data[0] == 0 && (data[1] || data[2] > 1)))) { + /* It seems the extradata is encoded as hvcC format. */ int i, j, num_arrays, nal_len_size; *is_nalff = 1;

1 0

fftools/ffplay: remove usage of internal AVInputFormat.read_seek field
by James Almer 02 Jul '23

02 Jul '23

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Thu Jun 29 18:47:53 2023 -0300| [50f34172e0cca2cabc5836308ec66dbf93f5f2a3] | committer: James Almer fftools/ffplay: remove usage of internal AVInputFormat.read_seek field It's an internal field, so it should not be touched. Reviewed-by: Marton Balint <cus(a)passwd.hu> Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=50f34172e0cca2cab… --- fftools/ffplay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fftools/ffplay.c b/fftools/ffplay.c index 15fd644974..663f61d8b2 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -2639,7 +2639,7 @@ static int stream_component_open(VideoState *is, int stream_index) if ((ret = decoder_init(&is->auddec, avctx, &is->audioq, is->continue_read_thread)) < 0) goto fail; - if ((is->ic->iformat->flags & (AVFMT_NOBINSEARCH | AVFMT_NOGENSEARCH | AVFMT_NO_BYTE_SEEK)) && !is->ic->iformat->read_seek) { + if (is->ic->iformat->flags & AVFMT_NOTIMESTAMPS) { is->auddec.start_pts = is->audio_st->start_time; is->auddec.start_pts_tb = is->audio_st->time_base; }

1 0

Add SMC vsynth tests
by Tomas Härdin 02 Jul '23

02 Jul '23

ffmpeg | branch: master | Tomas Härdin <git(a)haerdin.se> | Sun Jul 2 16:58:11 2023 +0200| [25a91824af5d3699a5af49f80a4fce3c053031f7] | committer: Tomas Härdin Add SMC vsynth tests > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=25a91824af5d3699a… --- tests/fate/vcodec.mak | 4 ++++ tests/ref/vsynth/vsynth1-smc | 4 ++++ tests/ref/vsynth/vsynth2-smc | 4 ++++ tests/ref/vsynth/vsynth3-smc | 4 ++++ tests/ref/vsynth/vsynth_lena-smc | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index ef8904613a..2839e54de8 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -404,6 +404,10 @@ FATE_VCODEC-$(call ENCDEC, RV20, RM) += rv20 fate-vsynth%-rv20: ENCOPTS = -qscale 10 fate-vsynth%-rv20: FMT = rm +FATE_VCODEC_SCALE-$(call ENCDEC, SMC, MOV) += smc +fate-vsynth%-smc: CODEC = smc +fate-vsynth%-smc: FMT = mov + FATE_VCODEC_SCALE-$(call ENCDEC, SNOW, AVI) += snow snow-hpel fate-vsynth%-snow: ENCOPTS = -qscale 2 -flags +qpel \ -motion_est iter -dia_size 2 \ diff --git a/tests/ref/vsynth/vsynth1-smc b/tests/ref/vsynth/vsynth1-smc new file mode 100644 index 0000000000..09f4bd4ce1 --- /dev/null +++ b/tests/ref/vsynth/vsynth1-smc @@ -0,0 +1,4 @@ +b92226742d745515732a5e7b8a03e7b7 *tests/data/fate/vsynth1-smc.mov +4613320 tests/data/fate/vsynth1-smc.mov +f142ee03bf9f37bb2e1902fe32366bbf *tests/data/fate/vsynth1-smc.out.rawvideo +stddev: 8.69 PSNR: 29.34 MAXDIFF: 64 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-smc b/tests/ref/vsynth/vsynth2-smc new file mode 100644 index 0000000000..3ce6478e56 --- /dev/null +++ b/tests/ref/vsynth/vsynth2-smc @@ -0,0 +1,4 @@ +6e97e428fb20e96a5b8fc8a21f427504 *tests/data/fate/vsynth2-smc.mov +3475261 tests/data/fate/vsynth2-smc.mov +df26a524cad8ebf0cf5ba4376c5f115f *tests/data/fate/vsynth2-smc.out.rawvideo +stddev: 7.57 PSNR: 30.54 MAXDIFF: 35 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth3-smc b/tests/ref/vsynth/vsynth3-smc new file mode 100644 index 0000000000..ed9efd92e2 --- /dev/null +++ b/tests/ref/vsynth/vsynth3-smc @@ -0,0 +1,4 @@ +e4eb9909095e02577b59004e209ad8ec *tests/data/fate/vsynth3-smc.mov +65521 tests/data/fate/vsynth3-smc.mov +fa6042492a3116c1ae9a32b487caa677 *tests/data/fate/vsynth3-smc.out.rawvideo +stddev: 8.88 PSNR: 29.16 MAXDIFF: 51 bytes: 86700/ 86700 diff --git a/tests/ref/vsynth/vsynth_lena-smc b/tests/ref/vsynth/vsynth_lena-smc new file mode 100644 index 0000000000..2f9f5c1e87 --- /dev/null +++ b/tests/ref/vsynth/vsynth_lena-smc @@ -0,0 +1,4 @@ +037fa90a1ac659ff4dca22fb375dc7e1 *tests/data/fate/vsynth_lena-smc.mov +3502732 tests/data/fate/vsynth_lena-smc.mov +db453693ceae6f65c173dd716ee2662e *tests/data/fate/vsynth_lena-smc.out.rawvideo +stddev: 8.07 PSNR: 29.99 MAXDIFF: 32 bytes: 7603200/ 7603200

1 0

avcodec/decode: Preserve AFD side data when going from AVPacket to AVFrame
by Devin Heitmueller 02 Jul '23

02 Jul '23

ffmpeg | branch: master | Devin Heitmueller <devin.heitmueller(a)ltnglobal.com> | Fri Jun 30 17:38:49 2023 -0400| [695789eacc19332d066e2184e340bad3d321a4c8] | committer: Marton Balint avcodec/decode: Preserve AFD side data when going from AVPacket to AVFrame This is needed to ensure that AFD data continues to work when capturing V210 video with the Decklink libavdevice input. Signed-off-by: Devin Heitmueller <dheitmueller(a)ltnglobal.com> Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=695789eacc19332d0… --- libavcodec/decode.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index a7c130207c..6ee2c85a75 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1331,6 +1331,7 @@ int ff_decode_frame_props_from_pkt(const AVCodecContext *avctx, { AV_PKT_DATA_MASTERING_DISPLAY_METADATA, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA }, { AV_PKT_DATA_CONTENT_LIGHT_LEVEL, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL }, { AV_PKT_DATA_A53_CC, AV_FRAME_DATA_A53_CC }, + { AV_PKT_DATA_AFD, AV_FRAME_DATA_AFD }, { AV_PKT_DATA_ICC_PROFILE, AV_FRAME_DATA_ICC_PROFILE }, { AV_PKT_DATA_S12M_TIMECODE, AV_FRAME_DATA_S12M_TIMECODE }, { AV_PKT_DATA_DYNAMIC_HDR10_PLUS, AV_FRAME_DATA_DYNAMIC_HDR_PLUS },

1 0

avdevice/decklink_enc: add support for SMPTE 2038 VANC packet output
by Devin Heitmueller 02 Jul '23

02 Jul '23

ffmpeg | branch: master | Devin Heitmueller <devin.heitmueller(a)ltnglobal.com> | Fri Jun 30 17:14:39 2023 -0400| [ac4247270c055ecc56e6aca94fbb13a3f8aab3ce] | committer: Marton Balint avdevice/decklink_enc: add support for SMPTE 2038 VANC packet output Support decoding and embedding VANC packets delivered via SMPTE 2038 into the SDI output. We leverage an intermediate queue because data packets are announced separately from video but we need to embed the data into the video frame when it is output. Note that this patch has some additional abstraction for data streams in general as opposed to just SMPTE 2038 packets. This is because subsequent patches will introduce support for other data codecs. Thanks to Marton Balint for review/feedback. Signed-off-by: Devin Heitmueller <dheitmueller(a)ltnglobal.com> Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ac4247270c055ecc5… --- doc/outdevs.texi | 5 +++ libavdevice/decklink_common.cpp | 16 +++++++ libavdevice/decklink_common.h | 4 ++ libavdevice/decklink_common_c.h | 1 + libavdevice/decklink_enc.cpp | 94 ++++++++++++++++++++++++++++++++++++++++- libavdevice/decklink_enc_c.c | 1 + libavdevice/version.h | 2 +- 7 files changed, 121 insertions(+), 2 deletions(-) diff --git a/doc/outdevs.texi b/doc/outdevs.texi index 93391dbed7..f0484bbf8f 100644 --- a/doc/outdevs.texi +++ b/doc/outdevs.texi @@ -235,6 +235,11 @@ Enable SMPTE Level A mode on the used output. Must be @samp{unset}, @samp{true} or @samp{false}. Defaults to @option{unset}. +@item vanc_queue_size +Sets maximum output buffer size in bytes for VANC data. If the buffering reaches this value, +outgoing VANC data will be dropped. +Defaults to @samp{1048576}. + @end table @subsection Examples diff --git a/libavdevice/decklink_common.cpp b/libavdevice/decklink_common.cpp index b3b83f53b8..47de7ef6b0 100644 --- a/libavdevice/decklink_common.cpp +++ b/libavdevice/decklink_common.cpp @@ -484,6 +484,22 @@ int ff_decklink_packet_queue_get(DecklinkPacketQueue *q, AVPacket *pkt, int bloc return ret; } +int64_t ff_decklink_packet_queue_peekpts(DecklinkPacketQueue *q) +{ + PacketListEntry *pkt1; + int64_t pts = -1; + + pthread_mutex_lock(&q->mutex); + pkt1 = q->pkt_list.head; + if (pkt1) { + pts = pkt1->pkt.pts; + } + pthread_mutex_unlock(&q->mutex); + + return pts; +} + + int ff_decklink_list_devices(AVFormatContext *avctx, struct AVDeviceInfoList *device_list, int show_inputs, int show_outputs) diff --git a/libavdevice/decklink_common.h b/libavdevice/decklink_common.h index 53e9983abe..34ab1b9670 100644 --- a/libavdevice/decklink_common.h +++ b/libavdevice/decklink_common.h @@ -115,6 +115,9 @@ struct decklink_ctx { CCFifo cc_fifo; ///< closed captions + /* Output VANC queue */ + DecklinkPacketQueue vanc_queue; + /* Streams present */ int audio; int video; @@ -241,5 +244,6 @@ void ff_decklink_packet_queue_end(DecklinkPacketQueue *q); unsigned long long ff_decklink_packet_queue_size(DecklinkPacketQueue *q); int ff_decklink_packet_queue_put(DecklinkPacketQueue *q, AVPacket *pkt); int ff_decklink_packet_queue_get(DecklinkPacketQueue *q, AVPacket *pkt, int block); +int64_t ff_decklink_packet_queue_peekpts(DecklinkPacketQueue *q); #endif /* AVDEVICE_DECKLINK_COMMON_H */ diff --git a/libavdevice/decklink_common_c.h b/libavdevice/decklink_common_c.h index 75896ad32b..9c55d89149 100644 --- a/libavdevice/decklink_common_c.h +++ b/libavdevice/decklink_common_c.h @@ -63,6 +63,7 @@ struct decklink_cctx { char *format_code; int raw_format; int64_t queue_size; + int64_t vanc_queue_size; int copyts; int64_t timestamp_align; int timing_offset; diff --git a/libavdevice/decklink_enc.cpp b/libavdevice/decklink_enc.cpp index 6906cb0882..1809f79cac 100644 --- a/libavdevice/decklink_enc.cpp +++ b/libavdevice/decklink_enc.cpp @@ -345,6 +345,25 @@ static int decklink_setup_subtitle(AVFormatContext *avctx, AVStream *st) return ret; } +static int decklink_setup_data(AVFormatContext *avctx, AVStream *st) +{ + int ret = -1; + + switch(st->codecpar->codec_id) { +#if CONFIG_LIBKLVANC + case AV_CODEC_ID_SMPTE_2038: + /* No specific setup required */ + ret = 0; + break; +#endif + default: + av_log(avctx, AV_LOG_ERROR, "Unsupported data codec specified\n"); + break; + } + + return ret; +} + av_cold int ff_decklink_write_trailer(AVFormatContext *avctx) { struct decklink_cctx *cctx = (struct decklink_cctx *)avctx->priv_data; @@ -370,6 +389,7 @@ av_cold int ff_decklink_write_trailer(AVFormatContext *avctx) #if CONFIG_LIBKLVANC klvanc_context_destroy(ctx->vanc_ctx); #endif + ff_decklink_packet_queue_end(&ctx->vanc_queue); ff_ccfifo_uninit(&ctx->cc_fifo); av_freep(&cctx->ctx); @@ -552,6 +572,58 @@ static int decklink_construct_vanc(AVFormatContext *avctx, struct decklink_ctx * construct_cc(avctx, ctx, pkt, &vanc_lines); construct_afd(avctx, ctx, pkt, &vanc_lines, st); + /* See if there any pending data packets to process */ + while (ff_decklink_packet_queue_size(&ctx->vanc_queue) > 0) { + AVStream *vanc_st; + AVPacket vanc_pkt; + int64_t pts; + + pts = ff_decklink_packet_queue_peekpts(&ctx->vanc_queue); + if (pts > ctx->last_pts) { + /* We haven't gotten to the video frame we are supposed to inject + the oldest VANC packet into yet, so leave it on the queue... */ + break; + } + + ret = ff_decklink_packet_queue_get(&ctx->vanc_queue, &vanc_pkt, 1); + if (vanc_pkt.pts + 1 < ctx->last_pts) { + av_log(avctx, AV_LOG_WARNING, "VANC packet too old, throwing away\n"); + av_packet_unref(&vanc_pkt); + continue; + } + + vanc_st = avctx->streams[vanc_pkt.stream_index]; + if (vanc_st->codecpar->codec_id == AV_CODEC_ID_SMPTE_2038) { + struct klvanc_smpte2038_anc_data_packet_s *pkt_2038 = NULL; + + klvanc_smpte2038_parse_pes_payload(vanc_pkt.data, vanc_pkt.size, &pkt_2038); + if (pkt_2038 == NULL) { + av_log(avctx, AV_LOG_ERROR, "failed to decode SMPTE 2038 PES packet"); + av_packet_unref(&vanc_pkt); + continue; + } + for (int i = 0; i < pkt_2038->lineCount; i++) { + struct klvanc_smpte2038_anc_data_line_s *l = &pkt_2038->lines[i]; + uint16_t *vancWords = NULL; + uint16_t vancWordCount; + + if (klvanc_smpte2038_convert_line_to_words(l, &vancWords, + &vancWordCount) < 0) + break; + + ret = klvanc_line_insert(ctx->vanc_ctx, &vanc_lines, vancWords, + vancWordCount, l->line_number, 0); + free(vancWords); + if (ret != 0) { + av_log(avctx, AV_LOG_ERROR, "VANC line insertion failed\n"); + break; + } + } + klvanc_smpte2038_anc_data_packet_free(pkt_2038); + } + av_packet_unref(&vanc_pkt); + } + IDeckLinkVideoFrameAncillary *vanc; int result = ctx->dlo->CreateAncillaryData(bmdFormat10BitYUV, &vanc); if (result != S_OK) { @@ -750,6 +822,18 @@ static int decklink_write_subtitle_packet(AVFormatContext *avctx, AVPacket *pkt) return 0; } +static int decklink_write_data_packet(AVFormatContext *avctx, AVPacket *pkt) +{ + struct decklink_cctx *cctx = (struct decklink_cctx *)avctx->priv_data; + struct decklink_ctx *ctx = (struct decklink_ctx *)cctx->ctx; + + if (ff_decklink_packet_queue_put(&ctx->vanc_queue, pkt) < 0) { + av_log(avctx, AV_LOG_WARNING, "Failed to queue DATA packet\n"); + } + + return 0; +} + extern "C" { av_cold int ff_decklink_write_header(AVFormatContext *avctx) @@ -814,6 +898,9 @@ av_cold int ff_decklink_write_header(AVFormatContext *avctx) } else if (c->codec_type == AVMEDIA_TYPE_VIDEO) { if (decklink_setup_video(avctx, st)) goto error; + } else if (c->codec_type == AVMEDIA_TYPE_DATA) { + if (decklink_setup_data(avctx, st)) + goto error; } else if (c->codec_type == AVMEDIA_TYPE_SUBTITLE) { if (decklink_setup_subtitle(avctx, st)) goto error; @@ -823,13 +910,16 @@ av_cold int ff_decklink_write_header(AVFormatContext *avctx) } } + /* Reconfigure the data/subtitle stream clocks to match the video */ for (n = 0; n < avctx->nb_streams; n++) { AVStream *st = avctx->streams[n]; AVCodecParameters *c = st->codecpar; - if(c->codec_type == AVMEDIA_TYPE_SUBTITLE) + if(c->codec_type == AVMEDIA_TYPE_DATA || + c->codec_type == AVMEDIA_TYPE_SUBTITLE) avpriv_set_pts_info(st, 64, ctx->bmd_tb_num, ctx->bmd_tb_den); } + ff_decklink_packet_queue_init(avctx, &ctx->vanc_queue, cctx->vanc_queue_size); ret = ff_ccfifo_init(&ctx->cc_fifo, av_make_q(ctx->bmd_tb_den, ctx->bmd_tb_num), avctx); if (ret < 0) { @@ -852,6 +942,8 @@ int ff_decklink_write_packet(AVFormatContext *avctx, AVPacket *pkt) return decklink_write_video_packet(avctx, pkt); else if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) return decklink_write_audio_packet(avctx, pkt); + else if (st->codecpar->codec_type == AVMEDIA_TYPE_DATA) + return decklink_write_data_packet(avctx, pkt); else if (st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE) return decklink_write_subtitle_packet(avctx, pkt); diff --git a/libavdevice/decklink_enc_c.c b/libavdevice/decklink_enc_c.c index 0a3984b9e2..25ffe77784 100644 --- a/libavdevice/decklink_enc_c.c +++ b/libavdevice/decklink_enc_c.c @@ -32,6 +32,7 @@ static const AVOption options[] = { { "list_devices", "use ffmpeg -sinks decklink instead", OFFSET(list_devices), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, ENC | AV_OPT_FLAG_DEPRECATED}, { "list_formats", "list supported formats" , OFFSET(list_formats), AV_OPT_TYPE_INT , { .i64 = 0 }, 0, 1, ENC }, { "preroll" , "video preroll in seconds", OFFSET(preroll ), AV_OPT_TYPE_DOUBLE, { .dbl = 0.5 }, 0, 5, ENC }, + { "vanc_queue_size", "VANC queue buffer size", OFFSET(vanc_queue_size), AV_OPT_TYPE_INT64, { .i64 = (1024 * 1024)}, 0, INT64_MAX, ENC }, #if BLACKMAGIC_DECKLINK_API_VERSION >= 0x0b000000 { "duplex_mode" , "duplex mode" , OFFSET(duplex_mode ), AV_OPT_TYPE_INT , { .i64 = 0 }, 0, 5, ENC, "duplex_mode"}, #else diff --git a/libavdevice/version.h b/libavdevice/version.h index 5cd01a1672..0796e41221 100644 --- a/libavdevice/version.h +++ b/libavdevice/version.h @@ -30,7 +30,7 @@ #include "version_major.h" #define LIBAVDEVICE_VERSION_MINOR 2 -#define LIBAVDEVICE_VERSION_MICRO 100 +#define LIBAVDEVICE_VERSION_MICRO 101 #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \ LIBAVDEVICE_VERSION_MINOR, \

1 0

avdevice/decklink: move queue_size to an argument for ff_decklink_packet_queue_init
by Devin Heitmueller 02 Jul '23

02 Jul '23

ffmpeg | branch: master | Devin Heitmueller <devin.heitmueller(a)ltnglobal.com> | Fri Jun 30 17:14:38 2023 -0400| [e7d800fe89d337a0414d4d3b2de4162d94fe7046] | committer: Marton Balint avdevice/decklink: move queue_size to an argument for ff_decklink_packet_queue_init The existing queue initialization function would always sets it's maximum queue size to ctx->queue_size. But because we are introducing more queues we may want the sizes to differ between them. Move the specification of the queue size into an argument, which can be passed from the caller. This patch makes no functional change to the behavior. It is being made to accommodate Marton Balin's request to split out the queue size for the new VANC queue being introduced in a later patch. Signed-off-by: Devin Heitmueller <dheitmueller(a)ltnglobal.com> Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e7d800fe89d337a04… --- libavdevice/decklink_common.cpp | 5 ++--- libavdevice/decklink_common.h | 2 +- libavdevice/decklink_dec.cpp | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/libavdevice/decklink_common.cpp b/libavdevice/decklink_common.cpp index b6cc8d71f1..b3b83f53b8 100644 --- a/libavdevice/decklink_common.cpp +++ b/libavdevice/decklink_common.cpp @@ -390,14 +390,13 @@ int ff_decklink_set_format(AVFormatContext *avctx, decklink_direction_t directio return ff_decklink_set_format(avctx, 0, 0, 0, 0, AV_FIELD_UNKNOWN, direction); } -void ff_decklink_packet_queue_init(AVFormatContext *avctx, DecklinkPacketQueue *q) +void ff_decklink_packet_queue_init(AVFormatContext *avctx, DecklinkPacketQueue *q, int64_t queue_size) { - struct decklink_cctx *ctx = (struct decklink_cctx *)avctx->priv_data; memset(q, 0, sizeof(DecklinkPacketQueue)); pthread_mutex_init(&q->mutex, NULL); pthread_cond_init(&q->cond, NULL); q->avctx = avctx; - q->max_q_size = ctx->queue_size; + q->max_q_size = queue_size; } void ff_decklink_packet_queue_flush(DecklinkPacketQueue *q) diff --git a/libavdevice/decklink_common.h b/libavdevice/decklink_common.h index ebb5b94bed..53e9983abe 100644 --- a/libavdevice/decklink_common.h +++ b/libavdevice/decklink_common.h @@ -235,7 +235,7 @@ int ff_decklink_list_formats(AVFormatContext *avctx, decklink_direction_t direct void ff_decklink_cleanup(AVFormatContext *avctx); int ff_decklink_init_device(AVFormatContext *avctx, const char* name); -void ff_decklink_packet_queue_init(AVFormatContext *avctx, DecklinkPacketQueue *q); +void ff_decklink_packet_queue_init(AVFormatContext *avctx, DecklinkPacketQueue *q, int64_t queue_size); void ff_decklink_packet_queue_flush(DecklinkPacketQueue *q); void ff_decklink_packet_queue_end(DecklinkPacketQueue *q); unsigned long long ff_decklink_packet_queue_size(DecklinkPacketQueue *q); diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp index 66abee1268..11640f72ca 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -1297,7 +1297,7 @@ av_cold int ff_decklink_read_header(AVFormatContext *avctx) goto error; } - ff_decklink_packet_queue_init(avctx, &ctx->queue); + ff_decklink_packet_queue_init(avctx, &ctx->queue, cctx->queue_size); if (ctx->dli->StartStreams() != S_OK) { av_log(avctx, AV_LOG_ERROR, "Cannot start input stream\n");

1 0

lavc/videotoolboxenc: fix enabling low-latency encode
by xufuji456 02 Jul '23

02 Jul '23

ffmpeg | branch: master | xufuji456 <839789740(a)qq.com> | Wed Jun 21 17:38:33 2023 +0800| [5930d397ef1555d8aba2d1e3d1dc694922650101] | committer: Rick Kern lavc/videotoolboxenc: fix enabling low-latency encode Use CFDictionarySetValue to enable low-latency encoding mode. Since the key is a type of "EncoderSpecification", instead of "CompressionProperty". Signed-off-by: xufuji456 <839789740(a)qq.com> Signed-off-by: Rick Kern <kernrj(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5930d397ef1555d8a… --- libavcodec/videotoolboxenc.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index a313087876..6114351392 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -1536,17 +1536,6 @@ static int vtenc_create_encoder(AVCodecContext *avctx, } } - // low-latency mode: eliminate frame reordering, follow a one-in-one-out encoding mode - if ((avctx->flags & AV_CODEC_FLAG_LOW_DELAY) && avctx->codec_id == AV_CODEC_ID_H264) { - status = VTSessionSetProperty(vtctx->session, - compat_keys.kVTVideoEncoderSpecification_EnableLowLatencyRateControl, - kCFBooleanTrue); - - if (status) { - av_log(avctx, AV_LOG_ERROR, "Error setting low latency property: %d\n", status); - } - } - if ((avctx->flags & AV_CODEC_FLAG_CLOSED_GOP) != 0) { set_encoder_property_or_log(avctx, compat_keys.kVTCompressionPropertyKey_AllowOpenGOP, @@ -1690,6 +1679,13 @@ static int vtenc_configure_encoder(AVCodecContext *avctx) } #endif + // low-latency mode: eliminate frame reordering, follow a one-in-one-out encoding mode + if ((avctx->flags & AV_CODEC_FLAG_LOW_DELAY) && avctx->codec_id == AV_CODEC_ID_H264) { + CFDictionarySetValue(enc_info, + compat_keys.kVTVideoEncoderSpecification_EnableLowLatencyRateControl, + kCFBooleanTrue); + } + if (avctx->pix_fmt != AV_PIX_FMT_VIDEOTOOLBOX) { status = create_cv_pixel_buffer_info(avctx, &pixel_buffer_info); if (status)

1 0

fate/cbs: fix sample path for discard tests
by James Almer 02 Jul '23

02 Jul '23

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Sun Jul 2 12:53:23 2023 -0300| [8a6d3482de7994cbdc4ed4ea6160224abd91ee09] | committer: James Almer fate/cbs: fix sample path for discard tests Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8a6d3482de7994cbd… --- tests/fate/cbs.mak | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/fate/cbs.mak b/tests/fate/cbs.mak index 6a68fcc593..4d8742d99c 100644 --- a/tests/fate/cbs.mak +++ b/tests/fate/cbs.mak @@ -86,7 +86,7 @@ FATE_CBS_DISCARD_TYPES = \ nonintra \ nonkey -$(foreach N,$(FATE_CBS_DISCARD_TYPES),$(eval $(call FATE_CBS_DISCARD_TEST,h264,$(N),$(TARGET_SAMPLES)/h264/interlaced_crop.mp4,h264))) +$(foreach N,$(FATE_CBS_DISCARD_TYPES),$(eval $(call FATE_CBS_DISCARD_TEST,h264,$(N),h264/interlaced_crop.mp4,h264))) FATE_CBS_H264-$(call ALLYES, MOV_DEMUXER, H264_MUXER, H264_PARSER, FILTER_UNITS_BSF) += $(FATE_CBS_h264_DISCARD) @@ -157,7 +157,7 @@ $(foreach N,$(FATE_CBS_HEVC_SAMPLES),$(eval $(call FATE_CBS_TEST,hevc,$(basename FATE_CBS_HEVC-$(call FATE_CBS_DEPS, HEVC, HEVC, HEVC, HEVC, HEVC) = $(FATE_CBS_hevc) -$(foreach N,$(FATE_CBS_DISCARD_TYPES),$(eval $(call FATE_CBS_DISCARD_TEST,hevc,$(N),$(TARGET_SAMPLES)/hevc-conformance/WPP_A_ericsson_MAIN10_2.bit,hevc))) +$(foreach N,$(FATE_CBS_DISCARD_TYPES),$(eval $(call FATE_CBS_DISCARD_TEST,hevc,$(N),hevc-conformance/WPP_A_ericsson_MAIN10_2.bit,hevc))) FATE_CBS_HEVC-$(call ALLYES, HEVC_DEMUXER, HEVC_MUXER, HEVC_PARSER, FILTER_UNITS_BSF) += $(FATE_CBS_hevc_DISCARD)

1 0

cbs_h266: fix typo for ols_mode_idc == 2
by Nuo Mi 02 Jul '23

02 Jul '23

ffmpeg | branch: master | Nuo Mi <nuomi2021(a)gmail.com> | Sun Jul 2 18:15:40 2023 +0800| [3720fa5fecc69af5fb22b6341d527788274db091] | committer: James Almer cbs_h266: fix typo for ols_mode_idc == 2 Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3720fa5fecc69af5f… --- libavcodec/cbs_h266_syntax_template.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index f1cd45f815..ae44565a54 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -712,7 +712,7 @@ static int FUNC(vps) (CodedBitstreamContext *ctx, RWContext *rw, } if (ols_mode_idc == 4 || ols_mode_idc == 0 || ols_mode_idc == 1) total_num_olss = current->vps_max_layers_minus1 + 1; - else if (ols_mode_idc = 2) + else if (ols_mode_idc == 2) total_num_olss = current->vps_num_output_layer_sets_minus2 + 2; else av_log(ctx->log_ctx, AV_LOG_ERROR,

1 0

cbs_h266: fix sign for pps_xxx_qp_offset_list
by Nuo Mi 02 Jul '23

02 Jul '23

ffmpeg | branch: master | Nuo Mi <nuomi2021(a)gmail.com> | Sun Jul 2 18:15:11 2023 +0800| [8489e317bf293d1fa1f07f39ccdb80987716f819] | committer: James Almer cbs_h266: fix sign for pps_xxx_qp_offset_list Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8489e317bf293d1fa… --- libavcodec/cbs_h266.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/cbs_h266.h b/libavcodec/cbs_h266.h index 9e823919af..e33d08a0f5 100644 --- a/libavcodec/cbs_h266.h +++ b/libavcodec/cbs_h266.h @@ -520,9 +520,9 @@ typedef struct H266RawPPS { uint8_t pps_slice_chroma_qp_offsets_present_flag; uint8_t pps_cu_chroma_qp_offset_list_enabled_flag; uint8_t pps_chroma_qp_offset_list_len_minus1; - uint8_t pps_cb_qp_offset_list[6]; - uint8_t pps_cr_qp_offset_list[6]; - uint8_t pps_joint_cbcr_qp_offset_list[6]; + int8_t pps_cb_qp_offset_list[6]; + int8_t pps_cr_qp_offset_list[6]; + int8_t pps_joint_cbcr_qp_offset_list[6]; uint8_t pps_deblocking_filter_control_present_flag; uint8_t pps_deblocking_filter_override_enabled_flag; uint8_t pps_deblocking_filter_disabled_flag;

1 0

fate/cbs: simplify the filter_unit discard tests
by James Almer 02 Jul '23

02 Jul '23

1 0

avcodec/cbs_h266: store SubpicIdVal in the context
by James Almer 01 Jul '23

01 Jul '23

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Fri Jun 30 22:20:28 2023 -0300| [a77f5019f5731d79eb6f6dee7c3eb2d9d447ef2c] | committer: James Almer avcodec/cbs_h266: store SubpicIdVal in the context And use it to derive CurrSubpicIdx Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a77f5019f5731d79e… --- libavcodec/cbs_h266.h | 1 + libavcodec/cbs_h266_syntax_template.c | 34 +++++++++++++++++----------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/libavcodec/cbs_h266.h b/libavcodec/cbs_h266.h index be3c744426..9e823919af 100644 --- a/libavcodec/cbs_h266.h +++ b/libavcodec/cbs_h266.h @@ -552,6 +552,7 @@ typedef struct H266RawPPS { uint16_t num_tiles_in_pic; uint16_t slice_height_in_ctus[VVC_MAX_SLICES]; uint16_t num_slices_in_subpic[VVC_MAX_SLICES]; + uint16_t sub_pic_id_val[VVC_MAX_SLICES]; } H266RawPPS; typedef struct H266RawAUD { diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index f48b89cac9..f1cd45f815 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -1706,6 +1706,15 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw, } } + for (i = 0; i <= sps->sps_num_subpics_minus1; i++) { + if (sps->sps_subpic_id_mapping_explicitly_signalled_flag) + current->sub_pic_id_val[i] = current->pps_subpic_id_mapping_present_flag + ? current->pps_subpic_id[i] + : sps->sps_subpic_id[i]; + else + current->sub_pic_id_val[i] = i; + } + pic_width_in_ctbs_y = AV_CEIL_RSHIFT (current->pps_pic_width_in_luma_samples, (sps->sps_log2_ctu_size_minus5 + 5)); pic_height_in_ctbs_y = AV_CEIL_RSHIFT( @@ -2697,25 +2706,16 @@ static int FUNC(slice_header) (CodedBitstreamContext *ctx, RWContext *rw, if (sps->sps_subpic_info_present_flag) { ub(sps->sps_subpic_id_len_minus1 + 1, sh_subpic_id); - if (sps->sps_subpic_id_mapping_explicitly_signalled_flag) { - for (i = 0; i <= sps->sps_num_subpics_minus1; i++) { - uint16_t subpic_id_val = - pps->pps_subpic_id_mapping_present_flag ? - pps->pps_subpic_id[i] : sps->sps_subpic_id[i]; - if (subpic_id_val == current->sh_subpic_id) { - curr_subpic_idx = i; - break; - } - } - } else { - curr_subpic_idx = current->sh_subpic_id; - if (curr_subpic_idx > sps->sps_num_subpics_minus1) { - av_log(ctx->log_ctx, AV_LOG_ERROR, - "sh_subpic_id(%d) should in range [0, %d]\n", - curr_subpic_idx, sps->sps_num_subpics_minus1); - return AVERROR_INVALIDDATA; + for (i = 0; i <= sps->sps_num_subpics_minus1; i++) { + if (pps->sub_pic_id_val[i] == current->sh_subpic_id) { + curr_subpic_idx = i; + break; } } + if (i > sps->sps_num_subpics_minus1) { + av_log(ctx->log_ctx, AV_LOG_ERROR, "invalid CurrSubpicIdx %d\n", i); + return AVERROR_INVALIDDATA; + } } else { curr_subpic_idx = 0; }

1 0

avcodec/cbs_h266_syntax_template: Avoid shadowing
by Andreas Rheinhardt 01 Jul '23

01 Jul '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Fri Jun 30 23:40:52 2023 +0200| [e7f152a8c2214f5d82dccdc49734f050469f5869] | committer: Andreas Rheinhardt avcodec/cbs_h266_syntax_template: Avoid shadowing Reviewed-by: Nuo Mi <nuomi2021(a)gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e7f152a8c2214f5d8… --- libavcodec/cbs_h266_syntax_template.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index 56e1205337..f48b89cac9 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -514,9 +514,9 @@ static int FUNC(ref_pic_lists) (CodedBitstreamContext *ctx, RWContext *rw, ref_list = &current->rpl_ref_list[i]; num_ltrp_entries = 0; - for (int i = 0; i < ref_list->num_ref_entries; i++) { - if (!ref_list->inter_layer_ref_pic_flag[i]) { - if (!ref_list->st_ref_pic_flag[i]) { + for (int k = 0; k < ref_list->num_ref_entries; k++) { + if (!ref_list->inter_layer_ref_pic_flag[k]) { + if (!ref_list->st_ref_pic_flag[k]) { num_ltrp_entries++; } }

1 0

avcodec/cbs_h266_syntax_template: Don't use uninitialized value
by Andreas Rheinhardt 01 Jul '23

01 Jul '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Fri Jun 30 23:29:53 2023 +0200| [c732fdfa05949e53afc41d888ae4cd5d525d5aaf] | committer: Andreas Rheinhardt avcodec/cbs_h266_syntax_template: Don't use uninitialized value Just a typo. Fixes a warning from Clang. Reviewed-by: Nuo Mi <nuomi2021(a)gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c732fdfa05949e53a… --- libavcodec/cbs_h266_syntax_template.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index 863fecdefa..56e1205337 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -1059,7 +1059,7 @@ static int FUNC(sps)(CodedBitstreamContext *ctx, RWContext *rw, if (current->sps_pic_width_max_in_luma_samples > ctb_size_y) ubs(wlen, sps_subpic_width_minus1[0], 1, 0); else - infer(sps_subpic_width_minus1[i], tmp_width_val - 1); + infer(sps_subpic_width_minus1[0], tmp_width_val - 1); if (current->sps_pic_height_max_in_luma_samples > ctb_size_y) ubs(hlen, sps_subpic_height_minus1[0], 1, 0); else

1 0