@@ -1,17 +1,17 @@
clean::
$(RM) $(CLEANSUFFIXES:%=libavcodec/vvc/%)
-OBJS-$(CONFIG_VVC_DECODER) += vvc/vvcdec.o \
- vvc/vvcdsp.o \
- vvc/vvc_cabac.o \
- vvc/vvc_ctu.o \
- vvc/vvc_data.o \
- vvc/vvc_filter.o \
- vvc/vvc_inter.o \
- vvc/vvc_intra.o \
- vvc/vvc_intra_utils.o \
- vvc/vvc_itx_1d.o \
- vvc/vvc_mvs.o \
- vvc/vvc_ps.o \
- vvc/vvc_refs.o \
- vvc/vvc_thread.o \
+OBJS-$(CONFIG_VVC_DECODER) += vvc/dec.o \
+ vvc/dsp.o \
+ vvc/cabac.o \
+ vvc/ctu.o \
+ vvc/data.o \
+ vvc/filter.o \
+ vvc/inter.o \
+ vvc/intra.o \
+ vvc/intra_utils.o \
+ vvc/itx_1d.o \
+ vvc/mvs.o \
+ vvc/ps.o \
+ vvc/refs.o \
+ vvc/thread.o \
similarity index 99%
rename from libavcodec/vvc/vvc_cabac.c
rename to libavcodec/vvc/cabac.c
@@ -21,9 +21,9 @@
*/
#include "libavcodec/cabac_functions.h"
-#include "vvc_cabac.h"
-#include "vvc_ctu.h"
-#include "vvc_data.h"
+#include "cabac.h"
+#include "ctu.h"
+#include "data.h"
#define CABAC_MAX_BIN 31
similarity index 99%
rename from libavcodec/vvc/vvc_cabac.h
rename to libavcodec/vvc/cabac.h
@@ -23,7 +23,7 @@
#ifndef AVCODEC_VVC_VVC_CABAC_H
#define AVCODEC_VVC_VVC_CABAC_H
-#include "vvc_ctu.h"
+#include "ctu.h"
int ff_vvc_cabac_init(VVCLocalContext *lc, int ctu_idx, int rx, int ry);
similarity index 99%
rename from libavcodec/vvc/vvc_ctu.c
rename to libavcodec/vvc/ctu.c
@@ -22,10 +22,10 @@
#include "libavcodec/refstruct.h"
-#include "vvc_cabac.h"
-#include "vvc_ctu.h"
-#include "vvc_inter.h"
-#include "vvc_mvs.h"
+#include "cabac.h"
+#include "ctu.h"
+#include "inter.h"
+#include "mvs.h"
#define PROF_TEMP_SIZE (PROF_BLOCK_SIZE) * sizeof(int16_t)
similarity index 99%
rename from libavcodec/vvc/vvc_ctu.h
rename to libavcodec/vvc/ctu.h
@@ -26,7 +26,7 @@
#include "libavcodec/cabac.h"
#include "libavutil/mem_internal.h"
-#include "vvcdec.h"
+#include "dec.h"
#define MAX_CTU_SIZE 128
similarity index 99%
rename from libavcodec/vvc/vvc_data.c
rename to libavcodec/vvc/data.c
@@ -22,7 +22,7 @@
#include "libavutil/avassert.h"
-#include "vvc_data.h"
+#include "data.h"
const uint8_t ff_vvc_diag_scan_x[5][5][16*16] = {
{
similarity index 100%
rename from libavcodec/vvc/vvc_data.h
rename to libavcodec/vvc/data.h
similarity index 99%
rename from libavcodec/vvc/vvcdec.c
rename to libavcodec/vvc/dec.c
@@ -28,11 +28,11 @@
#include "libavutil/mem.h"
#include "libavutil/thread.h"
-#include "vvcdec.h"
-#include "vvc_ctu.h"
-#include "vvc_data.h"
-#include "vvc_refs.h"
-#include "vvc_thread.h"
+#include "dec.h"
+#include "ctu.h"
+#include "data.h"
+#include "refs.h"
+#include "thread.h"
#define TAB_MAX 32
similarity index 99%
rename from libavcodec/vvc/vvcdec.h
rename to libavcodec/vvc/dec.h
@@ -27,8 +27,8 @@
#include "libavcodec/videodsp.h"
#include "libavcodec/vvc.h"
-#include "vvc_ps.h"
-#include "vvcdsp.h"
+#include "ps.h"
+#include "dsp.h"
#define LUMA 0
#define CHROMA 1
similarity index 96%
rename from libavcodec/vvc/vvcdsp.c
rename to libavcodec/vvc/dsp.c
@@ -20,9 +20,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "vvcdsp.h"
-#include "vvc_ctu.h"
-#include "vvc_itx_1d.h"
+#include "dsp.h"
+#include "ctu.h"
+#include "itx_1d.h"
#define VVC_SIGN(v) (v < 0 ? -1 : !!v)
@@ -84,15 +84,15 @@ typedef struct IntraEdgeParams {
#define BDOF_GRADIENT_SIZE (BDOF_BLOCK_SIZE + BDOF_BORDER_EXT * 2)
#define BIT_DEPTH 8
-#include "vvcdsp_template.c"
+#include "dsp_template.c"
#undef BIT_DEPTH
#define BIT_DEPTH 10
-#include "vvcdsp_template.c"
+#include "dsp_template.c"
#undef BIT_DEPTH
#define BIT_DEPTH 12
-#include "vvcdsp_template.c"
+#include "dsp_template.c"
#undef BIT_DEPTH
void ff_vvc_dsp_init(VVCDSPContext *vvcdsp, int bit_depth)
similarity index 100%
rename from libavcodec/vvc/vvcdsp.h
rename to libavcodec/vvc/dsp.h
similarity index 96%
rename from libavcodec/vvc/vvcdsp_template.c
rename to libavcodec/vvc/dsp_template.c
@@ -22,12 +22,12 @@
#include "libavutil/frame.h"
#include "libavcodec/bit_depth_template.c"
-#include "vvcdec.h"
-#include "vvc_data.h"
+#include "dec.h"
+#include "data.h"
-#include "vvc_inter_template.c"
-#include "vvc_intra_template.c"
-#include "vvc_filter_template.c"
+#include "inter_template.c"
+#include "intra_template.c"
+#include "filter_template.c"
static void FUNC(add_residual)(uint8_t *_dst, const int *res,
const int w, const int h, const ptrdiff_t _stride)
similarity index 99%
rename from libavcodec/vvc/vvc_filter.c
rename to libavcodec/vvc/filter.c
@@ -21,10 +21,10 @@
*/
#include "libavutil/frame.h"
-#include "vvc_ctu.h"
-#include "vvc_data.h"
-#include "vvc_filter.h"
-#include "vvc_refs.h"
+#include "ctu.h"
+#include "data.h"
+#include "filter.h"
+#include "refs.h"
#define LEFT 0
#define TOP 1
similarity index 99%
rename from libavcodec/vvc/vvc_filter.h
rename to libavcodec/vvc/filter.h
@@ -23,7 +23,7 @@
#ifndef AVCODEC_VVC_VVC_FILTER_H
#define AVCODEC_VVC_VVC_FILTER_H
-#include "vvcdec.h"
+#include "dec.h"
/**
* lmcs filter for the CTU
similarity index 100%
rename from libavcodec/vvc/vvc_filter_template.c
rename to libavcodec/vvc/filter_template.c
similarity index 99%
rename from libavcodec/vvc/vvc_inter.c
rename to libavcodec/vvc/inter.c
@@ -21,10 +21,10 @@
*/
#include "libavutil/frame.h"
-#include "vvc_data.h"
-#include "vvc_inter.h"
-#include "vvc_mvs.h"
-#include "vvc_refs.h"
+#include "data.h"
+#include "inter.h"
+#include "mvs.h"
+#include "refs.h"
// +1 is enough, + 32 for asm alignment
#define PROF_TEMP_OFFSET (MAX_PB_SIZE + 32)
similarity index 98%
rename from libavcodec/vvc/vvc_inter.h
rename to libavcodec/vvc/inter.h
@@ -23,7 +23,7 @@
#ifndef AVCODEC_VVC_VVC_INTER_H
#define AVCODEC_VVC_VVC_INTER_H
-#include "vvc_ctu.h"
+#include "ctu.h"
/**
* Loop entire CTU to predict all inter coding blocks
similarity index 100%
rename from libavcodec/vvc/vvc_inter_template.c
rename to libavcodec/vvc/inter_template.c
similarity index 99%
rename from libavcodec/vvc/vvc_intra.c
rename to libavcodec/vvc/intra.c
@@ -22,10 +22,10 @@
#include "libavutil/frame.h"
#include "libavutil/imgutils.h"
-#include "vvc_data.h"
-#include "vvc_inter.h"
-#include "vvc_intra.h"
-#include "vvc_itx_1d.h"
+#include "data.h"
+#include "inter.h"
+#include "intra.h"
+#include "itx_1d.h"
static int is_cclm(enum IntraPredMode mode)
{
similarity index 98%
rename from libavcodec/vvc/vvc_intra.h
rename to libavcodec/vvc/intra.h
@@ -22,7 +22,7 @@
#ifndef AVCODEC_VVC_VVC_INTRA_H
#define AVCODEC_VVC_VVC_INTRA_H
-#include "vvc_ctu.h"
+#include "ctu.h"
/**
* reconstruct a CTU
similarity index 99%
rename from libavcodec/vvc/vvc_intra_template.c
rename to libavcodec/vvc/intra_template.c
@@ -22,7 +22,7 @@
#include "libavcodec/bit_depth_template.c"
-#include "vvc_intra.h"
+#include "intra.h"
#define POS(x, y) src[(x) + stride * (y)]
similarity index 98%
rename from libavcodec/vvc/vvc_intra_utils.c
rename to libavcodec/vvc/intra_utils.c
@@ -25,10 +25,10 @@
#include "libavutil/avassert.h"
#include "libavutil/macros.h"
#include "libavutil/common.h"
-#include "vvc_ctu.h"
-#include "vvc_intra.h"
-#include "vvc_ps.h"
-#include "vvcdec.h"
+#include "ctu.h"
+#include "intra.h"
+#include "ps.h"
+#include "dec.h"
int ff_vvc_get_mip_size_id(const int w, const int h)
{
similarity index 99%
rename from libavcodec/vvc/vvc_itx_1d.c
rename to libavcodec/vvc/itx_1d.c
@@ -57,8 +57,8 @@
Compact inverse discrete cosine transform circuit for MPEG video decoding.
*/
-#include "vvc_data.h"
-#include "vvc_itx_1d.h"
+#include "data.h"
+#include "itx_1d.h"
#include "libavutil/avutil.h"
#define G2(m) ((nz > 2) ? (m) : 0)
similarity index 100%
rename from libavcodec/vvc/vvc_itx_1d.h
rename to libavcodec/vvc/itx_1d.h
similarity index 99%
rename from libavcodec/vvc/vvc_mvs.c
rename to libavcodec/vvc/mvs.c
@@ -20,10 +20,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "vvc_ctu.h"
-#include "vvc_data.h"
-#include "vvc_refs.h"
-#include "vvc_mvs.h"
+#include "ctu.h"
+#include "data.h"
+#include "refs.h"
+#include "mvs.h"
#define IS_SAME_MV(a, b) (AV_RN64A(a) == AV_RN64A(b))
similarity index 99%
rename from libavcodec/vvc/vvc_mvs.h
rename to libavcodec/vvc/mvs.h
@@ -23,7 +23,7 @@
#ifndef AVCODEC_VVC_VVC_MVS_H
#define AVCODEC_VVC_VVC_MVS_H
-#include "vvc_ctu.h"
+#include "ctu.h"
void ff_vvc_round_mv(Mv *mv, int lshift, int rshift);
void ff_vvc_clip_mv(Mv *mv);
similarity index 99%
rename from libavcodec/vvc/vvc_ps.c
rename to libavcodec/vvc/ps.c
@@ -25,9 +25,9 @@
#include "libavutil/mem.h"
#include "libavutil/pixdesc.h"
#include "libavcodec/refstruct.h"
-#include "vvc_data.h"
-#include "vvc_ps.h"
-#include "vvcdec.h"
+#include "data.h"
+#include "ps.h"
+#include "dec.h"
static int sps_map_pixel_format(VVCSPS *sps, void *log_ctx)
{
similarity index 100%
rename from libavcodec/vvc/vvc_ps.h
rename to libavcodec/vvc/ps.h
similarity index 99%
rename from libavcodec/vvc/vvc_refs.c
rename to libavcodec/vvc/refs.c
@@ -27,7 +27,7 @@
#include "libavcodec/refstruct.h"
#include "libavcodec/thread.h"
-#include "vvc_refs.h"
+#include "refs.h"
#define VVC_FRAME_FLAG_OUTPUT (1 << 0)
#define VVC_FRAME_FLAG_SHORT_REF (1 << 1)
similarity index 99%
rename from libavcodec/vvc/vvc_refs.h
rename to libavcodec/vvc/refs.h
@@ -23,7 +23,7 @@
#ifndef AVCODEC_VVC_VVC_REFS_H
#define AVCODEC_VVC_VVC_REFS_H
-#include "vvcdec.h"
+#include "dec.h"
int ff_vvc_output_frame(VVCContext *s, VVCFrameContext *fc, struct AVFrame *out, int no_output_of_prior_pics_flag, int flush);
void ff_vvc_bump_frame(VVCContext *s, VVCFrameContext *fc);
similarity index 99%
rename from libavcodec/vvc/vvc_thread.c
rename to libavcodec/vvc/thread.c
@@ -26,12 +26,12 @@
#include "libavutil/mem.h"
#include "libavutil/thread.h"
-#include "vvc_thread.h"
-#include "vvc_ctu.h"
-#include "vvc_filter.h"
-#include "vvc_inter.h"
-#include "vvc_intra.h"
-#include "vvc_refs.h"
+#include "thread.h"
+#include "ctu.h"
+#include "filter.h"
+#include "inter.h"
+#include "intra.h"
+#include "refs.h"
typedef struct ProgressListener {
VVCProgressListener l;
similarity index 98%
rename from libavcodec/vvc/vvc_thread.h
rename to libavcodec/vvc/thread.h
@@ -23,7 +23,7 @@
#ifndef AVCODEC_VVC_VVC_THREAD_H
#define AVCODEC_VVC_VVC_THREAD_H
-#include "vvcdec.h"
+#include "dec.h"
struct AVExecutor* ff_vvc_executor_alloc(VVCContext *s, int thread_count);
void ff_vvc_executor_free(struct AVExecutor **e);
@@ -24,11 +24,10 @@
#include "config.h"
#include "libavutil/cpu.h"
-#include "libavutil/x86/asm.h"
#include "libavutil/x86/cpu.h"
-#include "libavcodec/vvc/vvcdec.h"
-#include "libavcodec/vvc/vvc_ctu.h"
-#include "libavcodec/vvc/vvcdsp.h"
+#include "libavcodec/vvc/dec.h"
+#include "libavcodec/vvc/ctu.h"
+#include "libavcodec/vvc/dsp.h"
#include "libavcodec/x86/h26x/h2656dsp.h"
#if ARCH_X86_64
@@ -22,9 +22,9 @@
#include <string.h>
#include "checkasm.h"
-#include "libavcodec/vvc/vvc_ctu.h"
-#include "libavcodec/vvc/vvc_data.h"
-#include "libavcodec/vvc/vvcdsp.h"
+#include "libavcodec/vvc/ctu.h"
+#include "libavcodec/vvc/data.h"
+#include "libavcodec/vvc/dsp.h"
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h"
A namespace is unnecessary here given that all these files are already in the vvc subfolder. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/vvc/Makefile | 28 +++++++++---------- libavcodec/vvc/{vvc_cabac.c => cabac.c} | 6 ++-- libavcodec/vvc/{vvc_cabac.h => cabac.h} | 2 +- libavcodec/vvc/{vvc_ctu.c => ctu.c} | 8 +++--- libavcodec/vvc/{vvc_ctu.h => ctu.h} | 2 +- libavcodec/vvc/{vvc_data.c => data.c} | 2 +- libavcodec/vvc/{vvc_data.h => data.h} | 0 libavcodec/vvc/{vvcdec.c => dec.c} | 10 +++---- libavcodec/vvc/{vvcdec.h => dec.h} | 4 +-- libavcodec/vvc/{vvcdsp.c => dsp.c} | 12 ++++---- libavcodec/vvc/{vvcdsp.h => dsp.h} | 0 .../vvc/{vvcdsp_template.c => dsp_template.c} | 10 +++---- libavcodec/vvc/{vvc_filter.c => filter.c} | 8 +++--- libavcodec/vvc/{vvc_filter.h => filter.h} | 2 +- ...vc_filter_template.c => filter_template.c} | 0 libavcodec/vvc/{vvc_inter.c => inter.c} | 8 +++--- libavcodec/vvc/{vvc_inter.h => inter.h} | 2 +- ...{vvc_inter_template.c => inter_template.c} | 0 libavcodec/vvc/{vvc_intra.c => intra.c} | 8 +++--- libavcodec/vvc/{vvc_intra.h => intra.h} | 2 +- ...{vvc_intra_template.c => intra_template.c} | 2 +- .../vvc/{vvc_intra_utils.c => intra_utils.c} | 8 +++--- libavcodec/vvc/{vvc_itx_1d.c => itx_1d.c} | 4 +-- libavcodec/vvc/{vvc_itx_1d.h => itx_1d.h} | 0 libavcodec/vvc/{vvc_mvs.c => mvs.c} | 8 +++--- libavcodec/vvc/{vvc_mvs.h => mvs.h} | 2 +- libavcodec/vvc/{vvc_ps.c => ps.c} | 6 ++-- libavcodec/vvc/{vvc_ps.h => ps.h} | 0 libavcodec/vvc/{vvc_refs.c => refs.c} | 2 +- libavcodec/vvc/{vvc_refs.h => refs.h} | 2 +- libavcodec/vvc/{vvc_thread.c => thread.c} | 12 ++++---- libavcodec/vvc/{vvc_thread.h => thread.h} | 2 +- libavcodec/x86/vvc/vvcdsp_init.c | 7 ++--- tests/checkasm/vvc_mc.c | 6 ++-- 34 files changed, 87 insertions(+), 88 deletions(-) rename libavcodec/vvc/{vvc_cabac.c => cabac.c} (99%) rename libavcodec/vvc/{vvc_cabac.h => cabac.h} (99%) rename libavcodec/vvc/{vvc_ctu.c => ctu.c} (99%) rename libavcodec/vvc/{vvc_ctu.h => ctu.h} (99%) rename libavcodec/vvc/{vvc_data.c => data.c} (99%) rename libavcodec/vvc/{vvc_data.h => data.h} (100%) rename libavcodec/vvc/{vvcdec.c => dec.c} (99%) rename libavcodec/vvc/{vvcdec.h => dec.h} (99%) rename libavcodec/vvc/{vvcdsp.c => dsp.c} (96%) rename libavcodec/vvc/{vvcdsp.h => dsp.h} (100%) rename libavcodec/vvc/{vvcdsp_template.c => dsp_template.c} (96%) rename libavcodec/vvc/{vvc_filter.c => filter.c} (99%) rename libavcodec/vvc/{vvc_filter.h => filter.h} (99%) rename libavcodec/vvc/{vvc_filter_template.c => filter_template.c} (100%) rename libavcodec/vvc/{vvc_inter.c => inter.c} (99%) rename libavcodec/vvc/{vvc_inter.h => inter.h} (98%) rename libavcodec/vvc/{vvc_inter_template.c => inter_template.c} (100%) rename libavcodec/vvc/{vvc_intra.c => intra.c} (99%) rename libavcodec/vvc/{vvc_intra.h => intra.h} (98%) rename libavcodec/vvc/{vvc_intra_template.c => intra_template.c} (99%) rename libavcodec/vvc/{vvc_intra_utils.c => intra_utils.c} (98%) rename libavcodec/vvc/{vvc_itx_1d.c => itx_1d.c} (99%) rename libavcodec/vvc/{vvc_itx_1d.h => itx_1d.h} (100%) rename libavcodec/vvc/{vvc_mvs.c => mvs.c} (99%) rename libavcodec/vvc/{vvc_mvs.h => mvs.h} (99%) rename libavcodec/vvc/{vvc_ps.c => ps.c} (99%) rename libavcodec/vvc/{vvc_ps.h => ps.h} (100%) rename libavcodec/vvc/{vvc_refs.c => refs.c} (99%) rename libavcodec/vvc/{vvc_refs.h => refs.h} (99%) rename libavcodec/vvc/{vvc_thread.c => thread.c} (99%) rename libavcodec/vvc/{vvc_thread.h => thread.h} (98%)