diff options
| author | James Zern <jzern@google.com> | 2023-03-24 18:04:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-03-24 18:04:19 +0000 |
| commit | 5b05f6f3a01d7e25d0573b482245a2b8b0eb09bd (patch) | |
| tree | 0b98bf5637db1fce414beebe0376f9333cceede4 /vp9/common/vp9_scan.h | |
| parent | 5817bce969f2845493f22f85ca5f19c70adc1c2f (diff) | |
| parent | bad39ce7a3b766ea44fcd1637610986a4a672999 (diff) | |
| download | libvpx-5b05f6f3a01d7e25d0573b482245a2b8b0eb09bd.tar libvpx-5b05f6f3a01d7e25d0573b482245a2b8b0eb09bd.tar.gz libvpx-5b05f6f3a01d7e25d0573b482245a2b8b0eb09bd.tar.bz2 libvpx-5b05f6f3a01d7e25d0573b482245a2b8b0eb09bd.zip | |
Merge changes Ide512788,I77c7abae into main
* changes:
vp9_scan.h: rename scan_order struct to ScanOrder
vp9_encodeframe.c: clear -Wshadow warnings
Diffstat (limited to 'vp9/common/vp9_scan.h')
| -rw-r--r-- | vp9/common/vp9_scan.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vp9/common/vp9_scan.h b/vp9/common/vp9_scan.h index efa0e2336..3d1dcc66d 100644 --- a/vp9/common/vp9_scan.h +++ b/vp9/common/vp9_scan.h @@ -23,14 +23,14 @@ extern "C" { #define MAX_NEIGHBORS 2 -typedef struct scan_order { +typedef struct ScanOrder { const int16_t *scan; const int16_t *iscan; const int16_t *neighbors; -} scan_order; +} ScanOrder; -extern const scan_order vp9_default_scan_orders[TX_SIZES]; -extern const scan_order vp9_scan_orders[TX_SIZES][TX_TYPES]; +extern const ScanOrder vp9_default_scan_orders[TX_SIZES]; +extern const ScanOrder vp9_scan_orders[TX_SIZES][TX_TYPES]; static INLINE int get_coef_context(const int16_t *neighbors, const uint8_t *token_cache, int c) { @@ -39,8 +39,8 @@ static INLINE int get_coef_context(const int16_t *neighbors, 1; } -static INLINE const scan_order *get_scan(const MACROBLOCKD *xd, TX_SIZE tx_size, - PLANE_TYPE type, int block_idx) { +static INLINE const ScanOrder *get_scan(const MACROBLOCKD *xd, TX_SIZE tx_size, + PLANE_TYPE type, int block_idx) { const MODE_INFO *const mi = xd->mi[0]; if (is_inter_block(mi) || type != PLANE_TYPE_Y || xd->lossless) { |