Fix WebMStreamParser to continue parsing after a cluster end

media/formats/webm/cluster_builder.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/formats/webm/cluster_builder.h"
 
 #include "base/logging.h"
 #include "media/base/data_buffer.h"
+#include "media/formats/webm/webm_constants.h"
 
 namespace media {
 
 static const uint8 kClusterHeader[] = {
   0x1F, 0x43, 0xB6, 0x75,  // CLUSTER ID
   0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // cluster(size = 0)
   0xE7,  // Timecode ID
   0x88,  // timecode(size=8)
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // timecode value
 };
@@ skipping 154 matching lines @@
 scoped_ptr<Cluster> ClusterBuilder::Finish() {
   DCHECK_NE(cluster_timecode_, -1);
 
   UpdateUInt64(kClusterSizeOffset, bytes_used_ - (kClusterSizeOffset + 8));
 
   scoped_ptr<Cluster> ret(new Cluster(buffer_.Pass(), bytes_used_));
   Reset();
   return ret.Pass();
 }
 
+scoped_ptr<Cluster> ClusterBuilder::FinishWithUnknownSize() {
+  DCHECK_NE(cluster_timecode_, -1);
+
+  UpdateUInt64(kClusterSizeOffset, kWebMUnknownSize);
+
+  scoped_ptr<Cluster> ret(new Cluster(buffer_.Pass(), bytes_used_));
+  Reset();
+  return ret.Pass();
+}
+
 void ClusterBuilder::Reset() {
   buffer_size_ = kInitialBufferSize;
   buffer_.reset(new uint8[buffer_size_]);
   memcpy(buffer_.get(), kClusterHeader, sizeof(kClusterHeader));
   bytes_used_ = sizeof(kClusterHeader);
   cluster_timecode_ = -1;
 }
 
 void ClusterBuilder::ExtendBuffer(int bytes_needed) {
   int new_buffer_size = 2 * buffer_size_;
@@ skipping 13 matching lines @@
   uint8* buf = buffer_.get() + offset;
 
   // Fill the last 7 bytes of size field in big-endian order.
   for (int i = 7; i > 0; i--) {
     buf[i] = value & 0xff;
     value >>= 8;
   }
 }
 
 }  // namespace media