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

avcodec/h264_refs: Rewrite code to make control flow clearer
by Andreas Rheinhardt 30 Mar '24

30 Mar '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Tue Mar 26 20:07:24 2024 +0100| [ac14d682777a7f74cea1fdf42189c4c421eed664] | committer: Andreas Rheinhardt avcodec/h264_refs: Rewrite code to make control flow clearer While this change IMO makes the control flow clearer for the human reader, it is especially important for GCC: It erroneously believes that it is possible to enter the SHORT2(UNUSED|LONG) cases without having entered the preceding block that initializes pic, frame_num, structure and j; it would emit -Wmaybe-uninitialized warnings for these variables if they were not pseudo- initialized with av_uninit(). This patch allows to remove the latter. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ac14d682777a7f74c… --- libavcodec/h264_refs.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 9bc7b20988..c2ba4b9b9e 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -646,8 +646,9 @@ int ff_h264_execute_ref_pic_marking(H264Context *h) av_log(h->avctx, AV_LOG_DEBUG, "mmco:%d %d %d\n", h->mmco[i].opcode, h->mmco[i].short_pic_num, h->mmco[i].long_arg); - if (mmco[i].opcode == MMCO_SHORT2UNUSED || - mmco[i].opcode == MMCO_SHORT2LONG) { + switch (mmco[i].opcode) { + case MMCO_SHORT2UNUSED: + case MMCO_SHORT2LONG: frame_num = pic_num_extract(h, mmco[i].short_pic_num, &structure); pic = find_short(h, frame_num, &j); if (!pic) { @@ -659,16 +660,12 @@ int ff_h264_execute_ref_pic_marking(H264Context *h) } continue; } - } - - switch (mmco[i].opcode) { - case MMCO_SHORT2UNUSED: - if (h->avctx->debug & FF_DEBUG_MMCO) - av_log(h->avctx, AV_LOG_DEBUG, "mmco: unref short %d count %d\n", - h->mmco[i].short_pic_num, h->short_ref_count); - remove_short(h, frame_num, structure ^ PICT_FRAME); - break; - case MMCO_SHORT2LONG: + if (mmco[i].opcode == MMCO_SHORT2UNUSED) { + if (h->avctx->debug & FF_DEBUG_MMCO) + av_log(h->avctx, AV_LOG_DEBUG, "mmco: unref short %d count %d\n", + h->mmco[i].short_pic_num, h->short_ref_count); + remove_short(h, frame_num, structure ^ PICT_FRAME); + } else { if (h->long_ref[mmco[i].long_arg] != pic) remove_long(h, mmco[i].long_arg, 0); @@ -678,6 +675,7 @@ int ff_h264_execute_ref_pic_marking(H264Context *h) h->long_ref[mmco[i].long_arg]->long_ref = 1; h->long_ref_count++; } + } break; case MMCO_LONG2UNUSED: j = pic_num_extract(h, mmco[i].long_arg, &structure);

1 0

swscale/swscale_internal: Only include altivec header iff HAVE_ALTIVEC
by Andreas Rheinhardt 30 Mar '24

30 Mar '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Mar 28 16:34:57 2024 +0100| [4b44b5eaf0ad23c348317e5fa8f8a52cbdfc27b9] | committer: Andreas Rheinhardt swscale/swscale_internal: Only include altivec header iff HAVE_ALTIVEC Reviewed-by: Sean McGovern <gseanmcg(a)gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4b44b5eaf0ad23c34… --- libswscale/swscale_internal.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index abeebbb002..2f6cc70946 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -34,7 +34,9 @@ #include "libavutil/pixfmt.h" #include "libavutil/pixdesc.h" #include "libavutil/slicethread.h" +#if HAVE_ALTIVEC #include "libavutil/ppc/util_altivec.h" +#endif #include "libavutil/half2float.h" #define STR(s) AV_TOSTRING(s) // AV_STRINGIFY is too long

1 0

postproc/postprocess: Don't generally include arch-specific headers
by Andreas Rheinhardt 30 Mar '24

