shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "decode_test_driver: Use size_t for size arg to DecodeFrame()."

--- a/test/decode_test_driver.cc

+++ b/test/decode_test_driver.cc

@@ -15,11 +15,13 @@

 namespace libvpx_test {

-vpx_codec_err_t Decoder::DecodeFrame(const uint8_t *cxdata, int size) {

+vpx_codec_err_t Decoder::DecodeFrame(const uint8_t *cxdata, size_t size) {

   vpx_codec_err_t res_dec;

   InitOnce();

-  REGISTER_STATE_CHECK(res_dec = vpx_codec_decode(&decoder_,

-                                                  cxdata, size, NULL, 0));

+  REGISTER_STATE_CHECK(

+      res_dec = vpx_codec_decode(&decoder_,

+                                 cxdata, static_cast<unsigned int>(size),

+                                 NULL, 0));

   return res_dec;

 }

--- a/test/decode_test_driver.h

+++ b/test/decode_test_driver.h

@@ -49,7 +49,7 @@

     vpx_codec_destroy(&decoder_);

   }

-  vpx_codec_err_t DecodeFrame(const uint8_t *cxdata, int size);

+  vpx_codec_err_t DecodeFrame(const uint8_t *cxdata, size_t size);

   DxDataIterator GetDxData() {

     return DxDataIterator(&decoder_);