March 2024 - ffmpeg-cvslog - lists.ffmpeg.org

avcodec/nvdec: reset bitstream_len/nb_slices when resetting bitstream pointer
by Timo Rothenpieler 29 Mar '24

29 Mar '24

ffmpeg | branch: release/5.1 | Timo Rothenpieler <timo(a)rothenpieler.org> | Sat Mar 30 00:12:03 2024 +0100| [82abc7af817ea118aaadb6adf911f78cdff75c46] | committer: Timo Rothenpieler avcodec/nvdec: reset bitstream_len/nb_slices when resetting bitstream pointer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=82abc7af817ea118a… --- libavcodec/nvdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/nvdec.c b/libavcodec/nvdec.c index d54b8669a9..76904b801a 100644 --- a/libavcodec/nvdec.c +++ b/libavcodec/nvdec.c @@ -668,6 +668,8 @@ int ff_nvdec_simple_end_frame(AVCodecContext *avctx) NVDECContext *ctx = avctx->internal->hwaccel_priv_data; int ret = ff_nvdec_end_frame(avctx); ctx->bitstream = NULL; + ctx->bitstream_len = 0; + ctx->nb_slices = 0; return ret; }

1 0

avcodec/nvdec: reset bitstream_len/nb_slices when resetting bitstream pointer
by Timo Rothenpieler 29 Mar '24

29 Mar '24

ffmpeg | branch: release/6.0 | Timo Rothenpieler <timo(a)rothenpieler.org> | Sat Mar 30 00:12:03 2024 +0100| [a39e922fb770180c079f5fef7d23ea9a27832334] | committer: Timo Rothenpieler avcodec/nvdec: reset bitstream_len/nb_slices when resetting bitstream pointer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a39e922fb770180c0… --- libavcodec/nvdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/nvdec.c b/libavcodec/nvdec.c index b57adae98e..cd3a1cfb31 100644 --- a/libavcodec/nvdec.c +++ b/libavcodec/nvdec.c @@ -677,6 +677,8 @@ int ff_nvdec_simple_end_frame(AVCodecContext *avctx) NVDECContext *ctx = avctx->internal->hwaccel_priv_data; int ret = ff_nvdec_end_frame(avctx); ctx->bitstream = NULL; + ctx->bitstream_len = 0; + ctx->nb_slices = 0; return ret; }

1 0

avcodec/nvdec: reset bitstream_len/nb_slices when resetting bitstream pointer
by Timo Rothenpieler 29 Mar '24

29 Mar '24

ffmpeg | branch: release/6.1 | Timo Rothenpieler <timo(a)rothenpieler.org> | Sat Mar 30 00:12:03 2024 +0100| [f4a6db1222eaec502eb5c09d9b57321903aaeaff] | committer: Timo Rothenpieler avcodec/nvdec: reset bitstream_len/nb_slices when resetting bitstream pointer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f4a6db1222eaec502… --- libavcodec/nvdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/nvdec.c b/libavcodec/nvdec.c index b2481e7fe8..09c91e0dab 100644 --- a/libavcodec/nvdec.c +++ b/libavcodec/nvdec.c @@ -665,6 +665,8 @@ int ff_nvdec_simple_end_frame(AVCodecContext *avctx) NVDECContext *ctx = avctx->internal->hwaccel_priv_data; int ret = ff_nvdec_end_frame(avctx); ctx->bitstream = NULL; + ctx->bitstream_len = 0; + ctx->nb_slices = 0; return ret; }

1 0

avcodec/nvdec: reset bitstream_len/nb_slices when resetting bitstream pointer
by Timo Rothenpieler 29 Mar '24

29 Mar '24

ffmpeg | branch: release/7.0 | Timo Rothenpieler <timo(a)rothenpieler.org> | Sat Mar 30 00:12:03 2024 +0100| [515949a15a94b9c8e505d7334faceed435f9e107] | committer: Timo Rothenpieler avcodec/nvdec: reset bitstream_len/nb_slices when resetting bitstream pointer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=515949a15a94b9c8e… --- libavcodec/nvdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/nvdec.c b/libavcodec/nvdec.c index 553c9bdf18..1741ee7e47 100644 --- a/libavcodec/nvdec.c +++ b/libavcodec/nvdec.c @@ -664,6 +664,8 @@ int ff_nvdec_simple_end_frame(AVCodecContext *avctx) NVDECContext *ctx = avctx->internal->hwaccel_priv_data; int ret = ff_nvdec_end_frame(avctx); ctx->bitstream = NULL; + ctx->bitstream_len = 0; + ctx->nb_slices = 0; return ret; }

1 0

avcodec/nvdec: reset bitstream_len/nb_slices when resetting bitstream pointer
by Timo Rothenpieler 29 Mar '24

29 Mar '24

