Commit 00c48ae0 authored by Jim Bankoski's avatar Jim Bankoski Committed by Gerrit Code Review
Browse files

Merge "Converted functions in header to INLINE..."

parents adc84cf9 6a9e58cb
...@@ -98,8 +98,8 @@ static INLINE vp9_prob vp9_get_pred_prob_single_ref_p2(const VP9_COMMON *cm, ...@@ -98,8 +98,8 @@ static INLINE vp9_prob vp9_get_pred_prob_single_ref_p2(const VP9_COMMON *cm,
int vp9_get_tx_size_context(const MACROBLOCKD *xd); int vp9_get_tx_size_context(const MACROBLOCKD *xd);
static const vp9_prob *get_tx_probs(TX_SIZE max_tx_size, int ctx, static INLINE const vp9_prob *get_tx_probs(TX_SIZE max_tx_size, int ctx,
const struct tx_probs *tx_probs) { const struct tx_probs *tx_probs) {
switch (max_tx_size) { switch (max_tx_size) {
case TX_8X8: case TX_8X8:
return tx_probs->p8x8[ctx]; return tx_probs->p8x8[ctx];
...@@ -113,13 +113,14 @@ static const vp9_prob *get_tx_probs(TX_SIZE max_tx_size, int ctx, ...@@ -113,13 +113,14 @@ static const vp9_prob *get_tx_probs(TX_SIZE max_tx_size, int ctx,
} }
} }
static const vp9_prob *get_tx_probs2(TX_SIZE max_tx_size, const MACROBLOCKD *xd, static INLINE const vp9_prob *get_tx_probs2(TX_SIZE max_tx_size,
const struct tx_probs *tx_probs) { const MACROBLOCKD *xd,
const struct tx_probs *tx_probs) {
return get_tx_probs(max_tx_size, vp9_get_tx_size_context(xd), tx_probs); return get_tx_probs(max_tx_size, vp9_get_tx_size_context(xd), tx_probs);
} }
static unsigned int *get_tx_counts(TX_SIZE max_tx_size, int ctx, static INLINE unsigned int *get_tx_counts(TX_SIZE max_tx_size, int ctx,
struct tx_counts *tx_counts) { struct tx_counts *tx_counts) {
switch (max_tx_size) { switch (max_tx_size) {
case TX_8X8: case TX_8X8:
return tx_counts->p8x8[ctx]; return tx_counts->p8x8[ctx];
......
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