diff options
| author | Jim Bankoski <jimbankoski@google.com> | 2014-02-10 11:34:36 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-02-10 11:34:36 -0800 |
| commit | adc84cf9561f648bfef44931e4e2d41f200e5f30 (patch) | |
| tree | 9a2c63fdc585b6e33802bad3da5014191c4058fd /vp9 | |
| parent | 56090b2d1e37f2756ec3c980ec92db7b7dd65c2e (diff) | |
| parent | 18c8deabbf01df52362177b7c96d769d0d65e599 (diff) | |
| download | libvpx-adc84cf9561f648bfef44931e4e2d41f200e5f30.tar libvpx-adc84cf9561f648bfef44931e4e2d41f200e5f30.tar.gz libvpx-adc84cf9561f648bfef44931e4e2d41f200e5f30.tar.bz2 libvpx-adc84cf9561f648bfef44931e4e2d41f200e5f30.zip | |
Merge "Convert functions to inline that are small ."
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/common/vp9_onyxc_int.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vp9/common/vp9_onyxc_int.h b/vp9/common/vp9_onyxc_int.h index d92a25b12..e82556c96 100644 --- a/vp9/common/vp9_onyxc_int.h +++ b/vp9/common/vp9_onyxc_int.h @@ -225,11 +225,11 @@ typedef struct VP9Common { int log2_tile_cols, log2_tile_rows; } VP9_COMMON; -static YV12_BUFFER_CONFIG *get_frame_new_buffer(VP9_COMMON *cm) { +static INLINE YV12_BUFFER_CONFIG *get_frame_new_buffer(VP9_COMMON *cm) { return &cm->frame_bufs[cm->new_fb_idx].buf; } -static int get_free_fb(VP9_COMMON *cm) { +static INLINE int get_free_fb(VP9_COMMON *cm) { int i; for (i = 0; i < FRAME_BUFFERS; i++) if (cm->frame_bufs[i].ref_count == 0) @@ -240,7 +240,7 @@ static int get_free_fb(VP9_COMMON *cm) { return i; } -static void ref_cnt_fb(RefCntBuffer *bufs, int *idx, int new_idx) { +static INLINE void ref_cnt_fb(RefCntBuffer *bufs, int *idx, int new_idx) { const int ref_index = *idx; if (ref_index >= 0 && bufs[ref_index].ref_count > 0) @@ -251,7 +251,7 @@ static void ref_cnt_fb(RefCntBuffer *bufs, int *idx, int new_idx) { bufs[new_idx].ref_count++; } -static int mi_cols_aligned_to_sb(int n_mis) { +static INLINE int mi_cols_aligned_to_sb(int n_mis) { return ALIGN_POWER_OF_TWO(n_mis, MI_BLOCK_SIZE_LOG2); } @@ -275,10 +275,10 @@ static INLINE void set_skip_context( } } -static void set_mi_row_col(MACROBLOCKD *xd, const TileInfo *const tile, - int mi_row, int bh, - int mi_col, int bw, - int mi_rows, int mi_cols) { +static INLINE void set_mi_row_col(MACROBLOCKD *xd, const TileInfo *const tile, + int mi_row, int bh, + int mi_col, int bw, + int mi_rows, int mi_cols) { xd->mb_to_top_edge = -((mi_row * MI_SIZE) * 8); xd->mb_to_bottom_edge = ((mi_rows - bh - mi_row) * MI_SIZE) * 8; xd->mb_to_left_edge = -((mi_col * MI_SIZE) * 8); |