diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-03-10 18:47:41 -0700 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2014-03-10 18:50:28 -0700 |
| commit | 2b9c581393d23995a9866b50817fdb239c030796 (patch) | |
| tree | 2859e1e00fd3edbc6e081ad87fd4b46765cc7923 /vp9/encoder | |
| parent | 29beeff11dd957af3f28d52fea9433ec43603bc7 (diff) | |
| download | libvpx-2b9c581393d23995a9866b50817fdb239c030796.tar libvpx-2b9c581393d23995a9866b50817fdb239c030796.tar.gz libvpx-2b9c581393d23995a9866b50817fdb239c030796.tar.bz2 libvpx-2b9c581393d23995a9866b50817fdb239c030796.zip | |
Using MAX_REF_FRAMES constant instead of number 4.
Change-Id: I6e2fec2814fd366a1ce1321208d3b0e8aa0d98b0
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_onyx_int.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 10162096a..c7ba70ac1 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -2249,7 +2249,7 @@ static TX_MODE select_tx_mode(const VP9_COMP *cpi) { if (cpi->sf.tx_size_search_method == USE_LARGESTALL) { return ALLOW_32X32; } else if (cpi->sf.tx_size_search_method == USE_FULL_RD) { - const int frame_type = get_frame_type(cpi); + const MV_REFERENCE_FRAME frame_type = get_frame_type(cpi); return cpi->rd_tx_select_threshes[frame_type][ALLOW_32X32] > cpi->rd_tx_select_threshes[frame_type][TX_MODE_SELECT] ? ALLOW_32X32 : TX_MODE_SELECT; diff --git a/vp9/encoder/vp9_onyx_int.h b/vp9/encoder/vp9_onyx_int.h index 1540d6e26..10583bcbc 100644 --- a/vp9/encoder/vp9_onyx_int.h +++ b/vp9/encoder/vp9_onyx_int.h @@ -682,13 +682,13 @@ typedef struct VP9_COMP { int rd_thresh_freq_sub8x8[BLOCK_SIZES][MAX_REFS]; int64_t rd_comp_pred_diff[REFERENCE_MODES]; - int64_t rd_prediction_type_threshes[4][REFERENCE_MODES]; + int64_t rd_prediction_type_threshes[MAX_REF_FRAMES][REFERENCE_MODES]; int64_t rd_tx_select_diff[TX_MODES]; // FIXME(rbultje) can this overflow? - int rd_tx_select_threshes[4][TX_MODES]; + int rd_tx_select_threshes[MAX_REF_FRAMES][TX_MODES]; int64_t rd_filter_diff[SWITCHABLE_FILTER_CONTEXTS]; - int64_t rd_filter_threshes[4][SWITCHABLE_FILTER_CONTEXTS]; + int64_t rd_filter_threshes[MAX_REF_FRAMES][SWITCHABLE_FILTER_CONTEXTS]; int64_t rd_filter_cache[SWITCHABLE_FILTER_CONTEXTS]; int64_t mask_filter_rd; |