eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-11 17:30:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/vvcdec: misc, rename BDOF_BLOCK_SIZE to BDOF_MIN_BLOCK_SIZE

Browse Source
This commit is contained in:
Nuo Mi
2024-08-20 21:22:33 +08:00
parent b730defd52
commit 8347def797
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/vvc/dsp.c
View File

@@ -80,8 +80,8 @@ typedef struct IntraEdgeParams {
#define BDOF_BORDER_EXT 1 #define BDOF_BORDER_EXT 1
#define BDOF_PADDED_SIZE (16 + BDOF_BORDER_EXT * 2) #define BDOF_PADDED_SIZE (16 + BDOF_BORDER_EXT * 2)
#define BDOF_BLOCK_SIZE 4 #define BDOF_MIN_BLOCK_SIZE 4
#define BDOF_GRADIENT_SIZE (BDOF_BLOCK_SIZE + BDOF_BORDER_EXT * 2) #define BDOF_GRADIENT_SIZE (BDOF_MIN_BLOCK_SIZE + BDOF_BORDER_EXT * 2)
#define BIT_DEPTH 8 #define BIT_DEPTH 8
#include "dsp_template.c" #include "dsp_template.c"

10
libavcodec/vvc/inter_template.c
View File

@@ -433,8 +433,8 @@ static void FUNC(apply_bdof_min_block)(pixel* dst, const ptrdiff_t dst_stride, c
const int16_t* gh[] = { gradient_h[0] + 1 + BDOF_PADDED_SIZE, gradient_h[1] + 1 + BDOF_PADDED_SIZE }; const int16_t* gh[] = { gradient_h[0] + 1 + BDOF_PADDED_SIZE, gradient_h[1] + 1 + BDOF_PADDED_SIZE };
const int16_t* gv[] = { gradient_v[0] + 1 + BDOF_PADDED_SIZE, gradient_v[1] + 1 + BDOF_PADDED_SIZE }; const int16_t* gv[] = { gradient_v[0] + 1 + BDOF_PADDED_SIZE, gradient_v[1] + 1 + BDOF_PADDED_SIZE };
for (int y = 0; y < BDOF_BLOCK_SIZE; y++) { for (int y = 0; y < BDOF_MIN_BLOCK_SIZE; y++) {
for (int x = 0; x < BDOF_BLOCK_SIZE; x++) { for (int x = 0; x < BDOF_MIN_BLOCK_SIZE; x++) {
const int idx = y * BDOF_PADDED_SIZE + x; const int idx = y * BDOF_PADDED_SIZE + x;
const int bdof_offset = vx * (gh[0][idx] - gh[1][idx]) + vy * (gv[0][idx] - gv[1][idx]); const int bdof_offset = vx * (gh[0][idx] - gh[1][idx]) + vy * (gv[0][idx] - gv[1][idx]);
dst[x] = av_clip_pixel((src0[x] + offset4 + src1[x] + bdof_offset) >> shift4); dst[x] = av_clip_pixel((src0[x] + offset4 + src1[x] + bdof_offset) >> shift4);
@@ -461,8 +461,8 @@ static void FUNC(apply_bdof)(uint8_t *_dst, const ptrdiff_t _dst_stride, int16_t
_src1, MAX_PB_SIZE, block_w, block_h, 1); _src1, MAX_PB_SIZE, block_w, block_h, 1);
pad_int16(_src1, MAX_PB_SIZE, block_w, block_h); pad_int16(_src1, MAX_PB_SIZE, block_w, block_h);
for (int y = 0; y < block_h; y += BDOF_BLOCK_SIZE) { for (int y = 0; y < block_h; y += BDOF_MIN_BLOCK_SIZE) {
for (int x = 0; x < block_w; x += BDOF_BLOCK_SIZE) { for (int x = 0; x < block_w; x += BDOF_MIN_BLOCK_SIZE) {
const int16_t* src0 = _src0 + y * MAX_PB_SIZE + x; const int16_t* src0 = _src0 + y * MAX_PB_SIZE + x;
const int16_t* src1 = _src1 + y * MAX_PB_SIZE + x; const int16_t* src1 = _src1 + y * MAX_PB_SIZE + x;
pixel *d = dst + x; pixel *d = dst + x;
@@ -472,7 +472,7 @@ static void FUNC(apply_bdof)(uint8_t *_dst, const ptrdiff_t _dst_stride, int16_t
FUNC(derive_bdof_vx_vy)(src0, src1, gh, gv, BDOF_PADDED_SIZE, &vx, &vy); FUNC(derive_bdof_vx_vy)(src0, src1, gh, gv, BDOF_PADDED_SIZE, &vx, &vy);
FUNC(apply_bdof_min_block)(d, dst_stride, src0, src1, gh, gv, vx, vy); FUNC(apply_bdof_min_block)(d, dst_stride, src0, src1, gh, gv, vx, vy);
} }
dst += BDOF_BLOCK_SIZE * dst_stride; dst += BDOF_MIN_BLOCK_SIZE * dst_stride;
} }
} }