Prefix loop restoration global functions with av1_
BUG=aomedia:1540
Change-Id: I774294703e9ba8e10e7e94f418fa1762d9da214a
diff --git a/av1/common/arm/selfguided_neon.c b/av1/common/arm/selfguided_neon.c
index f335f9f..992b863 100644
--- a/av1/common/arm/selfguided_neon.c
+++ b/av1/common/arm/selfguided_neon.c
@@ -86,7 +86,7 @@
for (int x = 0; x < 4; x++) {
for (int y = 0; y < 4; y++) {
- dst_A16[x * buf_stride + y] = x_by_xplus1[src1[x * buf_stride + y]];
+ dst_A16[x * buf_stride + y] = av1_x_by_xplus1[src1[x * buf_stride + y]];
}
}
load_u16_4x4(dst_A16, buf_stride, &d0, &d1, &d2, &d3);
@@ -214,7 +214,7 @@
for (int x = 0; x < 4; x++) {
for (int y = 0; y < 8; y++) {
- dst_A16[x * buf_stride + y] = x_by_xplus1[src1[x * buf_stride + y]];
+ dst_A16[x * buf_stride + y] = av1_x_by_xplus1[src1[x * buf_stride + y]];
}
}
load_u16_8x4(dst_A16, buf_stride, &s16_4, &s16_5, &s16_6, &s16_7);
@@ -467,7 +467,7 @@
const uint32_t n = (2 * r + 1) * (2 * r + 1);
const uint32x4_t const_n_val = vdupq_n_u32(n);
const uint16x8_t sgrproj_sgr = vdupq_n_u16(SGRPROJ_SGR);
- const uint16x4_t one_by_n_minus_1_vec = vdup_n_u16(one_by_x[n - 1]);
+ const uint16x4_t one_by_n_minus_1_vec = vdup_n_u16(av1_one_by_x[n - 1]);
const uint32x4_t const_val = vdupq_n_u32(255);
uint16x8_t s16_0, s16_1, s16_2, s16_3, s16_4, s16_5, s16_6, s16_7;
@@ -522,7 +522,7 @@
const int32x4_t bd_min_1_vec = vdupq_n_s32(-((bit_depth - 8) << 1));
const uint32x4_t const_n_val = vdupq_n_u32(n);
const uint16x8_t sgrproj_sgr = vdupq_n_u16(SGRPROJ_SGR);
- const uint16x4_t one_by_n_minus_1_vec = vdup_n_u16(one_by_x[n - 1]);
+ const uint16x4_t one_by_n_minus_1_vec = vdup_n_u16(av1_one_by_x[n - 1]);
const uint32x4_t const_val = vdupq_n_u32(255);
int32x4_t sr0, sr1, sr2, sr3, sr4, sr5, sr6, sr7;
@@ -584,7 +584,7 @@
const uint32_t n = (2 * r + 1) * (2 * r + 1);
const uint32x4_t const_n_val = vdupq_n_u32(n);
const uint16x4_t sgrproj_sgr = vdup_n_u16(SGRPROJ_SGR);
- const uint32x4_t one_by_n_minus_1_vec = vdupq_n_u32(one_by_x[n - 1]);
+ const uint32x4_t one_by_n_minus_1_vec = vdupq_n_u32(av1_one_by_x[n - 1]);
const uint32x4_t const_val = vdupq_n_u32(255);
int32x4_t sr0, sr1, sr2, sr3, sr4, sr5, sr6, sr7;
@@ -638,7 +638,7 @@
const int32x4_t bd_min_1_vec = vdupq_n_s32(-((bit_depth - 8) << 1));
const uint32x4_t const_n_val = vdupq_n_u32(n);
const uint16x4_t sgrproj_sgr = vdup_n_u16(SGRPROJ_SGR);
- const uint32x4_t one_by_n_minus_1_vec = vdupq_n_u32(one_by_x[n - 1]);
+ const uint32x4_t one_by_n_minus_1_vec = vdupq_n_u32(av1_one_by_x[n - 1]);
const uint32x4_t const_val = vdupq_n_u32(255);
int32x4_t sr0, sr1, sr2, sr3, sr4, sr5, sr6, sr7;
@@ -1145,7 +1145,7 @@
int32_t *dst, int dst_stride,
int bit_depth, int sgr_params_idx,
int radius_idx) {
- const sgr_params_type *const params = &sgr_params[sgr_params_idx];
+ const sgr_params_type *const params = &av1_sgr_params[sgr_params_idx];
const int r = params->r[radius_idx];
const int width_ext = width + 2 * SGRPROJ_BORDER_HORZ;
const int height_ext = height + 2 * SGRPROJ_BORDER_VERT;
@@ -1200,7 +1200,7 @@
int dgd_stride, int32_t *dst,
int dst_stride, int bit_depth,
int sgr_params_idx, int radius_idx) {
- const sgr_params_type *const params = &sgr_params[sgr_params_idx];
+ const sgr_params_type *const params = &av1_sgr_params[sgr_params_idx];
const int r = params->r[radius_idx];
const int width_ext = width + 2 * SGRPROJ_BORDER_HORZ;
const int height_ext = height + 2 * SGRPROJ_BORDER_VERT;
@@ -1345,7 +1345,7 @@
int stride, int32_t *flt0, int32_t *flt1,
int flt_stride, int sgr_params_idx,
int bit_depth, int highbd) {
- const sgr_params_type *const params = &sgr_params[sgr_params_idx];
+ const sgr_params_type *const params = &av1_sgr_params[sgr_params_idx];
assert(!(params->r[0] == 0 && params->r[1] == 0));
uint16_t dgd16_[RESTORATION_PROC_UNIT_PELS];
@@ -1395,7 +1395,7 @@
const int width_ext = width + 2 * SGRPROJ_BORDER_HORZ;
const int height_ext = height + 2 * SGRPROJ_BORDER_VERT;
const int dgd_stride = stride;
- const sgr_params_type *const params = &sgr_params[eps];
+ const sgr_params_type *const params = &av1_sgr_params[eps];
int xq[2];
assert(!(params->r[0] == 0 && params->r[1] == 0));
@@ -1422,7 +1422,7 @@
restoration_internal(dgd16, width, height, dgd16_stride, flt1, width,
bit_depth, eps, 1);
- decode_xq(xqd, xq, params);
+ av1_decode_xq(xqd, xq, params);
{
int16_t *src_ptr;
diff --git a/av1/common/restoration.c b/av1/common/restoration.c
index d8af61f..bd07b89 100644
--- a/av1/common/restoration.c
+++ b/av1/common/restoration.c
@@ -28,7 +28,7 @@
// The 's' values are calculated based on original 'r' and 'e' values in the
// spec using GenSgrprojVtable().
// Note: Setting r = 0 skips the filter; with corresponding s = -1 (invalid).
-const sgr_params_type sgr_params[SGRPROJ_PARAMS] = {
+const sgr_params_type av1_sgr_params[SGRPROJ_PARAMS] = {
{ { 2, 1 }, { 140, 3236 } }, { { 2, 1 }, { 112, 2158 } },
{ { 2, 1 }, { 93, 1618 } }, { { 2, 1 }, { 80, 1438 } },
{ { 2, 1 }, { 70, 1295 } }, { { 2, 1 }, { 58, 1177 } },
@@ -111,7 +111,7 @@
static void GenSgrprojVtable() {
for (int i = 0; i < SGRPROJ_PARAMS; ++i) {
- const sgr_params_type *const params = &sgr_params[i];
+ const sgr_params_type *const params = &av1_sgr_params[i];
for (int j = 0; j < 2; ++j) {
const int e = params->e[j];
const int r = params->r[j];
@@ -173,8 +173,8 @@
}
}
-void extend_frame(uint8_t *data, int width, int height, int stride,
- int border_horz, int border_vert, int highbd) {
+void av1_extend_frame(uint8_t *data, int width, int height, int stride,
+ int border_horz, int border_vert, int highbd) {
if (highbd)
extend_frame_highbd(CONVERT_TO_SHORTPTR(data), width, height, stride,
border_horz, border_vert);
@@ -212,11 +212,10 @@
// rules:
//
// * At a frame boundary, we copy the outermost row of CDEF pixels three times.
-// This extension is done by a call to extend_frame() at the start of the loop
-// restoration process, so the value of copy_above/copy_below doesn't strictly
-// matter.
-// However, by setting *copy_above = *copy_below = 1 whenever loop filtering
-// across tiles is disabled, we can allow
+// This extension is done by a call to av1_extend_frame() at the start of the
+// loop restoration process, so the value of copy_above/copy_below doesn't
+// strictly matter. However, by setting *copy_above = *copy_below = 1 whenever
+// loop filtering across tiles is disabled, we can allow
// {setup,restore}_processing_stripe_boundary to assume that the top/bottom
// data has always been copied, simplifying the behaviour at the left and
// right edges of tiles.
@@ -620,7 +619,7 @@
assert(0 && "Invalid value of r in self-guided filter");
}
-void decode_xq(const int *xqd, int *xq, const sgr_params_type *params) {
+void av1_decode_xq(const int *xqd, int *xq, const sgr_params_type *params) {
if (params->r[0] == 0) {
xq[0] = 0;
xq[1] = (1 << SGRPROJ_PRJ_BITS) - xqd[1];
@@ -633,7 +632,7 @@
}
}
-const int32_t x_by_xplus1[256] = {
+const int32_t av1_x_by_xplus1[256] = {
// Special case: Map 0 -> 1 (corresponding to a value of 1/256)
// instead of 0. See comments in selfguided_restoration_internal() for why
1, 128, 171, 192, 205, 213, 219, 224, 228, 230, 233, 235, 236, 238, 239,
@@ -656,7 +655,7 @@
256,
};
-const int32_t one_by_x[MAX_NELEM] = {
+const int32_t av1_one_by_x[MAX_NELEM] = {
4096, 2048, 1365, 1024, 819, 683, 585, 512, 455, 410, 372, 341, 315,
293, 273, 256, 241, 228, 216, 205, 195, 186, 178, 171, 164,
};
@@ -665,7 +664,7 @@
int dgd_stride, int bit_depth,
int sgr_params_idx, int radius_idx,
int pass, int32_t *A, int32_t *B) {
- const sgr_params_type *const params = &sgr_params[sgr_params_idx];
+ const sgr_params_type *const params = &av1_sgr_params[sgr_params_idx];
const int r = params->r[radius_idx];
const int width_ext = width + 2 * SGRPROJ_BORDER_HORZ;
const int height_ext = height + 2 * SGRPROJ_BORDER_VERT;
@@ -726,7 +725,7 @@
// Further, in the calculation of B[k] below, if z == 0 and r == 2,
// then A[k] "should be" 0. But then we can end up setting B[k] to a value
// slightly above 2^(8 + bit depth), due to rounding in the value of
- // one_by_x[25-1].
+ // av1_one_by_x[25-1].
//
// Thus we saturate so that, when z == 0, A[k] is set to 1 instead of 0.
// This fixes the above issues (256 - A[k] fits in a uint8, and we can't
@@ -738,17 +737,17 @@
// would be a bad idea, as that corresponds to the case where the image
// is very variable, when we want to preserve the local pixel value as
// much as possible.
- A[k] = x_by_xplus1[AOMMIN(z, 255)]; // in range [1, 256]
+ A[k] = av1_x_by_xplus1[AOMMIN(z, 255)]; // in range [1, 256]
// SGRPROJ_SGR - A[k] < 2^8 (from above), B[k] < 2^(bit_depth) * n,
- // one_by_x[n - 1] = round(2^12 / n)
+ // av1_one_by_x[n - 1] = round(2^12 / n)
// => the product here is < 2^(20 + bit_depth) <= 2^32,
// and B[k] is set to a value < 2^(8 + bit depth)
- // This holds even with the rounding in one_by_x and in the overall
+ // This holds even with the rounding in av1_one_by_x and in the overall
// result, as long as SGRPROJ_SGR - A[k] is strictly less than 2^8.
B[k] = (int32_t)ROUND_POWER_OF_TWO((uint32_t)(SGRPROJ_SGR - A[k]) *
(uint32_t)B[k] *
- (uint32_t)one_by_x[n - 1],
+ (uint32_t)av1_one_by_x[n - 1],
SGRPROJ_RECIP_BITS);
}
}
@@ -757,7 +756,7 @@
static void selfguided_restoration_fast_internal(
int32_t *dgd, int width, int height, int dgd_stride, int32_t *dst,
int dst_stride, int bit_depth, int sgr_params_idx, int radius_idx) {
- const sgr_params_type *const params = &sgr_params[sgr_params_idx];
+ const sgr_params_type *const params = &av1_sgr_params[sgr_params_idx];
const int r = params->r[radius_idx];
const int width_ext = width + 2 * SGRPROJ_BORDER_HORZ;
// Adjusting the stride of A and B here appears to avoid bad cache effects,
@@ -883,7 +882,7 @@
}
}
- const sgr_params_type *const params = &sgr_params[sgr_params_idx];
+ const sgr_params_type *const params = &av1_sgr_params[sgr_params_idx];
// If params->r == 0 we skip the corresponding filter. We only allow one of
// the radii to be 0, as having both equal to 0 would be equivalent to
// skipping SGR entirely.
@@ -912,9 +911,9 @@
dat8, width, height, stride, flt0, flt1, width, eps, bit_depth, highbd);
(void)ret;
assert(!ret);
- const sgr_params_type *const params = &sgr_params[eps];
+ const sgr_params_type *const params = &av1_sgr_params[eps];
int xq[2];
- decode_xq(xqd, xq, params);
+ av1_decode_xq(xqd, xq, params);
for (int i = 0; i < height; ++i) {
for (int j = 0; j < width; ++j) {
const int k = i * width + j;
@@ -1120,9 +1119,9 @@
const int plane_height = frame->crop_heights[is_uv];
FilterFrameCtxt *lr_plane_ctxt = &lr_ctxt->ctxt[plane];
- extend_frame(frame->buffers[plane], plane_width, plane_height,
- frame->strides[is_uv], RESTORATION_BORDER, RESTORATION_BORDER,
- highbd);
+ av1_extend_frame(frame->buffers[plane], plane_width, plane_height,
+ frame->strides[is_uv], RESTORATION_BORDER,
+ RESTORATION_BORDER, highbd);
lr_plane_ctxt->rsi = rsi;
lr_plane_ctxt->ss_x = is_uv && seq_params->subsampling_x;
diff --git a/av1/common/restoration.h b/av1/common/restoration.h
index 81ad3ba..3b80dd5 100644
--- a/av1/common/restoration.h
+++ b/av1/common/restoration.h
@@ -278,18 +278,18 @@
YV12_BUFFER_CONFIG *dst;
} AV1LrStruct;
-extern const sgr_params_type sgr_params[SGRPROJ_PARAMS];
+extern const sgr_params_type av1_sgr_params[SGRPROJ_PARAMS];
extern int sgrproj_mtable[SGRPROJ_PARAMS][2];
-extern const int32_t x_by_xplus1[256];
-extern const int32_t one_by_x[MAX_NELEM];
+extern const int32_t av1_x_by_xplus1[256];
+extern const int32_t av1_one_by_x[MAX_NELEM];
void av1_alloc_restoration_struct(struct AV1Common *cm, RestorationInfo *rsi,
int is_uv);
void av1_free_restoration_struct(RestorationInfo *rst_info);
-void extend_frame(uint8_t *data, int width, int height, int stride,
- int border_horz, int border_vert, int highbd);
-void decode_xq(const int *xqd, int *xq, const sgr_params_type *params);
+void av1_extend_frame(uint8_t *data, int width, int height, int stride,
+ int border_horz, int border_vert, int highbd);
+void av1_decode_xq(const int *xqd, int *xq, const sgr_params_type *params);
// Filter a single loop restoration unit.
//
diff --git a/av1/common/x86/selfguided_avx2.c b/av1/common/x86/selfguided_avx2.c
index 9d0f67b..3c5558d 100644
--- a/av1/common/x86/selfguided_avx2.c
+++ b/av1/common/x86/selfguided_avx2.c
@@ -219,12 +219,12 @@
static void calc_ab(int32_t *A, int32_t *B, const int32_t *C, const int32_t *D,
int width, int height, int buf_stride, int bit_depth,
int sgr_params_idx, int radius_idx) {
- const sgr_params_type *const params = &sgr_params[sgr_params_idx];
+ const sgr_params_type *const params = &av1_sgr_params[sgr_params_idx];
const int r = params->r[radius_idx];
const int n = (2 * r + 1) * (2 * r + 1);
const __m256i s = _mm256_set1_epi32(params->s[radius_idx]);
// one_over_n[n-1] is 2^12/n, so easily fits in an int16
- const __m256i one_over_n = _mm256_set1_epi32(one_by_x[n - 1]);
+ const __m256i one_over_n = _mm256_set1_epi32(av1_one_by_x[n - 1]);
const __m256i rnd_z = round_for_shift(SGRPROJ_MTABLE_BITS);
const __m256i rnd_res = round_for_shift(SGRPROJ_RECIP_BITS);
@@ -263,7 +263,7 @@
SGRPROJ_MTABLE_BITS),
_mm256_set1_epi32(255));
- const __m256i a_res = _mm256_i32gather_epi32(x_by_xplus1, z, 4);
+ const __m256i a_res = _mm256_i32gather_epi32(av1_x_by_xplus1, z, 4);
yy_storeu_256(A + i * buf_stride + j, a_res);
@@ -356,12 +356,12 @@
const int32_t *D, int width, int height,
int buf_stride, int bit_depth, int sgr_params_idx,
int radius_idx) {
- const sgr_params_type *const params = &sgr_params[sgr_params_idx];
+ const sgr_params_type *const params = &av1_sgr_params[sgr_params_idx];
const int r = params->r[radius_idx];
const int n = (2 * r + 1) * (2 * r + 1);
const __m256i s = _mm256_set1_epi32(params->s[radius_idx]);
// one_over_n[n-1] is 2^12/n, so easily fits in an int16
- const __m256i one_over_n = _mm256_set1_epi32(one_by_x[n - 1]);
+ const __m256i one_over_n = _mm256_set1_epi32(av1_one_by_x[n - 1]);
const __m256i rnd_z = round_for_shift(SGRPROJ_MTABLE_BITS);
const __m256i rnd_res = round_for_shift(SGRPROJ_RECIP_BITS);
@@ -400,7 +400,7 @@
SGRPROJ_MTABLE_BITS),
_mm256_set1_epi32(255));
- const __m256i a_res = _mm256_i32gather_epi32(x_by_xplus1, z, 4);
+ const __m256i a_res = _mm256_i32gather_epi32(av1_x_by_xplus1, z, 4);
yy_storeu_256(A + i * buf_stride + j, a_res);
@@ -604,7 +604,7 @@
integral_images(dgd0, dgd_stride, width_ext, height_ext, Ctl, Dtl,
buf_stride);
- const sgr_params_type *const params = &sgr_params[sgr_params_idx];
+ const sgr_params_type *const params = &av1_sgr_params[sgr_params_idx];
// Write to flt0 and flt1
// If params->r == 0 we skip the corresponding filter. We only allow one of
// the radii to be 0, as having both equal to 0 would be equivalent to
@@ -642,9 +642,9 @@
dat8, width, height, stride, flt0, flt1, width, eps, bit_depth, highbd);
(void)ret;
assert(!ret);
- const sgr_params_type *const params = &sgr_params[eps];
+ const sgr_params_type *const params = &av1_sgr_params[eps];
int xq[2];
- decode_xq(xqd, xq, params);
+ av1_decode_xq(xqd, xq, params);
__m256i xq0 = _mm256_set1_epi32(xq[0]);
__m256i xq1 = _mm256_set1_epi32(xq[1]);
diff --git a/av1/common/x86/selfguided_sse4.c b/av1/common/x86/selfguided_sse4.c
index b21ddc4..72c7708 100644
--- a/av1/common/x86/selfguided_sse4.c
+++ b/av1/common/x86/selfguided_sse4.c
@@ -170,12 +170,12 @@
static void calc_ab(int32_t *A, int32_t *B, const int32_t *C, const int32_t *D,
int width, int height, int buf_stride, int bit_depth,
int sgr_params_idx, int radius_idx) {
- const sgr_params_type *const params = &sgr_params[sgr_params_idx];
+ const sgr_params_type *const params = &av1_sgr_params[sgr_params_idx];
const int r = params->r[radius_idx];
const int n = (2 * r + 1) * (2 * r + 1);
const __m128i s = _mm_set1_epi32(params->s[radius_idx]);
// one_over_n[n-1] is 2^12/n, so easily fits in an int16
- const __m128i one_over_n = _mm_set1_epi32(one_by_x[n - 1]);
+ const __m128i one_over_n = _mm_set1_epi32(av1_one_by_x[n - 1]);
const __m128i rnd_z = round_for_shift(SGRPROJ_MTABLE_BITS);
const __m128i rnd_res = round_for_shift(SGRPROJ_RECIP_BITS);
@@ -216,10 +216,11 @@
// 'Gather' type instructions are not available pre-AVX2, so synthesize a
// gather using scalar loads.
- const __m128i a_res = _mm_set_epi32(x_by_xplus1[_mm_extract_epi32(z, 3)],
- x_by_xplus1[_mm_extract_epi32(z, 2)],
- x_by_xplus1[_mm_extract_epi32(z, 1)],
- x_by_xplus1[_mm_extract_epi32(z, 0)]);
+ const __m128i a_res =
+ _mm_set_epi32(av1_x_by_xplus1[_mm_extract_epi32(z, 3)],
+ av1_x_by_xplus1[_mm_extract_epi32(z, 2)],
+ av1_x_by_xplus1[_mm_extract_epi32(z, 1)],
+ av1_x_by_xplus1[_mm_extract_epi32(z, 0)]);
xx_storeu_128(A + i * buf_stride + j, a_res);
@@ -310,12 +311,12 @@
const int32_t *D, int width, int height,
int buf_stride, int bit_depth, int sgr_params_idx,
int radius_idx) {
- const sgr_params_type *const params = &sgr_params[sgr_params_idx];
+ const sgr_params_type *const params = &av1_sgr_params[sgr_params_idx];
const int r = params->r[radius_idx];
const int n = (2 * r + 1) * (2 * r + 1);
const __m128i s = _mm_set1_epi32(params->s[radius_idx]);
// one_over_n[n-1] is 2^12/n, so easily fits in an int16
- const __m128i one_over_n = _mm_set1_epi32(one_by_x[n - 1]);
+ const __m128i one_over_n = _mm_set1_epi32(av1_one_by_x[n - 1]);
const __m128i rnd_z = round_for_shift(SGRPROJ_MTABLE_BITS);
const __m128i rnd_res = round_for_shift(SGRPROJ_RECIP_BITS);
@@ -356,10 +357,11 @@
// 'Gather' type instructions are not available pre-AVX2, so synthesize a
// gather using scalar loads.
- const __m128i a_res = _mm_set_epi32(x_by_xplus1[_mm_extract_epi32(z, 3)],
- x_by_xplus1[_mm_extract_epi32(z, 2)],
- x_by_xplus1[_mm_extract_epi32(z, 1)],
- x_by_xplus1[_mm_extract_epi32(z, 0)]);
+ const __m128i a_res =
+ _mm_set_epi32(av1_x_by_xplus1[_mm_extract_epi32(z, 3)],
+ av1_x_by_xplus1[_mm_extract_epi32(z, 2)],
+ av1_x_by_xplus1[_mm_extract_epi32(z, 1)],
+ av1_x_by_xplus1[_mm_extract_epi32(z, 0)]);
xx_storeu_128(A + i * buf_stride + j, a_res);
@@ -554,7 +556,7 @@
integral_images(dgd0, dgd_stride, width_ext, height_ext, Ctl, Dtl,
buf_stride);
- const sgr_params_type *const params = &sgr_params[sgr_params_idx];
+ const sgr_params_type *const params = &av1_sgr_params[sgr_params_idx];
// Write to flt0 and flt1
// If params->r == 0 we skip the corresponding filter. We only allow one of
// the radii to be 0, as having both equal to 0 would be equivalent to
@@ -592,9 +594,9 @@
dat8, width, height, stride, flt0, flt1, width, eps, bit_depth, highbd);
(void)ret;
assert(!ret);
- const sgr_params_type *const params = &sgr_params[eps];
+ const sgr_params_type *const params = &av1_sgr_params[eps];
int xq[2];
- decode_xq(xqd, xq, params);
+ av1_decode_xq(xqd, xq, params);
__m128i xq0 = _mm_set1_epi32(xq[0]);
__m128i xq1 = _mm_set1_epi32(xq[1]);
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 6638c34..36f823f 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -1865,7 +1865,7 @@
static void read_sgrproj_filter(SgrprojInfo *sgrproj_info,
SgrprojInfo *ref_sgrproj_info, aom_reader *rb) {
sgrproj_info->ep = aom_read_literal(rb, SGRPROJ_PARAMS_BITS, ACCT_STR);
- const sgr_params_type *params = &sgr_params[sgrproj_info->ep];
+ const sgr_params_type *params = &av1_sgr_params[sgrproj_info->ep];
if (params->r[0] == 0) {
sgrproj_info->xqd[0] = 0;
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index b1ea418..46c041e 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -1817,7 +1817,7 @@
SgrprojInfo *ref_sgrproj_info,
aom_writer *wb) {
aom_write_literal(wb, sgrproj_info->ep, SGRPROJ_PARAMS_BITS);
- const sgr_params_type *params = &sgr_params[sgrproj_info->ep];
+ const sgr_params_type *params = &av1_sgr_params[sgrproj_info->ep];
if (params->r[0] == 0) {
assert(sgrproj_info->xqd[0] == 0);
diff --git a/av1/encoder/pickrst.c b/av1/encoder/pickrst.c
index b62789e..cda92ba 100644
--- a/av1/encoder/pickrst.c
+++ b/av1/encoder/pickrst.c
@@ -332,7 +332,7 @@
int32_t *flt1, int flt1_stride, int *xqd,
const sgr_params_type *params) {
int xq[2];
- decode_xq(xqd, xq, params);
+ av1_decode_xq(xqd, xq, params);
if (!use_highbitdepth) {
return av1_lowbd_pixel_proj_error(src8, width, height, src_stride, dat8,
dat_stride, flt0, flt0_stride, flt1,
@@ -569,7 +569,7 @@
apply_sgr(ep, dat8, width, height, dat_stride, use_highbitdepth, bit_depth,
pu_width, pu_height, flt0, flt1, flt_stride);
aom_clear_system_state();
- const sgr_params_type *const params = &sgr_params[ep];
+ const sgr_params_type *const params = &av1_sgr_params[ep];
get_proj_subspace(src8, width, height, src_stride, dat8, dat_stride,
use_highbitdepth, flt0, flt_stride, flt1, flt_stride, exq,
params);
@@ -596,7 +596,7 @@
static int count_sgrproj_bits(SgrprojInfo *sgrproj_info,
SgrprojInfo *ref_sgrproj_info) {
int bits = SGRPROJ_PARAMS_BITS;
- const sgr_params_type *params = &sgr_params[sgrproj_info->ep];
+ const sgr_params_type *params = &av1_sgr_params[sgrproj_info->ep];
if (params->r[0] > 0)
bits += aom_count_primitive_refsubexpfin(
SGRPROJ_PRJ_MAX0 - SGRPROJ_PRJ_MIN0 + 1, SGRPROJ_PRJ_SUBEXP_K,
@@ -1420,9 +1420,9 @@
const int highbd = rsc.cm->seq_params.use_highbitdepth;
if (!cpi->sf.disable_loop_restoration_chroma || !plane) {
- extend_frame(rsc.dgd_buffer, rsc.plane_width, rsc.plane_height,
- rsc.dgd_stride, RESTORATION_BORDER, RESTORATION_BORDER,
- highbd);
+ av1_extend_frame(rsc.dgd_buffer, rsc.plane_width, rsc.plane_height,
+ rsc.dgd_stride, RESTORATION_BORDER, RESTORATION_BORDER,
+ highbd);
for (RestorationType r = 0; r < num_rtypes; ++r) {
if ((force_restore_type != RESTORE_TYPES) && (r != RESTORE_NONE) &&
