Chrome-side implementation of media source timestamp offset

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.h"
@@ skipping 19 matching lines @@
       has_sbr_(has_sbr) {
 }
 
 MP4StreamParser::~MP4StreamParser() {}
 
 void MP4StreamParser::Init(const InitCB& init_cb,
                            const NewConfigCB& config_cb,
                            const NewBuffersCB& audio_cb,
                            const NewBuffersCB& video_cb,
                            const NeedKeyCB& need_key_cb,
-                           const NewMediaSegmentCB& new_segment_cb) {
+                           const NewMediaSegmentCB& new_segment_cb,
+                           const base::Closure& end_of_segment_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(!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;
   need_key_cb_ = need_key_cb;
   new_segment_cb_ = new_segment_cb;
+  end_of_segment_cb_ = end_of_segment_cb;
 }
 
 void MP4StreamParser::Flush() {
   DCHECK_NE(state_, kWaitingForInit);
 
   queue_.Reset();
   moof_head_ = 0;
   mdat_tail_ = 0;
 }
 
@@ skipping 189 matching lines @@
   return true;
 }
 
 bool MP4StreamParser::EnqueueSample(BufferQueue* audio_buffers,
                                     BufferQueue* video_buffers,
                                     bool* err) {
   if (!runs_->RunIsValid()) {
     // Flush any buffers we've gotten in this chunk so that buffers don't
     // cross NewSegment() calls
     *err = !SendAndFlushSamples(audio_buffers, video_buffers);
-    if (*err) return false;
+    if (*err)
+      return false;
+
     ChangeState(kParsingBoxes);
+    end_of_segment_cb_.Run();
     return true;
   }
 
   if (!runs_->SampleIsValid()) {
     runs_->AdvanceRun();
     return true;
   }
 
   DCHECK(!(*err));
 
   const uint8* buf;
   int size;
   queue_.Peek(&buf, &size);
-  if (!size) return false;
+  if (!size)
+    return false;
 
   bool audio = has_audio_ && audio_track_id_ == runs_->track_id();
   bool video = has_video_ && video_track_id_ == runs_->track_id();
 
   // Skip this entire track if it's not one we're interested in
-  if (!audio && !video) runs_->AdvanceRun();
+  if (!audio && !video)
+    runs_->AdvanceRun();
 
   queue_.PeekAt(runs_->sample_offset() + moof_head_, &buf, &size);
-  if (size < runs_->sample_size()) return false;
+  if (size < runs_->sample_size())
+    return false;
 
   std::vector<uint8> frame_buf(buf, buf + runs_->sample_size());
   if (video) {
     const AVCDecoderConfigurationRecord& avc_config =
         runs_->video_description().avcc;
     RCHECK(AVC::ConvertToAnnexB(avc_config.length_size, &frame_buf));
     if (runs_->is_keyframe())
       RCHECK(AVC::InsertParameterSets(avc_config, &frame_buf));
   }
 
@@ skipping 67 matching lines @@
   return true;
 }
 
 void MP4StreamParser::ChangeState(State new_state) {
   DVLOG(2) << "Changing state: " << new_state;
   state_ = new_state;
 }
 
 }  // namespace mp4
 }  // namespace media