diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-04-23 12:44:51 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-04-23 12:44:51 -0700 |
| commit | d0d1094a059146d7719f6ad4ca3d722b3bfbc77c (patch) | |
| tree | d0530e84d9579589706492ea6b3d81122d7eab3b /vp9/common | |
| parent | c4cae4cd5d71f6ed1afaddaf2d67a8b0a2f966d6 (diff) | |
| parent | 5de7e16ca2b65e834293fab25d8c820329a18193 (diff) | |
| download | libvpx-d0d1094a059146d7719f6ad4ca3d722b3bfbc77c.tar libvpx-d0d1094a059146d7719f6ad4ca3d722b3bfbc77c.tar.gz libvpx-d0d1094a059146d7719f6ad4ca3d722b3bfbc77c.tar.bz2 libvpx-d0d1094a059146d7719f6ad4ca3d722b3bfbc77c.zip | |
Merge "Adding get_scan_{4x4, 8x8, 16x16} functions." into experimental
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/vp9_entropy.c | 1 | ||||
| -rw-r--r-- | vp9/common/vp9_entropy.h | 33 |
2 files changed, 33 insertions, 1 deletions
diff --git a/vp9/common/vp9_entropy.c b/vp9/common/vp9_entropy.c index a5437d889..16ef14fec 100644 --- a/vp9/common/vp9_entropy.c +++ b/vp9/common/vp9_entropy.c @@ -12,7 +12,6 @@ #include <stdio.h> #include "vp9/common/vp9_entropy.h" -#include "string.h" #include "vp9/common/vp9_blockd.h" #include "vp9/common/vp9_onyxc_int.h" #include "vp9/common/vp9_entropymode.h" diff --git a/vp9/common/vp9_entropy.h b/vp9/common/vp9_entropy.h index 123b5e289..07b07a7e7 100644 --- a/vp9/common/vp9_entropy.h +++ b/vp9/common/vp9_entropy.h @@ -223,6 +223,39 @@ void vp9_adapt_zpc_probs(struct VP9Common *cm); #endif // CONFIG_CODE_ZEROGROUP +static INLINE const int* get_scan_4x4(TX_TYPE tx_type) { + switch (tx_type) { + case ADST_DCT: + return vp9_row_scan_4x4; + case DCT_ADST: + return vp9_col_scan_4x4; + default: + return vp9_default_zig_zag1d_4x4; + } +} + +static INLINE const int* get_scan_8x8(TX_TYPE tx_type) { + switch (tx_type) { + case ADST_DCT: + return vp9_row_scan_8x8; + case DCT_ADST: + return vp9_col_scan_8x8; + default: + return vp9_default_zig_zag1d_8x8; + } +} + +static INLINE const int* get_scan_16x16(TX_TYPE tx_type) { + switch (tx_type) { + case ADST_DCT: + return vp9_row_scan_16x16; + case DCT_ADST: + return vp9_col_scan_16x16; + default: + return vp9_default_zig_zag1d_16x16; + } +} + #include "vp9/common/vp9_coefupdateprobs.h" #endif // VP9_COMMON_VP9_ENTROPY_H_ |