diff options
| author | James Zern <jzern@google.com> | 2023-02-22 15:16:43 -0800 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2023-03-24 09:35:55 -0700 |
| commit | bad39ce7a3b766ea44fcd1637610986a4a672999 (patch) | |
| tree | af558527600266a4f046afa7cffbe49ea3f9c558 /test | |
| parent | 1701d55e33fe227cee4442d898c3ef6ae6a8206a (diff) | |
| download | libvpx-bad39ce7a3b766ea44fcd1637610986a4a672999.tar libvpx-bad39ce7a3b766ea44fcd1637610986a4a672999.tar.gz libvpx-bad39ce7a3b766ea44fcd1637610986a4a672999.tar.bz2 libvpx-bad39ce7a3b766ea44fcd1637610986a4a672999.zip | |
vp9_scan.h: rename scan_order struct to ScanOrder
This matches the style guide and fixes some -Wshadow warnings related to
variables with the same name. Something similar was done in libaom in:
03f6fdcfca Fix warnings reported by -Wshadow: Part1b: scan_order struct
and variable
Bug: webm:1793
Change-Id: Ide5127886b7fd7778e6d8a983bfba6edda21ff28
Diffstat (limited to 'test')
| -rw-r--r-- | test/vp9_quantize_test.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/vp9_quantize_test.cc b/test/vp9_quantize_test.cc index e9b17d5eb..84a5a58e4 100644 --- a/test/vp9_quantize_test.cc +++ b/test/vp9_quantize_test.cc @@ -42,7 +42,7 @@ typedef void (*QuantizeFunc)(const tran_low_t *coeff, intptr_t count, const macroblock_plane *const mb_plane, tran_low_t *qcoeff, tran_low_t *dqcoeff, const int16_t *dequant, uint16_t *eob, - const struct scan_order *const scan_order); + const struct ScanOrder *const scan_order); typedef std::tuple<QuantizeFunc, QuantizeFunc, vpx_bit_depth_t, int /*max_size*/, bool /*is_fp*/> QuantizeParam; @@ -60,7 +60,7 @@ template <QuantizeBaseFunc fn> void QuantWrapper(const tran_low_t *coeff, intptr_t count, const macroblock_plane *const mb_plane, tran_low_t *qcoeff, tran_low_t *dqcoeff, const int16_t *dequant, uint16_t *eob, - const struct scan_order *const scan_order) { + const struct ScanOrder *const scan_order) { fn(coeff, count, mb_plane->zbin, mb_plane->round, mb_plane->quant, mb_plane->quant_shift, qcoeff, dqcoeff, dequant, eob, scan_order->scan, scan_order->iscan); @@ -71,14 +71,14 @@ typedef void (*Quantize32x32Func)(const tran_low_t *coeff, const macroblock_plane *const mb_plane, tran_low_t *qcoeff, tran_low_t *dqcoeff, const int16_t *dequant, uint16_t *eob, - const struct scan_order *const scan_order); + const struct ScanOrder *const scan_order); template <Quantize32x32Func fn> void Quant32x32Wrapper(const tran_low_t *coeff, intptr_t count, const macroblock_plane *const mb_plane, tran_low_t *qcoeff, tran_low_t *dqcoeff, const int16_t *dequant, uint16_t *eob, - const struct scan_order *const scan_order) { + const struct ScanOrder *const scan_order) { (void)count; fn(coeff, mb_plane, qcoeff, dqcoeff, dequant, eob, scan_order); } @@ -94,7 +94,7 @@ template <QuantizeFPFunc fn> void QuantFPWrapper(const tran_low_t *coeff, intptr_t count, const macroblock_plane *const mb_plane, tran_low_t *qcoeff, tran_low_t *dqcoeff, const int16_t *dequant, uint16_t *eob, - const struct scan_order *const scan_order) { + const struct ScanOrder *const scan_order) { fn(coeff, count, mb_plane->round_fp, mb_plane->quant_fp, qcoeff, dqcoeff, dequant, eob, scan_order->scan, scan_order->iscan); } @@ -213,7 +213,7 @@ class VP9QuantizeBase : public AbstractBench { int16_t *r_ptr_; int16_t *q_ptr_; int count_; - const scan_order *scan_; + const ScanOrder *scan_; uint16_t eob_; }; |