Use write_modes_b_wrapper throughout.
Change-Id: Ifbef3aa6e6b0dbc3701a9ef91b8b685a918d84f4
This commit is contained in:
		@@ -1760,71 +1760,35 @@ static void write_modes_sb(VP10_COMP *const cpi,
 | 
				
			|||||||
        break;
 | 
					        break;
 | 
				
			||||||
#if CONFIG_EXT_PARTITION_TYPES
 | 
					#if CONFIG_EXT_PARTITION_TYPES
 | 
				
			||||||
      case PARTITION_HORZ_A:
 | 
					      case PARTITION_HORZ_A:
 | 
				
			||||||
        write_modes_b(cpi, tile, w, tok, tok_end,
 | 
					        write_modes_b_wrapper(cpi, tile, w, ans, tok, tok_end, supertx_enabled,
 | 
				
			||||||
#if CONFIG_SUPERTX
 | 
					 | 
				
			||||||
                      supertx_enabled,
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
                      mi_row, mi_col);
 | 
					                      mi_row, mi_col);
 | 
				
			||||||
        write_modes_b(cpi, tile, w, tok, tok_end,
 | 
					        write_modes_b_wrapper(cpi, tile, w, ans, tok, tok_end, supertx_enabled,
 | 
				
			||||||
#if CONFIG_SUPERTX
 | 
					 | 
				
			||||||
                      supertx_enabled,
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
                      mi_row, mi_col + bs);
 | 
					                      mi_row, mi_col + bs);
 | 
				
			||||||
        write_modes_b(cpi, tile, w, tok, tok_end,
 | 
					        write_modes_b_wrapper(cpi, tile, w, ans, tok, tok_end, supertx_enabled,
 | 
				
			||||||
#if CONFIG_SUPERTX
 | 
					 | 
				
			||||||
                      supertx_enabled,
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
                      mi_row + bs, mi_col);
 | 
					                      mi_row + bs, mi_col);
 | 
				
			||||||
        break;
 | 
					        break;
 | 
				
			||||||
      case PARTITION_HORZ_B:
 | 
					      case PARTITION_HORZ_B:
 | 
				
			||||||
        write_modes_b(cpi, tile, w, tok, tok_end,
 | 
					        write_modes_b_wrapper(cpi, tile, w, ans, tok, tok_end, supertx_enabled,
 | 
				
			||||||
#if CONFIG_SUPERTX
 | 
					 | 
				
			||||||
                      supertx_enabled,
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
                      mi_row, mi_col);
 | 
					                      mi_row, mi_col);
 | 
				
			||||||
        write_modes_b(cpi, tile, w, tok, tok_end,
 | 
					        write_modes_b_wrapper(cpi, tile, w, ans, tok, tok_end, supertx_enabled,
 | 
				
			||||||
#if CONFIG_SUPERTX
 | 
					 | 
				
			||||||
                      supertx_enabled,
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
                      mi_row + bs, mi_col);
 | 
					                      mi_row + bs, mi_col);
 | 
				
			||||||
        write_modes_b(cpi, tile, w, tok, tok_end,
 | 
					        write_modes_b_wrapper(cpi, tile, w, ans, tok, tok_end, supertx_enabled,
 | 
				
			||||||
#if CONFIG_SUPERTX
 | 
					 | 
				
			||||||
                      supertx_enabled,
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
                      mi_row + bs, mi_col + bs);
 | 
					                      mi_row + bs, mi_col + bs);
 | 
				
			||||||
        break;
 | 
					        break;
 | 
				
			||||||
      case PARTITION_VERT_A:
 | 
					      case PARTITION_VERT_A:
 | 
				
			||||||
        write_modes_b(cpi, tile, w, tok, tok_end,
 | 
					        write_modes_b_wrapper(cpi, tile, w, ans, tok, tok_end, supertx_enabled,
 | 
				
			||||||
#if CONFIG_SUPERTX
 | 
					 | 
				
			||||||
                      supertx_enabled,
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
                      mi_row, mi_col);
 | 
					                      mi_row, mi_col);
 | 
				
			||||||
        write_modes_b(cpi, tile, w, tok, tok_end,
 | 
					        write_modes_b_wrapper(cpi, tile, w, ans, tok, tok_end, supertx_enabled,
 | 
				
			||||||
#if CONFIG_SUPERTX
 | 
					 | 
				
			||||||
                      supertx_enabled,
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
                      mi_row + bs, mi_col);
 | 
					                      mi_row + bs, mi_col);
 | 
				
			||||||
        write_modes_b(cpi, tile, w, tok, tok_end,
 | 
					        write_modes_b_wrapper(cpi, tile, w, ans, tok, tok_end, supertx_enabled,
 | 
				
			||||||
#if CONFIG_SUPERTX
 | 
					 | 
				
			||||||
                      supertx_enabled,
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
                      mi_row, mi_col + bs);
 | 
					                      mi_row, mi_col + bs);
 | 
				
			||||||
        break;
 | 
					        break;
 | 
				
			||||||
      case PARTITION_VERT_B:
 | 
					      case PARTITION_VERT_B:
 | 
				
			||||||
        write_modes_b(cpi, tile, w, tok, tok_end,
 | 
					        write_modes_b_wrapper(cpi, tile, w, ans, tok, tok_end, supertx_enabled,
 | 
				
			||||||
#if CONFIG_SUPERTX
 | 
					 | 
				
			||||||
                      supertx_enabled,
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
                      mi_row, mi_col);
 | 
					                      mi_row, mi_col);
 | 
				
			||||||
        write_modes_b(cpi, tile, w, tok, tok_end,
 | 
					        write_modes_b_wrapper(cpi, tile, w, ans, tok, tok_end, supertx_enabled,
 | 
				
			||||||
#if CONFIG_SUPERTX
 | 
					 | 
				
			||||||
                      supertx_enabled,
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
                      mi_row, mi_col + bs);
 | 
					                      mi_row, mi_col + bs);
 | 
				
			||||||
        write_modes_b(cpi, tile, w, tok, tok_end,
 | 
					        write_modes_b_wrapper(cpi, tile, w, ans, tok, tok_end, supertx_enabled,
 | 
				
			||||||
#if CONFIG_SUPERTX
 | 
					 | 
				
			||||||
                      supertx_enabled,
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
                      mi_row + bs, mi_col + bs);
 | 
					                      mi_row + bs, mi_col + bs);
 | 
				
			||||||
        break;
 | 
					        break;
 | 
				
			||||||
#endif  // CONFIG_EXT_PARTITION_TYPES
 | 
					#endif  // CONFIG_EXT_PARTITION_TYPES
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user