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

media/mp4/mp4_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/mp4/mp4_stream_parser.h"
 
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/time/time.h"
@@ skipping 24 matching lines @@
       audio_object_types_(audio_object_types),
       has_sbr_(has_sbr),
       is_audio_track_encrypted_(false),
       is_video_track_encrypted_(false) {
 }
 
 MP4StreamParser::~MP4StreamParser() {}
 
 void MP4StreamParser::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(!need_key_cb.is_null());
   DCHECK(!end_of_segment_cb.is_null());
 
   ChangeState(kParsingBoxes);
   init_cb_ = init_cb;
   config_cb_ = config_cb;
-  audio_cb_ = audio_cb;
-  video_cb_ = video_cb;
+  new_buffers_cb_ = new_buffers_cb;
   need_key_cb_ = need_key_cb;
   new_segment_cb_ = new_segment_cb;
   end_of_segment_cb_ = end_of_segment_cb;
   log_cb_ = log_cb;
 }
 
 void MP4StreamParser::Reset() {
   queue_.Reset();
   runs_.reset();
   moof_head_ = 0;
@@ skipping 451 matching lines @@
   } else {
     video_buffers->push_back(stream_buf);
   }
 
   runs_->AdvanceSample();
   return true;
 }
 
 bool MP4StreamParser::SendAndFlushSamples(BufferQueue* audio_buffers,
                                           BufferQueue* video_buffers) {
-  bool err = false;
-  if (!audio_buffers->empty()) {
-    err |= (audio_cb_.is_null() || !audio_cb_.Run(*audio_buffers));
-    audio_buffers->clear();
-  }
-  if (!video_buffers->empty()) {
-    err |= (video_cb_.is_null() || !video_cb_.Run(*video_buffers));
-    video_buffers->clear();
-  }
-  return !err;
+  if (audio_buffers->empty() && video_buffers->empty())

[scherkus (not reviewing), 2013/07/24 22:47:41]

OOC is there any harm in running the cb w/ empty queues?

[acolwell GONE FROM CHROMIUM, 2013/07/25 20:39:33]

No. It just violates the contract for the NewBuffersCB. It is expected to be
called with at least 1 buffer. I can lift this restriction, but it means we
might not detect badly written parsers that just run the callback w/o any data
all the time.

+    return true;
+
+  bool success = new_buffers_cb_.Run(*audio_buffers, *video_buffers);
+  audio_buffers->clear();
+  video_buffers->clear();
+  return success;
 }
 
 bool MP4StreamParser::ReadAndDiscardMDATsUntil(const int64 offset) {
   bool err = false;
   while (mdat_tail_ < offset) {
     const uint8* buf;
     int size;
     queue_.PeekAt(mdat_tail_, &buf, &size);
 
     FourCC type;
@@ skipping 12 matching lines @@
   return !err;
 }
 
 void MP4StreamParser::ChangeState(State new_state) {
   DVLOG(2) << "Changing state: " << new_state;
   state_ = new_state;
 }
 
 }  // namespace mp4
 }  // namespace media