shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge changes If45b8931,Ieab273a7

* changes:
  vp9_ethread_test: avoid crash when decoder is unavailable
  resize_test: skip VP9 decode checks if it's disabled

--- a/test/resize_test.cc

+++ b/test/resize_test.cc

@@ -7,6 +7,8 @@

  *  in the file PATENTS.  All contributing project authors may

  *  be found in the AUTHORS file in the root of the source tree.

  */

+#include <stdio.h>

+

 #include <climits>

 #include <vector>

 #include "third_party/googletest/src/include/gtest/gtest.h"

@@ -558,9 +560,13 @@

     }

   }

+#if CONFIG_VP9_DECODER

   // Verify that we get 1 resize down event in this test.

   ASSERT_EQ(1, resize_count) << "Resizing should occur.";

   EXPECT_EQ(static_cast<unsigned int>(0), GetMismatchFrames());

+#else

+  printf("Warning: VP9 decoder unavailable, unable to check resize count!\n");

+#endif

 }

 // Verify the dynamic resizer behavior for real time, 1 pass CBR mode.

@@ -602,9 +608,13 @@

     }

   }

+#if CONFIG_VP9_DECODER

   // Verify that we get 2 resize events in this test.

   ASSERT_EQ(resize_count, 2) << "Resizing should occur twice.";

   EXPECT_EQ(static_cast<unsigned int>(0), GetMismatchFrames());

+#else

+  printf("Warning: VP9 decoder unavailable, unable to check resize count!\n");

+#endif

 }

 vpx_img_fmt_t CspForFrameNumber(int frame) {

--- a/test/vp9_ethread_test.cc

+++ b/test/vp9_ethread_test.cc

@@ -82,6 +82,7 @@

   }

   virtual void FramePktHook(const vpx_codec_cx_pkt_t *pkt) {

+#if CONFIG_VP9_DECODER

     const vpx_codec_err_t res = decoder_->DecodeFrame(

         reinterpret_cast<uint8_t*>(pkt->data.frame.buf), pkt->data.frame.sz);

     if (res != VPX_CODEC_OK) {

@@ -95,6 +96,9 @@

       md5_res.Add(img);

       md5_.push_back(md5_res.Get());

     }

+#else

+    ASSERT_EQ(NULL, decoder_);

+#endif

   }

   bool encoder_initialized_;