Patches attached.
- Andreas
From 21a2f6356d81876e005c7aea2d4dcb83f1020891 Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
Date: Tue, 18 Mar 2025 08:25:14 +0100
Subject: [PATCH 1/3] avcodec/vvc/Makefile: Move VVC decoder->h2645data dep to
lavc/Makefile
If h2645data.c were changed in a way that makes it rely on another
object file, all components that need h2645data.o would need to be
updated. And given that the VVC decoder->h2645data.o dependency is
currently hidden in a separate Makefile, it would likely be forgotten.
So move it to the libavcodec/Makefile.
Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
---
libavcodec/Makefile | 1 +
libavcodec/vvc/Makefile | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index abe8b3ffda..20b3a93a69 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -809,6 +809,7 @@ OBJS-$(CONFIG_VPLAYER_DECODER) += textdec.o ass.o
OBJS-$(CONFIG_VP9_V4L2M2M_DECODER) += v4l2_m2m_dec.o
OBJS-$(CONFIG_VQA_DECODER) += vqavideo.o
OBJS-$(CONFIG_VQC_DECODER) += vqcdec.o
+OBJS-$(CONFIG_VVC_DECODER) += h2645data.o
OBJS-$(CONFIG_WADY_DPCM_DECODER) += dpcm.o
OBJS-$(CONFIG_WAVARC_DECODER) += wavarc.o
OBJS-$(CONFIG_WAVPACK_DECODER) += wavpack.o wavpackdata.o dsd.o
diff --git a/libavcodec/vvc/Makefile b/libavcodec/vvc/Makefile
index d1d78933d1..6a28d32bc2 100644
--- a/libavcodec/vvc/Makefile
+++ b/libavcodec/vvc/Makefile
@@ -15,4 +15,3 @@ OBJS-$(CONFIG_VVC_DECODER) += vvc/dec.o \
vvc/ps.o \
vvc/refs.o \
vvc/thread.o \
- h2645data.o \
--
2.45.2
From 746810fab0018ad3ea6c928b8445db6c9af750ac Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
Date: Tue, 18 Mar 2025 08:38:36 +0100
Subject: [PATCH 2/3] avcodec/Makefile: Only compile executor when VVC decoder
is enabled
Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
---
libavcodec/Makefile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 20b3a93a69..5284c561a6 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -43,7 +43,6 @@ OBJS = ac3_parser.o \
dirac.o \
dv_profile.o \
encode.o \
- executor.o \
get_buffer.o \
imgconvert.o \
jni.o \
@@ -809,7 +808,7 @@ OBJS-$(CONFIG_VPLAYER_DECODER) += textdec.o ass.o
OBJS-$(CONFIG_VP9_V4L2M2M_DECODER) += v4l2_m2m_dec.o
OBJS-$(CONFIG_VQA_DECODER) += vqavideo.o
OBJS-$(CONFIG_VQC_DECODER) += vqcdec.o
-OBJS-$(CONFIG_VVC_DECODER) += h2645data.o
+OBJS-$(CONFIG_VVC_DECODER) += executor.o h2645data.o
OBJS-$(CONFIG_WADY_DPCM_DECODER) += dpcm.o
OBJS-$(CONFIG_WAVARC_DECODER) += wavarc.o
OBJS-$(CONFIG_WAVPACK_DECODER) += wavpack.o wavpackdata.o dsd.o
--
2.45.2
From 42e58ab1ba8f8e2e611136425a6a9032e71fa0e7 Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
Date: Tue, 18 Mar 2025 08:47:50 +0100
Subject: [PATCH 3/3] avcodec/mathtables: Fix inaccurate macro name
Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
---
libavcodec/mathtables.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/mathtables.c b/libavcodec/mathtables.c
index 8b0031eb00..3ebc146b06 100644
--- a/libavcodec/mathtables.c
+++ b/libavcodec/mathtables.c
@@ -72,10 +72,10 @@ const uint8_t ff_sqrt_tab[256]={
};
#define times4(x) x, x, x, x
-#define times256(x) times4(times4(times4(times4(times4(x)))))
+#define times1024(x) times4(times4(times4(times4(times4(x)))))
const uint8_t ff_crop_tab[256 + 2 * MAX_NEG_CROP] = {
-times256(0x00),
+times1024(0x00),
0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
@@ -92,7 +92,7 @@ times256(0x00),
0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,
0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,
0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF,
-times256(0xFF)
+times1024(0xFF)
};
const uint8_t ff_zigzag_direct[64] = {
--
2.45.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
