Commit d902b74a authored by Zoe Liu's avatar Zoe Liu
Browse files

Align function names with naming conventions

Change-Id: Ia5ab13d7219ae79e685c999692a9f8bc35f0d360
parent cd44a054
...@@ -507,11 +507,11 @@ int av1_get_qindex(const struct segmentation *seg, int segment_id, ...@@ -507,11 +507,11 @@ int av1_get_qindex(const struct segmentation *seg, int segment_id,
} }
#if CONFIG_AOM_QM #if CONFIG_AOM_QM
const qm_val_t *aom_iqmatrix(AV1_COMMON *cm, int qmlevel, int plane, const qm_val_t *av1_iqmatrix(AV1_COMMON *cm, int qmlevel, int plane,
TX_SIZE tx_size) { TX_SIZE tx_size) {
return &cm->giqmatrix[qmlevel][plane][tx_size][0]; return &cm->giqmatrix[qmlevel][plane][tx_size][0];
} }
const qm_val_t *aom_qmatrix(AV1_COMMON *cm, int qmlevel, int plane, const qm_val_t *av1_qmatrix(AV1_COMMON *cm, int qmlevel, int plane,
TX_SIZE tx_size) { TX_SIZE tx_size) {
return &cm->gqmatrix[qmlevel][plane][tx_size][0]; return &cm->gqmatrix[qmlevel][plane][tx_size][0];
} }
...@@ -520,7 +520,7 @@ const qm_val_t *aom_qmatrix(AV1_COMMON *cm, int qmlevel, int plane, ...@@ -520,7 +520,7 @@ const qm_val_t *aom_qmatrix(AV1_COMMON *cm, int qmlevel, int plane,
static const qm_val_t wt_matrix_ref[NUM_QM_LEVELS][2][QM_TOTAL_SIZE]; static const qm_val_t wt_matrix_ref[NUM_QM_LEVELS][2][QM_TOTAL_SIZE];
static const qm_val_t iwt_matrix_ref[NUM_QM_LEVELS][2][QM_TOTAL_SIZE]; static const qm_val_t iwt_matrix_ref[NUM_QM_LEVELS][2][QM_TOTAL_SIZE];
void aom_qm_init(AV1_COMMON *cm) { void av1_qm_init(AV1_COMMON *cm) {
const int num_planes = av1_num_planes(cm); const int num_planes = av1_num_planes(cm);
int q, c, t; int q, c, t;
int current; int current;
......
...@@ -56,10 +56,10 @@ int av1_get_qindex(const struct segmentation *seg, int segment_id, ...@@ -56,10 +56,10 @@ int av1_get_qindex(const struct segmentation *seg, int segment_id,
static INLINE int aom_get_qmlevel(int qindex, int first, int last) { static INLINE int aom_get_qmlevel(int qindex, int first, int last) {
return first + (qindex * (last + 1 - first)) / QINDEX_RANGE; return first + (qindex * (last + 1 - first)) / QINDEX_RANGE;
} }
void aom_qm_init(struct AV1Common *cm); void av1_qm_init(struct AV1Common *cm);
const qm_val_t *aom_iqmatrix(struct AV1Common *cm, int qindex, int comp, const qm_val_t *av1_iqmatrix(struct AV1Common *cm, int qindex, int comp,
TX_SIZE tx_size); TX_SIZE tx_size);
const qm_val_t *aom_qmatrix(struct AV1Common *cm, int qindex, int comp, const qm_val_t *av1_qmatrix(struct AV1Common *cm, int qindex, int comp,
TX_SIZE tx_size); TX_SIZE tx_size);
#endif // CONFIG_AOM_QM #endif // CONFIG_AOM_QM
......
...@@ -1139,19 +1139,19 @@ static void setup_segmentation_dequant(AV1_COMMON *const cm) { ...@@ -1139,19 +1139,19 @@ static void setup_segmentation_dequant(AV1_COMMON *const cm) {
: aom_get_qmlevel(cm->base_qindex, minqm, maxqm); : aom_get_qmlevel(cm->base_qindex, minqm, maxqm);
#endif #endif
for (int j = 0; j < TX_SIZES_ALL; ++j) { for (int j = 0; j < TX_SIZES_ALL; ++j) {
cm->y_iqmatrix[i][j] = aom_iqmatrix(cm, qmlevel, AOM_PLANE_Y, j); cm->y_iqmatrix[i][j] = av1_iqmatrix(cm, qmlevel, AOM_PLANE_Y, j);
} }
#if CONFIG_AOM_QM_EXT #if CONFIG_AOM_QM_EXT
qmlevel = (lossless || using_qm == 0) ? NUM_QM_LEVELS - 1 : cm->qm_u; qmlevel = (lossless || using_qm == 0) ? NUM_QM_LEVELS - 1 : cm->qm_u;
#endif #endif
for (int j = 0; j < TX_SIZES_ALL; ++j) { for (int j = 0; j < TX_SIZES_ALL; ++j) {
cm->u_iqmatrix[i][j] = aom_iqmatrix(cm, qmlevel, AOM_PLANE_U, j); cm->u_iqmatrix[i][j] = av1_iqmatrix(cm, qmlevel, AOM_PLANE_U, j);
} }
#if CONFIG_AOM_QM_EXT #if CONFIG_AOM_QM_EXT
qmlevel = (lossless || using_qm == 0) ? NUM_QM_LEVELS - 1 : cm->qm_v; qmlevel = (lossless || using_qm == 0) ? NUM_QM_LEVELS - 1 : cm->qm_v;
#endif #endif
for (int j = 0; j < TX_SIZES_ALL; ++j) { for (int j = 0; j < TX_SIZES_ALL; ++j) {
cm->v_iqmatrix[i][j] = aom_iqmatrix(cm, qmlevel, AOM_PLANE_V, j); cm->v_iqmatrix[i][j] = av1_iqmatrix(cm, qmlevel, AOM_PLANE_V, j);
} }
#endif // CONFIG_AOM_QM #endif // CONFIG_AOM_QM
#if CONFIG_NEW_QUANT #if CONFIG_NEW_QUANT
......
...@@ -123,7 +123,7 @@ AV1Decoder *av1_decoder_create(BufferPool *const pool) { ...@@ -123,7 +123,7 @@ AV1Decoder *av1_decoder_create(BufferPool *const pool) {
av1_loop_filter_init(cm); av1_loop_filter_init(cm);
#if CONFIG_AOM_QM #if CONFIG_AOM_QM
aom_qm_init(cm); av1_qm_init(cm);
#endif #endif
#if CONFIG_LOOP_RESTORATION #if CONFIG_LOOP_RESTORATION
av1_loop_restoration_precal(); av1_loop_restoration_precal();
......
...@@ -3819,7 +3819,7 @@ AV1_COMP *av1_create_compressor(AV1EncoderConfig *oxcf, ...@@ -3819,7 +3819,7 @@ AV1_COMP *av1_create_compressor(AV1EncoderConfig *oxcf,
*/ */
av1_init_quantizer(cpi); av1_init_quantizer(cpi);
#if CONFIG_AOM_QM #if CONFIG_AOM_QM
aom_qm_init(cm); av1_qm_init(cm);
#endif #endif
av1_loop_filter_init(cm); av1_loop_filter_init(cm);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment