shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9: Fix mem rel for non-ref for external buffer."

--- a/test/external_frame_buffer_test.cc

+++ b/test/external_frame_buffer_test.cc

@@ -499,7 +499,7 @@

                                     release_vp9_frame_buffer));

 }

-TEST_F(ExternalFrameBufferNonRefTest, DISABLED_ReleaseNonRefFrameBuffer) {

+TEST_F(ExternalFrameBufferNonRefTest, ReleaseNonRefFrameBuffer) {

   const int num_buffers = VP9_MAXIMUM_REF_BUFFERS + VPX_MAXIMUM_WORK_BUFFERS;

   ASSERT_EQ(VPX_CODEC_OK,

             SetFrameBufferFunctions(num_buffers, get_vp9_frame_buffer,

--- a/vp9/common/vp9_alloccommon.c

+++ b/vp9/common/vp9_alloccommon.c

@@ -65,10 +65,11 @@

   int i;

   for (i = 0; i < FRAME_BUFFERS; ++i) {

-    if (pool->frame_bufs[i].ref_count > 0 &&

+    if (!pool->frame_bufs[i].released &&

         pool->frame_bufs[i].raw_frame_buffer.data != NULL) {

       pool->release_fb_cb(pool->cb_priv, &pool->frame_bufs[i].raw_frame_buffer);

       pool->frame_bufs[i].ref_count = 0;

+      pool->frame_bufs[i].released = 1;

     }

     vpx_free(pool->frame_bufs[i].mvs);

     pool->frame_bufs[i].mvs = NULL;

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

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

@@ -69,6 +69,7 @@

   MV_REF *mvs;

   int mi_rows;

   int mi_cols;

+  uint8_t released;

   vpx_codec_frame_buffer_t raw_frame_buffer;

   YV12_BUFFER_CONFIG buf;

 } RefCntBuffer;

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

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

@@ -1184,6 +1184,7 @@

                        "Failed to allocate frame buffer");

   }

+  pool->frame_bufs[cm->new_fb_idx].released = 0;

   pool->frame_bufs[cm->new_fb_idx].buf.subsampling_x = cm->subsampling_x;

   pool->frame_bufs[cm->new_fb_idx].buf.subsampling_y = cm->subsampling_y;

   pool->frame_bufs[cm->new_fb_idx].buf.bit_depth = (unsigned int)cm->bit_depth;

@@ -1267,6 +1268,7 @@

                        "Failed to allocate frame buffer");

   }

+  pool->frame_bufs[cm->new_fb_idx].released = 0;

   pool->frame_bufs[cm->new_fb_idx].buf.subsampling_x = cm->subsampling_x;

   pool->frame_bufs[cm->new_fb_idx].buf.subsampling_y = cm->subsampling_y;

   pool->frame_bufs[cm->new_fb_idx].buf.bit_depth = (unsigned int)cm->bit_depth;

--- a/vp9/decoder/vp9_decoder.c

+++ b/vp9/decoder/vp9_decoder.c

@@ -287,9 +287,13 @@

   pbi->ready_for_new_data = 0;

   // Check if the previous frame was a frame without any references to it.

-  if (cm->new_fb_idx >= 0 && frame_bufs[cm->new_fb_idx].ref_count == 0)

+  if (cm->new_fb_idx >= 0 && frame_bufs[cm->new_fb_idx].ref_count == 0 &&

+      !frame_bufs[cm->new_fb_idx].released) {

     pool->release_fb_cb(pool->cb_priv,

                         &frame_bufs[cm->new_fb_idx].raw_frame_buffer);

+    frame_bufs[cm->new_fb_idx].released = 1;

+  }

+

   // Find a free frame buffer. Return error if can not find any.

   cm->new_fb_idx = get_free_fb(cm);

   if (cm->new_fb_idx == INVALID_IDX) {

--- a/vp9/decoder/vp9_decoder.h

+++ b/vp9/decoder/vp9_decoder.h

@@ -117,9 +117,10 @@

     // But the private buffer is not set up until finish decoding header.

     // So any error happens during decoding header, the frame_bufs will not

     // have valid priv buffer.

-    if (frame_bufs[idx].ref_count == 0 &&

+    if (!frame_bufs[idx].released && frame_bufs[idx].ref_count == 0 &&

         frame_bufs[idx].raw_frame_buffer.priv) {

       pool->release_fb_cb(pool->cb_priv, &frame_bufs[idx].raw_frame_buffer);

+      frame_bufs[idx].released = 1;

     }

   }

 }