video_source.h: Minor clean up.

- Use size_t for frame_size() (fixes warnings elsewhere)
- Remove unnecessary use of const.

Change-Id: Id2cba182ac3fd2f67d25fd1db3a0bc3e1eda040b

diff --git a/test/ivf_video_source.h b/test/ivf_video_source.h
index 3fbafbd7015bf852bc30bc066f2561b9695955d2..824a39d7e669c672b708314f7ef42bf3bb36a617 100644 (file)
--- a/test/ivf_video_source.h
+++ b/test/ivf_video_source.h
@@ -94,14 +94,14 @@ class IVFVideoSource : public CompressedVideoSource {
   virtual const uint8_t *cxdata() const {
     return end_of_file_ ? NULL : compressed_frame_buf_;
   }
-  virtual const unsigned int frame_size() const { return frame_sz_; }
-  virtual const unsigned int frame_number() const { return frame_; }
+  virtual size_t frame_size() const { return frame_sz_; }
+  virtual unsigned int frame_number() const { return frame_; }
 
  protected:
   std::string file_name_;
   FILE *input_file_;
   uint8_t *compressed_frame_buf_;
-  unsigned int frame_sz_;
+  size_t frame_sz_;
   unsigned int frame_;
   bool end_of_file_;
 };

diff --git a/test/video_source.h b/test/video_source.h
index 3d01d39b27db2ab548c4b48246da543ae9bfb874..6d1855ae35bd7278a9cf899e982fadf66e6bf692 100644 (file)
--- a/test/video_source.h
+++ b/test/video_source.h
@@ -184,9 +184,9 @@ class CompressedVideoSource {
 
   virtual const uint8_t *cxdata() const = 0;
 
-  virtual const unsigned int frame_size() const = 0;
+  virtual size_t frame_size() const = 0;
 
-  virtual const unsigned int frame_number() const = 0;
+  virtual unsigned int frame_number() const = 0;
 };
 
 }  // namespace libvpx_test

diff --git a/test/webm_video_source.h b/test/webm_video_source.h
index 53b0ba2b41a1f640ed552cf54e6b26697062fbbb..f21cf98f907c319edad2fde10e297f9ed995b07e 100644 (file)
--- a/test/webm_video_source.h
+++ b/test/webm_video_source.h
@@ -169,8 +169,8 @@ class WebMVideoSource : public CompressedVideoSource {
   virtual const uint8_t *cxdata() const {
     return end_of_file_ ? NULL : buf_;
   }
-  virtual const unsigned int frame_size() const { return buf_sz_; }
-  virtual const unsigned int frame_number() const { return frame_; }
+  virtual size_t frame_size() const { return buf_sz_; }
+  virtual unsigned int frame_number() const { return frame_; }
 
  protected:
   std::string file_name_;