apply clang-format
For these files:
av1/common/common_data.h
av1/encoder/encodemb.c
av1/encoder/quantize.c
av1/encoder/rdopt.c
Change-Id: I379e861d55c2875d0366df24f986b29796a70087
diff --git a/av1/common/common_data.h b/av1/common/common_data.h
index 7877106..50a423b 100644
--- a/av1/common/common_data.h
+++ b/av1/common/common_data.h
@@ -478,11 +478,11 @@
#if CONFIG_CB4X4
4,
#endif
- 16, 64, 256, 1024,
+ 16, 64, 256, 1024,
#if CONFIG_TX64X64
4096,
#endif // CONFIG_TX64X64
- 32, 32, 128, 128, 512, 512,
+ 32, 32, 128, 128, 512, 512,
};
static const uint8_t tx_size_1d_log2[TX_SIZES] = { 2, 3, 4, 5 };
diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index a0fa37a..e03eadd 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -649,16 +649,16 @@
switch (get_tx_scale(tx_size)) {
#if CONFIG_TX64X64
case 2:
- quantize_64x64_nuq(coeff, tx_size_2d[tx_size], x->skip_block,
- p->quant, p->quant_shift, pd->dequant,
+ quantize_64x64_nuq(coeff, tx_size_2d[tx_size], x->skip_block, p->quant,
+ p->quant_shift, pd->dequant,
(const cuml_bins_type_nuq *)p->cuml_bins_nuq[dq],
(const dequant_val_type_nuq *)pd->dequant_val_nuq[dq],
qcoeff, dqcoeff, eob, scan_order->scan, band);
break;
#endif // CONFIG_TX64X64
case 1:
- quantize_32x32_nuq(coeff, tx_size_2d[tx_size], x->skip_block,
- p->quant, p->quant_shift, pd->dequant,
+ quantize_32x32_nuq(coeff, tx_size_2d[tx_size], x->skip_block, p->quant,
+ p->quant_shift, pd->dequant,
(const cuml_bins_type_nuq *)p->cuml_bins_nuq[dq],
(const dequant_val_type_nuq *)pd->dequant_val_nuq[dq],
qcoeff, dqcoeff, eob, scan_order->scan, band);
diff --git a/av1/encoder/quantize.c b/av1/encoder/quantize.c
index 9dc1b13..07270d1 100644
--- a/av1/encoder/quantize.c
+++ b/av1/encoder/quantize.c
@@ -339,11 +339,11 @@
int i;
for (i = 0; i < n_coeffs; i++) {
const int rc = scan[i];
- if (quantize_coeff_bigtx_nuq(
- coeff_ptr[rc], quant_ptr[rc != 0], quant_shift_ptr[rc != 0],
- dequant_ptr[rc != 0], cuml_bins_ptr[band[i]],
- dequant_val[band[i]], &qcoeff_ptr[rc], &dqcoeff_ptr[rc],
- get_tx_scale(TX_32X32)))
+ if (quantize_coeff_bigtx_nuq(coeff_ptr[rc], quant_ptr[rc != 0],
+ quant_shift_ptr[rc != 0],
+ dequant_ptr[rc != 0], cuml_bins_ptr[band[i]],
+ dequant_val[band[i]], &qcoeff_ptr[rc],
+ &dqcoeff_ptr[rc], get_tx_scale(TX_32X32)))
eob = i;
}
}
@@ -392,11 +392,11 @@
int i;
for (i = 0; i < n_coeffs; i++) {
const int rc = scan[i];
- if (quantize_coeff_bigtx_nuq(
- coeff_ptr[rc], quant_ptr[rc != 0], quant_shift_ptr[rc != 0],
- dequant_ptr[rc != 0], cuml_bins_ptr[band[i]],
- dequant_val[band[i]], &qcoeff_ptr[rc], &dqcoeff_ptr[rc],
- get_tx_scale(TX_64X64)))
+ if (quantize_coeff_bigtx_nuq(coeff_ptr[rc], quant_ptr[rc != 0],
+ quant_shift_ptr[rc != 0],
+ dequant_ptr[rc != 0], cuml_bins_ptr[band[i]],
+ dequant_val[band[i]], &qcoeff_ptr[rc],
+ &dqcoeff_ptr[rc], get_tx_scale(TX_64X64)))
eob = i;
}
}
@@ -993,10 +993,9 @@
memset(dqcoeff_ptr, 0, n_coeffs * sizeof(*dqcoeff_ptr));
if (!skip_block) {
const int rc = 0;
- if (highbd_quantize_coeff_bigtx_nuq(coeff_ptr[rc], quant, quant_shift,
- dequant, cuml_bins_ptr, dequant_val,
- qcoeff_ptr, dqcoeff_ptr,
- get_tx_scale(TX_32X32)))
+ if (highbd_quantize_coeff_bigtx_nuq(
+ coeff_ptr[rc], quant, quant_shift, dequant, cuml_bins_ptr,
+ dequant_val, qcoeff_ptr, dqcoeff_ptr, get_tx_scale(TX_32X32)))
eob = 0;
}
*eob_ptr = eob + 1;
@@ -1012,10 +1011,9 @@
memset(dqcoeff_ptr, 0, n_coeffs * sizeof(*dqcoeff_ptr));
if (!skip_block) {
const int rc = 0;
- if (highbd_quantize_coeff_bigtx_fp_nuq(coeff_ptr[rc], quant, dequant,
- cuml_bins_ptr, dequant_val,
- qcoeff_ptr, dqcoeff_ptr,
- get_tx_scale(TX_32X32)))
+ if (highbd_quantize_coeff_bigtx_fp_nuq(
+ coeff_ptr[rc], quant, dequant, cuml_bins_ptr, dequant_val,
+ qcoeff_ptr, dqcoeff_ptr, get_tx_scale(TX_32X32)))
eob = 0;
}
*eob_ptr = eob + 1;
@@ -1032,10 +1030,9 @@
memset(dqcoeff_ptr, 0, n_coeffs * sizeof(*dqcoeff_ptr));
if (!skip_block) {
const int rc = 0;
- if (highbd_quantize_coeff_bigtx_nuq(coeff_ptr[rc], quant, quant_shift,
- dequant, cuml_bins_ptr, dequant_val,
- qcoeff_ptr, dqcoeff_ptr,
- get_tx_scale(TX_64X64)))
+ if (highbd_quantize_coeff_bigtx_nuq(
+ coeff_ptr[rc], quant, quant_shift, dequant, cuml_bins_ptr,
+ dequant_val, qcoeff_ptr, dqcoeff_ptr, get_tx_scale(TX_64X64)))
eob = 0;
}
*eob_ptr = eob + 1;
@@ -1051,10 +1048,9 @@
memset(dqcoeff_ptr, 0, n_coeffs * sizeof(*dqcoeff_ptr));
if (!skip_block) {
const int rc = 0;
- if (highbd_quantize_coeff_bigtx_fp_nuq(coeff_ptr[rc], quant, dequant,
- cuml_bins_ptr, dequant_val,
- qcoeff_ptr, dqcoeff_ptr,
- get_tx_scale(TX_64X64)))
+ if (highbd_quantize_coeff_bigtx_fp_nuq(
+ coeff_ptr[rc], quant, dequant, cuml_bins_ptr, dequant_val,
+ qcoeff_ptr, dqcoeff_ptr, get_tx_scale(TX_64X64)))
eob = 0;
}
*eob_ptr = eob + 1;
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 0633116..30bc063 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -7795,11 +7795,11 @@
sizeof(uint8_t) * xd->n8_h * xd->n8_w * 4);
}
#else
- super_block_yrd(cpi, x, &rd_stats_y, bsize, ref_best_rd);
- *rate_y = rd_stats_y.rate;
- distortion_y = rd_stats_y.dist;
- skippable_y = rd_stats_y.skip;
- *psse = rd_stats_y.sse;
+ super_block_yrd(cpi, x, &rd_stats_y, bsize, ref_best_rd);
+ *rate_y = rd_stats_y.rate;
+ distortion_y = rd_stats_y.dist;
+ skippable_y = rd_stats_y.skip;
+ *psse = rd_stats_y.sse;
#endif // CONFIG_VAR_TX
}
