History

avcodec/vvcdec: misc, rename BDOF_BLOCK_SIZE to BDOF_MIN_BLOCK_SIZE

Nuo Mi committed 2 years ago

Commit 8347def1 parent b730def2 files · +7 −7Browse files

Unified · Split

2 files
  1. libavcodec/vvc/dsp.c +2 −2
  2. libavcodec/vvc/inter_template.c +5 −5
libavcodec/vvc/dsp.c+2−2
@@ -80,8 +80,8 @@ typedef struct IntraEdgeParams { · 79 unmodified lines
8080 #define BDOF_BORDER_EXT 1
8181
8282 #define BDOF_PADDED_SIZE (16 + BDOF_BORDER_EXT * 2)
83−#define BDOF_BLOCK_SIZE 4
84−#define BDOF_GRADIENT_SIZE (BDOF_BLOCK_SIZE + BDOF_BORDER_EXT * 2)
83+#define BDOF_MIN_BLOCK_SIZE 4
84+#define BDOF_GRADIENT_SIZE (BDOF_MIN_BLOCK_SIZE + BDOF_BORDER_EXT * 2)
8585
8686 #define BIT_DEPTH 8
8787 #include "dsp_template.c"
libavcodec/vvc/inter_template.c+5−5
@@ -433,8 +433,8 @@ static void FUNC(apply_bdof_min_block)(pixel* dst, const ptrdiff_t dst_stride, c · 432 unmodified lines
433433 const int16_t* gh[] = { gradient_h[0] + 1 + BDOF_PADDED_SIZE, gradient_h[1] + 1 + BDOF_PADDED_SIZE };
434434 const int16_t* gv[] = { gradient_v[0] + 1 + BDOF_PADDED_SIZE, gradient_v[1] + 1 + BDOF_PADDED_SIZE };
435435
436− for (int y = 0; y < BDOF_BLOCK_SIZE; y++) {
437− for (int x = 0; x < BDOF_BLOCK_SIZE; x++) {
436+ for (int y = 0; y < BDOF_MIN_BLOCK_SIZE; y++) {
437+ for (int x = 0; x < BDOF_MIN_BLOCK_SIZE; x++) {
438438 const int idx = y * BDOF_PADDED_SIZE + x;
439439 const int bdof_offset = vx * (gh[0][idx] - gh[1][idx]) + vy * (gv[0][idx] - gv[1][idx]);
440440 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 · 20 unmodified lines
461461 _src1, MAX_PB_SIZE, block_w, block_h, 1);
462462 pad_int16(_src1, MAX_PB_SIZE, block_w, block_h);
463463
464− for (int y = 0; y < block_h; y += BDOF_BLOCK_SIZE) {
465− for (int x = 0; x < block_w; x += BDOF_BLOCK_SIZE) {
464+ for (int y = 0; y < block_h; y += BDOF_MIN_BLOCK_SIZE) {
465+ for (int x = 0; x < block_w; x += BDOF_MIN_BLOCK_SIZE) {
466466 const int16_t* src0 = _src0 + y * MAX_PB_SIZE + x;
467467 const int16_t* src1 = _src1 + y * MAX_PB_SIZE + x;
468468 pixel *d = dst + x;
@@ -472,7 +472,7 @@ static void FUNC(apply_bdof)(uint8_t *_dst, const ptrdiff_t _dst_stride, int16_t · 3 unmodified lines
472472 FUNC(derive_bdof_vx_vy)(src0, src1, gh, gv, BDOF_PADDED_SIZE, &vx, &vy);
473473 FUNC(apply_bdof_min_block)(d, dst_stride, src0, src1, gh, gv, vx, vy);
474474 }
475− dst += BDOF_BLOCK_SIZE * dst_stride;
475+ dst += BDOF_MIN_BLOCK_SIZE * dst_stride;
476476 }
477477 }
478478

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t