summaryrefslogtreecommitdiff
path: root/third_party/libwebm/mkvreader.hpp
diff options
context:
space:
mode:
authorVignesh Venkatasubramanian <vigneshv@google.com>2014-04-09 11:16:14 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2014-04-09 11:16:14 -0700
commit667ab1c70864b9105537fbfb86210e30d12e1780 (patch)
treef1a6597ceba4613db0e1e7fd2672ae77d11f0da2 /third_party/libwebm/mkvreader.hpp
parent5ed83c32201ca5ba4992b2a7350ed02df0d8bf92 (diff)
parent919553695c9673ff7016e9435905412fcdfbd552 (diff)
downloadlibvpx-667ab1c70864b9105537fbfb86210e30d12e1780.tar
libvpx-667ab1c70864b9105537fbfb86210e30d12e1780.tar.gz
libvpx-667ab1c70864b9105537fbfb86210e30d12e1780.tar.bz2
libvpx-667ab1c70864b9105537fbfb86210e30d12e1780.zip
Merge "third_party/libwebm: Pull from upstream"
Diffstat (limited to 'third_party/libwebm/mkvreader.hpp')
-rw-r--r--third_party/libwebm/mkvreader.hpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/third_party/libwebm/mkvreader.hpp b/third_party/libwebm/mkvreader.hpp
index adcc29f47..8ebdd99a7 100644
--- a/third_party/libwebm/mkvreader.hpp
+++ b/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