libvpx: Pull from upstream

source/libvpx/third_party/libwebm/mkvparser.hpp

 // Copyright (c) 2012 The WebM project authors. All Rights Reserved.
 //
 // Use of this source code is governed by a BSD-style license
 // that can be found in the LICENSE file in the root of the source
 // tree. An additional intellectual property rights grant can be found
 // in the file PATENTS.  All contributing project authors may
 // be found in the AUTHORS file in the root of the source tree.
 
 #ifndef MKVPARSER_HPP
 #define MKVPARSER_HPP
 
+#include <cstddef>
+#include <cstdio>
 #include <cstdlib>
-#include <cstdio>
-#include <cstddef>
 
 namespace mkvparser {
 
+const int E_PARSE_FAILED = -1;
 const int E_FILE_FORMAT_INVALID = -2;
 const int E_BUFFER_NOT_FULL = -3;
 
 class IMkvReader {
  public:
   virtual int Read(long long pos, long len, unsigned char* buf) = 0;
   virtual int Length(long long* total, long long* available) = 0;
 
  protected:
   virtual ~IMkvReader();
 };
 
+template<typename Type> Type* SafeArrayAlloc(unsigned long long num_elements,
+                                             unsigned long long element_size);
 long long GetUIntLength(IMkvReader*, long long, long&);
 long long ReadUInt(IMkvReader*, long long, long&);
+long long ReadID(IMkvReader* pReader, long long pos, long& len);
 long long UnserializeUInt(IMkvReader*, long long pos, long long size);
 
 long UnserializeFloat(IMkvReader*, long long pos, long long size, double&);
 long UnserializeInt(IMkvReader*, long long pos, long long size,
                     long long& result);
 
 long UnserializeString(IMkvReader*, long long pos, long long size, char*& str);
 
 long ParseElementHeader(IMkvReader* pReader,
                         long long& pos,  // consume id and size fields
@@ skipping 784 matching lines @@
   const BlockEntry* GetBlock(const CuePoint*,
                              const CuePoint::TrackPosition*) const;
 
   bool LoadCuePoint() const;
   long GetCount() const;  // loaded only
   // long GetTotal() const;  //loaded + preloaded
   bool DoneParsing() const;
 
  private:
   bool Init() const;
-  void PreloadCuePoint(long&, long long) const;
+  bool PreloadCuePoint(long&, long long) const;
 
   mutable CuePoint** m_cue_points;
   mutable long m_count;
   mutable long m_preload_count;
   mutable long long m_pos;
 };
 
 class Cluster {
   friend class Segment;
 
@@ skipping 145 matching lines @@
   Tags* m_pTags;
   Cluster** m_clusters;
   long m_clusterCount;  // number of entries for which m_index >= 0
   long m_clusterPreloadCount;  // number of entries for which m_index < 0
   long m_clusterSize;  // array size
 
   long DoLoadCluster(long long&, long&);
   long DoLoadClusterUnknownSize(long long&, long&);
   long DoParseNext(const Cluster*&, long long&, long&);
 
-  void AppendCluster(Cluster*);
-  void PreloadCluster(Cluster*, ptrdiff_t);
+  bool AppendCluster(Cluster*);
+  bool PreloadCluster(Cluster*, ptrdiff_t);
 
   // void ParseSeekHead(long long pos, long long size);
   // void ParseSeekEntry(long long pos, long long size);
   // void ParseCues(long long);
 
   const BlockEntry* GetBlock(const CuePoint&, const CuePoint::TrackPosition&);
 };
 
 }  // end namespace mkvparser
 
 inline long mkvparser::Segment::LoadCluster() {
   long long pos;
   long size;
 
   return LoadCluster(pos, size);
 }
 
 #endif  // MKVPARSER_HPP