shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Fix the initial references to frame buffers."

--- a/vp9/common/vp9_onyxc_int.h

+++ b/vp9/common/vp9_onyxc_int.h

@@ -238,8 +238,10 @@

 }

 static void ref_cnt_fb(int *buf, int *idx, int new_idx) {

-  if (buf[*idx] > 0)

-    buf[*idx]--;

+  const int ref_index = *idx;

+

+  if (ref_index > 0 && buf[ref_index] > 0)

+    buf[ref_index]--;

   *idx = new_idx;

--- a/vp9/decoder/vp9_decodeframe.c

+++ b/vp9/decoder/vp9_decodeframe.c

@@ -687,12 +687,6 @@

   if (cm->width != width || cm->height != height) {

     // Change in frame size.

-    if (cm->width == 0 || cm->height == 0) {

-      // Assign new frame buffer on first call.

-      cm->new_fb_idx = NUM_YV12_BUFFERS - 1;

-      cm->fb_idx_ref_cnt[cm->new_fb_idx] = 1;

-    }

-

     // TODO(agrange) Don't test width/height, check overall size.

     if (width > cm->width || height > cm->height) {

       // Rescale frame buffers only if they're not big enough already.

--- a/vp9/decoder/vp9_onyxd_if.c

+++ b/vp9/decoder/vp9_onyxd_if.c

@@ -125,6 +125,9 @@

   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);