diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2015-05-22 11:19:51 -0700 |
|---|---|---|
| committer | Scott LaVarnway <slavarnway@google.com> | 2015-05-22 11:19:51 -0700 |
| commit | b962646fc588b4b0ff1e527f8aaf7c7f5eaf14cd (patch) | |
| tree | e5abfb889c8467e2c0102fe3abb0df313e41a5d4 /vp9/common/vp9_scan.h | |
| parent | 37d03809bfb523910b2a07a726a0dad82980047b (diff) | |
| download | libvpx-b962646fc588b4b0ff1e527f8aaf7c7f5eaf14cd.tar libvpx-b962646fc588b4b0ff1e527f8aaf7c7f5eaf14cd.tar.gz libvpx-b962646fc588b4b0ff1e527f8aaf7c7f5eaf14cd.tar.bz2 libvpx-b962646fc588b4b0ff1e527f8aaf7c7f5eaf14cd.zip | |
Re-worked header files
Various header/test files had to be re-worked in order to
build "Remove cm parameter from vp9_decode_block_tokens()".
This patch reverts the "Remove cm" part and only contains
the re-worked header files.
Change-Id: I520958a88d1991fee988a3c784d0eac40e117a32
Diffstat (limited to 'vp9/common/vp9_scan.h')
| -rw-r--r-- | vp9/common/vp9_scan.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/vp9/common/vp9_scan.h b/vp9/common/vp9_scan.h index 65e2aa69a..1d86b5cfe 100644 --- a/vp9/common/vp9_scan.h +++ b/vp9/common/vp9_scan.h @@ -38,6 +38,18 @@ static INLINE int get_coef_context(const int16_t *neighbors, token_cache[neighbors[MAX_NEIGHBORS * c + 1]]) >> 1; } +static INLINE const scan_order *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->mbmi) || type != PLANE_TYPE_Y || xd->lossless) { + return &vp9_default_scan_orders[tx_size]; + } else { + const PREDICTION_MODE mode = get_y_mode(mi, block_idx); + return &vp9_scan_orders[tx_size][intra_mode_to_tx_type_lookup[mode]]; + } +} + #ifdef __cplusplus } // extern "C" #endif |