libvpx: Pull from upstream

source/libvpx/vp9/decoder/vp9_onyxd_if.c

 /*
  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include <assert.h>
 #include <limits.h>
 #include <stdio.h>
 
 #include "vp9/common/vp9_onyxc_int.h"
 #if CONFIG_VP9_POSTPROC
 #include "vp9/common/vp9_postproc.h"
 #endif
 #include "vp9/decoder/vp9_onyxd.h"
 #include "vp9/decoder/vp9_onyxd_int.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vp9/common/vp9_alloccommon.h"
 #include "vp9/common/vp9_loopfilter.h"
 #include "vp9/common/vp9_quant_common.h"
 #include "vpx_scale/vpx_scale.h"
 #include "vp9/common/vp9_systemdependent.h"
 #include "vpx_ports/vpx_timer.h"
-#include "vp9/decoder/vp9_decodframe.h"
+#include "vp9/decoder/vp9_decodeframe.h"
 #include "vp9/decoder/vp9_detokenize.h"
 #include "./vpx_scale_rtcd.h"
 
 #define WRITE_RECON_BUFFER 0
 #if WRITE_RECON_BUFFER == 1
 static void recon_write_yuv_frame(const char *name,
                                   const YV12_BUFFER_CONFIG *s,
                                   int w, int _h) {
   FILE *yuv_file = fopen(name, "ab");
   const uint8_t *src = s->y_buffer;
@@ skipping 61 matching lines @@
 void vp9_initialize_dec() {
   static int init_done = 0;
 
   if (!init_done) {
     vp9_initialize_common();
     vp9_init_quant_tables();
     init_done = 1;
   }
 }
 
+static void init_macroblockd(VP9D_COMP *const pbi) {
+  MACROBLOCKD *xd = &pbi->mb;
+  struct macroblockd_plane *const pd = xd->plane;
+  int i;
+
+  for (i = 0; i < MAX_MB_PLANE; ++i)
+    pd[i].dqcoeff = pbi->dqcoeff[i];
+}
+
 VP9D_PTR vp9_create_decompressor(VP9D_CONFIG *oxcf) {
   VP9D_COMP *const pbi = vpx_memalign(32, sizeof(VP9D_COMP));
   VP9_COMMON *const cm = pbi ? &pbi->common : NULL;
 
   if (!cm)
     return NULL;
 
   vp9_zero(*pbi);
 
+  // Initialize the references to not point to any frame buffers.
+  memset(&cm->ref_frame_map, -1, sizeof(cm->ref_frame_map));
+
   if (setjmp(cm->error.jmp)) {
     cm->error.setjmp = 0;
     vp9_remove_decompressor(pbi);
     return NULL;
   }
 
   cm->error.setjmp = 1;
   vp9_initialize_dec();
 
   vp9_create_common(cm);
 
   pbi->oxcf = *oxcf;
   pbi->ready_for_new_data = 1;
   cm->current_video_frame = 0;
 
   // vp9_init_dequantizer() is first called here. Add check in
   // frame_init_dequantizer() to avoid unnecessary calling of
   // vp9_init_dequantizer() for every frame.
   vp9_init_dequantizer(cm);
 
   vp9_loop_filter_init(cm);
 
   cm->error.setjmp = 0;
   pbi->decoded_key_frame = 0;
 
+  init_macroblockd(pbi);
+
   vp9_worker_init(&pbi->lf_worker);
 
   return pbi;
 }
 
 void vp9_remove_decompressor(VP9D_PTR ptr) {
   int i;
   VP9D_COMP *const pbi = (VP9D_COMP *)ptr;
 
   if (!pbi)
@@ skipping 86 matching lines @@
   }
 
   return pbi->common.error.error_code;
 }
 
 
 int vp9_get_reference_dec(VP9D_PTR ptr, int index, YV12_BUFFER_CONFIG **fb) {
   VP9D_COMP *pbi = (VP9D_COMP *) ptr;
   VP9_COMMON *cm = &pbi->common;
 
-  if (index < 0 || index >= NUM_REF_FRAMES)
+  if (index < 0 || index >= REF_FRAMES)
     return -1;
 
   *fb = &cm->yv12_fb[cm->ref_frame_map[index]];
   return 0;
 }
 
 /* If any buffer updating is signaled it should be done here. */
 static void swap_frame_buffers(VP9D_COMP *pbi) {
   int ref_index = 0, mask;
   VP9_COMMON *const cm = &pbi->common;
@@ skipping 97 matching lines @@
 
 #if WRITE_RECON_BUFFER == 2
   if (cm->show_frame)
     write_dx_frame_to_file(cm->frame_to_show,
                            cm->current_video_frame + 2000);
   else
     write_dx_frame_to_file(cm->frame_to_show,
                            cm->current_video_frame + 3000);
 #endif
 
-  vp9_extend_frame_inner_borders(cm->frame_to_show,
-                                 cm->subsampling_x,
-                                 cm->subsampling_y);
-
 #if WRITE_RECON_BUFFER == 1
   if (cm->show_frame)
     recon_write_yuv_frame("recon.yuv", cm->frame_to_show,
                           cm->width, cm->height);
 #endif
 
   vp9_clear_system_state();
 
   cm->last_show_frame = cm->show_frame;
   if (cm->show_frame) {
@@ skipping 55 matching lines @@
 
     ret = 0;
   } else {
     ret = -1;
   }
 
 #endif /*!CONFIG_POSTPROC*/
   vp9_clear_system_state();
   return ret;
 }