From e63099d199b492710cd2d74f02f56071ba8a6749 Mon Sep 17 00:00:00 2001 From: Jingning Han Date: Tue, 9 Apr 2013 20:34:25 -0700 Subject: Make SB Decoding units size-independent Unify the sb32x32 and sb64x64 decoding units, which also allow for other rectangular block sizes. Change-Id: Ia5187ab2af56f98c3f99272bdf4dbcabe798ad5d --- vp9/decoder/vp9_detokenize.h | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'vp9/decoder/vp9_detokenize.h') diff --git a/vp9/decoder/vp9_detokenize.h b/vp9/decoder/vp9_detokenize.h index 97de72b9a..e0c29686f 100644 --- a/vp9/decoder/vp9_detokenize.h +++ b/vp9/decoder/vp9_detokenize.h @@ -14,16 +14,10 @@ #include "vp9/decoder/vp9_onyxd_int.h" -int vp9_decode_mb_tokens(VP9D_COMP* const, MACROBLOCKD* const, - BOOL_DECODER* const); - -int vp9_decode_sb_tokens(VP9D_COMP* const pbi, - MACROBLOCKD* const xd, - BOOL_DECODER* const bc); - -int vp9_decode_sb64_tokens(VP9D_COMP* const pbi, - MACROBLOCKD* const xd, - BOOL_DECODER* const bc); +int vp9_decode_tokens(VP9D_COMP* const pbi, + MACROBLOCKD* const xd, + BOOL_DECODER* const bc, + BLOCK_SIZE_TYPE bsize); int vp9_decode_mb_tokens_4x4_uv(VP9D_COMP* const dx, MACROBLOCKD* const xd, BOOL_DECODER* const bc); -- cgit v1.2.3