ffmpeg | branch: master | Timo Rothenpieler <timo(a)rothenpieler.org> | Sat Mar 30 00:12:03 2024 +0100| [e99c273feca16439fa4750f52693d94136d95ea7] | committer: Timo Rothenpieler avcodec/nvdec: reset bitstream_len/nb_slices when resetting bitstream pointer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e99c273feca16439f… --- libavcodec/nvdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/nvdec.c b/libavcodec/nvdec.c index 553c9bdf18..1741ee7e47 100644 --- a/libavcodec/nvdec.c +++ b/libavcodec/nvdec.c @@ -664,6 +664,8 @@ int ff_nvdec_simple_end_frame(AVCodecContext *avctx) NVDECContext *ctx = avctx->internal->hwaccel_priv_data; int ret = ff_nvdec_end_frame(avctx); ctx->bitstream = NULL; + ctx->bitstream_len = 0; + ctx->nb_slices = 0; return ret; }

1 0

avcodec/hevc_ps: don't use a fixed sized buffer for parameter set raw data
by James Almer 29 Mar '24

29 Mar '24

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Fri Mar 29 12:47:03 2024 -0300| [547c9201933f55787fd6818edeaabfeacc1ad4b6] | committer: James Almer avcodec/hevc_ps: don't use a fixed sized buffer for parameter set raw data Allocate it instead, and use it to compare sets instead of the parsed struct. Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=547c9201933f55787… --- libavcodec/hevc_ps.c | 140 ++++++++++++++++++++++++++------------------------- libavcodec/hevc_ps.h | 11 ++-- 2 files changed, 77 insertions(+), 74 deletions(-) diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index 6475d86d7d..1f69b99c4f 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -442,47 +442,43 @@ static int decode_hrd(GetBitContext *gb, int common_inf_present, return 0; } -static void uninit_vps(FFRefStructOpaque opaque, void *obj) +static void hevc_vps_free(FFRefStructOpaque opaque, void *obj) { HEVCVPS *vps = obj; av_freep(&vps->hdr); -} - -static int compare_vps(const HEVCVPS *vps1, const HEVCVPS *vps2) -{ - if (!memcmp(vps1, vps2, offsetof(HEVCVPS, hdr))) - return !vps1->vps_num_hrd_parameters || - !memcmp(vps1->hdr, vps2->hdr, vps1->vps_num_hrd_parameters * sizeof(*vps1->hdr)); - - return 0; + av_freep(&vps->data); } int ff_hevc_decode_nal_vps(GetBitContext *gb, AVCodecContext *avctx, HEVCParamSets *ps) { int i,j; - int vps_id = 0; - ptrdiff_t nal_size; - HEVCVPS *vps = ff_refstruct_alloc_ext(sizeof(*vps), 0, NULL, uninit_vps); + int vps_id = get_bits(gb, 4); + ptrdiff_t nal_size = gb->buffer_end - gb->buffer; + int ret = AVERROR_INVALIDDATA; + HEVCVPS *vps; + + if (ps->pps_list[vps_id]) { + const HEVCVPS *vps1 = ps->vps_list[vps_id]; + if (vps1->data_size == nal_size && + !memcmp(vps1->data, gb->buffer, vps1->data_size)) + return 0; + } + vps = ff_refstruct_alloc_ext(sizeof(*vps), 0, NULL, hevc_vps_free); if (!vps) return AVERROR(ENOMEM); av_log(avctx, AV_LOG_DEBUG, "Decoding VPS\n"); - nal_size = gb->buffer_end - gb->buffer; - if (nal_size > sizeof(vps->data)) { - av_log(avctx, AV_LOG_WARNING, "Truncating likely oversized VPS " - "(%"PTRDIFF_SPECIFIER" > %"SIZE_SPECIFIER")\n", - nal_size, sizeof(vps->data)); - vps->data_size = sizeof(vps->data); - } else { - vps->data_size = nal_size; + vps->data_size = nal_size; + vps->data = av_memdup(gb->buffer, nal_size); + if (!vps->data) { + ret = AVERROR(ENOMEM); + goto err; } - memcpy(vps->data, gb->buffer, vps->data_size); - - vps_id = vps->vps_id = get_bits(gb, 4); + vps->vps_id = vps_id; if (get_bits(gb, 2) != 3) { // vps_reserved_three_2bits av_log(avctx, AV_LOG_ERROR, "vps_reserved_three_2bits is not three\n"); @@ -579,19 +575,14 @@ int ff_hevc_decode_nal_vps(GetBitContext *gb, AVCodecContext *avctx, goto err; } - if (ps->vps_list[vps_id] && - compare_vps(ps->vps_list[vps_id], vps)) { - ff_refstruct_unref(&vps); - } else { - remove_vps(ps, vps_id); - ps->vps_list[vps_id] = vps; - } + remove_vps(ps, vps_id); + ps->vps_list[vps_id] = vps; return 0; err: ff_refstruct_unref(&vps); - return AVERROR_INVALIDDATA; + return ret; } static void decode_vui(GetBitContext *gb, AVCodecContext *avctx, @@ -1294,37 +1285,43 @@ int ff_hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb, unsigned int *sps_id, return 0; } +static void hevc_sps_free(FFRefStructOpaque opaque, void *obj) +{ + HEVCSPS *sps = obj; + + av_freep(&sps->data); +} + +static int compare_sps(const HEVCSPS *sps1, const HEVCSPS *sps2) +{ + return sps1->data_size == sps2->data_size && + !memcmp(sps1->data, sps2->data, sps1->data_size); +} + int ff_hevc_decode_nal_sps(GetBitContext *gb, AVCodecContext *avctx, HEVCParamSets *ps, int apply_defdispwin) { - HEVCSPS *sps = ff_refstruct_allocz(sizeof(*sps)); + HEVCSPS *sps = ff_refstruct_alloc_ext(sizeof(*sps), 0, NULL, hevc_sps_free); unsigned int sps_id; int ret; - ptrdiff_t nal_size; if (!sps) return AVERROR(ENOMEM); av_log(avctx, AV_LOG_DEBUG, "Decoding SPS\n"); - nal_size = gb->buffer_end - gb->buffer; - if (nal_size > sizeof(sps->data)) { - av_log(avctx, AV_LOG_WARNING, "Truncating likely oversized SPS " - "(%"PTRDIFF_SPECIFIER" > %"SIZE_SPECIFIER")\n", - nal_size, sizeof(sps->data)); - sps->data_size = sizeof(sps->data); - } else { - sps->data_size = nal_size; + sps->data_size = gb->buffer_end - gb->buffer; + sps->data = av_memdup(gb->buffer, sps->data_size); + if (!sps->data) { + ret = AVERROR(ENOMEM); + goto err; } - memcpy(sps->data, gb->buffer, sps->data_size); ret = ff_hevc_parse_sps(sps, gb, &sps_id, apply_defdispwin, ps->vps_list, avctx); - if (ret < 0) { - ff_refstruct_unref(&sps); - return ret; - } + if (ret < 0) + goto err; if (avctx->debug & FF_DEBUG_BITSTREAM) { av_log(avctx, AV_LOG_DEBUG, @@ -1340,7 +1337,7 @@ int ff_hevc_decode_nal_sps(GetBitContext *gb, AVCodecContext *avctx, * original one. * otherwise drop all PPSes that depend on it */ if (ps->sps_list[sps_id] && - !memcmp(ps->sps_list[sps_id], sps, sizeof(*sps))) { + compare_sps(ps->sps_list[sps_id], sps)) { ff_refstruct_unref(&sps); } else { remove_sps(ps, sps_id); @@ -1348,6 +1345,9 @@ int ff_hevc_decode_nal_sps(GetBitContext *gb, AVCodecContext *avctx, } return 0; +err: + ff_refstruct_unref(&sps); + return ret; } static void hevc_pps_free(FFRefStructOpaque unused, void *obj) @@ -1364,6 +1364,7 @@ static void hevc_pps_free(FFRefStructOpaque unused, void *obj) av_freep(&pps->tile_pos_rs); av_freep(&pps->tile_id); av_freep(&pps->min_tb_addr_zs_tab); + av_freep(&pps->data); } static void colour_mapping_octants(GetBitContext *gb, HEVCPPS *pps, int inp_depth, @@ -1762,27 +1763,35 @@ int ff_hevc_decode_nal_pps(GetBitContext *gb, AVCodecContext *avctx, const HEVCSPS *sps = NULL; const HEVCVPS *vps = NULL; int i, ret = 0; - unsigned int pps_id = 0; - ptrdiff_t nal_size; + ptrdiff_t nal_size = gb->buffer_end - gb->buffer; + unsigned int pps_id = get_ue_golomb_long(gb); unsigned log2_parallel_merge_level_minus2; + HEVCPPS *pps; + + av_log(avctx, AV_LOG_DEBUG, "Decoding PPS\n"); - HEVCPPS *pps = ff_refstruct_alloc_ext(sizeof(*pps), 0, NULL, hevc_pps_free); + if (pps_id >= HEVC_MAX_PPS_COUNT) { + av_log(avctx, AV_LOG_ERROR, "PPS id out of range: %d\n", pps_id); + return AVERROR_INVALIDDATA; + } + if (ps->pps_list[pps_id]) { + const HEVCPPS *pps1 = ps->pps_list[pps_id]; + if (pps1->data_size == nal_size && + !memcmp(pps1->data, gb->buffer, pps1->data_size)) + return 0; + } + + pps = ff_refstruct_alloc_ext(sizeof(*pps), 0, NULL, hevc_pps_free); if (!pps) return AVERROR(ENOMEM); - av_log(avctx, AV_LOG_DEBUG, "Decoding PPS\n"); - - nal_size = gb->buffer_end - gb->buffer; - if (nal_size > sizeof(pps->data)) { - av_log(avctx, AV_LOG_WARNING, "Truncating likely oversized PPS " - "(%"PTRDIFF_SPECIFIER" > %"SIZE_SPECIFIER")\n", - nal_size, sizeof(pps->data)); - pps->data_size = sizeof(pps->data); - } else { - pps->data_size = nal_size; + pps->data_size = nal_size; + pps->data = av_memdup(gb->buffer, nal_size); + if (!pps->data) { + ret = AVERROR_INVALIDDATA; + goto err; } - memcpy(pps->data, gb->buffer, pps->data_size); // Default values pps->loop_filter_across_tiles_enabled_flag = 1; @@ -1795,12 +1804,7 @@ int ff_hevc_decode_nal_pps(GetBitContext *gb, AVCodecContext *avctx, pps->log2_max_transform_skip_block_size = 2; // Coded parameters - pps_id = pps->pps_id = get_ue_golomb_long(gb); - if (pps_id >= HEVC_MAX_PPS_COUNT) { - av_log(avctx, AV_LOG_ERROR, "PPS id out of range: %d\n", pps_id); - ret = AVERROR_INVALIDDATA; - goto err; - } + pps->pps_id = pps_id; pps->sps_id = get_ue_golomb_long(gb); if (pps->sps_id >= HEVC_MAX_SPS_COUNT) { av_log(avctx, AV_LOG_ERROR, "SPS id out of range: %d\n", pps->sps_id); diff --git a/libavcodec/hevc_ps.h b/libavcodec/hevc_ps.h index 0d8eaf2b3e..61a0fe2219 100644 --- a/libavcodec/hevc_ps.h +++ b/libavcodec/hevc_ps.h @@ -172,11 +172,10 @@ typedef struct HEVCVPS { int vps_num_ticks_poc_diff_one; ///< vps_num_ticks_poc_diff_one_minus1 + 1 int vps_num_hrd_parameters; - uint8_t data[4096]; - int data_size; - /* Put this at the end of the structure to make it easier to calculate the - * size before this pointer, which is used for memcmp */ HEVCHdrParams *hdr; + + uint8_t *data; + int data_size; } HEVCVPS; typedef struct ScalingList { @@ -299,7 +298,7 @@ typedef struct HEVCSPS { int qp_bd_offset; - uint8_t data[4096]; + uint8_t *data; int data_size; } HEVCSPS; @@ -434,7 +433,7 @@ typedef struct HEVCPPS { int *min_tb_addr_zs; ///< MinTbAddrZS int *min_tb_addr_zs_tab;///< MinTbAddrZS - uint8_t data[4096]; + uint8_t *data; int data_size; } HEVCPPS;

