From 9d288bf6984148738a85db0dd3765bbb1328edd8 Mon Sep 17 00:00:00 2001 From: Geza Lore Date: Wed, 30 Mar 2016 10:56:14 +0100 Subject: [PATCH] Use write_modes_b_wrapper throughout. Change-Id: Ifbef3aa6e6b0dbc3701a9ef91b8b685a918d84f4 --- vp10/encoder/bitstream.c | 60 ++++++++-------------------------------- 1 file changed, 12 insertions(+), 48 deletions(-) diff --git a/vp10/encoder/bitstream.c b/vp10/encoder/bitstream.c index 721a7a6da..85a930590 100644 --- a/vp10/encoder/bitstream.c +++ b/vp10/encoder/bitstream.c @@ -1760,71 +1760,35 @@ static void write_modes_sb(VP10_COMP *const cpi, break; #if CONFIG_EXT_PARTITION_TYPES case PARTITION_HORZ_A: - write_modes_b(cpi, tile, w, tok, tok_end, -#if CONFIG_SUPERTX - supertx_enabled, -#endif + write_modes_b_wrapper(cpi, tile, w, ans, tok, tok_end, supertx_enabled, mi_row, mi_col); - write_modes_b(cpi, tile, w, tok, tok_end, -#if CONFIG_SUPERTX - supertx_enabled, -#endif + write_modes_b_wrapper(cpi, tile, w, ans, tok, tok_end, supertx_enabled, mi_row, mi_col + bs); - write_modes_b(cpi, tile, w, tok, tok_end, -#if CONFIG_SUPERTX - supertx_enabled, -#endif + write_modes_b_wrapper(cpi, tile, w, ans, tok, tok_end, supertx_enabled, mi_row + bs, mi_col); break; case PARTITION_HORZ_B: - write_modes_b(cpi, tile, w, tok, tok_end, -#if CONFIG_SUPERTX - supertx_enabled, -#endif + write_modes_b_wrapper(cpi, tile, w, ans, tok, tok_end, supertx_enabled, mi_row, mi_col); - write_modes_b(cpi, tile, w, tok, tok_end, -#if CONFIG_SUPERTX - supertx_enabled, -#endif + write_modes_b_wrapper(cpi, tile, w, ans, tok, tok_end, supertx_enabled, mi_row + bs, mi_col); - write_modes_b(cpi, tile, w, tok, tok_end, -#if CONFIG_SUPERTX - supertx_enabled, -#endif + write_modes_b_wrapper(cpi, tile, w, ans, tok, tok_end, supertx_enabled, mi_row + bs, mi_col + bs); break; case PARTITION_VERT_A: - write_modes_b(cpi, tile, w, tok, tok_end, -#if CONFIG_SUPERTX - supertx_enabled, -#endif + write_modes_b_wrapper(cpi, tile, w, ans, tok, tok_end, supertx_enabled, mi_row, mi_col); - write_modes_b(cpi, tile, w, tok, tok_end, -#if CONFIG_SUPERTX - supertx_enabled, -#endif + write_modes_b_wrapper(cpi, tile, w, ans, tok, tok_end, supertx_enabled, mi_row + bs, mi_col); - write_modes_b(cpi, tile, w, tok, tok_end, -#if CONFIG_SUPERTX - supertx_enabled, -#endif + write_modes_b_wrapper(cpi, tile, w, ans, tok, tok_end, supertx_enabled, mi_row, mi_col + bs); break; case PARTITION_VERT_B: - write_modes_b(cpi, tile, w, tok, tok_end, -#if CONFIG_SUPERTX - supertx_enabled, -#endif + write_modes_b_wrapper(cpi, tile, w, ans, tok, tok_end, supertx_enabled, mi_row, mi_col); - write_modes_b(cpi, tile, w, tok, tok_end, -#if CONFIG_SUPERTX - supertx_enabled, -#endif + write_modes_b_wrapper(cpi, tile, w, ans, tok, tok_end, supertx_enabled, mi_row, mi_col + bs); - write_modes_b(cpi, tile, w, tok, tok_end, -#if CONFIG_SUPERTX - supertx_enabled, -#endif + write_modes_b_wrapper(cpi, tile, w, ans, tok, tok_end, supertx_enabled, mi_row + bs, mi_col + bs); break; #endif // CONFIG_EXT_PARTITION_TYPES -- 2.40.0