June 2023 - ffmpeg-cvslog - lists.ffmpeg.org

doc/general_contents: update for recent additions
by Paul B Mahol 30 Jun '23

30 Jun '23

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Fri Jun 30 21:39:45 2023 +0200| [b40324d417e7952b73ce600b1e9651aeeda8db47] | committer: Paul B Mahol doc/general_contents: update for recent additions > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b40324d417e7952b7… --- doc/general_contents.texi | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/general_contents.texi b/doc/general_contents.texi index 2eeebd847d..8ac121dee1 100644 --- a/doc/general_contents.texi +++ b/doc/general_contents.texi @@ -1006,7 +1006,7 @@ following image formats are supported: @tab Also known as Microsoft Screen 3. @item Microsoft Expression Encoder Screen @tab @tab X @tab Also known as Microsoft Titanium Screen 2. -@item Microsoft RLE @tab @tab X +@item Microsoft RLE @tab X @tab X @item Microsoft Screen 1 @tab @tab X @tab Also known as Windows Media Video V7 Screen. @item Microsoft Screen 2 @tab @tab X @@ -1066,6 +1066,8 @@ following image formats are supported: @item RealVideo 4.0 @tab @tab X @item Renderware TXD (TeXture Dictionary) @tab @tab X @tab Texture dictionaries used by the Renderware Engine. +@item RivaTuner Video @tab @tab X + @tab fourcc: 'RTV1' @item RL2 video @tab @tab X @tab used in some games by Entertainment Software Partners @item ScreenPressor @tab @tab X @@ -1102,6 +1104,8 @@ following image formats are supported: @item v408 QuickTime uncompressed 4:4:4:4 @tab X @tab X @item v410 QuickTime uncompressed 4:4:4 10-bit @tab X @tab X @item VBLE Lossless Codec @tab @tab X +@item vMix Video @tab @tab X + @tab fourcc: 'VMX1' @item VMware Screen Codec / VMware Video @tab @tab X @tab Codec used in videos captured by VMware. @item Westwood Studios VQA (Vector Quantized Animation) video @tab @tab X

1 0

fate/cbs: run the VVC tests within the fate-cbs target
by James Almer 30 Jun '23

30 Jun '23

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Fri Jun 30 13:45:34 2023 -0300| [e4d4d616ba08f4046f2247f57f8b5a8fb0b05369] | committer: James Almer fate/cbs: run the VVC tests within the fate-cbs target Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e4d4d616ba08f4046… --- tests/fate/cbs.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate/cbs.mak b/tests/fate/cbs.mak index 344515a7fa..b01a02766f 100644 --- a/tests/fate/cbs.mak +++ b/tests/fate/cbs.mak @@ -2,7 +2,7 @@ # arguments, it decomposes the stream fully and then recomposes it # without making any changes. -fate-cbs: fate-cbs-av1 fate-cbs-h264 fate-cbs-hevc fate-cbs-mpeg2 fate-cbs-vp9 +fate-cbs: fate-cbs-av1 fate-cbs-h264 fate-cbs-hevc fate-cbs-mpeg2 fate-cbs-vp9 fate-cbs-vvc FATE_CBS_DEPS = $(call ALLYES, $(1)_DEMUXER $(2)_PARSER $(3)_METADATA_BSF $(4)_DECODER $(5)_MUXER) FATE_CBS_NO_DEC_DEPS = $(call ALLYES, $(1)_DEMUXER $(2)_PARSER $(3)_METADATA_BSF $(4)_MUXER)

1 0

avcodec/tests/avcodec: Remove unnecessary internal.h inclusion
by Andreas Rheinhardt 30 Jun '23

30 Jun '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Fri Jun 30 13:25:48 2023 +0200| [46a5b9e2c063f7a6776323afdebe6d9558ba96c1] | committer: Andreas Rheinhardt avcodec/tests/avcodec: Remove unnecessary internal.h inclusion Forgotten in a688f3c13ce55c2ba51dbbb344564649f1bb52fe. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=46a5b9e2c063f7a67… --- libavcodec/tests/avcodec.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/tests/avcodec.c b/libavcodec/tests/avcodec.c index d78447d0fc..bbf5289af2 100644 --- a/libavcodec/tests/avcodec.c +++ b/libavcodec/tests/avcodec.c @@ -20,7 +20,6 @@ #include "libavcodec/codec.h" #include "libavcodec/codec_desc.h" #include "libavcodec/codec_internal.h" -#include "libavcodec/internal.h" static const char *get_type_string(enum AVMediaType type) {

1 0

avcodec/hevc_ps: Constify VPS, SPS pointers when parsing PPS
by Andreas Rheinhardt 30 Jun '23

