shithub: libvpx

Info  •  Files  •  Log  •  Branches

test/decode_test_driver: rm unused deadline member

has the side-effect of removing some lint and -Wshorten-64-to-32
warnings

Change-Id: Ib7cb87fa65cd65534096921f243d15288e97256d

--- a/test/codec_factory.h

+++ b/test/codec_factory.h

@@ -32,13 +32,10 @@

   virtual ~CodecFactory() {}

-  virtual Decoder *CreateDecoder(vpx_codec_dec_cfg_t cfg,

-                                 unsigned long deadline) const = 0;

+  virtual Decoder *CreateDecoder(vpx_codec_dec_cfg_t cfg) const = 0;

   virtual Decoder *CreateDecoder(vpx_codec_dec_cfg_t cfg,

-                                 const vpx_codec_flags_t flags,

-                                 unsigned long deadline)  // NOLINT(runtime/int)

-      const = 0;

+                                 const vpx_codec_flags_t flags) const = 0;

   virtual Encoder *CreateEncoder(vpx_codec_enc_cfg_t cfg,

                                  unsigned long deadline,

@@ -74,12 +71,10 @@

 #if CONFIG_VP8

 class VP8Decoder : public Decoder {

  public:

-  VP8Decoder(vpx_codec_dec_cfg_t cfg, unsigned long deadline)

-      : Decoder(cfg, deadline) {}

+  explicit VP8Decoder(vpx_codec_dec_cfg_t cfg) : Decoder(cfg) {}

-  VP8Decoder(vpx_codec_dec_cfg_t cfg, const vpx_codec_flags_t flag,

-             unsigned long deadline)  // NOLINT

-      : Decoder(cfg, flag, deadline) {}

+  VP8Decoder(vpx_codec_dec_cfg_t cfg, const vpx_codec_flags_t flag)

+      : Decoder(cfg, flag) {}

  protected:

   virtual vpx_codec_iface_t *CodecInterface() const {

@@ -111,16 +106,14 @@

  public:

   VP8CodecFactory() : CodecFactory() {}

-  virtual Decoder *CreateDecoder(vpx_codec_dec_cfg_t cfg,

-                                 unsigned long deadline) const {

-    return CreateDecoder(cfg, 0, deadline);

+  virtual Decoder *CreateDecoder(vpx_codec_dec_cfg_t cfg) const {

+    return CreateDecoder(cfg, 0);

   }

   virtual Decoder *CreateDecoder(vpx_codec_dec_cfg_t cfg,

-                                 const vpx_codec_flags_t flags,

-                                 unsigned long deadline) const {  // NOLINT

+                                 const vpx_codec_flags_t flags) const {

 #if CONFIG_VP8_DECODER

-    return new VP8Decoder(cfg, flags, deadline);

+    return new VP8Decoder(cfg, flags);

 #else

     return NULL;

 #endif

@@ -166,12 +159,10 @@

 #if CONFIG_VP9

 class VP9Decoder : public Decoder {

  public:

-  VP9Decoder(vpx_codec_dec_cfg_t cfg, unsigned long deadline)

-      : Decoder(cfg, deadline) {}

+  explicit VP9Decoder(vpx_codec_dec_cfg_t cfg) : Decoder(cfg) {}

-  VP9Decoder(vpx_codec_dec_cfg_t cfg, const vpx_codec_flags_t flag,

-             unsigned long deadline)  // NOLINT

-      : Decoder(cfg, flag, deadline) {}

+  VP9Decoder(vpx_codec_dec_cfg_t cfg, const vpx_codec_flags_t flag)

+      : Decoder(cfg, flag) {}

  protected:

   virtual vpx_codec_iface_t *CodecInterface() const {

@@ -203,16 +194,14 @@

  public:

   VP9CodecFactory() : CodecFactory() {}

-  virtual Decoder *CreateDecoder(vpx_codec_dec_cfg_t cfg,

-                                 unsigned long deadline) const {

-    return CreateDecoder(cfg, 0, deadline);

+  virtual Decoder *CreateDecoder(vpx_codec_dec_cfg_t cfg) const {

+    return CreateDecoder(cfg, 0);

   }

   virtual Decoder *CreateDecoder(vpx_codec_dec_cfg_t cfg,

-                                 const vpx_codec_flags_t flags,

-                                 unsigned long deadline) const {  // NOLINT

+                                 const vpx_codec_flags_t flags) const {

 #if CONFIG_VP9_DECODER

-    return new VP9Decoder(cfg, flags, deadline);

+    return new VP9Decoder(cfg, flags);

 #else

     return NULL;

 #endif

--- a/test/decode_test_driver.cc

+++ b/test/decode_test_driver.cc

@@ -65,7 +65,7 @@

 void DecoderTest::RunLoop(CompressedVideoSource *video,

                           const vpx_codec_dec_cfg_t &dec_cfg) {

-  Decoder *const decoder = codec_->CreateDecoder(dec_cfg, flags_, 0);

+  Decoder *const decoder = codec_->CreateDecoder(dec_cfg, flags_);

   ASSERT_TRUE(decoder != NULL);

   bool end_of_file = false;

--- a/test/decode_test_driver.h

+++ b/test/decode_test_driver.h

@@ -38,17 +38,13 @@

 // as more tests are added.

 class Decoder {

  public:

-  Decoder(vpx_codec_dec_cfg_t cfg, unsigned long deadline)

-      : cfg_(cfg), flags_(0), deadline_(deadline), init_done_(false) {

+  explicit Decoder(vpx_codec_dec_cfg_t cfg)

+      : cfg_(cfg), flags_(0), init_done_(false) {

     memset(&decoder_, 0, sizeof(decoder_));

   }

-  Decoder(vpx_codec_dec_cfg_t cfg, const vpx_codec_flags_t flag,

-          unsigned long deadline)  // NOLINT

-      : cfg_(cfg),

-        flags_(flag),

-        deadline_(deadline),

-        init_done_(false) {

+  Decoder(vpx_codec_dec_cfg_t cfg, const vpx_codec_flags_t flag)

+      : cfg_(cfg), flags_(flag), init_done_(false) {

     memset(&decoder_, 0, sizeof(decoder_));

   }

@@ -64,8 +60,6 @@

   DxDataIterator GetDxData() { return DxDataIterator(&decoder_); }

-  void set_deadline(unsigned long deadline) { deadline_ = deadline; }

-

   void Control(int ctrl_id, int arg) { Control(ctrl_id, arg, VPX_CODEC_OK); }

   void Control(int ctrl_id, const void *arg) {

@@ -117,7 +111,6 @@

   vpx_codec_ctx_t decoder_;

   vpx_codec_dec_cfg_t cfg_;

   vpx_codec_flags_t flags_;

-  unsigned int deadline_;

   bool init_done_;

 };

--- a/test/encode_test_driver.cc

+++ b/test/encode_test_driver.cc

@@ -185,7 +185,7 @@

     if (init_flags_ & VPX_CODEC_USE_OUTPUT_PARTITION)

       dec_init_flags |= VPX_CODEC_USE_INPUT_FRAGMENTS;

     testing::internal::scoped_ptr<Decoder> decoder(

-        codec_->CreateDecoder(dec_cfg, dec_init_flags, 0));

+        codec_->CreateDecoder(dec_cfg, dec_init_flags));

     bool again;

     for (again = true; again; video->Next()) {

       again = (video->img() != NULL);

--- a/test/vp9_frame_parallel_test.cc

+++ b/test/vp9_frame_parallel_test.cc

@@ -50,7 +50,7 @@

   cfg.threads = num_threads;

   vpx_codec_flags_t flags = 0;

   flags |= VPX_CODEC_USE_FRAME_THREADING;

-  libvpx_test::VP9Decoder decoder(cfg, flags, 0);

+  libvpx_test::VP9Decoder decoder(cfg, flags);

   libvpx_test::MD5 md5;

   video.Begin();

@@ -136,7 +136,7 @@

   vpx_codec_dec_cfg_t cfg = vpx_codec_dec_cfg_t();

   cfg.threads = num_threads;

   const vpx_codec_flags_t flags = VPX_CODEC_USE_FRAME_THREADING;

-  libvpx_test::VP9Decoder decoder(cfg, flags, 0);

+  libvpx_test::VP9Decoder decoder(cfg, flags);

   libvpx_test::MD5 md5;

   video.Begin();