libvpx: Pull from upstream

source/libvpx/test/decode_test_driver.h

 /*
  *  Copyright (c) 2012 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 26 matching lines @@
 
 // Provides a simplified interface to manage one video decoding.
 //
 // TODO: similar to Encoder class, the exact services should be
 // added as more tests are added.
 class Decoder {
  public:
   Decoder(vpx_codec_dec_cfg_t cfg, unsigned long deadline)
       : cfg_(cfg), deadline_(deadline) {
     memset(&decoder_, 0, sizeof(decoder_));
+    Init();
   }
 
   ~Decoder() {
     vpx_codec_destroy(&decoder_);
   }
 
-  void DecodeFrame(const uint8_t *cxdata, int size);
+  vpx_codec_err_t DecodeFrame(const uint8_t *cxdata, int size);
 
   DxDataIterator GetDxData() {
     return DxDataIterator(&decoder_);
   }
 
   void set_deadline(unsigned long deadline) {
     deadline_ = deadline;
   }
 
   void Control(int ctrl_id, int arg) {
     const vpx_codec_err_t res = vpx_codec_control_(&decoder_, ctrl_id, arg);
     ASSERT_EQ(VPX_CODEC_OK, res) << DecodeError();
   }
 
- protected:
+  void Control(int ctrl_id, const void *arg) {
+    const vpx_codec_err_t res = vpx_codec_control_(&decoder_, ctrl_id, arg);
+    ASSERT_EQ(VPX_CODEC_OK, res) << DecodeError();
+  }
+
   const char *DecodeError() {
     const char *detail = vpx_codec_error_detail(&decoder_);
     return detail ? detail : vpx_codec_error(&decoder_);
   }
 
+ protected:
+  void Init() {
+    const vpx_codec_err_t res = vpx_codec_dec_init(&decoder_,
+                                                   &vpx_codec_vp8_dx_algo,
+                                                   &cfg_, 0);
+    ASSERT_EQ(VPX_CODEC_OK, res) << DecodeError();
+  }
+
   vpx_codec_ctx_t     decoder_;
   vpx_codec_dec_cfg_t cfg_;
   unsigned int        deadline_;
 };
 
 // Common test functionality for all Decoder tests.
 class DecoderTest {
  public:
   // Main loop.
   virtual void RunLoop(CompressedVideoSource *video);
 
   // Hook to be called on every decompressed frame.
   virtual void DecompressedFrameHook(const vpx_image_t& img,
                                      const unsigned int frame_number) {}
 
  protected:
   DecoderTest() {}
 
   virtual ~DecoderTest() {}
 };
 
 }  // namespace libvpx_test
 
 #endif  // TEST_DECODE_TEST_DRIVER_H_