virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

avcodec/vvc: Rename vvc_?foo->foo

Browse Source 
A namespace is unnecessary here given that all these files
are already in the vvc subfolder.

Reviewed-by: Nuo Mi <nuomi2021@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2024-04-04 04:14:58 +02:00
parent 486a2b964b
commit db063212c8
34 changed files with 126 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libavcodec/vvc/Makefile
View File

@ -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 \

6
libavcodec/vvc/vvc_cabac.c → libavcodec/vvc/cabac.c
View File

@ -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

8
libavcodec/vvc/vvc_cabac.h → libavcodec/vvc/cabac.h
View File

@ -20,10 +20,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_VVC_VVC_CABAC_H
#define AVCODEC_VVC_VVC_CABAC_H
#ifndef AVCODEC_VVC_CABAC_H
#define AVCODEC_VVC_CABAC_H
#include "vvc_ctu.h"
#include "ctu.h"
int ff_vvc_cabac_init(VVCLocalContext *lc, int ctu_idx, int rx, int ry);
@ -123,4 +123,4 @@ int ff_vvc_end_of_slice_flag_decode(VVCLocalContext *lc);
int ff_vvc_end_of_tile_one_bit(VVCLocalContext *lc);
int ff_vvc_end_of_subset_one_bit(VVCLocalContext *lc);
#endif //AVCODEC_VVC_VVC_CABAC_H
#endif //AVCODEC_VVC_CABAC_H

8
libavcodec/vvc/vvc_ctu.c → libavcodec/vvc/ctu.c
View File

@ -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)

8
libavcodec/vvc/vvc_ctu.h → libavcodec/vvc/ctu.h
View File

@ -20,13 +20,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_VVC_VVC_CTU_H
#define AVCODEC_VVC_VVC_CTU_H
#ifndef AVCODEC_VVC_CTU_H
#define AVCODEC_VVC_CTU_H
#include "libavcodec/cabac.h"
#include "libavutil/mem_internal.h"
#include "vvcdec.h"
#include "dec.h"
#define MAX_CTU_SIZE 128
@ -483,4 +483,4 @@ void ff_vvc_ctu_free_cus(CTU *ctu);
int ff_vvc_get_qPy(const VVCFrameContext *fc, int xc, int yc);
void ff_vvc_ep_init_stat_coeff(EntryPoint *ep, int bit_depth, int persistent_rice_adaptation_enabled_flag);
#endif // AVCODEC_VVC_VVC_CTU_H
#endif // AVCODEC_VVC_CTU_H

2
libavcodec/vvc/vvc_data.c → libavcodec/vvc/data.c
View File

@ -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] = {
{

6
libavcodec/vvc/vvc_data.h → libavcodec/vvc/data.h
View File

@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_VVC_VVC_DATA_H
#define AVCODEC_VVC_VVC_DATA_H
#ifndef AVCODEC_VVC_DATA_H
#define AVCODEC_VVC_DATA_H
#include <stdint.h>
@ -77,4 +77,4 @@ extern const uint8_t ff_vvc_alf_aps_class_to_filt_map[25];
const uint8_t* ff_vvc_get_mip_matrix(const int size_id, const int mode_idx);
#endif /* AVCODEC_VVC_VVC_DATA_H */
#endif /* AVCODEC_VVC_DATA_H */

10
libavcodec/vvc/vvcdec.c → libavcodec/vvc/dec.c
View File

@ -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

10
libavcodec/vvc/vvcdec.h → libavcodec/vvc/dec.h
View File

@ -21,14 +21,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_VVC_VVCDEC_H
#define AVCODEC_VVC_VVCDEC_H
#ifndef AVCODEC_VVC_DEC_H
#define AVCODEC_VVC_DEC_H
#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
@ -226,4 +226,4 @@ typedef struct VVCContext {
int nb_delayed; ///< delayed frames
} VVCContext ;
#endif /* AVCODEC_VVC_VVCDEC_H */
#endif /* AVCODEC_VVC_DEC_H */

12
libavcodec/vvc/vvcdsp.c → libavcodec/vvc/dsp.c
View File

@ -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)

6
libavcodec/vvc/vvcdsp.h → libavcodec/vvc/dsp.h
View File

@ -21,8 +21,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_VVC_VVCDSP_H
#define AVCODEC_VVC_VVCDSP_H
#ifndef AVCODEC_VVC_DSP_H
#define AVCODEC_VVC_DSP_H
#include <stdint.h>
#include <stddef.h>
@ -169,4 +169,4 @@ void ff_vvc_dsp_init(VVCDSPContext *hpc, int bit_depth);
void ff_vvc_dsp_init_x86(VVCDSPContext *hpc, const int bit_depth);
#endif /* AVCODEC_VVC_VVCDSP_H */
#endif /* AVCODEC_VVC_DSP_H */

10
libavcodec/vvc/vvcdsp_template.c → libavcodec/vvc/dsp_template.c
View File

@ -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)