30 Mar '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Mar 28 16:08:36 2024 +0100| [7d9d400695552d98408107c11bf488ea9a161c57] | committer: Andreas Rheinhardt postproc/postprocess: Don't generally include arch-specific headers Reviewed-by: Sean McGovern <gseanmcg(a)gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7d9d400695552d984… --- libpostproc/postprocess.c | 3 ++- libpostproc/postprocess_template.c | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c index 0586e458b4..8f4de8b1e1 100644 --- a/libpostproc/postprocess.c +++ b/libpostproc/postprocess.c @@ -88,7 +88,6 @@ try to unroll inner for(x=0 ... loop to avoid these damn if(x ... checks #include "postprocess.h" #include "postprocess_internal.h" #include "libavutil/avstring.h" -#include "libavutil/ppc/util_altivec.h" #define GET_MODE_BUFFER_SIZE 500 #define OPTIONS_ARRAY_SIZE 10 @@ -499,6 +498,8 @@ static av_always_inline void do_a_deblock_C(uint8_t *src, int step, #include "postprocess_template.c" #if HAVE_ALTIVEC +#include "libavutil/ppc/util_altivec.h" + # define TEMPLATE_PP_ALTIVEC 1 # include "postprocess_altivec_template.c" # include "postprocess_template.c" diff --git a/libpostproc/postprocess_template.c b/libpostproc/postprocess_template.c index ade1d6ce2b..d56b45d3b4 100644 --- a/libpostproc/postprocess_template.c +++ b/libpostproc/postprocess_template.c @@ -22,9 +22,12 @@ * @file * mmx/mmx2/sse2 postprocess code. */ +#include "config.h" #include "libavutil/mem_internal.h" +#if ARCH_X86 #include "libavutil/x86/asm.h" +#endif /* A single TEMPLATE_PP_* should be defined (to 1) when this template is * included. The following macros will define its dependencies to 1 as well @@ -830,7 +833,7 @@ static inline void RENAME(doVertDefFilter)(uint8_t src[], int stride, PPContext #if !TEMPLATE_PP_ALTIVEC static inline void RENAME(dering)(uint8_t src[], int stride, PPContext *c) { -#if HAVE_7REGS && TEMPLATE_PP_MMXEXT +#if TEMPLATE_PP_MMXEXT && HAVE_7REGS DECLARE_ALIGNED(8, uint64_t, tmp)[3]; __asm__ volatile( "pxor %%mm6, %%mm6 \n\t"

1 0

fate: fix sub2video_{basic, time_limited} on big-endian targets
by Sean McGovern 30 Mar '24

30 Mar '24

ffmpeg | branch: master | Sean McGovern <gseanmcg(a)gmail.com> | Wed Mar 6 18:48:37 2024 -0500| [f63a87629e5229119d22c95533f14ec89b97e623] | committer: Andreas Rheinhardt fate: fix sub2video_{basic, time_limited} on big-endian targets The reference file uses BGRA pixel format, so request it here. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f63a87629e5229119… --- tests/fate/ffmpeg.mak | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak index 3c549b265e..49dbba4a6b 100644 --- a/tests/fate/ffmpeg.mak +++ b/tests/fate/ffmpeg.mak @@ -62,6 +62,7 @@ fate-sub2video: CMD = framecrc -auto_conversion_filters \ FATE_SAMPLES_FFMPEG-$(call FRAMECRC, VOBSUB, DVDSUB, SCALE_FILTER) += fate-sub2video_basic fate-sub2video_basic: CMD = framecrc -auto_conversion_filters \ -i $(TARGET_SAMPLES)/sub/vobsub.idx \ + -pix_fmt bgra \ -fps_mode passthrough -copyts \ -filter_complex "sws_flags=+accurate_rnd+bitexact\;[0:s:0]scale" \ -c:v rawvideo -threads 1 @@ -71,6 +72,7 @@ fate-sub2video_basic: CMD = framecrc -auto_conversion_filters \ FATE_SAMPLES_FFMPEG-$(call FRAMECRC, SUP, PGSSUB, SCALE_FILTER RAWVIDEO_ENCODER) += fate-sub2video_time_limited fate-sub2video_time_limited: CMD = framecrc -auto_conversion_filters \ -i $(TARGET_SAMPLES)/sub/pgs_sub.sup \ + -pix_fmt bgra \ -fps_mode passthrough -copyts \ -t 15 \ -filter_complex "sws_flags=+accurate_rnd+bitexact\;[0:s:0]scale" \

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/4.0 | Timo Rothenpieler <timo(a)rothenpieler.org> | Sat Mar 30 00:12:03 2024 +0100| [d1275f8a77fa9800b7fb5497ca2f99978cb29fc6] | 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=d1275f8a77fa9800b… --- libavcodec/nvdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/nvdec.c b/libavcodec/nvdec.c index ab3cb88b27..ec562eba9c 100644 --- a/libavcodec/nvdec.c +++ b/libavcodec/nvdec.c @@ -496,6 +496,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/4.1 | Timo Rothenpieler <timo(a)rothenpieler.org> | Sat Mar 30 00:12:03 2024 +0100| [835453fbd8a91cb1ebdb750efcf2a33bdb4801b7] | 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=835453fbd8a91cb1e… --- libavcodec/nvdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/nvdec.c b/libavcodec/nvdec.c index 0426c9b319..d0e3cd3df6 100644 --- a/libavcodec/nvdec.c +++ b/libavcodec/nvdec.c @@ -539,6 +539,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/4.2 | Timo Rothenpieler <timo(a)rothenpieler.org> | Sat Mar 30 00:12:03 2024 +0100| [197f7eacf67484fd77b9697ffb611a0a97a5733d] | 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=197f7eacf67484fd7… --- libavcodec/nvdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/nvdec.c b/libavcodec/nvdec.c index b60da24301..88061d353c 100644 --- a/libavcodec/nvdec.c +++ b/libavcodec/nvdec.c @@ -550,6 +550,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/4.3 | Timo Rothenpieler <timo(a)rothenpieler.org> | Sat Mar 30 00:12:03 2024 +0100| [fa9a0e7f3e83beecbf031bebd51f1b3ac0f568af] | 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=fa9a0e7f3e83beecb… --- libavcodec/nvdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/nvdec.c b/libavcodec/nvdec.c index 6168a7e3f1..6d7e712580 100644 --- a/libavcodec/nvdec.c +++ b/libavcodec/nvdec.c @@ -624,6 +624,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/4.4 | Timo Rothenpieler <timo(a)rothenpieler.org> | Sat Mar 30 00:12:03 2024 +0100| [5d07afd48253b7dece9d481c0f3cdd186187c0d2] | 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=5d07afd48253b7dec… --- libavcodec/nvdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/nvdec.c b/libavcodec/nvdec.c index 1c24bae8c1..caf9715707 100644 --- a/libavcodec/nvdec.c +++ b/libavcodec/nvdec.c @@ -667,6 +667,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/5.0 | Timo Rothenpieler <timo(a)rothenpieler.org> | Sat Mar 30 00:12:03 2024 +0100| [201d0e6fc17aeb58bb4d4c0fd8d9420293d865fb] | 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=201d0e6fc17aeb58b… --- libavcodec/nvdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/nvdec.c b/libavcodec/nvdec.c index 4a085e1a63..f37dc16fd6 100644 --- a/libavcodec/nvdec.c +++ b/libavcodec/nvdec.c @@ -667,6 +667,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