commit e2a4cafc1ca264d4ad5962c5dd42d7f7f949a1cb
author Wan-Teh Chang <wtc@google.com> Mon Oct 29 16:29:44 2018 -0700
committer Wan-Teh Chang <wtc@google.com> Wed Oct 31 23:32:42 2018 +0000
tree 50da6ba90072941cd04546d937559658d9cb510b
parent c096d34786ad5dc0e65a9d93b7ea650bac294b36

Re-enable the NotEnoughBuffers and NoRelease tests.

The NotEnoughBuffers test needs a test file that uses more than two
frame buffers. (Almost all of the current test vectors have exactly two
video frames.)

The NoRelease test needs a test file that has more than 16
(AOM_MAXIMUM_REF_BUFFERS + AOM_MAXIMUM_WORK_BUFFERS) video frames.

The test file av1-1-b8-03-sizeup.mkv meets both of these requirements.
It needs to be read with a libaom_test::WebMVideoSource instead of a
libaom_test::IVFVideoSource.

BUG=aomedia:1255

Change-Id: I87b74a9b47501e9ff5b663b0a8ebf0fb5f5aa1ab

test/external_frame_buffer_test.cc

diff --git a/test/external_frame_buffer_test.cc b/test/external_frame_buffer_test.cc
index 665137e..50cf18b 100644
--- a/test/external_frame_buffer_test.cc
+++ b/test/external_frame_buffer_test.cc
@@ -295,7 +295,7 @@
 };
 
 #if CONFIG_WEBM_IO
-const char kAV1TestFile[] = "av1-1-b8-01-size-226x226.ivf";
+const char kAV1TestFile[] = "av1-1-b8-03-sizeup.mkv";
 const char kAV1NonRefTestFile[] = "av1-1-b8-01-size-226x226.ivf";
 
 // Class for testing passing in external frame buffers to libvpx.
@@ -304,7 +304,7 @@
   ExternalFrameBufferTest() : video_(NULL), decoder_(NULL), num_buffers_(0) {}
 
   virtual void SetUp() {
-    video_ = new libaom_test::IVFVideoSource(kAV1TestFile);
+    video_ = new libaom_test::WebMVideoSource(kAV1TestFile);
     ASSERT_TRUE(video_ != NULL);
     video_->Init();
     video_->Begin();
@@ -362,7 +362,7 @@
     }
   }
 
-  libaom_test::IVFVideoSource *video_;
+  libaom_test::CompressedVideoSource *video_;
   libaom_test::AV1Decoder *decoder_;
   int num_buffers_;
   ExternalFrameBufferList fb_list_;
@@ -455,7 +455,7 @@
   ASSERT_EQ(AOM_CODEC_OK, DecodeRemainingFrames());
 }
 
-TEST_F(ExternalFrameBufferTest, DISABLED_NotEnoughBuffers) {
+TEST_F(ExternalFrameBufferTest, NotEnoughBuffers) {
   // Minimum number of external frame buffers for AV1 is
   // #AOM_MAXIMUM_REF_BUFFERS + #AOM_MAXIMUM_WORK_BUFFERS. Most files will
   // only use 5 frame buffers at one time.
@@ -469,7 +469,7 @@
   ASSERT_EQ(AOM_CODEC_MEM_ERROR, DecodeRemainingFrames());
 }
 
-TEST_F(ExternalFrameBufferTest, DISABLED_NoRelease) {
+TEST_F(ExternalFrameBufferTest, NoRelease) {
   const int num_buffers = AOM_MAXIMUM_REF_BUFFERS + AOM_MAXIMUM_WORK_BUFFERS;
   ASSERT_EQ(AOM_CODEC_OK,
             SetFrameBufferFunctions(num_buffers, get_aom_frame_buffer,