1 0

avcodec/hevc_ps: fix the problem of memcmp losing effectiveness
by Tong Wu 29 Mar '24

29 Mar '24

ffmpeg | branch: release/7.0 | Tong Wu <tong1.wu(a)intel.com> | Fri Mar 29 23:31:20 2024 +0800| [7fa569e34d448c4a3a19fc0e5c7a74cfc9f6be59] | committer: James Almer avcodec/hevc_ps: fix the problem of memcmp losing effectiveness HEVCHdrParams* receives a pointer which points to a dynamically allocated memory block. It causes the memcmp always returning 1. Add a function to do the comparision. A condition is also added to avoid malloc(0). Reviewed-by: James Almer <jamrial(a)gmail.com> Signed-off-by: Tong Wu <tong1.wu(a)intel.com> Signed-off-by: James Almer <jamrial(a)gmail.com> (cherry picked from commit 6bf17136a2bc1e6f52ea9cd27a6dcaab648efe5c) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7fa569e34d448c4a3… --- libavcodec/hevc_ps.c | 19 +++++++++++++++---- libavcodec/hevc_ps.h | 4 +++- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index cbef3ef4cd..6475d86d7d 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -449,6 +449,15 @@ static void uninit_vps(FFRefStructOpaque opaque, void *obj) av_freep(&vps->hdr); } +static int compare_vps(const HEVCVPS *vps1, const HEVCVPS *vps2) +{ + if (!memcmp(vps1, vps2, offsetof(HEVCVPS, hdr))) + return !vps1->vps_num_hrd_parameters || + !memcmp(vps1->hdr, vps2->hdr, vps1->vps_num_hrd_parameters * sizeof(*vps1->hdr)); + + return 0; +} + int ff_hevc_decode_nal_vps(GetBitContext *gb, AVCodecContext *avctx, HEVCParamSets *ps) { @@ -545,9 +554,11 @@ int ff_hevc_decode_nal_vps(GetBitContext *gb, AVCodecContext *avctx, goto err; } - vps->hdr = av_calloc(vps->vps_num_hrd_parameters, sizeof(*vps->hdr)); - if (!vps->hdr) - goto err; + if (vps->vps_num_hrd_parameters) { + vps->hdr = av_calloc(vps->vps_num_hrd_parameters, sizeof(*vps->hdr)); + if (!vps->hdr) + goto err; + } for (i = 0; i < vps->vps_num_hrd_parameters; i++) { int common_inf_present = 1; @@ -569,7 +580,7 @@ int ff_hevc_decode_nal_vps(GetBitContext *gb, AVCodecContext *avctx, } if (ps->vps_list[vps_id] && - !memcmp(ps->vps_list[vps_id], vps, sizeof(*vps))) { + compare_vps(ps->vps_list[vps_id], vps)) { ff_refstruct_unref(&vps); } else { remove_vps(ps, vps_id); diff --git a/libavcodec/hevc_ps.h b/libavcodec/hevc_ps.h index cc75aeb8d3..0d8eaf2b3e 100644 --- a/libavcodec/hevc_ps.h +++ b/libavcodec/hevc_ps.h @@ -153,7 +153,6 @@ typedef struct PTL { typedef struct HEVCVPS { unsigned int vps_id; - HEVCHdrParams *hdr; uint8_t vps_temporal_id_nesting_flag; int vps_max_layers; @@ -175,6 +174,9 @@ typedef struct HEVCVPS { uint8_t data[4096]; int data_size; + /* Put this at the end of the structure to make it easier to calculate the + * size before this pointer, which is used for memcmp */ + HEVCHdrParams *hdr; } HEVCVPS; typedef struct ScalingList {

1 0

avcodec/hevc_ps: fix the problem of memcmp losing effectiveness
by Tong Wu 29 Mar '24

29 Mar '24

ffmpeg | branch: master | Tong Wu <tong1.wu(a)intel.com> | Fri Mar 29 23:31:20 2024 +0800| [6bf17136a2bc1e6f52ea9cd27a6dcaab648efe5c] | committer: James Almer avcodec/hevc_ps: fix the problem of memcmp losing effectiveness HEVCHdrParams* receives a pointer which points to a dynamically allocated memory block. It causes the memcmp always returning 1. Add a function to do the comparision. A condition is also added to avoid malloc(0). Reviewed-by: James Almer <jamrial(a)gmail.com> Signed-off-by: Tong Wu <tong1.wu(a)intel.com> Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6bf17136a2bc1e6f5… --- libavcodec/hevc_ps.c | 19 +++++++++++++++---- libavcodec/hevc_ps.h | 4 +++- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index cbef3ef4cd..6475d86d7d 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -449,6 +449,15 @@ static void uninit_vps(FFRefStructOpaque opaque, void *obj) av_freep(&vps->hdr); } +static int compare_vps(const HEVCVPS *vps1, const HEVCVPS *vps2) +{ + if (!memcmp(vps1, vps2, offsetof(HEVCVPS, hdr))) + return !vps1->vps_num_hrd_parameters || + !memcmp(vps1->hdr, vps2->hdr, vps1->vps_num_hrd_parameters * sizeof(*vps1->hdr)); + + return 0; +} + int ff_hevc_decode_nal_vps(GetBitContext *gb, AVCodecContext *avctx, HEVCParamSets *ps) { @@ -545,9 +554,11 @@ int ff_hevc_decode_nal_vps(GetBitContext *gb, AVCodecContext *avctx, goto err; } - vps->hdr = av_calloc(vps->vps_num_hrd_parameters, sizeof(*vps->hdr)); - if (!vps->hdr) - goto err; + if (vps->vps_num_hrd_parameters) { + vps->hdr = av_calloc(vps->vps_num_hrd_parameters, sizeof(*vps->hdr)); + if (!vps->hdr) + goto err; + } for (i = 0; i < vps->vps_num_hrd_parameters; i++) { int common_inf_present = 1; @@ -569,7 +580,7 @@ int ff_hevc_decode_nal_vps(GetBitContext *gb, AVCodecContext *avctx, } if (ps->vps_list[vps_id] && - !memcmp(ps->vps_list[vps_id], vps, sizeof(*vps))) { + compare_vps(ps->vps_list[vps_id], vps)) { ff_refstruct_unref(&vps); } else { remove_vps(ps, vps_id); diff --git a/libavcodec/hevc_ps.h b/libavcodec/hevc_ps.h index cc75aeb8d3..0d8eaf2b3e 100644 --- a/libavcodec/hevc_ps.h +++ b/libavcodec/hevc_ps.h @@ -153,7 +153,6 @@ typedef struct PTL { typedef struct HEVCVPS { unsigned int vps_id; - HEVCHdrParams *hdr; uint8_t vps_temporal_id_nesting_flag; int vps_max_layers; @@ -175,6 +174,9 @@ typedef struct HEVCVPS { uint8_t data[4096]; int data_size; + /* Put this at the end of the structure to make it easier to calculate the + * size before this pointer, which is used for memcmp */ + HEVCHdrParams *hdr; } HEVCVPS; typedef struct ScalingList {

1 0

lavfi/setpts: unset frame durations
by Anton Khirnov 29 Mar '24

29 Mar '24

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Wed Mar 27 13:57:15 2024 +0100| [fa110c32b5168d99098dc0c50c6465054cf9d20b] | committer: Anton Khirnov lavfi/setpts: unset frame durations Actual frame durations are, in general, not computable without buffering a frame. FIxes #10886 > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fa110c32b5168d990… --- libavfilter/setpts.c | 1 + tests/ref/fate/filter-setpts | 100 +++++++++++++++++++++---------------------- 2 files changed, 51 insertions(+), 50 deletions(-) diff --git a/libavfilter/setpts.c b/libavfilter/setpts.c index 4f02a9a617..60cf2b642e 100644 --- a/libavfilter/setpts.c +++ b/libavfilter/setpts.c @@ -205,6 +205,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) d = eval_pts(setpts, inlink, frame, frame->pts); frame->pts = D2TS(d); + frame->duration = 0; av_log(inlink->dst, AV_LOG_TRACE, "N:%"PRId64" PTS:%s T:%f", diff --git a/tests/ref/fate/filter-setpts b/tests/ref/fate/filter-setpts index 8aa7a1e6a0..08e0203831 100644 --- a/tests/ref/fate/filter-setpts +++ b/tests/ref/fate/filter-setpts @@ -3,53 +3,53 @@ #codec_id 0: rawvideo #dimensions 0: 352x288 #sar 0: 0/1 -0, 0, 0, 40, 152064, 0x05b789ef -0, 28, 28, 40, 152064, 0x4bb46551 -0, 57, 57, 40, 152064, 0x9dddf64a -0, 86, 86, 40, 152064, 0x2a8380b0 -0, 115, 115, 40, 152064, 0x4de3b652 -0, 144, 144, 40, 152064, 0xedb5a8e6 -0, 172, 172, 40, 152064, 0xe20f7c23 -0, 201, 201, 40, 152064, 0x5ab58bac -0, 229, 229, 40, 152064, 0x1f1b8026 -0, 258, 258, 40, 152064, 0x91373915 -0, 286, 286, 40, 152064, 0x02344760 -0, 314, 314, 40, 152064, 0x30f5fcd5 -0, 343, 343, 40, 152064, 0xc711ad61 -0, 371, 371, 40, 152064, 0x24eca223 -0, 399, 399, 40, 152064, 0x52a48ddd -0, 427, 427, 40, 152064, 0xa91c0f05 -0, 456, 456, 40, 152064, 0x8e364e18 -0, 484, 484, 40, 152064, 0xb15d38c8 -0, 512, 512, 40, 152064, 0xf25f6acc -0, 541, 541, 40, 152064, 0xf34ddbff -0, 570, 570, 40, 152064, 0xfc7bf570 -0, 598, 598, 40, 152064, 0x9dc72412 -0, 627, 627, 40, 152064, 0x445d1d59 -0, 656, 656, 40, 152064, 0x2f2768ef -0, 685, 685, 40, 152064, 0xce09f9d6 -0, 714, 714, 40, 152064, 0x95579936 -0, 743, 743, 40, 152064, 0x43d796b5 -0, 772, 772, 40, 152064, 0xd780d887 -0, 800, 800, 40, 152064, 0x76d2a455 -0, 829, 829, 40, 152064, 0x6dc3650e -0, 858, 858, 40, 152064, 0x0f9d6aca -0, 887, 887, 40, 152064, 0xe295c51e -0, 915, 915, 40, 152064, 0xd766fc8d -0, 944, 944, 40, 152064, 0xe22f7a30 -0, 972, 972, 40, 152064, 0x7fea4378 -0, 1000, 1000, 40, 152064, 0xfa8d94fb -0, 1029, 1029, 40, 152064, 0x4c9737ab -0, 1057, 1057, 40, 152064, 0xa50d01f8 -0, 1085, 1085, 40, 152064, 0x0b07594c -0, 1113, 1113, 40, 152064, 0x88734edd -0, 1142, 1142, 40, 152064, 0xd2735925 -0, 1170, 1170, 40, 152064, 0xd4e49e08 -0, 1198, 1198, 40, 152064, 0x20cebfa9 -0, 1227, 1227, 40, 152064, 0x575c20ec -0, 1255, 1255, 40, 152064, 0xfd500471 -0, 1284, 1284, 40, 152064, 0x61b47e73 -0, 1313, 1313, 40, 152064, 0x09ef53ff -0, 1341, 1341, 40, 152064, 0x6e88c5c2 -0, 1370, 1370, 40, 152064, 0xbb87b483 -0, 1399, 1399, 40, 152064, 0x4bbad8ea +0, 0, 0, 0, 152064, 0x05b789ef +0, 28, 28, 0, 152064, 0x4bb46551 +0, 57, 57, 0, 152064, 0x9dddf64a +0, 86, 86, 0, 152064, 0x2a8380b0 +0, 115, 115, 0, 152064, 0x4de3b652 +0, 144, 144, 0, 152064, 0xedb5a8e6 +0, 172, 172, 0, 152064, 0xe20f7c23 +0, 201, 201, 0, 152064, 0x5ab58bac +0, 229, 229, 0, 152064, 0x1f1b8026 +0, 258, 258, 0, 152064, 0x91373915 +0, 286, 286, 0, 152064, 0x02344760 +0, 314, 314, 0, 152064, 0x30f5fcd5 +0, 343, 343, 0, 152064, 0xc711ad61 +0, 371, 371, 0, 152064, 0x24eca223 +0, 399, 399, 0, 152064, 0x52a48ddd +0, 427, 427, 0, 152064, 0xa91c0f05 +0, 456, 456, 0, 152064, 0x8e364e18 +0, 484, 484, 0, 152064, 0xb15d38c8 +0, 512, 512, 0, 152064, 0xf25f6acc +0, 541, 541, 0, 152064, 0xf34ddbff +0, 570, 570, 0, 152064, 0xfc7bf570 +0, 598, 598, 0, 152064, 0x9dc72412 +0, 627, 627, 0, 152064, 0x445d1d59 +0, 656, 656, 0, 152064, 0x2f2768ef +0, 685, 685, 0, 152064, 0xce09f9d6 +0, 714, 714, 0, 152064, 0x95579936 +0, 743, 743, 0, 152064, 0x43d796b5 +0, 772, 772, 0, 152064, 0xd780d887 +0, 800, 800, 0, 152064, 0x76d2a455 +0, 829, 829, 0, 152064, 0x6dc3650e +0, 858, 858, 0, 152064, 0x0f9d6aca +0, 887, 887, 0, 152064, 0xe295c51e +0, 915, 915, 0, 152064, 0xd766fc8d +0, 944, 944, 0, 152064, 0xe22f7a30 +0, 972, 972, 0, 152064, 0x7fea4378 +0, 1000, 1000, 0, 152064, 0xfa8d94fb +0, 1029, 1029, 0, 152064, 0x4c9737ab +0, 1057, 1057, 0, 152064, 0xa50d01f8 +0, 1085, 1085, 0, 152064, 0x0b07594c +0, 1113, 1113, 0, 152064, 0x88734edd +0, 1142, 1142, 0, 152064, 0xd2735925 +0, 1170, 1170, 0, 152064, 0xd4e49e08 +0, 1198, 1198, 0, 152064, 0x20cebfa9 +0, 1227, 1227, 0, 152064, 0x575c20ec +0, 1255, 1255, 0, 152064, 0xfd500471 +0, 1284, 1284, 0, 152064, 0x61b47e73 +0, 1313, 1313, 0, 152064, 0x09ef53ff +0, 1341, 1341, 0, 152064, 0x6e88c5c2 +0, 1370, 1370, 0, 152064, 0xbb87b483 +0, 1399, 1399, 0, 152064, 0x4bbad8ea

1 0

lavf/vf_setpts: unset output framerate
by Anton Khirnov 29 Mar '24

29 Mar '24

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Wed Mar 27 13:55:26 2024 +0100| [f121d954ac89060cb7b07da230479cffe5bf9e5c] | committer: Anton Khirnov lavf/vf_setpts: unset output framerate This filter produces VFR output in general. Avoids dropping frames in the setpts test. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f121d954ac89060cb… --- libavfilter/setpts.c | 17 ++++++++- tests/ref/fate/filter-setpts | 89 +++++++++++++++++++++++++------------------- 2 files changed, 67 insertions(+), 39 deletions(-) diff --git a/libavfilter/setpts.c b/libavfilter/setpts.c index 88a8d6af86..4f02a9a617 100644 --- a/libavfilter/setpts.c +++ b/libavfilter/setpts.c @@ -150,6 +150,13 @@ static int config_input(AVFilterLink *inlink) return 0; } +static int config_output_video(AVFilterLink *outlink) +{ + outlink->frame_rate = (AVRational){ 1, 0 }; + + return 0; +} + #define BUF_SIZE 64 static inline char *double2int64str(char *buf, double v) @@ -322,6 +329,14 @@ static const AVFilterPad avfilter_vf_setpts_inputs[] = { }, }; +static const AVFilterPad outputs_video[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .config_props = config_output_video, + }, +}; + const AVFilter ff_vf_setpts = { .name = "setpts", .description = NULL_IF_CONFIG_SMALL("Set PTS for the output video frame."), @@ -335,7 +350,7 @@ const AVFilter ff_vf_setpts = { .priv_class = &setpts_class, FILTER_INPUTS(avfilter_vf_setpts_inputs), - FILTER_OUTPUTS(ff_video_default_filterpad), + FILTER_OUTPUTS(outputs_video), }; #endif /* CONFIG_SETPTS_FILTER */ diff --git a/tests/ref/fate/filter-setpts b/tests/ref/fate/filter-setpts index efdcf6a16e..8aa7a1e6a0 100644 --- a/tests/ref/fate/filter-setpts +++ b/tests/ref/fate/filter-setpts @@ -1,42 +1,55 @@ -#tb 0: 1/25 +#tb 0: 1/1000 #media_type 0: video #codec_id 0: rawvideo #dimensions 0: 352x288 #sar 0: 0/1 -0, 0, 0, 1, 152064, 0x05b789ef -0, 1, 1, 1, 152064, 0x4bb46551 -0, 2, 2, 1, 152064, 0x9dddf64a -0, 3, 3, 1, 152064, 0x2a8380b0 -0, 4, 4, 1, 152064, 0x4de3b652 -0, 5, 5, 1, 152064, 0xedb5a8e6 -0, 6, 6, 1, 152064, 0x5ab58bac -0, 7, 7, 1, 152064, 0x1f1b8026 -0, 8, 8, 1, 152064, 0x91373915 -0, 9, 9, 1, 152064, 0x30f5fcd5 -0, 10, 10, 1, 152064, 0xc711ad61 -0, 11, 11, 1, 152064, 0x52a48ddd -0, 12, 12, 1, 152064, 0xa91c0f05 -0, 13, 13, 1, 152064, 0x8e364e18 -0, 14, 14, 1, 152064, 0xf25f6acc -0, 15, 15, 1, 152064, 0xf34ddbff -0, 16, 16, 1, 152064, 0x9dc72412 -0, 17, 17, 1, 152064, 0x445d1d59 -0, 18, 18, 1, 152064, 0x2f2768ef -0, 19, 19, 1, 152064, 0x95579936 -0, 20, 20, 1, 152064, 0x43d796b5 -0, 21, 21, 1, 152064, 0x76d2a455 -0, 22, 22, 1, 152064, 0x6dc3650e -0, 23, 23, 1, 152064, 0x0f9d6aca -0, 24, 24, 1, 152064, 0xd766fc8d -0, 25, 25, 1, 152064, 0xe22f7a30 -0, 26, 26, 1, 152064, 0xfa8d94fb -0, 27, 27, 1, 152064, 0x4c9737ab -0, 28, 28, 1, 152064, 0xa50d01f8 -0, 29, 29, 1, 152064, 0x88734edd -0, 30, 30, 1, 152064, 0xd2735925 -0, 31, 31, 1, 152064, 0x20cebfa9 -0, 32, 32, 1, 152064, 0x575c20ec -0, 33, 33, 1, 152064, 0x61b47e73 -0, 34, 34, 1, 152064, 0x09ef53ff -0, 35, 35, 1, 152064, 0x6e88c5c2 -0, 36, 36, 1, 152064, 0x4bbad8ea +0, 0, 0, 40, 152064, 0x05b789ef +0, 28, 28, 40, 152064, 0x4bb46551 +0, 57, 57, 40, 152064, 0x9dddf64a +0, 86, 86, 40, 152064, 0x2a8380b0 +0, 115, 115, 40, 152064, 0x4de3b652 +0, 144, 144, 40, 152064, 0xedb5a8e6 +0, 172, 172, 40, 152064, 0xe20f7c23 +0, 201, 201, 40, 152064, 0x5ab58bac +0, 229, 229, 40, 152064, 0x1f1b8026 +0, 258, 258, 40, 152064, 0x91373915 +0, 286, 286, 40, 152064, 0x02344760 +0, 314, 314, 40, 152064, 0x30f5fcd5 +0, 343, 343, 40, 152064, 0xc711ad61 +0, 371, 371, 40, 152064, 0x24eca223 +0, 399, 399, 40, 152064, 0x52a48ddd +0, 427, 427, 40, 152064, 0xa91c0f05 +0, 456, 456, 40, 152064, 0x8e364e18 +0, 484, 484, 40, 152064, 0xb15d38c8 +0, 512, 512, 40, 152064, 0xf25f6acc +0, 541, 541, 40, 152064, 0xf34ddbff +0, 570, 570, 40, 152064, 0xfc7bf570 +0, 598, 598, 40, 152064, 0x9dc72412 +0, 627, 627, 40, 152064, 0x445d1d59 +0, 656, 656, 40, 152064, 0x2f2768ef +0, 685, 685, 40, 152064, 0xce09f9d6 +0, 714, 714, 40, 152064, 0x95579936 +0, 743, 743, 40, 152064, 0x43d796b5 +0, 772, 772, 40, 152064, 0xd780d887 +0, 800, 800, 40, 152064, 0x76d2a455 +0, 829, 829, 40, 152064, 0x6dc3650e +0, 858, 858, 40, 152064, 0x0f9d6aca +0, 887, 887, 40, 152064, 0xe295c51e +0, 915, 915, 40, 152064, 0xd766fc8d +0, 944, 944, 40, 152064, 0xe22f7a30 +0, 972, 972, 40, 152064, 0x7fea4378 +0, 1000, 1000, 40, 152064, 0xfa8d94fb +0, 1029, 1029, 40, 152064, 0x4c9737ab +0, 1057, 1057, 40, 152064, 0xa50d01f8 +0, 1085, 1085, 40, 152064, 0x0b07594c +0, 1113, 1113, 40, 152064, 0x88734edd +0, 1142, 1142, 40, 152064, 0xd2735925 +0, 1170, 1170, 40, 152064, 0xd4e49e08 +0, 1198, 1198, 40, 152064, 0x20cebfa9 +0, 1227, 1227, 40, 152064, 0x575c20ec +0, 1255, 1255, 40, 152064, 0xfd500471 +0, 1284, 1284, 40, 152064, 0x61b47e73 +0, 1313, 1313, 40, 152064, 0x09ef53ff +0, 1341, 1341, 40, 152064, 0x6e88c5c2 +0, 1370, 1370, 40, 152064, 0xbb87b483 +0, 1399, 1399, 40, 152064, 0x4bbad8ea

1 0