[FFmpeg-devel] [PATCH 09/11] lavc/hevc*: move to hevc/ subdir
Anton Khirnov
anton at khirnov.net
Fri May 31 20:47:47 EEST 2024
---
libavcodec/Makefile | 12 ++-----
libavcodec/aarch64/hevcdsp_init_aarch64.c | 2 +-
libavcodec/arm/hevcdsp_arm.h | 2 +-
libavcodec/arm/hevcdsp_init_arm.c | 2 +-
libavcodec/arm/hevcdsp_init_neon.c | 2 +-
libavcodec/bsf/extract_extradata.c | 3 +-
libavcodec/bsf/h265_metadata.c | 3 +-
libavcodec/bsf/hevc_mp4toannexb.c | 3 +-
libavcodec/bsf/remove_extradata.c | 3 +-
libavcodec/cbs_h2645.c | 2 +-
libavcodec/cbs_h265.h | 3 +-
libavcodec/d3d12va_hevc.c | 4 +--
libavcodec/dxva2_hevc.c | 4 +--
libavcodec/h2645_parse.c | 3 +-
libavcodec/hevc/Makefile | 36 +++++++++++++++++++
libavcodec/{hevc_cabac.c => hevc/cabac.c} | 2 +-
libavcodec/{hevc_data.c => hevc/data.c} | 2 +-
libavcodec/{hevc_data.h => hevc/data.h} | 0
libavcodec/{hevcdsp.c => hevc/dsp.c} | 10 +++---
libavcodec/{hevcdsp.h => hevc/dsp.h} | 8 ++---
.../dsp_template.c} | 2 +-
libavcodec/{hevc_filter.c => hevc/filter.c} | 0
libavcodec/{ => hevc}/hevc.h | 6 ++--
libavcodec/{ => hevc}/hevcdec.c | 2 +-
libavcodec/{ => hevc}/hevcdec.h | 33 ++++++++---------
libavcodec/{hevc_mvs.c => hevc/mvs.c} | 0
libavcodec/{hevc_parse.c => hevc/parse.c} | 2 +-
libavcodec/{hevc_parse.h => hevc/parse.h} | 4 +--
libavcodec/{hevc_parser.c => hevc/parser.c} | 6 ++--
libavcodec/{hevcpred.c => hevc/pred.c} | 10 +++---
libavcodec/{hevcpred.h => hevc/pred.h} | 6 ++--
.../pred_template.c} | 2 +-
libavcodec/{hevc_ps.c => hevc/ps.c} | 4 +--
libavcodec/{hevc_ps.h => hevc/ps.h} | 7 ++--
libavcodec/{hevc_ps_enc.c => hevc/ps_enc.c} | 2 +-
libavcodec/{hevc_refs.c => hevc/refs.c} | 0
libavcodec/{hevc_sei.c => hevc/sei.c} | 4 +--
libavcodec/{hevc_sei.h => hevc/sei.h} | 7 ++--
libavcodec/loongarch/hevcdsp_lasx.h | 2 +-
libavcodec/loongarch/hevcdsp_lsx.h | 2 +-
libavcodec/mediacodecdec.c | 2 +-
libavcodec/mips/hevcdsp_mips.h | 2 +-
libavcodec/mips/hevcdsp_mmi.c | 2 +-
libavcodec/mips/hevcpred_mips.h | 2 +-
libavcodec/mips/hevcpred_msa.c | 2 +-
libavcodec/nvdec_hevc.c | 4 +--
libavcodec/nvenc.c | 2 +-
libavcodec/ppc/hevcdsp.c | 2 +-
libavcodec/qsvenc_hevc.c | 5 +--
libavcodec/vaapi_encode_h265.c | 3 +-
libavcodec/vaapi_hevc.c | 3 +-
libavcodec/vdpau_hevc.c | 4 +--
libavcodec/videotoolbox.c | 2 +-
libavcodec/vulkan_hevc.c | 6 ++--
libavcodec/x86/hevcdsp_init.c | 2 +-
libavformat/hevc.c | 2 +-
libavformat/hevcdec.c | 2 +-
libavformat/mov.c | 2 +-
libavformat/mpegtsenc.c | 2 +-
tests/checkasm/hevc_add_res.c | 2 +-
tests/checkasm/hevc_deblock.c | 2 +-
tests/checkasm/hevc_idct.c | 2 +-
tests/checkasm/hevc_pel.c | 2 +-
tests/checkasm/hevc_sao.c | 2 +-
64 files changed, 154 insertions(+), 114 deletions(-)
create mode 100644 libavcodec/hevc/Makefile
rename libavcodec/{hevc_cabac.c => hevc/cabac.c} (99%)
rename libavcodec/{hevc_data.c => hevc/data.c} (98%)
rename libavcodec/{hevc_data.h => hevc/data.h} (100%)
rename libavcodec/{hevcdsp.c => hevc/dsp.c} (99%)
rename libavcodec/{hevcdsp.h => hevc/dsp.h} (98%)
rename libavcodec/{hevcdsp_template.c => hevc/dsp_template.c} (99%)
rename libavcodec/{hevc_filter.c => hevc/filter.c} (100%)
rename libavcodec/{ => hevc}/hevc.h (98%)
rename libavcodec/{ => hevc}/hevcdec.c (99%)
rename libavcodec/{ => hevc}/hevcdec.h (97%)
rename libavcodec/{hevc_mvs.c => hevc/mvs.c} (100%)
rename libavcodec/{hevc_parse.c => hevc/parse.c} (99%)
rename libavcodec/{hevc_parse.h => hevc/parse.h} (96%)
rename libavcodec/{hevc_parser.c => hevc/parser.c} (99%)
rename libavcodec/{hevcpred.c => hevc/pred.c} (93%)
rename libavcodec/{hevcpred.h => hevc/pred.h} (94%)
rename libavcodec/{hevcpred_template.c => hevc/pred_template.c} (99%)
rename libavcodec/{hevc_ps.c => hevc/ps.c} (99%)
rename libavcodec/{hevc_ps.h => hevc/ps.h} (99%)
rename libavcodec/{hevc_ps_enc.c => hevc/ps_enc.c} (99%)
rename libavcodec/{hevc_refs.c => hevc/refs.c} (100%)
rename libavcodec/{hevc_sei.c => hevc/sei.c} (99%)
rename libavcodec/{hevc_sei.h => hevc/sei.h} (96%)
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 2443d2c6fd..8ab4398b6c 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -65,6 +65,7 @@ OBJS = ac3_parser.o \
# subsystems
include $(SRC_PATH)/libavcodec/aac/Makefile
+include $(SRC_PATH)/libavcodec/hevc/Makefile
include $(SRC_PATH)/libavcodec/vvc/Makefile
-include $(SRC_PATH)/libavcodec/$(ARCH)/vvc/Makefile
OBJS-$(CONFIG_AANDCTTABLES) += aandcttab.o
@@ -105,10 +106,6 @@ OBJS-$(CONFIG_H264PARSE) += h264_parse.o h264_ps.o h264data.o \
OBJS-$(CONFIG_H264PRED) += h264pred.o
OBJS-$(CONFIG_H264QPEL) += h264qpel.o
OBJS-$(CONFIG_H264_SEI) += h264_sei.o h2645_sei.o
-OBJS-$(CONFIG_HEVCPARSE) += hevc_parse.o hevc_ps.o hevc_data.o \
- h2645data.o h2645_parse.o h2645_vui.o
-OBJS-$(CONFIG_HEVC_SEI) += hevc_sei.o h2645_sei.o \
- dynamic_hdr_vivid.o aom_film_grain.o
OBJS-$(CONFIG_HPELDSP) += hpeldsp.o
OBJS-$(CONFIG_HUFFMAN) += huffman.o
OBJS-$(CONFIG_HUFFYUVDSP) += huffyuvdsp.o
@@ -430,10 +427,6 @@ OBJS-$(CONFIG_HCA_DECODER) += hcadec.o
OBJS-$(CONFIG_HCOM_DECODER) += hcom.o
OBJS-$(CONFIG_HDR_DECODER) += hdrdec.o
OBJS-$(CONFIG_HDR_ENCODER) += hdrenc.o
-OBJS-$(CONFIG_HEVC_DECODER) += hevcdec.o hevc_mvs.o \
- hevc_cabac.o hevc_refs.o hevcpred.o \
- hevcdsp.o hevc_filter.o hevc_data.o \
- h274.o aom_film_grain.o
OBJS-$(CONFIG_HEVC_AMF_ENCODER) += amfenc_hevc.o
OBJS-$(CONFIG_HEVC_CUVID_DECODER) += cuviddec.o
OBJS-$(CONFIG_HEVC_MEDIACODEC_DECODER) += mediacodecdec.o
@@ -441,7 +434,7 @@ OBJS-$(CONFIG_HEVC_MEDIACODEC_ENCODER) += mediacodecenc.o
OBJS-$(CONFIG_HEVC_MF_ENCODER) += mfenc.o mf_utils.o
OBJS-$(CONFIG_HEVC_NVENC_ENCODER) += nvenc_hevc.o nvenc.o
OBJS-$(CONFIG_HEVC_QSV_DECODER) += qsvdec.o
-OBJS-$(CONFIG_HEVC_QSV_ENCODER) += qsvenc_hevc.o hevc_ps_enc.o
+OBJS-$(CONFIG_HEVC_QSV_ENCODER) += qsvenc_hevc.o hevc/ps_enc.o
OBJS-$(CONFIG_HEVC_RKMPP_DECODER) += rkmppdec.o
OBJS-$(CONFIG_HEVC_VAAPI_ENCODER) += vaapi_encode_h265.o h265_profile_level.o \
h2645data.o
@@ -1199,7 +1192,6 @@ OBJS-$(CONFIG_GSM_PARSER) += gsm_parser.o
OBJS-$(CONFIG_H261_PARSER) += h261_parser.o
OBJS-$(CONFIG_H263_PARSER) += h263_parser.o
OBJS-$(CONFIG_H264_PARSER) += h264_parser.o h264data.o
-OBJS-$(CONFIG_HEVC_PARSER) += hevc_parser.o
OBJS-$(CONFIG_HDR_PARSER) += hdr_parser.o
OBJS-$(CONFIG_IPU_PARSER) += ipu_parser.o
OBJS-$(CONFIG_JPEG2000_PARSER) += jpeg2000_parser.o
diff --git a/libavcodec/aarch64/hevcdsp_init_aarch64.c b/libavcodec/aarch64/hevcdsp_init_aarch64.c
index e24dd0cbda..e8c911deb4 100644
--- a/libavcodec/aarch64/hevcdsp_init_aarch64.c
+++ b/libavcodec/aarch64/hevcdsp_init_aarch64.c
@@ -24,7 +24,7 @@
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/aarch64/cpu.h"
-#include "libavcodec/hevcdsp.h"
+#include "libavcodec/hevc/dsp.h"
void ff_hevc_v_loop_filter_chroma_8_neon(uint8_t *_pix, ptrdiff_t _stride,
const int *_tc, const uint8_t *_no_p, const uint8_t *_no_q);
diff --git a/libavcodec/arm/hevcdsp_arm.h b/libavcodec/arm/hevcdsp_arm.h
index 47cdfa574d..de2303314c 100644
--- a/libavcodec/arm/hevcdsp_arm.h
+++ b/libavcodec/arm/hevcdsp_arm.h
@@ -19,7 +19,7 @@
#ifndef AVCODEC_ARM_HEVCDSP_ARM_H
#define AVCODEC_ARM_HEVCDSP_ARM_H
-#include "libavcodec/hevcdsp.h"
+#include "libavcodec/hevc/dsp.h"
void ff_hevc_dsp_init_neon(HEVCDSPContext *c, const int bit_depth);
diff --git a/libavcodec/arm/hevcdsp_init_arm.c b/libavcodec/arm/hevcdsp_init_arm.c
index e8fa1f79ac..5e5da5ac6b 100644
--- a/libavcodec/arm/hevcdsp_init_arm.c
+++ b/libavcodec/arm/hevcdsp_init_arm.c
@@ -22,7 +22,7 @@
#include "libavutil/cpu.h"
#include "libavutil/arm/cpu.h"
-#include "libavcodec/hevcdsp.h"
+#include "libavcodec/hevc/dsp.h"
#include "hevcdsp_arm.h"
av_cold void ff_hevc_dsp_init_arm(HEVCDSPContext *c, const int bit_depth)
diff --git a/libavcodec/arm/hevcdsp_init_neon.c b/libavcodec/arm/hevcdsp_init_neon.c
index 1f26fc6454..6f113618c0 100644
--- a/libavcodec/arm/hevcdsp_init_neon.c
+++ b/libavcodec/arm/hevcdsp_init_neon.c
@@ -20,7 +20,7 @@
#include "libavutil/attributes.h"
#include "libavutil/arm/cpu.h"
-#include "libavcodec/hevcdsp.h"
+#include "libavcodec/hevc/dsp.h"
#include "libavcodec/avcodec.h"
#include "hevcdsp_arm.h"
diff --git a/libavcodec/bsf/extract_extradata.c b/libavcodec/bsf/extract_extradata.c
index c3c98c7d77..b037990562 100644
--- a/libavcodec/bsf/extract_extradata.c
+++ b/libavcodec/bsf/extract_extradata.c
@@ -29,11 +29,12 @@
#include "bytestream.h"
#include "h2645_parse.h"
#include "h264.h"
-#include "hevc.h"
#include "startcode.h"
#include "vc1_common.h"
#include "vvc.h"
+#include "hevc/hevc.h"
+
typedef struct ExtractExtradataContext {
const AVClass *class;
diff --git a/libavcodec/bsf/h265_metadata.c b/libavcodec/bsf/h265_metadata.c
index c9e1cc3eed..87bdac5f1e 100644
--- a/libavcodec/bsf/h265_metadata.c
+++ b/libavcodec/bsf/h265_metadata.c
@@ -25,9 +25,10 @@
#include "cbs_bsf.h"
#include "cbs_h265.h"
#include "h2645data.h"
-#include "hevc.h"
#include "h265_profile_level.h"
+#include "hevc/hevc.h"
+
enum {
LEVEL_UNSET = -2,
LEVEL_AUTO = -1,
diff --git a/libavcodec/bsf/hevc_mp4toannexb.c b/libavcodec/bsf/hevc_mp4toannexb.c
index 8eec18f31e..f281185769 100644
--- a/libavcodec/bsf/hevc_mp4toannexb.c
+++ b/libavcodec/bsf/hevc_mp4toannexb.c
@@ -28,7 +28,8 @@
#include "bsf_internal.h"
#include "bytestream.h"
#include "defs.h"
-#include "hevc.h"
+
+#include "hevc/hevc.h"
#define MIN_HEVCC_LENGTH 23
diff --git a/libavcodec/bsf/remove_extradata.c b/libavcodec/bsf/remove_extradata.c
index 3010eba058..b4a0359434 100644
--- a/libavcodec/bsf/remove_extradata.c
+++ b/libavcodec/bsf/remove_extradata.c
@@ -25,10 +25,11 @@
#include "bsf.h"
#include "bsf_internal.h"
#include "h264.h"
-#include "hevc.h"
#include "startcode.h"
#include "vc1_common.h"
+#include "hevc/hevc.h"
+
enum RemoveFreq {
REMOVE_FREQ_KEYFRAME,
REMOVE_FREQ_ALL,
diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c
index 1a45d424ba..c5f167334d 100644
--- a/libavcodec/cbs_h2645.c
+++ b/libavcodec/cbs_h2645.c
@@ -28,10 +28,10 @@
#include "cbs_h266.h"
#include "h264.h"
#include "h2645_parse.h"
-#include "hevc.h"
#include "refstruct.h"
#include "vvc.h"
+#include "hevc/hevc.h"
static int cbs_read_ue_golomb(CodedBitstreamContext *ctx, GetBitContext *gbc,
const char *name, const int *subscripts,
diff --git a/libavcodec/cbs_h265.h b/libavcodec/cbs_h265.h
index 1b1195f198..91a5a55317 100644
--- a/libavcodec/cbs_h265.h
+++ b/libavcodec/cbs_h265.h
@@ -24,7 +24,8 @@
#include "cbs_h2645.h"
#include "cbs_sei.h"
-#include "hevc.h"
+
+#include "hevc/hevc.h"
typedef struct H265RawNALUnitHeader {
uint8_t nal_unit_type;
diff --git a/libavcodec/d3d12va_hevc.c b/libavcodec/d3d12va_hevc.c
index a4964a05c6..c04a103f86 100644
--- a/libavcodec/d3d12va_hevc.c
+++ b/libavcodec/d3d12va_hevc.c
@@ -24,8 +24,8 @@
#include "libavutil/avassert.h"
#include "libavutil/hwcontext_d3d12va_internal.h"
-#include "hevc_data.h"
-#include "hevcdec.h"
+#include "hevc/data.h"
+#include "hevc/hevcdec.h"
#include "dxva2_internal.h"
#include "d3d12va_decode.h"
#include <dxva.h>
diff --git a/libavcodec/dxva2_hevc.c b/libavcodec/dxva2_hevc.c
index 08b3b1e785..2f4073edd6 100644
--- a/libavcodec/dxva2_hevc.c
+++ b/libavcodec/dxva2_hevc.c
@@ -25,8 +25,8 @@
#include "libavutil/avassert.h"
#include "dxva2_internal.h"
-#include "hevc_data.h"
-#include "hevcdec.h"
+#include "hevc/data.h"
+#include "hevc/hevcdec.h"
#include "hwaccel_internal.h"
#define MAX_SLICES 256
diff --git a/libavcodec/h2645_parse.c b/libavcodec/h2645_parse.c
index 9f66f079c2..2341f0e0a7 100644
--- a/libavcodec/h2645_parse.c
+++ b/libavcodec/h2645_parse.c
@@ -27,11 +27,12 @@
#include "libavutil/mem.h"
#include "bytestream.h"
-#include "hevc.h"
#include "h264.h"
#include "h2645_parse.h"
#include "vvc.h"
+#include "hevc/hevc.h"
+
int ff_h2645_extract_rbsp(const uint8_t *src, int length,
H2645RBSP *rbsp, H2645NAL *nal, int small_padding)
{
diff --git a/libavcodec/hevc/Makefile b/libavcodec/hevc/Makefile
new file mode 100644
index 0000000000..9c385ef3da
--- /dev/null
+++ b/libavcodec/hevc/Makefile
@@ -0,0 +1,36 @@
+clean::
+ $(RM) $(CLEANSUFFIXES:%=libavcodec/hevc/%)
+
+OBJS-$(CONFIG_HEVC_DECODER) += \
+ aom_film_grain.o \
+ h274.o \
+ hevc/cabac.o \
+ hevc/data.o \
+ hevc/dsp.o \
+ hevc/filter.o \
+ hevc/hevcdec.o \
+ hevc/mvs.o \
+ hevc/pred.o \
+ hevc/refs.o \
+
+OBJS-$(CONFIG_HEVC_PARSER) += \
+ hevc/parser.o \
+
+
+OBJS-$(CONFIG_HEVCPARSE) += \
+ h2645data.o \
+ h2645_parse.o \
+ h2645_vui.o \
+ hevc/data.o \
+ hevc/parse.o \
+ hevc/ps.o \
+
+
+OBJS-$(CONFIG_HEVC_SEI) += \
+ hevc/sei.o \
+ h2645_sei.o \
+ dynamic_hdr_vivid.o \
+ aom_film_grain.o \
+
+
+libavcodec/hevc/%.o: CPPFLAGS += -I$(SRC_PATH)/libavcodec/
diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc/cabac.c
similarity index 99%
rename from libavcodec/hevc_cabac.c
rename to libavcodec/hevc/cabac.c
index c9da4d7fc1..37f144758a 100644
--- a/libavcodec/hevc_cabac.c
+++ b/libavcodec/hevc/cabac.c
@@ -25,7 +25,7 @@
#include "libavutil/common.h"
#include "cabac_functions.h"
-#include "hevc_data.h"
+#include "data.h"
#include "hevc.h"
#include "hevcdec.h"
diff --git a/libavcodec/hevc_data.c b/libavcodec/hevc/data.c
similarity index 98%
rename from libavcodec/hevc_data.c
rename to libavcodec/hevc/data.c
index 1633a41c13..8a4f74c3cb 100644
--- a/libavcodec/hevc_data.c
+++ b/libavcodec/hevc/data.c
@@ -20,7 +20,7 @@
#include <stdint.h>
-#include "hevc_data.h"
+#include "data.h"
const uint8_t ff_hevc_diag_scan4x4_x[16] = {
0, 0, 1, 0,
diff --git a/libavcodec/hevc_data.h b/libavcodec/hevc/data.h
similarity index 100%
rename from libavcodec/hevc_data.h
rename to libavcodec/hevc/data.h
diff --git a/libavcodec/hevcdsp.c b/libavcodec/hevc/dsp.c
similarity index 99%
rename from libavcodec/hevcdsp.c
rename to libavcodec/hevc/dsp.c
index 630fdc012e..60f059292c 100644
--- a/libavcodec/hevcdsp.c
+++ b/libavcodec/hevc/dsp.c
@@ -22,7 +22,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "hevcdsp.h"
+#include "dsp.h"
static const int8_t transform[32][32] = {
{ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
@@ -110,19 +110,19 @@ DECLARE_ALIGNED(16, const int8_t, ff_hevc_qpel_filters)[4][16] = {
};
#define BIT_DEPTH 8
-#include "hevcdsp_template.c"
+#include "dsp_template.c"
#undef BIT_DEPTH
#define BIT_DEPTH 9
-#include "hevcdsp_template.c"
+#include "dsp_template.c"
#undef BIT_DEPTH
#define BIT_DEPTH 10
-#include "hevcdsp_template.c"
+#include "dsp_template.c"
#undef BIT_DEPTH
#define BIT_DEPTH 12
-#include "hevcdsp_template.c"
+#include "dsp_template.c"
#undef BIT_DEPTH
void ff_hevc_dsp_init(HEVCDSPContext *hevcdsp, int bit_depth)
diff --git a/libavcodec/hevcdsp.h b/libavcodec/hevc/dsp.h
similarity index 98%
rename from libavcodec/hevcdsp.h
rename to libavcodec/hevc/dsp.h
index a5933dcac4..02b8e0e8e2 100644
--- a/libavcodec/hevcdsp.h
+++ b/libavcodec/hevc/dsp.h
@@ -22,12 +22,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef AVCODEC_HEVCDSP_H
-#define AVCODEC_HEVCDSP_H
+#ifndef AVCODEC_HEVC_DSP_H
+#define AVCODEC_HEVC_DSP_H
#include "libavutil/mem_internal.h"
-#include "get_bits.h"
+#include "libavcodec/get_bits.h"
#define MAX_PB_SIZE 64
@@ -137,4 +137,4 @@ void ff_hevc_dsp_init_x86(HEVCDSPContext *c, const int bit_depth);
void ff_hevc_dsp_init_mips(HEVCDSPContext *c, const int bit_depth);
void ff_hevc_dsp_init_loongarch(HEVCDSPContext *c, const int bit_depth);
-#endif /* AVCODEC_HEVCDSP_H */
+#endif /* AVCODEC_HEVC_DSP_H */
diff --git a/libavcodec/hevcdsp_template.c b/libavcodec/hevc/dsp_template.c
similarity index 99%
rename from libavcodec/hevcdsp_template.c
rename to libavcodec/hevc/dsp_template.c
index 121c44c401..aebccd1a0c 100644
--- a/libavcodec/hevcdsp_template.c
+++ b/libavcodec/hevc/dsp_template.c
@@ -24,7 +24,7 @@
#include "hevcdec.h"
#include "bit_depth_template.c"
-#include "hevcdsp.h"
+#include "dsp.h"
#include "h26x/h2656_sao_template.c"
#include "h26x/h2656_inter_template.c"
diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc/filter.c
similarity index 100%
rename from libavcodec/hevc_filter.c
rename to libavcodec/hevc/filter.c
diff --git a/libavcodec/hevc.h b/libavcodec/hevc/hevc.h
similarity index 98%
rename from libavcodec/hevc.h
rename to libavcodec/hevc/hevc.h
index 6b454a75c1..9fdbc0a224 100644
--- a/libavcodec/hevc.h
+++ b/libavcodec/hevc/hevc.h
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef AVCODEC_HEVC_H
-#define AVCODEC_HEVC_H
+#ifndef AVCODEC_HEVC_HEVC_H
+#define AVCODEC_HEVC_HEVC_H
/**
* Table 7-1 – NAL unit type codes and NAL unit type classes in
@@ -160,4 +160,4 @@ enum {
};
-#endif /* AVCODEC_HEVC_H */
+#endif /* AVCODEC_HEVC_HEVC_H */
diff --git a/libavcodec/hevcdec.c b/libavcodec/hevc/hevcdec.c
similarity index 99%
rename from libavcodec/hevcdec.c
rename to libavcodec/hevc/hevcdec.c
index 173810883d..4a07fa6612 100644
--- a/libavcodec/hevcdec.c
+++ b/libavcodec/hevc/hevcdec.c
@@ -43,7 +43,7 @@
#include "decode.h"
#include "golomb.h"
#include "hevc.h"
-#include "hevc_parse.h"
+#include "parse.h"
#include "hevcdec.h"
#include "hwaccel_internal.h"
#include "hwconfig.h"
diff --git a/libavcodec/hevcdec.h b/libavcodec/hevc/hevcdec.h
similarity index 97%
rename from libavcodec/hevcdec.h
rename to libavcodec/hevc/hevcdec.h
index 0cd6b8c2b4..8208268460 100644
--- a/libavcodec/hevcdec.h
+++ b/libavcodec/hevc/hevcdec.h
@@ -20,28 +20,29 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef AVCODEC_HEVCDEC_H
-#define AVCODEC_HEVCDEC_H
+#ifndef AVCODEC_HEVC_HEVCDEC_H
+#define AVCODEC_HEVC_HEVCDEC_H
#include <stdatomic.h>
#include "libavutil/buffer.h"
#include "libavutil/mem_internal.h"
-#include "avcodec.h"
-#include "bswapdsp.h"
-#include "cabac.h"
-#include "dovi_rpu.h"
-#include "get_bits.h"
-#include "hevcpred.h"
-#include "h2645_parse.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/bswapdsp.h"
+#include "libavcodec/cabac.h"
+#include "libavcodec/dovi_rpu.h"
+#include "libavcodec/get_bits.h"
+#include "libavcodec/h2645_parse.h"
+#include "libavcodec/h274.h"
+#include "libavcodec/progressframe.h"
+#include "libavcodec/videodsp.h"
+
+#include "dsp.h"
#include "hevc.h"
-#include "hevc_ps.h"
-#include "hevc_sei.h"
-#include "hevcdsp.h"
-#include "h274.h"
-#include "progressframe.h"
-#include "videodsp.h"
+#include "pred.h"
+#include "ps.h"
+#include "sei.h"
#define SHIFT_CTB_WPP 2
@@ -675,4 +676,4 @@ extern const uint8_t ff_hevc_qpel_extra_before[4];
extern const uint8_t ff_hevc_qpel_extra_after[4];
extern const uint8_t ff_hevc_qpel_extra[4];
-#endif /* AVCODEC_HEVCDEC_H */
+#endif /* AVCODEC_HEVC_HEVCDEC_H */
diff --git a/libavcodec/hevc_mvs.c b/libavcodec/hevc/mvs.c
similarity index 100%
rename from libavcodec/hevc_mvs.c
rename to libavcodec/hevc/mvs.c
diff --git a/libavcodec/hevc_parse.c b/libavcodec/hevc/parse.c
similarity index 99%
rename from libavcodec/hevc_parse.c
rename to libavcodec/hevc/parse.c
index 7bc28fd081..53b040d964 100644
--- a/libavcodec/hevc_parse.c
+++ b/libavcodec/hevc/parse.c
@@ -19,7 +19,7 @@
#include "bytestream.h"
#include "h2645_parse.h"
#include "hevc.h"
-#include "hevc_parse.h"
+#include "parse.h"
static int hevc_decode_nal_units(const uint8_t *buf, int buf_size, HEVCParamSets *ps,
HEVCSEI *sei, int is_nalff, int nal_length_size,
diff --git a/libavcodec/hevc_parse.h b/libavcodec/hevc/parse.h
similarity index 96%
rename from libavcodec/hevc_parse.h
rename to libavcodec/hevc/parse.h
index 4ab96ab1cb..b3bcbde500 100644
--- a/libavcodec/hevc_parse.h
+++ b/libavcodec/hevc/parse.h
@@ -26,8 +26,8 @@
#include <stdint.h>
-#include "hevc_ps.h"
-#include "hevc_sei.h"
+#include "ps.h"
+#include "sei.h"
int ff_hevc_decode_extradata(const uint8_t *data, int size, HEVCParamSets *ps,
HEVCSEI *sei, int *is_nalff, int *nal_length_size,
diff --git a/libavcodec/hevc_parser.c b/libavcodec/hevc/parser.c
similarity index 99%
rename from libavcodec/hevc_parser.c
rename to libavcodec/hevc/parser.c
index 73fc5d6372..056e1b4aa4 100644
--- a/libavcodec/hevc_parser.c
+++ b/libavcodec/hevc/parser.c
@@ -25,9 +25,9 @@
#include "golomb.h"
#include "hevc.h"
-#include "hevc_parse.h"
-#include "hevc_ps.h"
-#include "hevc_sei.h"
+#include "parse.h"
+#include "ps.h"
+#include "sei.h"
#include "h2645_parse.h"
#include "parser.h"
diff --git a/libavcodec/hevcpred.c b/libavcodec/hevc/pred.c
similarity index 93%
rename from libavcodec/hevcpred.c
rename to libavcodec/hevc/pred.c
index 16b012f46c..8d588382fa 100644
--- a/libavcodec/hevcpred.c
+++ b/libavcodec/hevc/pred.c
@@ -22,22 +22,22 @@
#include "hevcdec.h"
-#include "hevcpred.h"
+#include "pred.h"
#define BIT_DEPTH 8
-#include "hevcpred_template.c"
+#include "pred_template.c"
#undef BIT_DEPTH
#define BIT_DEPTH 9
-#include "hevcpred_template.c"
+#include "pred_template.c"
#undef BIT_DEPTH
#define BIT_DEPTH 10
-#include "hevcpred_template.c"
+#include "pred_template.c"
#undef BIT_DEPTH
#define BIT_DEPTH 12
-#include "hevcpred_template.c"
+#include "pred_template.c"
#undef BIT_DEPTH
void ff_hevc_pred_init(HEVCPredContext *hpc, int bit_depth)
diff --git a/libavcodec/hevcpred.h b/libavcodec/hevc/pred.h
similarity index 94%
rename from libavcodec/hevcpred.h
rename to libavcodec/hevc/pred.h
index b1b1dc4f3a..b60d8176ae 100644
--- a/libavcodec/hevcpred.h
+++ b/libavcodec/hevc/pred.h
@@ -20,8 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef AVCODEC_HEVCPRED_H
-#define AVCODEC_HEVCPRED_H
+#ifndef AVCODEC_HEVC_PRED_H
+#define AVCODEC_HEVC_PRED_H
#include <stddef.h>
#include <stdint.h>
@@ -43,4 +43,4 @@ typedef struct HEVCPredContext {
void ff_hevc_pred_init(HEVCPredContext *hpc, int bit_depth);
void ff_hevc_pred_init_mips(HEVCPredContext *hpc, int bit_depth);
-#endif /* AVCODEC_HEVCPRED_H */
+#endif /* AVCODEC_HEVC_PRED_H */
diff --git a/libavcodec/hevcpred_template.c b/libavcodec/hevc/pred_template.c
similarity index 99%
rename from libavcodec/hevcpred_template.c
rename to libavcodec/hevc/pred_template.c
index a1f8cf150e..fe9a22614a 100644
--- a/libavcodec/hevcpred_template.c
+++ b/libavcodec/hevc/pred_template.c
@@ -23,7 +23,7 @@
#include "libavutil/pixdesc.h"
#include "bit_depth_template.c"
-#include "hevcpred.h"
+#include "pred.h"
#define POS(x, y) src[(x) + stride * (y)]
diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc/ps.c
similarity index 99%
rename from libavcodec/hevc_ps.c
rename to libavcodec/hevc/ps.c
index 7b486ce0af..03f18dcfee 100644
--- a/libavcodec/hevc_ps.c
+++ b/libavcodec/hevc/ps.c
@@ -27,8 +27,8 @@
#include "libavutil/mem.h"
#include "golomb.h"
#include "h2645_vui.h"
-#include "hevc_data.h"
-#include "hevc_ps.h"
+#include "data.h"
+#include "ps.h"
#include "refstruct.h"
static const uint8_t default_scaling_list_intra[] = {
diff --git a/libavcodec/hevc_ps.h b/libavcodec/hevc/ps.h
similarity index 99%
rename from libavcodec/hevc_ps.h
rename to libavcodec/hevc/ps.h
index d06d7cf1d4..99d70cefd2 100644
--- a/libavcodec/hevc_ps.h
+++ b/libavcodec/hevc/ps.h
@@ -26,9 +26,10 @@
#include "libavutil/pixfmt.h"
#include "libavutil/rational.h"
-#include "avcodec.h"
-#include "get_bits.h"
-#include "h2645_vui.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/get_bits.h"
+#include "libavcodec/h2645_vui.h"
+
#include "hevc.h"
typedef struct HEVCSublayerHdrParams {
diff --git a/libavcodec/hevc_ps_enc.c b/libavcodec/hevc/ps_enc.c
similarity index 99%
rename from libavcodec/hevc_ps_enc.c
rename to libavcodec/hevc/ps_enc.c
index 72641b2ffb..7fbcb3ba4e 100644
--- a/libavcodec/hevc_ps_enc.c
+++ b/libavcodec/hevc/ps_enc.c
@@ -19,7 +19,7 @@
*/
#include "put_golomb.h"
-#include "hevc_ps.h"
+#include "ps.h"
#include "put_bits.h"
static void write_ptl_layer(PutBitContext *pb, PTLCommon *ptl)
diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc/refs.c
similarity index 100%
rename from libavcodec/hevc_refs.c
rename to libavcodec/hevc/refs.c
diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc/sei.c
similarity index 99%
rename from libavcodec/hevc_sei.c
rename to libavcodec/hevc/sei.c
index abdb52acd3..e39ac0c38a 100644
--- a/libavcodec/hevc_sei.c
+++ b/libavcodec/hevc/sei.c
@@ -24,8 +24,8 @@
#include "bytestream.h"
#include "golomb.h"
-#include "hevc_ps.h"
-#include "hevc_sei.h"
+#include "ps.h"
+#include "sei.h"
static int decode_nal_sei_decoded_picture_hash(HEVCSEIPictureHash *s,
GetByteContext *gb)
diff --git a/libavcodec/hevc_sei.h b/libavcodec/hevc/sei.h
similarity index 96%
rename from libavcodec/hevc_sei.h
rename to libavcodec/hevc/sei.h
index a23a64ec4f..c97d22d423 100644
--- a/libavcodec/hevc_sei.h
+++ b/libavcodec/hevc/sei.h
@@ -25,10 +25,11 @@
#include "libavutil/buffer.h"
-#include "get_bits.h"
+#include "libavcodec/get_bits.h"
+#include "libavcodec/h2645_sei.h"
+#include "libavcodec/sei.h"
+
#include "hevc.h"
-#include "h2645_sei.h"
-#include "sei.h"
typedef enum {
diff --git a/libavcodec/loongarch/hevcdsp_lasx.h b/libavcodec/loongarch/hevcdsp_lasx.h
index 714cbf5880..907ee9f4bb 100644
--- a/libavcodec/loongarch/hevcdsp_lasx.h
+++ b/libavcodec/loongarch/hevcdsp_lasx.h
@@ -22,7 +22,7 @@
#ifndef AVCODEC_LOONGARCH_HEVCDSP_LASX_H
#define AVCODEC_LOONGARCH_HEVCDSP_LASX_H
-#include "libavcodec/hevcdsp.h"
+#include "libavcodec/hevc/dsp.h"
#define PEL_UNI_W(PEL, DIR, WIDTH) \
void ff_hevc_put_hevc_##PEL##_uni_w_##DIR##WIDTH##_8_lasx(uint8_t *dst, \
diff --git a/libavcodec/loongarch/hevcdsp_lsx.h b/libavcodec/loongarch/hevcdsp_lsx.h
index a5ef237b5d..cf2a519e94 100644
--- a/libavcodec/loongarch/hevcdsp_lsx.h
+++ b/libavcodec/loongarch/hevcdsp_lsx.h
@@ -23,7 +23,7 @@
#ifndef AVCODEC_LOONGARCH_HEVCDSP_LSX_H
#define AVCODEC_LOONGARCH_HEVCDSP_LSX_H
-#include "libavcodec/hevcdsp.h"
+#include "libavcodec/hevc/dsp.h"
#define MC(PEL, DIR, WIDTH) \
void ff_hevc_put_hevc_##PEL##_##DIR##WIDTH##_8_lsx(int16_t *dst, \
diff --git a/libavcodec/mediacodecdec.c b/libavcodec/mediacodecdec.c
index df8d40dd10..6d8dc600fe 100644
--- a/libavcodec/mediacodecdec.c
+++ b/libavcodec/mediacodecdec.c
@@ -38,7 +38,7 @@
#include "decode.h"
#include "h264_parse.h"
#include "h264_ps.h"
-#include "hevc_parse.h"
+#include "hevc/parse.h"
#include "hwconfig.h"
#include "internal.h"
#include "jni.h"
diff --git a/libavcodec/mips/hevcdsp_mips.h b/libavcodec/mips/hevcdsp_mips.h
index a8f78ff73a..0498938028 100644
--- a/libavcodec/mips/hevcdsp_mips.h
+++ b/libavcodec/mips/hevcdsp_mips.h
@@ -21,7 +21,7 @@
#ifndef AVCODEC_MIPS_HEVCDSP_MIPS_H
#define AVCODEC_MIPS_HEVCDSP_MIPS_H
-#include "libavcodec/hevcdsp.h"
+#include "libavcodec/hevc/dsp.h"
#define MC(PEL, DIR, WIDTH) \
void ff_hevc_put_hevc_##PEL##_##DIR##WIDTH##_8_msa(int16_t *dst, \
diff --git a/libavcodec/mips/hevcdsp_mmi.c b/libavcodec/mips/hevcdsp_mmi.c
index 7ece7b9be0..6ff52187e5 100644
--- a/libavcodec/mips/hevcdsp_mmi.c
+++ b/libavcodec/mips/hevcdsp_mmi.c
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "libavcodec/hevcdec.h"
+#include "libavcodec/hevc/hevcdec.h"
#include "libavcodec/bit_depth_template.c"
#include "libavcodec/mips/hevcdsp_mips.h"
#include "libavutil/mips/mmiutils.h"
diff --git a/libavcodec/mips/hevcpred_mips.h b/libavcodec/mips/hevcpred_mips.h
index 6848700010..220ab307af 100644
--- a/libavcodec/mips/hevcpred_mips.h
+++ b/libavcodec/mips/hevcpred_mips.h
@@ -21,7 +21,7 @@
#ifndef AVCODEC_MIPS_HEVCPRED_MIPS_H
#define AVCODEC_MIPS_HEVCPRED_MIPS_H
-#include "libavcodec/hevcpred.h"
+#include "libavcodec/hevc/pred.h"
void ff_hevc_intra_pred_planar_0_msa(uint8_t *dst,
const uint8_t *src_top,
diff --git a/libavcodec/mips/hevcpred_msa.c b/libavcodec/mips/hevcpred_msa.c
index d9137519ad..a4c795a578 100644
--- a/libavcodec/mips/hevcpred_msa.c
+++ b/libavcodec/mips/hevcpred_msa.c
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "libavcodec/hevcdec.h"
+#include "libavcodec/hevc/dec.h"
#include "libavutil/mips/generic_macros_msa.h"
#include "hevcpred_mips.h"
diff --git a/libavcodec/nvdec_hevc.c b/libavcodec/nvdec_hevc.c
index 381f8da97e..1d23f2ab56 100644
--- a/libavcodec/nvdec_hevc.c
+++ b/libavcodec/nvdec_hevc.c
@@ -28,8 +28,8 @@
#include "nvdec.h"
#include "decode.h"
#include "internal.h"
-#include "hevcdec.h"
-#include "hevc_data.h"
+#include "hevc/hevcdec.h"
+#include "hevc/data.h"
#include "hwaccel_internal.h"
static void dpb_add(CUVIDHEVCPICPARAMS *pp, int idx, const HEVCFrame *src)
diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c
index e48224347d..a9945355ba 100644
--- a/libavcodec/nvenc.c
+++ b/libavcodec/nvenc.c
@@ -23,7 +23,7 @@
#include "config_components.h"
#include "nvenc.h"
-#include "hevc_sei.h"
+#include "hevc/sei.h"
#if CONFIG_AV1_NVENC_ENCODER
#include "av1.h"
#endif
diff --git a/libavcodec/ppc/hevcdsp.c b/libavcodec/ppc/hevcdsp.c
index c1d562a409..7b032ef263 100644
--- a/libavcodec/ppc/hevcdsp.c
+++ b/libavcodec/ppc/hevcdsp.c
@@ -26,7 +26,7 @@
#include "libavutil/ppc/cpu.h"
#include "libavutil/ppc/util_altivec.h"
-#include "libavcodec/hevcdsp.h"
+#include "libavcodec/hevc/dsp.h"
#if HAVE_ALTIVEC
static const vec_s16 trans4[4] = {
diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c
index 40cff6335a..e6c038e67d 100644
--- a/libavcodec/qsvenc_hevc.c
+++ b/libavcodec/qsvenc_hevc.c
@@ -33,12 +33,13 @@
#include "bytestream.h"
#include "codec_internal.h"
#include "get_bits.h"
-#include "hevc.h"
-#include "hevcdec.h"
#include "h2645_parse.h"
#include "qsv.h"
#include "qsvenc.h"
+#include "hevc/hevc.h"
+#include "hevc/ps.h"
+
enum LoadPlugin {
LOAD_PLUGIN_NONE,
LOAD_PLUGIN_HEVC_SW,
diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c
index 2f59161346..c0dc3fca5f 100644
--- a/libavcodec/vaapi_encode_h265.c
+++ b/libavcodec/vaapi_encode_h265.c
@@ -35,9 +35,10 @@
#include "codec_internal.h"
#include "h2645data.h"
#include "h265_profile_level.h"
-#include "hevc.h"
#include "vaapi_encode.h"
+#include "hevc/hevc.h"
+
enum {
SEI_MASTERING_DISPLAY = 0x08,
SEI_CONTENT_LIGHT_LEVEL = 0x10,
diff --git a/libavcodec/vaapi_hevc.c b/libavcodec/vaapi_hevc.c
index ae099a481c..051762bfef 100644
--- a/libavcodec/vaapi_hevc.c
+++ b/libavcodec/vaapi_hevc.c
@@ -24,12 +24,13 @@
#include <va/va_dec_hevc.h>
#include "avcodec.h"
-#include "hevcdec.h"
#include "hwaccel_internal.h"
#include "vaapi_decode.h"
#include "vaapi_hevc.h"
#include "h265_profile_level.h"
+#include "hevc/hevcdec.h"
+
typedef struct VAAPIDecodePictureHEVC {
#if VA_CHECK_VERSION(1, 2, 0)
VAPictureParameterBufferHEVCExtension pic_param;
diff --git a/libavcodec/vdpau_hevc.c b/libavcodec/vdpau_hevc.c
index 0fec877570..f7cf1bd9c0 100644
--- a/libavcodec/vdpau_hevc.c
+++ b/libavcodec/vdpau_hevc.c
@@ -23,8 +23,8 @@
#include <vdpau/vdpau.h>
#include "avcodec.h"
-#include "hevc_data.h"
-#include "hevcdec.h"
+#include "hevc/data.h"
+#include "hevc/hevcdec.h"
#include "hwaccel_internal.h"
#include "vdpau.h"
#include "vdpau_internal.h"
diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c
index d6990a39c0..62dc2da89b 100644
--- a/libavcodec/videotoolbox.c
+++ b/libavcodec/videotoolbox.c
@@ -33,7 +33,7 @@
#include "decode.h"
#include "internal.h"
#include "h264dec.h"
-#include "hevcdec.h"
+#include "hevc/hevcdec.h"
#include "hwaccel_internal.h"
#include "mpegvideo.h"
#include "proresdec.h"
diff --git a/libavcodec/vulkan_hevc.c b/libavcodec/vulkan_hevc.c
index f994b94e7e..aa721493b0 100644
--- a/libavcodec/vulkan_hevc.c
+++ b/libavcodec/vulkan_hevc.c
@@ -17,9 +17,9 @@
*/
#include "libavutil/mem.h"
-#include "hevcdec.h"
-#include "hevc_data.h"
-#include "hevc_ps.h"
+#include "hevc/hevcdec.h"
+#include "hevc/data.h"
+#include "hevc/ps.h"
#include "vulkan_decode.h"
diff --git a/libavcodec/x86/hevcdsp_init.c b/libavcodec/x86/hevcdsp_init.c
index f5bc342cd5..2c0fca303e 100644
--- a/libavcodec/x86/hevcdsp_init.c
+++ b/libavcodec/x86/hevcdsp_init.c
@@ -26,7 +26,7 @@
#include "libavutil/mem_internal.h"
#include "libavutil/x86/asm.h"
#include "libavutil/x86/cpu.h"
-#include "libavcodec/hevcdsp.h"
+#include "libavcodec/hevc/dsp.h"
#include "libavcodec/x86/hevcdsp.h"
#include "libavcodec/x86/h26x/h2656dsp.h"
diff --git a/libavformat/hevc.c b/libavformat/hevc.c
index 395907807f..8ab0155f63 100644
--- a/libavformat/hevc.c
+++ b/libavformat/hevc.c
@@ -20,7 +20,7 @@
#include "libavcodec/get_bits.h"
#include "libavcodec/golomb.h"
-#include "libavcodec/hevc.h"
+#include "libavcodec/hevc/hevc.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/mem.h"
#include "avc.h"
diff --git a/libavformat/hevcdec.c b/libavformat/hevcdec.c
index 255f03bc48..4fc4068cd5 100644
--- a/libavformat/hevcdec.c
+++ b/libavformat/hevcdec.c
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "libavcodec/hevc.h"
+#include "libavcodec/hevc/hevc.h"
#include "avformat.h"
#include "rawdec.h"
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 45eca74d1d..160e9626d7 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -52,7 +52,7 @@
#include "libavutil/uuid.h"
#include "libavcodec/ac3tab.h"
#include "libavcodec/flac.h"
-#include "libavcodec/hevc.h"
+#include "libavcodec/hevc/hevc.h"
#include "libavcodec/mpegaudiodecheader.h"
#include "libavcodec/mlp_parse.h"
#include "avformat.h"
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index 99ce3416f1..215783f324 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -32,7 +32,7 @@
#include "libavcodec/bytestream.h"
#include "libavcodec/defs.h"
#include "libavcodec/h264.h"
-#include "libavcodec/hevc.h"
+#include "libavcodec/hevc/hevc.h"
#include "libavcodec/vvc.h"
#include "libavcodec/startcode.h"
diff --git a/tests/checkasm/hevc_add_res.c b/tests/checkasm/hevc_add_res.c
index 9dec3705c1..6388d5b12c 100644
--- a/tests/checkasm/hevc_add_res.c
+++ b/tests/checkasm/hevc_add_res.c
@@ -23,7 +23,7 @@
#include "libavutil/intreadwrite.h"
#include "libavutil/mem_internal.h"
-#include "libavcodec/hevcdsp.h"
+#include "libavcodec/hevc/dsp.h"
#include "checkasm.h"
diff --git a/tests/checkasm/hevc_deblock.c b/tests/checkasm/hevc_deblock.c
index c7f4f7e9ab..89dd8a308b 100644
--- a/tests/checkasm/hevc_deblock.c
+++ b/tests/checkasm/hevc_deblock.c
@@ -22,7 +22,7 @@
#include "libavutil/macros.h"
#include "libavutil/mem_internal.h"
-#include "libavcodec/hevcdsp.h"
+#include "libavcodec/hevc/dsp.h"
#include "checkasm.h"
diff --git a/tests/checkasm/hevc_idct.c b/tests/checkasm/hevc_idct.c
index 9da8b858a0..2bd7ae9409 100644
--- a/tests/checkasm/hevc_idct.c
+++ b/tests/checkasm/hevc_idct.c
@@ -23,7 +23,7 @@
#include "libavutil/intreadwrite.h"
#include "libavutil/mem_internal.h"
-#include "libavcodec/hevcdsp.h"
+#include "libavcodec/hevc/dsp.h"
#include "checkasm.h"
diff --git a/tests/checkasm/hevc_pel.c b/tests/checkasm/hevc_pel.c
index aebdf104e6..d9fa56d420 100644
--- a/tests/checkasm/hevc_pel.c
+++ b/tests/checkasm/hevc_pel.c
@@ -21,7 +21,7 @@
#include <string.h>
#include "checkasm.h"
-#include "libavcodec/hevcdsp.h"
+#include "libavcodec/hevc/dsp.h"
#include "libavutil/common.h"
#include "libavutil/internal.h"
#include "libavutil/intreadwrite.h"
diff --git a/tests/checkasm/hevc_sao.c b/tests/checkasm/hevc_sao.c
index 21c22b9749..ad47423f10 100644
--- a/tests/checkasm/hevc_sao.c
+++ b/tests/checkasm/hevc_sao.c
@@ -23,7 +23,7 @@
#include "libavutil/intreadwrite.h"
#include "libavutil/mem_internal.h"
-#include "libavcodec/hevcdsp.h"
+#include "libavcodec/hevc/dsp.h"
#include "checkasm.h"
--
2.43.0
More information about the ffmpeg-devel
mailing list