diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-04-22 14:08:41 -0700 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2013-04-22 14:08:41 -0700 |
| commit | 5de7e16ca2b65e834293fab25d8c820329a18193 (patch) | |
| tree | 829d20f3b29862a0196969782e0bab3b7dbfcd97 /vp9/encoder/vp9_encodemb.c | |
| parent | 94fa3bcc06778fb1ba26cb4a8e515c58dcc962eb (diff) | |
| download | libvpx-5de7e16ca2b65e834293fab25d8c820329a18193.tar libvpx-5de7e16ca2b65e834293fab25d8c820329a18193.tar.gz libvpx-5de7e16ca2b65e834293fab25d8c820329a18193.tar.bz2 libvpx-5de7e16ca2b65e834293fab25d8c820329a18193.zip | |
Adding get_scan_{4x4, 8x8, 16x16} functions.
Change-Id: Id4306ef6d65d4a3984aed50b775bdf48d4f6c438
Diffstat (limited to 'vp9/encoder/vp9_encodemb.c')
| -rw-r--r-- | vp9/encoder/vp9_encodemb.c | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/vp9/encoder/vp9_encodemb.c b/vp9/encoder/vp9_encodemb.c index c841c2823..8121f8639 100644 --- a/vp9/encoder/vp9_encodemb.c +++ b/vp9/encoder/vp9_encodemb.c @@ -335,13 +335,7 @@ static void optimize_b(VP9_COMMON *const cm, case TX_4X4: { const TX_TYPE tx_type = get_tx_type_4x4(xd, ib); default_eob = 16; - if (tx_type == DCT_ADST) { - scan = vp9_col_scan_4x4; - } else if (tx_type == ADST_DCT) { - scan = vp9_row_scan_4x4; - } else { - scan = vp9_default_zig_zag1d_4x4; - } + scan = get_scan_4x4(tx_type); break; } case TX_8X8: { @@ -349,13 +343,7 @@ static void optimize_b(VP9_COMMON *const cm, const int sz = 3 + mb_width_log2(sb_type); const int x = ib & ((1 << sz) - 1), y = ib - x; const TX_TYPE tx_type = get_tx_type_8x8(xd, y + (x >> 1)); - if (tx_type == DCT_ADST) { - scan = vp9_col_scan_8x8; - } else if (tx_type == ADST_DCT) { - scan = vp9_row_scan_8x8; - } else { - scan = vp9_default_zig_zag1d_8x8; - } + scan = get_scan_8x8(tx_type); default_eob = 64; break; } @@ -364,13 +352,7 @@ static void optimize_b(VP9_COMMON *const cm, const int sz = 4 + mb_width_log2(sb_type); const int x = ib & ((1 << sz) - 1), y = ib - x; const TX_TYPE tx_type = get_tx_type_16x16(xd, y + (x >> 2)); - if (tx_type == DCT_ADST) { - scan = vp9_col_scan_16x16; - } else if (tx_type == ADST_DCT) { - scan = vp9_row_scan_16x16; - } else { - scan = vp9_default_zig_zag1d_16x16; - } + scan = get_scan_16x16(tx_type); default_eob = 256; break; } |