commit db7312483f4222730fc0fe82c351e72f32ab8a5a
author Jingning Han <jingning@google.com> Thu Dec 10 20:09:08 2015
committer Jingning Han <jingning@google.com> Thu Dec 10 23:47:33 2015
tree 3f573346899a07a707d2306e50fa06712059f877
parent fb27ffbb069034a9f291a1337b285acb68226581

Fix high bit depth with scaled reference frame

This commit fixes an encoder issue in high bit depth implementation
that causes enc/dec mismatch in scaled reference frame.

Change-Id: I97655aa213f830d8e2dcd98253c3008abda30eea

vp9/encoder/vp9_encoder.c

diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c
index a9dc13a..3d7f8a3 100644
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -2834,7 +2834,6 @@
         if (cm->new_fb_idx == INVALID_IDX)
           return;
         new_fb_ptr = &pool->frame_bufs[new_fb];
-        cm->cur_frame = &pool->frame_bufs[new_fb];
         vp9_realloc_frame_buffer(&pool->frame_bufs[new_fb].buf,
                                  cm->width, cm->height,
                                  cm->subsampling_x, cm->subsampling_y,
@@ -3073,9 +3072,9 @@
 
 #if CONFIG_INTERNAL_RESIZE
   if (oxcf->pass == 2 && oxcf->resize_mode == RESIZE_DYNAMIC) {
-    if ((cm->current_video_frame % 5) == 2) {
+    if ((cm->current_video_frame % 15) == 3) {
       cpi->resize_pending = 1;
-      cpi->rc.frame_size_selector = (cm->current_video_frame / 5) & 0x01;
+      cpi->rc.frame_size_selector = (cm->current_video_frame / 15) & 0x01;
     } else {
       cpi->resize_pending = 0;
     }