From eb2325ee9ff21412beee3edd0c6b6b9d369b16a5 Mon Sep 17 00:00:00 2001
From: Tom Finegan <tomfinegan@google.com>
Date: Wed, 19 Feb 2014 14:17:55 -0800
Subject: [PATCH] video_source.h: Minor clean up.
- Use size_t for frame_size() (fixes warnings elsewhere)
- Remove unnecessary use of const.
Change-Id: Id2cba182ac3fd2f67d25fd1db3a0bc3e1eda040b
---
test/ivf_video_source.h | 6 +++---
test/video_source.h | 4 ++--
test/webm_video_source.h | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/test/ivf_video_source.h b/test/ivf_video_source.h
index 3fbafbd70..824a39d7e 100644
--- 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 3d01d39b2..6d1855ae3 100644
--- 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 53b0ba2b4..f21cf98f9 100644
--- 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_;
--
2.40.0