diff options
author | Jingning Han <jingning@google.com> | 2013-04-09 20:34:25 -0700 |
---|---|---|
committer | Jingning Han <jingning@google.com> | 2013-04-10 10:52:10 -0700 |
commit | e63099d199b492710cd2d74f02f56071ba8a6749 (patch) | |
tree | 1b517972ae4faba56e40b40781fbf84c99d31a06 /vp9/decoder/vp9_detokenize.h | |
parent | 1c6df34c06cc87d49dc4ea4e814133834e46339a (diff) | |
download | libvpx-e63099d199b492710cd2d74f02f56071ba8a6749.tar libvpx-e63099d199b492710cd2d74f02f56071ba8a6749.tar.gz libvpx-e63099d199b492710cd2d74f02f56071ba8a6749.tar.bz2 libvpx-e63099d199b492710cd2d74f02f56071ba8a6749.zip |
Make SB Decoding units size-independent
Unify the sb32x32 and sb64x64 decoding units, which also allow for
other rectangular block sizes.
Change-Id: Ia5187ab2af56f98c3f99272bdf4dbcabe798ad5d
Diffstat (limited to 'vp9/decoder/vp9_detokenize.h')
-rw-r--r-- | vp9/decoder/vp9_detokenize.h | 14 |
1 files changed, 4 insertions, 10 deletions
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); |