video_source.h: Minor clean up.
- Use size_t for frame_size() (fixes warnings elsewhere) - Remove unnecessary use of const. Change-Id: Id2cba182ac3fd2f67d25fd1db3a0bc3e1eda040b
This commit is contained in:
Родитель
14e3d317cd
Коммит
eb2325ee9f
|
@ -94,14 +94,14 @@ class IVFVideoSource : public CompressedVideoSource {
|
||||||
virtual const uint8_t *cxdata() const {
|
virtual const uint8_t *cxdata() const {
|
||||||
return end_of_file_ ? NULL : compressed_frame_buf_;
|
return end_of_file_ ? NULL : compressed_frame_buf_;
|
||||||
}
|
}
|
||||||
virtual const unsigned int frame_size() const { return frame_sz_; }
|
virtual size_t frame_size() const { return frame_sz_; }
|
||||||
virtual const unsigned int frame_number() const { return frame_; }
|
virtual unsigned int frame_number() const { return frame_; }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
std::string file_name_;
|
std::string file_name_;
|
||||||
FILE *input_file_;
|
FILE *input_file_;
|
||||||
uint8_t *compressed_frame_buf_;
|
uint8_t *compressed_frame_buf_;
|
||||||
unsigned int frame_sz_;
|
size_t frame_sz_;
|
||||||
unsigned int frame_;
|
unsigned int frame_;
|
||||||
bool end_of_file_;
|
bool end_of_file_;
|
||||||
};
|
};
|
||||||
|
|
|
@ -184,9 +184,9 @@ class CompressedVideoSource {
|
||||||
|
|
||||||
virtual const uint8_t *cxdata() const = 0;
|
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
|
} // namespace libvpx_test
|
||||||
|
|
|
@ -169,8 +169,8 @@ class WebMVideoSource : public CompressedVideoSource {
|
||||||
virtual const uint8_t *cxdata() const {
|
virtual const uint8_t *cxdata() const {
|
||||||
return end_of_file_ ? NULL : buf_;
|
return end_of_file_ ? NULL : buf_;
|
||||||
}
|
}
|
||||||
virtual const unsigned int frame_size() const { return buf_sz_; }
|
virtual size_t frame_size() const { return buf_sz_; }
|
||||||
virtual const unsigned int frame_number() const { return frame_; }
|
virtual unsigned int frame_number() const { return frame_; }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
std::string file_name_;
|
std::string file_name_;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче