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

media/webm/webm_stream_parser.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 "media/webm/webm_stream_parser.h"
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/logging.h"
@@ skipping 11 matching lines @@
     : state_(kWaitingForInit),
       waiting_for_buffers_(false) {
 }
 
 WebMStreamParser::~WebMStreamParser() {
   STLDeleteValues(&text_track_map_);
 }
 
 void WebMStreamParser::Init(const InitCB& init_cb,
                             const NewConfigCB& config_cb,
-                            const NewBuffersCB& audio_cb,
-                            const NewBuffersCB& video_cb,
+                            const NewBuffersCB& new_buffers_cb,
                             const NewTextBuffersCB& text_cb,
                             const NeedKeyCB& need_key_cb,
                             const AddTextTrackCB& add_text_track_cb,
                             const NewMediaSegmentCB& new_segment_cb,
                             const base::Closure& end_of_segment_cb,
                             const LogCB& log_cb) {
   DCHECK_EQ(state_, kWaitingForInit);
   DCHECK(init_cb_.is_null());
   DCHECK(!init_cb.is_null());
   DCHECK(!config_cb.is_null());
-  DCHECK(!audio_cb.is_null() || !video_cb.is_null());
+  DCHECK(!new_buffers_cb.is_null());
   DCHECK(!text_cb.is_null());
   DCHECK(!need_key_cb.is_null());
   DCHECK(!new_segment_cb.is_null());
   DCHECK(!end_of_segment_cb.is_null());
 
   ChangeState(kParsingHeaders);
   init_cb_ = init_cb;
   config_cb_ = config_cb;
-  audio_cb_ = audio_cb;
-  video_cb_ = video_cb;
+  new_buffers_cb_ = new_buffers_cb;
   text_cb_ = text_cb;
   need_key_cb_ = need_key_cb;
   add_text_track_cb_ = add_text_track_cb;
   new_segment_cb_ = new_segment_cb;
   end_of_segment_cb_ = end_of_segment_cb;
   log_cb_ = log_cb;
 }
 
 void WebMStreamParser::Flush() {
   DCHECK_NE(state_, kWaitingForInit);
@@ skipping 219 matching lines @@
   const BufferQueue& audio_buffers = cluster_parser_->audio_buffers();
   const BufferQueue& video_buffers = cluster_parser_->video_buffers();
   base::TimeDelta cluster_start_time = cluster_parser_->cluster_start_time();
   bool cluster_ended = cluster_parser_->cluster_ended();
 
   if (waiting_for_buffers_ && cluster_start_time != kNoTimestamp()) {
     new_segment_cb_.Run(cluster_start_time);
     waiting_for_buffers_ = false;
   }
 
-  if (!audio_buffers.empty() && !audio_cb_.Run(audio_buffers))
+  if ((!audio_buffers.empty() || !video_buffers.empty()) &&
+      !new_buffers_cb_.Run(audio_buffers, video_buffers)) {
     return -1;
-
-  if (!video_buffers.empty() && !video_cb_.Run(video_buffers))
-    return -1;
+  }
 
   WebMClusterParser::TextTrackIterator text_track_iter =
     cluster_parser_->CreateTextTrackIterator();
 
   int text_track_num;
   const BufferQueue* text_buffers;
 
   while (text_track_iter(&text_track_num, &text_buffers)) {
     TextTrackMap::iterator find_result = text_track_map_.find(text_track_num);
 
@@ skipping 14 matching lines @@
 
 void WebMStreamParser::FireNeedKey(const std::string& key_id) {
   int key_id_size = key_id.size();
   DCHECK_GT(key_id_size, 0);
   scoped_ptr<uint8[]> key_id_array(new uint8[key_id_size]);
   memcpy(key_id_array.get(), key_id.data(), key_id_size);
   need_key_cb_.Run(kWebMEncryptInitDataType, key_id_array.Pass(), key_id_size);
 }
 
 }  // namespace media