30 Jun '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Fri Jun 30 01:35:06 2023 +0200| [686156f366ebaa9330ef25ea4f269d8a46d958f0] | committer: Andreas Rheinhardt avcodec/hevc_ps: Constify VPS, SPS pointers when parsing PPS Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=686156f366ebaa933… --- libavcodec/hevc_ps.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index d7930d3ac3..4c4c1e2c17 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -725,7 +725,8 @@ static void set_default_scaling_list_data(ScalingList *sl) memcpy(sl->sl[3][5], default_scaling_list_inter, 64); } -static int scaling_list_data(GetBitContext *gb, AVCodecContext *avctx, ScalingList *sl, HEVCSPS *sps) +static int scaling_list_data(GetBitContext *gb, AVCodecContext *avctx, + ScalingList *sl, const HEVCSPS *sps) { uint8_t scaling_list_pred_mode_flag; uint8_t scaling_list_dc_coef[2][6]; @@ -1412,7 +1413,7 @@ static int colour_mapping_table(GetBitContext *gb, AVCodecContext *avctx, HEVCPP } static int pps_multilayer_extension(GetBitContext *gb, AVCodecContext *avctx, - HEVCPPS *pps, HEVCSPS *sps, HEVCVPS *vps) + HEVCPPS *pps, const HEVCSPS *sps, const HEVCVPS *vps) { pps->poc_reset_info_present_flag = get_bits1(gb); pps->pps_infer_scaling_list_flag = get_bits1(gb); @@ -1483,7 +1484,7 @@ static void delta_dlt(GetBitContext *gb, HEVCPPS *pps) } static int pps_3d_extension(GetBitContext *gb, AVCodecContext *avctx, - HEVCPPS *pps, HEVCSPS *sps) + HEVCPPS *pps, const HEVCSPS *sps) { unsigned int pps_depth_layers_minus1; @@ -1507,7 +1508,7 @@ static int pps_3d_extension(GetBitContext *gb, AVCodecContext *avctx, } static int pps_range_extensions(GetBitContext *gb, AVCodecContext *avctx, - HEVCPPS *pps, HEVCSPS *sps) + HEVCPPS *pps, const HEVCSPS *sps) { if (pps->transform_skip_enabled_flag) { pps->log2_max_transform_skip_block_size = get_ue_golomb_31(gb) + 2; @@ -1547,7 +1548,7 @@ static int pps_range_extensions(GetBitContext *gb, AVCodecContext *avctx, } static int pps_scc_extension(GetBitContext *gb, AVCodecContext *avctx, - HEVCPPS *pps, HEVCSPS *sps) + HEVCPPS *pps, const HEVCSPS *sps) { int num_comps, ret; @@ -1599,7 +1600,7 @@ static int pps_scc_extension(GetBitContext *gb, AVCodecContext *avctx, } static inline int setup_pps(AVCodecContext *avctx, GetBitContext *gb, - HEVCPPS *pps, HEVCSPS *sps) + HEVCPPS *pps, const HEVCSPS *sps) { int log2_diff; int pic_area_in_ctbs; @@ -1733,8 +1734,8 @@ static inline int setup_pps(AVCodecContext *avctx, GetBitContext *gb, int ff_hevc_decode_nal_pps(GetBitContext *gb, AVCodecContext *avctx, HEVCParamSets *ps) { - HEVCSPS *sps = NULL; - HEVCVPS *vps = NULL; + const HEVCSPS *sps = NULL; + const HEVCVPS *vps = NULL; int i, ret = 0; unsigned int pps_id = 0; ptrdiff_t nal_size;

1 0

avcodec/cbs_h266: use VVC_MAX_VPS_COUNT for range checks and array size
by James Almer 30 Jun '23