8
libavcodec/vvc/vvc_filter.c → libavcodec/vvc/filter.c
View File

@ -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

8
libavcodec/vvc/vvc_filter.h → libavcodec/vvc/filter.h
View File

@ -20,10 +20,10 @@
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_VVC_VVC_FILTER_H
#define AVCODEC_VVC_VVC_FILTER_H
#ifndef AVCODEC_VVC_FILTER_H
#define AVCODEC_VVC_FILTER_H
#include "vvcdec.h"
#include "dec.h"
/**
* lmcs filter for the CTU
@ -70,4 +70,4 @@ void ff_vvc_alf_copy_ctu_to_hv(VVCLocalContext* lc, int x0, int y0);
*/
void ff_vvc_alf_filter(VVCLocalContext *lc, const int x0, const int y0);
#endif // AVCODEC_VVC_VVC_CTU_H
#endif // AVCODEC_VVC_CTU_H

0
libavcodec/vvc/vvc_filter_template.c → libavcodec/vvc/filter_template.c
View File

8
libavcodec/vvc/vvc_inter.c → libavcodec/vvc/inter.c
View File

@ -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)

8
libavcodec/vvc/vvc_inter.h → libavcodec/vvc/inter.h
View File

@ -20,10 +20,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_VVC_VVC_INTER_H
#define AVCODEC_VVC_VVC_INTER_H
#ifndef AVCODEC_VVC_INTER_H
#define AVCODEC_VVC_INTER_H
#include "vvc_ctu.h"
#include "ctu.h"
/**
* Loop entire CTU to predict all inter coding blocks
@ -39,4 +39,4 @@ int ff_vvc_predict_inter(VVCLocalContext *lc, int rs);
*/
void ff_vvc_predict_ciip(VVCLocalContext *lc);
#endif // AVCODEC_VVC_VVC_INTER_H
#endif // AVCODEC_VVC_INTER_H

0
libavcodec/vvc/vvc_inter_template.c → libavcodec/vvc/inter_template.c
View File

8
libavcodec/vvc/vvc_intra.c → libavcodec/vvc/intra.c
View File

