Commit 076437f4 authored by Sarah Parker's avatar Sarah Parker

Fix broken assert when rect-tx is enabled on its own

The function is_rect_tx previously was only defined when
both ext-tx and rect-tx are enabled together. This function
needs to be defined when rect-tx is enabled alone to fix
failing asserts.

Change-Id: Ic8153a55b768cb49caac07d6aeaee109d63410a9
parent 6ee201db
......@@ -600,6 +600,11 @@ static INLINE int supertx_enabled(const MB_MODE_INFO *mbmi) {
#define USE_TXTYPE_SEARCH_FOR_SUB8X8_IN_CB4X4 1
#if CONFIG_RECT_TX
static INLINE int is_rect_tx(TX_SIZE tx_size) { return tx_size >= TX_SIZES; }
#endif // CONFIG_RECT_TX
#if CONFIG_EXT_TX
#define ALLOW_INTRA_EXT_TX 1
......@@ -764,8 +769,6 @@ static INLINE int is_rect_tx_allowed(const MACROBLOCKD *xd,
return is_rect_tx_allowed_bsize(mbmi->sb_type) &&
!xd->lossless[mbmi->segment_id];
}
static INLINE int is_rect_tx(TX_SIZE tx_size) { return tx_size >= TX_SIZES; }
#endif // CONFIG_RECT_TX
#endif // CONFIG_EXT_TX
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment