MSE: Relax the 'media segment must begin with keyframe' requirement

media/formats/mp2t/mp2t_stream_parser.cc

 // Copyright 2014 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/formats/mp2t/mp2t_stream_parser.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/stl_util.h"
 #include "media/base/stream_parser_buffer.h"
@@ skipping 150 matching lines @@
 Mp2tStreamParser::~Mp2tStreamParser() {
   STLDeleteValues(&pids_);
 }
 
 void Mp2tStreamParser::Init(
     const InitCB& init_cb,
     const NewConfigCB& config_cb,
     const NewBuffersCB& new_buffers_cb,
     bool /* ignore_text_tracks */,
     const EncryptedMediaInitDataCB& encrypted_media_init_data_cb,
-    const NewMediaSegmentCB& new_segment_cb,
+    const base::Closure& start_of_segment_cb,
     const base::Closure& end_of_segment_cb,
     const scoped_refptr<MediaLog>& media_log) {
   DCHECK(!is_initialized_);
   DCHECK(init_cb_.is_null());
   DCHECK(!init_cb.is_null());
   DCHECK(!config_cb.is_null());
   DCHECK(!new_buffers_cb.is_null());
   DCHECK(!encrypted_media_init_data_cb.is_null());
   DCHECK(!end_of_segment_cb.is_null());
 
   init_cb_ = init_cb;
   config_cb_ = config_cb;
   new_buffers_cb_ = new_buffers_cb;
   encrypted_media_init_data_cb_ = encrypted_media_init_data_cb;
-  new_segment_cb_ = new_segment_cb;
+  start_of_segment_cb_ = start_of_segment_cb;
   end_of_segment_cb_ = end_of_segment_cb;
   media_log_ = media_log;
 }
 
 void Mp2tStreamParser::Flush() {
   DVLOG(1) << "Mp2tStreamParser::Flush";
 
   // Flush the buffers and reset the pids.
   for (std::map<int, PidState*>::iterator it = pids_.begin();
        it != pids_.end(); ++it) {
@@ skipping 388 matching lines @@
     return true;
   if (selected_video_pid_ >= 0 && !last_video_config.IsValidConfig())
     return true;
 
   // Buffer emission.
   while (!buffer_queue_chain_.empty()) {
     // Start a segment if needed.
     if (!segment_started_) {
       DVLOG(1) << "Starting a new segment";
       segment_started_ = true;
-      new_segment_cb_.Run();
+      start_of_segment_cb_.Run();
     }
 
     // Update the audio and video config if needed.
     BufferQueueWithConfig& queue_with_config = buffer_queue_chain_.front();
     if (!queue_with_config.is_config_sent) {
       if (!config_cb_.Run(queue_with_config.audio_config,
                           queue_with_config.video_config,
                           TextTrackConfigMap()))
         return false;
       queue_with_config.is_config_sent = true;
@@ skipping 17 matching lines @@
   // so that buffers with the same config can be added later on.
   BufferQueueWithConfig queue_with_config(
       true, last_audio_config, last_video_config);
   buffer_queue_chain_.push_back(queue_with_config);
 
   return true;
 }
 
 }  // namespace mp2t
 }  // namespace media