@ -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)
{

8
libavcodec/vvc/vvc_intra.h → libavcodec/vvc/intra.h
View File

@ -19,10 +19,10 @@
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_VVC_VVC_INTRA_H
#define AVCODEC_VVC_VVC_INTRA_H
#ifndef AVCODEC_VVC_INTRA_H
#define AVCODEC_VVC_INTRA_H
#include "vvc_ctu.h"
#include "ctu.h"
/**
* reconstruct a CTU
@ -46,4 +46,4 @@ int ff_vvc_intra_inv_angle_derive(int pred_mode);
int ff_vvc_wide_angle_mode_mapping(const CodingUnit *cu,
int tb_width, int tb_height, int c_idx, int pred_mode_intra);
#endif // AVCODEC_VVC_VVC_INTRA_H
#endif // AVCODEC_VVC_INTRA_H

2
libavcodec/vvc/vvc_intra_template.c → libavcodec/vvc/intra_template.c
View File

@ -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)]

8
libavcodec/vvc/vvc_intra_utils.c → libavcodec/vvc/intra_utils.c
View File

@ -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)
{

4
libavcodec/vvc/vvc_itx_1d.c → libavcodec/vvc/itx_1d.c
View File

@ -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)

6
libavcodec/vvc/vvc_itx_1d.h → libavcodec/vvc/itx_1d.h
View File

@ -20,8 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_VVC_VVC_ITX_1D_H
#define AVCODEC_VVC_VVC_ITX_1D_H
#ifndef AVCODEC_VVC_ITX_1D_H
#define AVCODEC_VVC_ITX_1D_H
#include <stdint.h>
#include <stddef.h>
@ -49,4 +49,4 @@ vvc_itx_1d_fn(ff_vvc_inv_dct8_32);
void ff_vvc_inv_lfnst_1d(int *v, const int *u, int no_zero_size, int n_tr_s,
int pred_mode_intra, int lfnst_idx, int log2_transform_range);
#endif // AVCODEC_VVC_VVC_ITX_1D_H
#endif // AVCODEC_VVC_ITX_1D_H

8
libavcodec/vvc/vvc_mvs.c → libavcodec/vvc/mvs.c
View File

@ -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))

8
libavcodec/vvc/vvc_mvs.h → libavcodec/vvc/mvs.h
View File

@ -20,10 +20,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_VVC_VVC_MVS_H
#define AVCODEC_VVC_VVC_MVS_H
#ifndef AVCODEC_VVC_MVS_H
#define AVCODEC_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);
@ -45,4 +45,4 @@ MvField* ff_vvc_get_mvf(const VVCFrameContext *fc, const int x0, const int y0);
void ff_vvc_set_mvf(const VVCLocalContext *lc, const int x0, const int y0, const int w, const int h, const MvField *mvf);
void ff_vvc_set_intra_mvf(const VVCLocalContext *lc, int dmvr);
#endif //AVCODEC_VVC_VVC_MVS_H
#endif //AVCODEC_VVC_MVS_H

6
libavcodec/vvc/vvc_ps.c → libavcodec/vvc/ps.c
View File

@ -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)
{

6
libavcodec/vvc/vvc_ps.h → libavcodec/vvc/ps.h
View File

@ -20,8 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_VVC_VVC_PS_H
#define AVCODEC_VVC_VVC_PS_H
#ifndef AVCODEC_VVC_PS_H
#define AVCODEC_VVC_PS_H
#include "libavcodec/cbs_h266.h"
#include "libavcodec/vvc.h"
@ -263,4 +263,4 @@ int ff_vvc_decode_sh(VVCSH *sh, const VVCFrameParamSets *ps, const CodedBitstrea
void ff_vvc_frame_ps_free(VVCFrameParamSets *fps);
void ff_vvc_ps_uninit(VVCParamSets *ps);
#endif /* AVCODEC_VVC_VVC_PS_H */
#endif /* AVCODEC_VVC_PS_H */

2
libavcodec/vvc/vvc_refs.c → libavcodec/vvc/refs.c
View File

@ -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)

8
libavcodec/vvc/vvc_refs.h → libavcodec/vvc/refs.h
View File

@ -20,10 +20,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_VVC_VVC_REFS_H
#define AVCODEC_VVC_VVC_REFS_H
#ifndef AVCODEC_VVC_REFS_H
#define AVCODEC_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);
@ -55,4 +55,4 @@ void ff_vvc_report_frame_finished(VVCFrame *frame);
void ff_vvc_report_progress(VVCFrame *frame, VVCProgress vp, int y);
void ff_vvc_add_progress_listener(VVCFrame *frame, VVCProgressListener *l);
#endif // AVCODEC_VVC_VVC_REFS_H
#endif // AVCODEC_VVC_REFS_H

12
libavcodec/vvc/vvc_thread.c → libavcodec/vvc/thread.c
View File

@ -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;

8
libavcodec/vvc/vvc_thread.h → libavcodec/vvc/thread.h
View File

@ -20,10 +20,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_VVC_VVC_THREAD_H
#define AVCODEC_VVC_VVC_THREAD_H
#ifndef AVCODEC_VVC_THREAD_H
#define AVCODEC_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);
@ -33,4 +33,4 @@ void ff_vvc_frame_thread_free(VVCFrameContext *fc);
void ff_vvc_frame_submit(VVCContext *s, VVCFrameContext *fc);
int ff_vvc_frame_wait(VVCContext *s, VVCFrameContext *fc);
#endif // AVCODEC_VVC_VVC_THREAD_H
#endif // AVCODEC_VVC_THREAD_H

7
libavcodec/x86/vvc/vvcdsp_init.c
View File

@ -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

6
tests/checkasm/vvc_mc.c
View File

@ -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"