From 749e0c7b2883139afa14b4886bbd6a940d021f4f Mon Sep 17 00:00:00 2001 From: James Zern Date: Fri, 27 Jun 2014 17:31:01 -0700 Subject: Revert "Revert "Revert 3 patches from Hangyu to get Chrome to build:"" This reverts commit b336356198b8ada50fbb59f04f11cefceaf5ff95. This causes a hang in: VP9/InvalidFileTest.ReturnCode/3 the change to test/user_priv_test.cc remains with a minor update Change-Id: I4a8a272ca37ea329b0f413f0b1cd827a238bd9fd --- vp9/decoder/vp9_decoder.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'vp9/decoder/vp9_decoder.c') diff --git a/vp9/decoder/vp9_decoder.c b/vp9/decoder/vp9_decoder.c index 245c5f195..84cb84aec 100644 --- a/vp9/decoder/vp9_decoder.c +++ b/vp9/decoder/vp9_decoder.c @@ -210,10 +210,7 @@ static void swap_frame_buffers(VP9Decoder *pbi) { } cm->frame_to_show = get_frame_new_buffer(cm); - - if (!pbi->frame_parallel_decode || !cm->show_frame) { - --cm->frame_bufs[cm->new_fb_idx].ref_count; - } + cm->frame_bufs[cm->new_fb_idx].ref_count--; // Invalidate these references until the next frame starts. for (ref_index = 0; ref_index < 3; ref_index++) @@ -242,9 +239,7 @@ int vp9_receive_compressed_data(VP9Decoder *pbi, } // Check if the previous frame was a frame without any references to it. - // Release frame buffer if not decoding in frame parallel mode. - if (!pbi->frame_parallel_decode && cm->new_fb_idx >= 0 - && cm->frame_bufs[cm->new_fb_idx].ref_count == 0) + if (cm->new_fb_idx >= 0 && cm->frame_bufs[cm->new_fb_idx].ref_count == 0) cm->release_fb_cb(cm->cb_priv, &cm->frame_bufs[cm->new_fb_idx].raw_frame_buffer); cm->new_fb_idx = get_free_fb(cm); -- cgit v1.2.3