Flush sample buffers when reading new segments in Media Source BMFF parser.

media/mp4/mp4_stream_parser_unittest.cc

 // Copyright (c) 2012 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 <algorithm>
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
@@ skipping 12 matching lines @@
 
 namespace media {
 namespace mp4 {
 
 class MP4StreamParserTest : public testing::Test {
  public:
   MP4StreamParserTest() : parser_(new MP4StreamParser) {}
 
  protected:
   scoped_ptr<MP4StreamParser> parser_;
+  base::TimeDelta segment_start_;
 
   bool AppendData(const uint8* data, size_t length) {
     parser_->Parse(data, length);
     return true;
   }
 
   bool AppendDataInPieces(const uint8* data, size_t length) {
     return AppendDataInPieces(data, length, 7);
   }
 
@@ skipping 22 matching lines @@
     return true;
   }
 
   bool NewBuffersF(const StreamParser::BufferQueue& bufs) {
     DVLOG(2) << "NewBuffersF: " << bufs.size() << " buffers";
     for (StreamParser::BufferQueue::const_iterator buf = bufs.begin();
          buf != bufs.end(); buf++) {
       DVLOG(3) << "  n=" << buf - bufs.begin()
                << ", size=" << (*buf)->GetDataSize()
                << ", dur=" << (*buf)->GetDuration().InMilliseconds();
+      EXPECT_LE(segment_start_, (*buf)->GetTimestamp());
     }
     return true;
   }
 
   bool KeyNeededF(scoped_array<uint8> init_data, int init_data_size) {
     DVLOG(1) << "KeyNeededF: " << init_data_size;
     return true;
   }
 
   void NewSegmentF(TimeDelta start_dts) {
     DVLOG(1) << "NewSegmentF: " << start_dts.InMilliseconds();
+    segment_start_ = start_dts;
   }
 
   void InitializeParser() {
     parser_->Init(
         base::Bind(&MP4StreamParserTest::InitF, base::Unretained(this)),
         base::Bind(&MP4StreamParserTest::NewConfigF, base::Unretained(this)),
         base::Bind(&MP4StreamParserTest::NewBuffersF, base::Unretained(this)),
         base::Bind(&MP4StreamParserTest::NewBuffersF, base::Unretained(this)),
         base::Bind(&MP4StreamParserTest::KeyNeededF, base::Unretained(this)),
         base::Bind(&MP4StreamParserTest::NewSegmentF, base::Unretained(this)));
   }
 
-  bool ParseMP4File(const std::string& filename) {
+  bool ParseMP4File(const std::string& filename, int append_size) {
     InitializeParser();
 
     scoped_refptr<DecoderBuffer> buffer = ReadTestDataFile(filename);
     EXPECT_TRUE(AppendDataInPieces(buffer->GetData(),
                                    buffer->GetDataSize(),
-                                   512));
+                                   append_size));
     return true;
   }
 };
 
 TEST_F(MP4StreamParserTest, TestParseBearDASH) {
-  ParseMP4File("bear.1280x720_dash.mp4");
+  ParseMP4File("bear.1280x720_dash.mp4", 512);
+}
+
+TEST_F(MP4StreamParserTest, TestMultiFragmentAppend) {
+  ParseMP4File("bear.1280x720_dash.mp4", 768432);
 }
 
 }  // namespace mp4
 }  // namespace media