Commit 178db94c authored by James Zern's avatar James Zern

vp9 asserts: fix compile warning

string literal to int within an assert

Change-Id: I0c889256b67a078e6e2a79577f0b7ae084243258
parent c2634188
......@@ -166,7 +166,7 @@ static int get_entropy_context(TX_SIZE tx_size, const ENTROPY_CONTEXT *a,
left_ec = !!*(const uint64_t *)l;
break;
default:
assert(!"Invalid transform size.");
assert(0 && "Invalid transform size.");
}
return combine_entropy_contexts(above_ec, left_ec);
......
......@@ -104,7 +104,7 @@ static const vp9_prob *get_tx_probs(TX_SIZE max_tx_size, int ctx,
case TX_32X32:
return tx_probs->p32x32[ctx];
default:
assert(!"Invalid max_tx_size.");
assert(0 && "Invalid max_tx_size.");
return NULL;
}
}
......@@ -124,7 +124,7 @@ static unsigned int *get_tx_counts(TX_SIZE max_tx_size, int ctx,
case TX_32X32:
return tx_counts->p32x32[ctx];
default:
assert(!"Invalid max_tx_size.");
assert(0 && "Invalid max_tx_size.");
return NULL;
}
}
......
......@@ -266,7 +266,7 @@ static void inverse_transform_block(MACROBLOCKD* xd, int plane, int block,
vp9_idct32x32_add(dqcoeff, dst, stride, eob);
break;
default:
assert(!"Invalid transform size");
assert(0 && "Invalid transform size");
}
if (eob == 1) {
......@@ -507,7 +507,7 @@ static void decode_modes_sb(VP9_COMMON *const cm, MACROBLOCKD *const xd,
decode_modes_sb(cm, xd, tile, mi_row + hbs, mi_col + hbs, r, subsize);
break;
default:
assert(!"Invalid partition type");
assert(0 && "Invalid partition type");
}
}
......
......@@ -308,7 +308,7 @@ static void read_ref_frames(VP9_COMMON *const cm, MACROBLOCKD *const xd,
ref_frame[1] = NONE;
} else {
assert(!"Invalid prediction mode.");
assert(0 && "Invalid prediction mode.");
}
}
}
......
......@@ -468,7 +468,7 @@ static void encode_block(int plane, int block, BLOCK_SIZE plane_bsize,
xd->itxm_add(dqcoeff, dst, pd->dst.stride, p->eobs[block]);
break;
default:
assert(!"Invalid transform size");
assert(0 && "Invalid transform size");
}
}
......
......@@ -686,7 +686,7 @@ void vp9_get_entropy_contexts(TX_SIZE tx_size,
t_left[i] = !!*(const uint64_t *)&left[i];
break;
default:
assert(!"Invalid transform size.");
assert(0 && "Invalid transform size.");
}
}
......@@ -3237,7 +3237,7 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
break;
case NONE:
case MAX_REF_FRAMES:
assert(!"Invalid Reference frame");
assert(0 && "Invalid Reference frame");
}
}
if (cpi->mode_skip_mask & ((int64_t)1 << mode_index))
......@@ -3902,7 +3902,7 @@ int64_t vp9_rd_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x,
break;
case NONE:
case MAX_REF_FRAMES:
assert(!"Invalid Reference frame");
assert(0 && "Invalid Reference frame");
}
}
if (cpi->mode_skip_mask & ((int64_t)1 << mode_index))
......
......@@ -100,7 +100,7 @@ static VP9_REFFRAME ref_frame_to_vp9_reframe(vpx_ref_frame_type_t frame) {
case VP8_ALTR_FRAME:
return VP9_ALT_FLAG;
}
assert(!"Invalid Reference Frame");
assert(0 && "Invalid Reference Frame");
return VP9_LAST_FLAG;
}
......
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