diff options
author | hkuang <hkuang@google.com> | 2014-04-09 14:20:00 -0700 |
---|---|---|
committer | hkuang <hkuang@google.com> | 2014-04-09 14:20:00 -0700 |
commit | 6ac915abcdb404a00d927fe6308a47fcf09d9519 (patch) | |
tree | e1b38724c6741b657c04a788d42226d5f69d5c3d /libvpx/third_party/libwebm/mkvreader.hpp | |
parent | cf2f478820e07635bb013420f0498ab685190718 (diff) | |
download | android_external_libvpx-6ac915abcdb404a00d927fe6308a47fcf09d9519.tar.gz android_external_libvpx-6ac915abcdb404a00d927fe6308a47fcf09d9519.tar.bz2 android_external_libvpx-6ac915abcdb404a00d927fe6308a47fcf09d9519.zip |
Roll latest libvpx to fix hang when doing adaptive playback.
VP9 decoder will hang when switching from frames with 2 tiles to
4 tiles on a 4 core device.
libvpx hash:4fffefe189a9123d4b04482c26a1be5eb632b397
Bug: 13931133
Change-Id: I24a51fd572ca7e872bc440491e2c645a20e9a736
Diffstat (limited to 'libvpx/third_party/libwebm/mkvreader.hpp')
-rw-r--r-- | libvpx/third_party/libwebm/mkvreader.hpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libvpx/third_party/libwebm/mkvreader.hpp b/libvpx/third_party/libwebm/mkvreader.hpp index adcc29f..8ebdd99 100644 --- a/libvpx/third_party/libwebm/mkvreader.hpp +++ b/libvpx/third_party/libwebm/mkvreader.hpp @@ -21,6 +21,7 @@ class MkvReader : public IMkvReader MkvReader& operator=(const MkvReader&); public: MkvReader(); + MkvReader(FILE* fp); virtual ~MkvReader(); int Open(const char*); @@ -29,8 +30,15 @@ public: virtual int Read(long long position, long length, unsigned char* buffer); virtual int Length(long long* total, long long* available); private: + + // Determines the size of the file. This is called either by the constructor + // or by the Open function depending on file ownership. Returns true on + // success. + bool GetFileSize(); + long long m_length; FILE* m_file; + bool reader_owns_file_; }; } //end namespace mkvparser |