diff options
| author | Jingning Han <jingning@google.com> | 2013-07-31 09:11:37 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-07-31 09:11:37 -0700 |
| commit | ac7bab7575b63b523c575482344d83c9b38a3573 (patch) | |
| tree | c05f734e72250821f48d360b90e834c69fcdc45a /vp9 | |
| parent | 18cb8bdd206596b6a18c2d6a0258dd54b008a7f6 (diff) | |
| parent | 86c384d39893cc569fda4c5e133c42659ae41b5f (diff) | |
| download | libvpx-ac7bab7575b63b523c575482344d83c9b38a3573.tar libvpx-ac7bab7575b63b523c575482344d83c9b38a3573.tar.gz libvpx-ac7bab7575b63b523c575482344d83c9b38a3573.tar.bz2 libvpx-ac7bab7575b63b523c575482344d83c9b38a3573.zip | |
Merge "Make the use of ref_frame index consistent"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index abdf07131..fb1b527f1 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -1088,7 +1088,8 @@ static void choose_partitioning(VP9_COMP *cpi, MODE_INFO *m, int mi_row, dp = 64; if (cm->frame_type != KEY_FRAME) { int_mv nearest_mv, near_mv; - YV12_BUFFER_CONFIG *ref_fb = &cm->yv12_fb[0]; + const int idx = cm->ref_frame_map[get_ref_frame_idx(cpi, LAST_FRAME)]; + YV12_BUFFER_CONFIG *ref_fb = &cm->yv12_fb[idx]; YV12_BUFFER_CONFIG *second_ref_fb = NULL; setup_pre_planes(xd, 0, ref_fb, mi_row, mi_col, @@ -1104,7 +1105,6 @@ static void choose_partitioning(VP9_COMP *cpi, MODE_INFO *m, int mi_row, vp9_build_inter_predictors_sby(xd, mi_row, mi_col, BLOCK_SIZE_SB64X64); d = xd->plane[0].dst.buf; dp = xd->plane[0].dst.stride; - } // Fill in the entire tree of 8x8 variances for splits. @@ -1166,6 +1166,7 @@ static void choose_partitioning(VP9_COMP *cpi, MODE_INFO *m, int mi_row, } } } + static void rd_use_partition(VP9_COMP *cpi, MODE_INFO *m, TOKENEXTRA **tp, int mi_row, int mi_col, BLOCK_SIZE_TYPE bsize, int *rate, int64_t *dist, int do_recon) { |