commit f3cf030f5e50fd1e5dd908e0fd60666e66b27af1
author James Zern <jzern@google.com> Wed Sep 11 13:43:35 2024 -0700
committer James Zern <jzern@google.com> Wed Sep 11 23:37:08 2024 +0000
tree a70fc0149824e0af643d3669c52d323f35879809
parent 692b0b7dbcf1b39eeb6b472a05a2d4787ca7ce77

move av1_iqmatrix() to decodeframe.c

This function is only used by this module.

Bug: aomedia:3416
Change-Id: I7eb02d9c7a77344724a121f6b42e53ee17d5acd0

av1/common/quant_common.c

diff --git a/av1/common/quant_common.c b/av1/common/quant_common.c
index 6a29584..9be6106 100644
--- a/av1/common/quant_common.c
+++ b/av1/common/quant_common.c
@@ -236,12 +236,6 @@
   return quant_params->using_qmatrix && !xd->lossless[segment_id];
 }
 
-const qm_val_t *av1_iqmatrix(const CommonQuantParams *quant_params, int qmlevel,
-                             int plane, TX_SIZE tx_size) {
-  assert(quant_params->giqmatrix[qmlevel][plane][tx_size] != NULL ||
-         qmlevel == NUM_QM_LEVELS - 1);
-  return quant_params->giqmatrix[qmlevel][plane][tx_size];
-}
 const qm_val_t *av1_qmatrix(const CommonQuantParams *quant_params, int qmlevel,
                             int plane, TX_SIZE tx_size) {
   assert(quant_params->gqmatrix[qmlevel][plane][tx_size] != NULL ||

av1/common/quant_common.h

diff --git a/av1/common/quant_common.h b/av1/common/quant_common.h
index 1cd48c6..34754f8 100644
--- a/av1/common/quant_common.h
+++ b/av1/common/quant_common.h
@@ -61,9 +61,6 @@
 // Initialize all global quant/dequant matrices.
 void av1_qm_init(struct CommonQuantParams *quant_params, int num_planes);
 
-// Get global dequant matrix.
-const qm_val_t *av1_iqmatrix(const struct CommonQuantParams *quant_params,
-                             int qmlevel, int plane, TX_SIZE tx_size);
 // Get global quant matrix.
 const qm_val_t *av1_qmatrix(const struct CommonQuantParams *quant_params,
                             int qmlevel, int plane, TX_SIZE tx_size);

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 064a2ae..765c727 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -1811,6 +1811,14 @@
   }
 }
 
+// Get global dequant matrix.
+static const qm_val_t *get_iqmatrix(const CommonQuantParams *quant_params,
+                                    int qmlevel, int plane, TX_SIZE tx_size) {
+  assert(quant_params->giqmatrix[qmlevel][plane][tx_size] != NULL ||
+         qmlevel == NUM_QM_LEVELS - 1);
+  return quant_params->giqmatrix[qmlevel][plane][tx_size];
+}
+
 // Build y/uv dequant values based on segmentation.
 static inline void setup_segmentation_dequant(AV1_COMMON *const cm,
                                               MACROBLOCKD *const xd) {
@@ -1839,19 +1847,19 @@
         use_qmatrix ? quant_params->qmatrix_level_y : NUM_QM_LEVELS - 1;
     for (int j = 0; j < TX_SIZES_ALL; ++j) {
       quant_params->y_iqmatrix[i][j] =
-          av1_iqmatrix(quant_params, qmlevel_y, AOM_PLANE_Y, j);
+          get_iqmatrix(quant_params, qmlevel_y, AOM_PLANE_Y, j);
     }
     const int qmlevel_u =
         use_qmatrix ? quant_params->qmatrix_level_u : NUM_QM_LEVELS - 1;
     for (int j = 0; j < TX_SIZES_ALL; ++j) {
       quant_params->u_iqmatrix[i][j] =
-          av1_iqmatrix(quant_params, qmlevel_u, AOM_PLANE_U, j);
+          get_iqmatrix(quant_params, qmlevel_u, AOM_PLANE_U, j);
     }
     const int qmlevel_v =
         use_qmatrix ? quant_params->qmatrix_level_v : NUM_QM_LEVELS - 1;
     for (int j = 0; j < TX_SIZES_ALL; ++j) {
       quant_params->v_iqmatrix[i][j] =
-          av1_iqmatrix(quant_params, qmlevel_v, AOM_PLANE_V, j);
+          get_iqmatrix(quant_params, qmlevel_v, AOM_PLANE_V, j);
     }
   }
 }