30 Jun '23

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Fri Jun 30 08:42:07 2023 -0300| [96d69905171be47369839f8e8d3e6036f91df74f] | committer: James Almer avcodec/cbs_h266: use VVC_MAX_VPS_COUNT for range checks and array size Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=96d69905171be4736… --- libavcodec/cbs_h266.h | 2 +- libavcodec/cbs_h266_syntax_template.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/libavcodec/cbs_h266.h b/libavcodec/cbs_h266.h index 54590748c3..be3c744426 100644 --- a/libavcodec/cbs_h266.h +++ b/libavcodec/cbs_h266.h @@ -775,7 +775,7 @@ typedef struct CodedBitstreamH266Context { AVBufferRef *sps_ref[VVC_MAX_SPS_COUNT]; AVBufferRef *pps_ref[VVC_MAX_PPS_COUNT]; AVBufferRef *ph_ref; - H266RawVPS *vps[VVC_MAX_SPS_COUNT]; + H266RawVPS *vps[VVC_MAX_VPS_COUNT]; H266RawSPS *sps[VVC_MAX_SPS_COUNT]; H266RawPPS *pps[VVC_MAX_PPS_COUNT]; H266RawPictureHeader *ph; diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index b23a80d356..863fecdefa 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -639,12 +639,7 @@ static int FUNC(vps) (CodedBitstreamContext *ctx, RWContext *rw, CHECK(FUNC(nal_unit_header) (ctx, rw, &current->nal_unit_header, VVC_VPS_NUT)); - ub(4, vps_video_parameter_set_id); - if (current->vps_video_parameter_set_id == 0) { - av_log(ctx->log_ctx, AV_LOG_ERROR, - "vps_video_parameter_set_id should > 0.\n"); - return AVERROR_INVALIDDATA; - } + u(4, vps_video_parameter_set_id, 1, VVC_MAX_VPS_COUNT - 1); ub(6, vps_max_layers_minus1); u(3, vps_max_sublayers_minus1, 0, 6); if (current->vps_max_layers_minus1 > 0

1 0

fate/cbs: add VVC tests
by James Almer 30 Jun '23

30 Jun '23

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Thu Jun 29 13:33:26 2023 -0300| [3fd7841ef1ecedf494b69b1bcb17fcf46450f17f] | committer: James Almer fate/cbs: add VVC tests Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3fd7841ef1ecedf49… --- tests/fate/cbs.mak | 40 ++++++++++++++++++++++++++++++ tests/ref/fate/cbs-vvc-AUD_A_3 | 1 + tests/ref/fate/cbs-vvc-BOUNDARY_A_3 | 1 + tests/ref/fate/cbs-vvc-BUMP_A_2 | 1 + tests/ref/fate/cbs-vvc-CROP_B_4 | 1 + tests/ref/fate/cbs-vvc-CodingToolsSets_A_2 | 1 + tests/ref/fate/cbs-vvc-HRD_A_3 | 1 + tests/ref/fate/cbs-vvc-PHSH_B_1 | 1 + tests/ref/fate/cbs-vvc-POC_A_1 | 1 + tests/ref/fate/cbs-vvc-PPS_B_1 | 1 + tests/ref/fate/cbs-vvc-RAP_A_1 | 1 + tests/ref/fate/cbs-vvc-SAO_A_3 | 1 + tests/ref/fate/cbs-vvc-SCALING_A_1 | 1 + tests/ref/fate/cbs-vvc-SLICES_A_3 | 1 + tests/ref/fate/cbs-vvc-SPS_B_1 | 1 + tests/ref/fate/cbs-vvc-STILL_B_1 | 1 + tests/ref/fate/cbs-vvc-SUBPIC_A_3 | 1 + tests/ref/fate/cbs-vvc-TILE_A_2 | 1 + tests/ref/fate/cbs-vvc-VPS_A_3 | 1 + tests/ref/fate/cbs-vvc-WPP_A_3 | 1 + tests/ref/fate/cbs-vvc-WP_A_3 | 1 + tests/ref/fate/cbs-vvc-WRAP_A_4 | 1 + 22 files changed, 61 insertions(+) diff --git a/tests/fate/cbs.mak b/tests/fate/cbs.mak index 0084c3d25c..344515a7fa 100644 --- a/tests/fate/cbs.mak +++ b/tests/fate/cbs.mak @@ -5,6 +5,7 @@ fate-cbs: fate-cbs-av1 fate-cbs-h264 fate-cbs-hevc fate-cbs-mpeg2 fate-cbs-vp9 FATE_CBS_DEPS = $(call ALLYES, $(1)_DEMUXER $(2)_PARSER $(3)_METADATA_BSF $(4)_DECODER $(5)_MUXER) +FATE_CBS_NO_DEC_DEPS = $(call ALLYES, $(1)_DEMUXER $(2)_PARSER $(3)_METADATA_BSF $(4)_MUXER) define FATE_CBS_TEST # (codec, test_name, sample_file, output_format) @@ -12,6 +13,12 @@ FATE_CBS_$(1) += fate-cbs-$(1)-$(2) fate-cbs-$(1)-$(2): CMD = md5 -c:v $(3) -i $(TARGET_SAMPLES)/$(4) -c:v copy -y -bsf:v $(1)_metadata -f $(5) endef +define FATE_CBS_NO_DEC_TEST +# (codec, test_name, sample_file, output_format) +FATE_CBS_$(1) += fate-cbs-$(1)-$(2) +fate-cbs-$(1)-$(2): CMD = md5 -i $(TARGET_SAMPLES)/$(3) -c:v copy -y -bsf:v $(1)_metadata -f $(4) +endef + define FATE_CBS_DISCARD_TEST # (codec, discard_type, sample_file, output_format, dep) FATE_CBS_$(1)_DISCARD += fate-cbs-$(1)-discard-$(2) @@ -163,6 +170,39 @@ FATE_CBS_HEVC-$(call ALLYES, MP4_MUXER, HEVC_PARSER, FILTER_UNITS_BSF, HEVC_MUXE FATE_SAMPLES_AVCONV += $(FATE_CBS_HEVC-yes) fate-cbs-hevc: $(FATE_CBS_HEVC-yes) +# H.266 read/write + +FATE_CBS_VVC_SAMPLES = \ + AUD_A_3.bit \ + BOUNDARY_A_3.bit \ + BUMP_A_2.bit \ + CodingToolsSets_A_2.bit \ + CROP_B_4.bit \ + HRD_A_3.bit \ + PHSH_B_1.bit \ + POC_A_1.bit \ + PPS_B_1.bit \ + RAP_A_1.bit \ + SAO_A_3.bit \ + SCALING_A_1.bit \ + SLICES_A_3.bit \ + SPS_B_1.bit \ + STILL_B_1.bit \ + SUBPIC_A_3.bit \ + TILE_A_2.bit \ + VPS_A_3.bit \ + WP_A_3.bit \ + WPP_A_3.bit \ + WRAP_A_4.bit \ + + +$(foreach N,$(FATE_CBS_VVC_SAMPLES),$(eval $(call FATE_CBS_NO_DEC_TEST,vvc,$(basename $(N)),vvc-conformance/$(N),vvc))) + +FATE_CBS_VVC-$(call FATE_CBS_NO_DEC_DEPS, HEVC, HEVC, HEVC, HEVC) = $(FATE_CBS_vvc) + +FATE_SAMPLES_AVCONV += $(FATE_CBS_VVC-yes) +fate-cbs-vvc: $(FATE_CBS_VVC-yes) + # MPEG-2 read/write FATE_CBS_MPEG2_SAMPLES = \ diff --git a/tests/ref/fate/cbs-vvc-AUD_A_3 b/tests/ref/fate/cbs-vvc-AUD_A_3 new file mode 100644 index 0000000000..91dfc817b7 --- /dev/null +++ b/tests/ref/fate/cbs-vvc-AUD_A_3 @@ -0,0 +1 @@ +5a5bf4ec5e75d38958863ce8aa6c1fad diff --git a/tests/ref/fate/cbs-vvc-BOUNDARY_A_3 b/tests/ref/fate/cbs-vvc-BOUNDARY_A_3 new file mode 100644 index 0000000000..2647e37041 --- /dev/null +++ b/tests/ref/fate/cbs-vvc-BOUNDARY_A_3 @@ -0,0 +1 @@ +3ef48cf6019ee5d7ca4ab8d5cd12bbd5 diff --git a/tests/ref/fate/cbs-vvc-BUMP_A_2 b/tests/ref/fate/cbs-vvc-BUMP_A_2 new file mode 100644 index 0000000000..4f7c69c2b7 --- /dev/null +++ b/tests/ref/fate/cbs-vvc-BUMP_A_2 @@ -0,0 +1 @@ +80cb700aa0c31e693abaad7be56a606b diff --git a/tests/ref/fate/cbs-vvc-CROP_B_4 b/tests/ref/fate/cbs-vvc-CROP_B_4 new file mode 100644 index 0000000000..6b46df0c82 --- /dev/null +++ b/tests/ref/fate/cbs-vvc-CROP_B_4 @@ -0,0 +1 @@ +7d451021118d63bebe613cec1f773cc5 diff --git a/tests/ref/fate/cbs-vvc-CodingToolsSets_A_2 b/tests/ref/fate/cbs-vvc-CodingToolsSets_A_2 new file mode 100644 index 0000000000..a6a787b9de --- /dev/null +++ b/tests/ref/fate/cbs-vvc-CodingToolsSets_A_2 @@ -0,0 +1 @@ +6f0043acadfc70d7ec8d556194169a6e diff --git a/tests/ref/fate/cbs-vvc-HRD_A_3 b/tests/ref/fate/cbs-vvc-HRD_A_3 new file mode 100644 index 0000000000..39e4b906c6 --- /dev/null +++ b/tests/ref/fate/cbs-vvc-HRD_A_3 @@ -0,0 +1 @@ +c0d308912bcdda2b780f3e0a808ff138 diff --git a/tests/ref/fate/cbs-vvc-PHSH_B_1 b/tests/ref/fate/cbs-vvc-PHSH_B_1 new file mode 100644 index 0000000000..437a9eb64f --- /dev/null +++ b/tests/ref/fate/cbs-vvc-PHSH_B_1 @@ -0,0 +1 @@ +724e3af9b9aac47049a58534ada918e6 diff --git a/tests/ref/fate/cbs-vvc-POC_A_1 b/tests/ref/fate/cbs-vvc-POC_A_1 new file mode 100644 index 0000000000..f259307ca6 --- /dev/null +++ b/tests/ref/fate/cbs-vvc-POC_A_1 @@ -0,0 +1 @@ +608f780e20d18f8dde4ca25276a66598 diff --git a/tests/ref/fate/cbs-vvc-PPS_B_1 b/tests/ref/fate/cbs-vvc-PPS_B_1 new file mode 100644 index 0000000000..1981930a04 --- /dev/null +++ b/tests/ref/fate/cbs-vvc-PPS_B_1 @@ -0,0 +1 @@ +de563a85244bf4a7781b98198a5bf409 diff --git a/tests/ref/fate/cbs-vvc-RAP_A_1 b/tests/ref/fate/cbs-vvc-RAP_A_1 new file mode 100644 index 0000000000..22661eed54 --- /dev/null +++ b/tests/ref/fate/cbs-vvc-RAP_A_1 @@ -0,0 +1 @@ +6460f629ca2377bd271bd1fa5787214f diff --git a/tests/ref/fate/cbs-vvc-SAO_A_3 b/tests/ref/fate/cbs-vvc-SAO_A_3 new file mode 100644 index 0000000000..d8b3096dde --- /dev/null +++ b/tests/ref/fate/cbs-vvc-SAO_A_3 @@ -0,0 +1 @@ +44f8666cd7fa1f4f52f0570ad29e7a8b diff --git a/tests/ref/fate/cbs-vvc-SCALING_A_1 b/tests/ref/fate/cbs-vvc-SCALING_A_1 new file mode 100644 index 0000000000..e9c5477ccd --- /dev/null +++ b/tests/ref/fate/cbs-vvc-SCALING_A_1 @@ -0,0 +1 @@ +50b3221ba3dc373189527428ea8a4b38 diff --git a/tests/ref/fate/cbs-vvc-SLICES_A_3 b/tests/ref/fate/cbs-vvc-SLICES_A_3 new file mode 100644 index 0000000000..d45aa2c3f0 --- /dev/null +++ b/tests/ref/fate/cbs-vvc-SLICES_A_3 @@ -0,0 +1 @@ +77ac8631941cc5fe0d67cefe94e923a2 diff --git a/tests/ref/fate/cbs-vvc-SPS_B_1 b/tests/ref/fate/cbs-vvc-SPS_B_1 new file mode 100644 index 0000000000..a4ca603037 --- /dev/null +++ b/tests/ref/fate/cbs-vvc-SPS_B_1 @@ -0,0 +1 @@ +cf3e0c51035bde7499f80eac34563762 diff --git a/tests/ref/fate/cbs-vvc-STILL_B_1 b/tests/ref/fate/cbs-vvc-STILL_B_1 new file mode 100644 index 0000000000..34b54b736f --- /dev/null +++ b/tests/ref/fate/cbs-vvc-STILL_B_1 @@ -0,0 +1 @@ +bfa7b1d3ad3b84dac122e8127d579a24 diff --git a/tests/ref/fate/cbs-vvc-SUBPIC_A_3 b/tests/ref/fate/cbs-vvc-SUBPIC_A_3 new file mode 100644 index 0000000000..b3b5123fd8 --- /dev/null +++ b/tests/ref/fate/cbs-vvc-SUBPIC_A_3 @@ -0,0 +1 @@ +70eb8a1074a76e63406036e03dc8734a diff --git a/tests/ref/fate/cbs-vvc-TILE_A_2 b/tests/ref/fate/cbs-vvc-TILE_A_2 new file mode 100644 index 0000000000..c788b028d0 --- /dev/null +++ b/tests/ref/fate/cbs-vvc-TILE_A_2 @@ -0,0 +1 @@ +b9fca953a0b5aed276fb3c0418ada885 diff --git a/tests/ref/fate/cbs-vvc-VPS_A_3 b/tests/ref/fate/cbs-vvc-VPS_A_3 new file mode 100644 index 0000000000..62e95650e2 --- /dev/null +++ b/tests/ref/fate/cbs-vvc-VPS_A_3 @@ -0,0 +1 @@ +40c6750868d27bba165a1553c519cee5 diff --git a/tests/ref/fate/cbs-vvc-WPP_A_3 b/tests/ref/fate/cbs-vvc-WPP_A_3 new file mode 100644 index 0000000000..82631cfdfb --- /dev/null +++ b/tests/ref/fate/cbs-vvc-WPP_A_3 @@ -0,0 +1 @@ +c5e6ba8eb4ef6e991b8528ca2490d350 diff --git a/tests/ref/fate/cbs-vvc-WP_A_3 b/tests/ref/fate/cbs-vvc-WP_A_3 new file mode 100644 index 0000000000..71789587dc --- /dev/null +++ b/tests/ref/fate/cbs-vvc-WP_A_3 @@ -0,0 +1 @@ +05a8ac4844ce65c7a64dfd304f4186a5 diff --git a/tests/ref/fate/cbs-vvc-WRAP_A_4 b/tests/ref/fate/cbs-vvc-WRAP_A_4 new file mode 100644 index 0000000000..708d07e623 --- /dev/null +++ b/tests/ref/fate/cbs-vvc-WRAP_A_4 @@ -0,0 +1 @@ +ba7de3caf1bf4efe77bdb424ba5fc814

1 0

avcodec/cbs_h2645: fix parsing and storing Picture Header references in the context
by James Almer 30 Jun '23

30 Jun '23

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Thu Jun 29 17:21:33 2023 -0300| [995976750a18c0d0ab92f8da6c40f02a4faa1798] | committer: James Almer avcodec/cbs_h2645: fix parsing and storing Picture Header references in the context Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=995976750a18c0d0a… --- libavcodec/cbs_h2645.c | 35 +++++++++++++++++++++-------------- libavcodec/cbs_h266.h | 17 +++++++++-------- libavcodec/cbs_h266_syntax_template.c | 13 ++++++------- libavcodec/h266_metadata_bsf.c | 5 +++-- libavcodec/vvc_parser.c | 10 +++++----- 5 files changed, 44 insertions(+), 36 deletions(-) diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index cdd7901518..68ccf6a7eb 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -525,12 +525,6 @@ static int cbs_h2645_split_fragment(CodedBitstreamContext *ctx, if (frag->data_size == 0) return 0; - if (codec_id == AV_CODEC_ID_VVC) { - //we deactive picture header here to avoid reuse previous au's ph. - CodedBitstreamH266Context *h266 = ctx->priv_data; - h266->priv.ph = NULL; - } - if (header && frag->data[0] && codec_id == AV_CODEC_ID_H264) { // AVCC header. size_t size, start, end; @@ -793,19 +787,20 @@ cbs_h266_replace_ps(6, SPS, sps, sps_seq_parameter_set_id) cbs_h266_replace_ps(6, PPS, pps, pps_pic_parameter_set_id) static int cbs_h266_replace_ph(CodedBitstreamContext *ctx, - CodedBitstreamUnit *unit) + CodedBitstreamUnit *unit, + H266RawPictureHeader *ph) { CodedBitstreamH266Context *h266 = ctx->priv_data; int err; - h266->priv.ph = NULL; err = ff_cbs_make_unit_refcounted(ctx, unit); if (err < 0) return err; - err = av_buffer_replace(&h266->priv.ph_ref, unit->content_ref); + av_assert0(unit->content_ref); + err = av_buffer_replace(&h266->ph_ref, unit->content_ref); if (err < 0) return err; - h266->priv.ph = (H266RawPH*)h266->priv.ph_ref->data; + h266->ph = ph; return 0; } @@ -1111,7 +1106,7 @@ static int cbs_h266_read_nal_unit(CodedBitstreamContext *ctx, err = cbs_h266_read_ph(ctx, &gbc, ph); if (err < 0) return err; - err = cbs_h266_replace_ph(ctx, unit); + err = cbs_h266_replace_ph(ctx, unit, &ph->ph_picture_header); if (err < 0) return err; } @@ -1139,6 +1134,12 @@ static int cbs_h266_read_nal_unit(CodedBitstreamContext *ctx, pos = get_bits_count(&gbc); len = unit->data_size; + if (slice->header.sh_picture_header_in_slice_header_flag) { + err = cbs_h266_replace_ph(ctx, unit, &slice->header.sh_picture_header); + if (err < 0) + return err; + } + slice->data_size = len - pos / 8; slice->data_ref = av_buffer_ref(unit->data_ref); if (!slice->data_ref) @@ -1640,7 +1641,7 @@ static int cbs_h266_write_nal_unit(CodedBitstreamContext *ctx, if (err < 0) return err; - err = cbs_h266_replace_ph(ctx, unit); + err = cbs_h266_replace_ph(ctx, unit, &ph->ph_picture_header); if (err < 0) return err; } @@ -1661,6 +1662,12 @@ static int cbs_h266_write_nal_unit(CodedBitstreamContext *ctx, if (err < 0) return err; + if (slice->header.sh_picture_header_in_slice_header_flag) { + err = cbs_h266_replace_ph(ctx, unit, &slice->header.sh_picture_header); + if (err < 0) + return err; + } + if (slice->data) { err = cbs_h2645_write_slice_data(ctx, pbc, slice->data, slice->data_size, @@ -1884,8 +1891,8 @@ static void cbs_h266_flush(CodedBitstreamContext *ctx) av_buffer_unref(&h266->pps_ref[i]); h266->pps[i] = NULL; } - av_buffer_unref(&h266->priv.ph_ref); - h266->priv.ph = NULL; + av_buffer_unref(&h266->ph_ref); + h266->ph = NULL; } static void cbs_h266_close(CodedBitstreamContext *ctx) diff --git a/libavcodec/cbs_h266.h b/libavcodec/cbs_h266.h index 03dfd4a954..54590748c3 100644 --- a/libavcodec/cbs_h266.h +++ b/libavcodec/cbs_h266.h @@ -581,8 +581,7 @@ typedef struct H266RawPredWeightTable { int16_t delta_chroma_offset_l1[15][2]; } H266RawPredWeightTable; -typedef struct H266RawPH { - H266RawNALUnitHeader nal_unit_header; +typedef struct H266RawPictureHeader { uint8_t ph_gdr_or_irap_pic_flag; uint8_t ph_non_ref_pic_flag; uint8_t ph_gdr_pic_flag; @@ -670,12 +669,17 @@ typedef struct H266RawPH { uint8_t ph_extension_length; uint8_t ph_extension_data_byte[256]; +} H266RawPictureHeader; + +typedef struct H266RawPH { + H266RawNALUnitHeader nal_unit_header; + H266RawPictureHeader ph_picture_header; } H266RawPH; typedef struct H266RawSliceHeader { H266RawNALUnitHeader nal_unit_header; uint8_t sh_picture_header_in_slice_header_flag; - H266RawPH sh_picture_header; + H266RawPictureHeader sh_picture_header; uint16_t sh_subpic_id; uint16_t sh_slice_address; @@ -770,14 +774,11 @@ typedef struct CodedBitstreamH266Context { AVBufferRef *vps_ref[VVC_MAX_VPS_COUNT]; AVBufferRef *sps_ref[VVC_MAX_SPS_COUNT]; AVBufferRef *pps_ref[VVC_MAX_PPS_COUNT]; + AVBufferRef *ph_ref; H266RawVPS *vps[VVC_MAX_SPS_COUNT]; H266RawSPS *sps[VVC_MAX_SPS_COUNT]; H266RawPPS *pps[VVC_MAX_PPS_COUNT]; - - struct { - AVBufferRef *ph_ref; - H266RawPH *ph; - } priv; + H266RawPictureHeader *ph; } CodedBitstreamH266Context; #endif /* AVCODEC_CBS_H266_H */ diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index 06f9f29e08..b23a80d356 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -2232,7 +2232,7 @@ static int FUNC(pred_weight_table) (CodedBitstreamContext *ctx, RWContext *rw, } static int FUNC(picture_header) (CodedBitstreamContext *ctx, RWContext *rw, - H266RawPH *current){ + H266RawPictureHeader *current) { CodedBitstreamH266Context *h266 = ctx->priv_data; const H266RawVPS *vps; const H266RawSPS *sps; @@ -2651,7 +2651,7 @@ static int FUNC(ph) (CodedBitstreamContext *ctx, RWContext *rw, HEADER("Picture Header"); CHECK(FUNC(nal_unit_header) (ctx, rw, &current->nal_unit_header, VVC_PH_NUT)); - CHECK(FUNC(picture_header) (ctx, rw, current)); + CHECK(FUNC(picture_header) (ctx, rw, &current->ph_picture_header)); CHECK(FUNC(rbsp_trailing_bits) (ctx, rw)); return 0; } @@ -2662,7 +2662,7 @@ static int FUNC(slice_header) (CodedBitstreamContext *ctx, RWContext *rw, CodedBitstreamH266Context *h266 = ctx->priv_data; const H266RawSPS *sps; const H266RawPPS *pps; - const H266RawPH *ph; + const H266RawPictureHeader *ph; const H266RefPicLists *ref_pic_lists; int err, i; uint8_t nal_unit_type, qp_bd_offset; @@ -2675,12 +2675,11 @@ static int FUNC(slice_header) (CodedBitstreamContext *ctx, RWContext *rw, flag(sh_picture_header_in_slice_header_flag); if (current->sh_picture_header_in_slice_header_flag) { + // 7.4.8 if sh_picture_header_in_slice_header_flag is true, we do not have a PH NAL unit CHECK(FUNC(picture_header) (ctx, rw, &current->sh_picture_header)); ph = &current->sh_picture_header; - //7.4.8 if sh_picture_header_in_slice_header_flag is true, we do not have PH NAL unit - h266->priv.ph = NULL; } else { - ph = h266->priv.ph; + ph = h266->ph; if (!ph) { av_log(ctx->log_ctx, AV_LOG_ERROR, "Picture header not available.\n"); @@ -2822,7 +2821,7 @@ static int FUNC(slice_header) (CodedBitstreamContext *ctx, RWContext *rw, (ctx, rw, sps, pps, &current->sh_ref_pic_lists)); ref_pic_lists = &current->sh_ref_pic_lists; } else { - ref_pic_lists = &h266->priv.ph->ph_ref_pic_lists; + ref_pic_lists = &ph->ph_ref_pic_lists; } if ((current->sh_slice_type != VVC_SLICE_TYPE_I && ref_pic_lists->rpl_ref_list[0].num_ref_entries > 1) || diff --git a/libavcodec/h266_metadata_bsf.c b/libavcodec/h266_metadata_bsf.c index 18fa1a5c9c..c0dbf8ef96 100644 --- a/libavcodec/h266_metadata_bsf.c +++ b/libavcodec/h266_metadata_bsf.c @@ -48,7 +48,7 @@ static int h266_metadata_update_fragment(AVBSFContext *bsf, AVPacket *pkt, ff_cbs_delete_unit(pu, 0); } else if ( pkt && ctx->aud == BSF_ELEMENT_INSERT) { const H266RawSlice *first_slice = NULL; - const H266RawPH *ph = NULL; + const H266RawPictureHeader *ph = NULL; H266RawAUD *aud = &ctx->aud_nal; int pic_type = 0, temporal_id = 8, layer_id = 0; for (i = 0; i < pu->nb_units; i++) { @@ -58,7 +58,8 @@ static int h266_metadata_update_fragment(AVBSFContext *bsf, AVPacket *pkt, if (nal->nuh_temporal_id_plus1 < temporal_id + 1) temporal_id = nal->nuh_temporal_id_plus1 - 1; if ( nal->nal_unit_type == VVC_PH_NUT ) { - ph = pu->units[i].content; + const H266RawPH *header = pu->units[i].content; + ph = &header->ph_picture_header; } else if (IS_H266_SLICE(nal->nal_unit_type)) { const H266RawSlice *slice = pu->units[i].content; layer_id = nal->nuh_layer_id; diff --git a/libavcodec/vvc_parser.c b/libavcodec/vvc_parser.c index 0a8ef9f177..3951ebe50a 100644 --- a/libavcodec/vvc_parser.c +++ b/libavcodec/vvc_parser.c @@ -31,7 +31,7 @@ typedef struct PuInfo { const H266RawPPS *pps; const H266RawSPS *sps; - const H266RawPH *ph; + const H266RawPictureHeader *ph; const H266RawSlice *slice; int pic_type; } PuInfo; @@ -155,7 +155,6 @@ static void set_parser_ctx(AVCodecParserContext *s, AVCodecContext *avctx, }; const H266RawSPS *sps = pu->sps; const H266RawPPS *pps = pu->pps; - //const H266RawPH *ph = pu->ph; const H266RawNALUnitHeader *nal = &pu->slice->header.nal_unit_header; s->pict_type = pu->pic_type; @@ -205,7 +204,7 @@ static void set_parser_ctx(AVCodecParserContext *s, AVCodecContext *avctx, //We follow the VTM. static void get_slice_poc(VVCParserContext *s, int *poc, const H266RawSPS *sps, - const H266RawPH *ph, + const H266RawPictureHeader *ph, const H266RawSliceHeader *slice, void *log_ctx) { int poc_msb, max_poc_lsb, poc_lsb; @@ -251,7 +250,7 @@ static int is_au_start(VVCParserContext *s, const PuInfo *pu, void *log_ctx) AuDetector *d = &s->au_detector; const H266RawSPS *sps = pu->sps; const H266RawNALUnitHeader *nal = &pu->slice->header.nal_unit_header; - const H266RawPH *ph = pu->ph; + const H266RawPictureHeader *ph = pu->ph; const H266RawSlice *slice = pu->slice; int ret, poc, nut; @@ -282,7 +281,8 @@ static int get_pu_info(PuInfo *info, const CodedBitstreamH266Context *h266, if (!nal) continue; if ( nal->nal_unit_type == VVC_PH_NUT ) { - info->ph = pu->units[i].content; + const H266RawPH *ph = pu->units[i].content; + info->ph = &ph->ph_picture_header; } else if (IS_H266_SLICE(nal->nal_unit_type)) { info->slice = pu->units[i].content; if (info->slice->header.sh_picture_header_in_slice_header_flag)

1 0

tools/target_bsf_fuzzer: fix some filter names
by James Almer 30 Jun '23

30 Jun '23

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Thu Jun 29 22:44:11 2023 -0300| [f48ddc1ba0fbf42e71aeda4ac6df18a08f469a25] | committer: James Almer tools/target_bsf_fuzzer: fix some filter names Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f48ddc1ba0fbf42e7… --- tools/target_bsf_fuzzer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/target_bsf_fuzzer.c b/tools/target_bsf_fuzzer.c index c8fab00343..76e3b89cf1 100644 --- a/tools/target_bsf_fuzzer.c +++ b/tools/target_bsf_fuzzer.c @@ -94,8 +94,8 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { if (flags & 0x20) { if (!strcmp(f->name, "av1_metadata")) av_opt_set_int(bsf->priv_data, "td", bytestream2_get_byte(&gbc) % 3, 0); - else if (!strcmp(f->name, "h264_metadata") || !strcmp(f->name, "h265_metadata") || - !strcmp(f->name, "h266_metadata")) + else if (!strcmp(f->name, "h264_metadata") || !strcmp(f->name, "hevc_metadata") || + !strcmp(f->name, "vvc_metadata")) av_opt_set_int(bsf->priv_data, "aud", bytestream2_get_byte(&gbc) % 3, 0); else if (!strcmp(f->name, "extract_extradata")) av_opt_set_int(bsf->priv_data, "remove", bytestream2_get_byte(&gbc) & 1, 0);

1 0

avcodec/evc_ps: Replace av_malloc+memset by av_mallocz
by Andreas Rheinhardt 29 Jun '23

29 Jun '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Fri Jun 30 00:24:53 2023 +0200| [915701939ca5d0a801647f7916394f33a2645d83] | committer: Andreas Rheinhardt avcodec/evc_ps: Replace av_malloc+memset by av_mallocz Reviewed-by: James Almer <jamrial(a)gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=915701939ca5d0a80… --- libavcodec/evc_ps.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavcodec/evc_ps.c b/libavcodec/evc_ps.c index ec405345ae..fc2105b352 100644 --- a/libavcodec/evc_ps.c +++ b/libavcodec/evc_ps.c @@ -143,12 +143,10 @@ int ff_evc_parse_sps(GetBitContext *gb, EVCParamSets *ps) if (sps_seq_parameter_set_id >= EVC_MAX_SPS_COUNT) return AVERROR_INVALIDDATA; - sps = av_malloc(sizeof(*sps)); + sps = av_mallocz(sizeof(*sps)); if (!sps) return AVERROR(ENOMEM); - memset(sps, 0, sizeof(*sps)); - sps->sps_seq_parameter_set_id = sps_seq_parameter_set_id; // the Baseline profile is indicated by profile_idc eqal to 0 @@ -318,12 +316,10 @@ int ff_evc_parse_pps(GetBitContext *gb, EVCParamSets *ps) if (pps_pic_parameter_set_id >= EVC_MAX_PPS_COUNT) return AVERROR_INVALIDDATA; - pps = av_malloc(sizeof(*pps)); + pps = av_mallocz(sizeof(*pps)); if (!pps) return AVERROR(ENOMEM); - memset(pps, 0, sizeof(*pps)); - pps->pps_pic_parameter_set_id = pps_pic_parameter_set_id; pps->pps_seq_parameter_set_id = get_ue_golomb(gb);

1 0

avcodec/vvc_parser: Mark close function as av_cold
by Andreas Rheinhardt 29 Jun '23

29 Jun '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Fri Jun 30 00:11:34 2023 +0200| [b7158377c9449df831f89fe6fd39309efecbf188] | committer: Andreas Rheinhardt avcodec/vvc_parser: Mark close function as av_cold Reviewed-by: James Almer <jamrial(a)gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b7158377c9449df83… --- libavcodec/vvc_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vvc_parser.c b/libavcodec/vvc_parser.c index 69696eef57..0a8ef9f177 100644 --- a/libavcodec/vvc_parser.c +++ b/libavcodec/vvc_parser.c @@ -496,7 +496,7 @@ static av_cold int vvc_parser_init(AVCodecParserContext *s) return ret; } -static void vvc_parser_close(AVCodecParserContext *s) +static av_cold void vvc_parser_close(AVCodecParserContext *s) { VVCParserContext *ctx = s->priv_data;

1 0