Commit f6ab614b authored by James Zern's avatar James Zern Committed by Gerrit Code Review

Merge "video_source.h: Minor clean up."

parents 3fa7c9ea eb2325ee
......@@ -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_;
};
......
......@@ -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
......
......@@ -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_;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment