| Index: source/libvpx/vp9/common/vp9_onyxc_int.h
|
| ===================================================================
|
| --- source/libvpx/vp9/common/vp9_onyxc_int.h (revision 282873)
|
| +++ source/libvpx/vp9/common/vp9_onyxc_int.h (working copy)
|
| @@ -257,10 +257,14 @@
|
| xd->mi_stride = cm->mi_stride;
|
| }
|
|
|
| +static INLINE int frame_is_intra_only(const VP9_COMMON *const cm) {
|
| + return cm->frame_type == KEY_FRAME || cm->intra_only;
|
| +}
|
| +
|
| static INLINE const vp9_prob* get_partition_probs(const VP9_COMMON *cm,
|
| int ctx) {
|
| - return cm->frame_type == KEY_FRAME ? vp9_kf_partition_probs[ctx]
|
| - : cm->fc.partition_prob[ctx];
|
| + return frame_is_intra_only(cm) ? vp9_kf_partition_probs[ctx]
|
| + : cm->fc.partition_prob[ctx];
|
| }
|
|
|
| static INLINE void set_skip_context(MACROBLOCKD *xd, int mi_row, int mi_col) {
|
| @@ -299,10 +303,6 @@
|
| cm->prev_mip + cm->mi_stride + 1 : NULL;
|
| }
|
|
|
| -static INLINE int frame_is_intra_only(const VP9_COMMON *const cm) {
|
| - return cm->frame_type == KEY_FRAME || cm->intra_only;
|
| -}
|
| -
|
| static INLINE void update_partition_context(MACROBLOCKD *xd,
|
| int mi_row, int mi_col,
|
| BLOCK_SIZE subsize,
|
|
|