Add Chromium-side support for SourceBuffer.appendWindowStart and SourceBuffer.appendWindowEnd.

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 20 matching lines @@
  public:
   MP4StreamParserTest()
       : configs_received_(false) {
     std::set<int> audio_object_types;
     audio_object_types.insert(kISO_14496_3);
     parser_.reset(new MP4StreamParser(audio_object_types, false));
   }
 
  protected:
   scoped_ptr<MP4StreamParser> parser_;
-  base::TimeDelta segment_start_;
   bool configs_received_;
 
   bool AppendData(const uint8* data, size_t length) {
     return parser_->Parse(data, length);
   }
 
   bool AppendDataInPieces(const uint8* data, size_t length, size_t piece_size) {
     const uint8* start = data;
     const uint8* end = data + length;
     while (start < end) {
@@ skipping 11 matching lines @@
              << ", dur=" << duration.InMilliseconds();
   }
 
   bool NewConfigF(const AudioDecoderConfig& ac, const VideoDecoderConfig& vc) {
     DVLOG(1) << "NewConfigF: audio=" << ac.IsValidConfig()
              << ", video=" << vc.IsValidConfig();
     configs_received_ = true;
     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()
+
+  void DumpBuffers(const std::string& label,
+                   const StreamParser::BufferQueue& buffers) {
+    DVLOG(2) << "DumpBuffers: " << label << " size " << buffers.size();
+    for (StreamParser::BufferQueue::const_iterator buf = buffers.begin();
+         buf != buffers.end(); buf++) {
+      DVLOG(3) << "  n=" << buf - buffers.begin()
                << ", size=" << (*buf)->data_size()
                << ", dur=" << (*buf)->duration().InMilliseconds();
-      EXPECT_GE((*buf)->timestamp(), segment_start_);
     }
+  }
+
+  bool NewBuffersF(const StreamParser::BufferQueue& audio_buffers,
+                   const StreamParser::BufferQueue& video_buffers) {
+    DumpBuffers("audio_buffers", audio_buffers);
+    DumpBuffers("video_buffers", video_buffers);
     return true;
   }
 
   bool NewTextBuffersF(TextTrack* text_track,
                        const StreamParser::BufferQueue& buffers) {
     return true;
   }
 
   void KeyNeededF(const std::string& type,
                   scoped_ptr<uint8[]> init_data, int init_data_size) {
     DVLOG(1) << "KeyNeededF: " << init_data_size;
     EXPECT_EQ(kMp4InitDataType, type);
     EXPECT_TRUE(init_data.get());
     EXPECT_GT(init_data_size, 0);
   }
 
   scoped_ptr<TextTrack> AddTextTrackF(
       TextKind kind,
       const std::string& label,
       const std::string& language) {
     return scoped_ptr<TextTrack>();
   }
 
-  void NewSegmentF(TimeDelta start_dts) {
-    DVLOG(1) << "NewSegmentF: " << start_dts.InMilliseconds();
-    segment_start_ = start_dts;
+  void NewSegmentF() {
+    DVLOG(1) << "NewSegmentF";
   }
 
   void EndOfSegmentF() {
     DVLOG(1) << "EndOfSegmentF()";
   }
 
   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::NewTextBuffersF,
                    base::Unretained(this)),
         base::Bind(&MP4StreamParserTest::KeyNeededF, base::Unretained(this)),
         base::Bind(&MP4StreamParserTest::AddTextTrackF, base::Unretained(this)),
         base::Bind(&MP4StreamParserTest::NewSegmentF, base::Unretained(this)),
         base::Bind(&MP4StreamParserTest::EndOfSegmentF,
                    base::Unretained(this)),
         LogCB());
   }
 
@@ skipping 73 matching lines @@
   EXPECT_TRUE(AppendDataInPieces(buffer->data() + kFirstMoofOffset,
                                  buffer->data_size() - kFirstMoofOffset,
                                  512));
 }
 
 // TODO(strobe): Create and test media which uses CENC auxiliary info stored
 // inside a private box
 
 }  // namespace mp4
 }  // namespace media