Render inband text tracks in the media pipeline

media/mp2t/mp2t_stream_parser.cc

 // Copyright 2013 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/mp2t/mp2t_stream_parser.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/buffers.h"
 #include "media/base/stream_parser_buffer.h"
+#include "media/base/text_track_config.h"
 #include "media/base/video_decoder_config.h"
 #include "media/mp2t/es_parser.h"
 #include "media/mp2t/es_parser_adts.h"
 #include "media/mp2t/es_parser_h264.h"
 #include "media/mp2t/mp2t_common.h"
 #include "media/mp2t/ts_packet.h"
 #include "media/mp2t/ts_section.h"
 #include "media/mp2t/ts_section_pat.h"
 #include "media/mp2t/ts_section_pes.h"
 #include "media/mp2t/ts_section_pmt.h"
@@ skipping 136 matching lines @@
 }
 
 Mp2tStreamParser::~Mp2tStreamParser() {
   STLDeleteValues(&pids_);
 }
 
 void Mp2tStreamParser::Init(
     const InitCB& init_cb,
     const NewConfigCB& config_cb,
     const NewBuffersCB& new_buffers_cb,
-    const NewTextBuffersCB& text_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(!is_initialized_);
   DCHECK(init_cb_.is_null());
   DCHECK(!init_cb.is_null());
   DCHECK(!config_cb.is_null());
   DCHECK(!new_buffers_cb.is_null());
   DCHECK(!need_key_cb.is_null());
   DCHECK(!end_of_segment_cb.is_null());
@@ skipping 287 matching lines @@
   BufferQueueWithConfig& queue_with_config = buffer_queue_chain_.front();
   if (selected_audio_pid_ > 0 &&
       !queue_with_config.audio_config.IsValidConfig())
     return true;
   if (selected_video_pid_ > 0 &&
       !queue_with_config.video_config.IsValidConfig())
     return true;
 
   // Pass the config before invoking the initialization callback.
   RCHECK(config_cb_.Run(queue_with_config.audio_config,
-                        queue_with_config.video_config));
+                        queue_with_config.video_config,
+                        TextTrackConfigMap()));
   queue_with_config.is_config_sent = true;
 
   // For Mpeg2 TS, the duration is not known.
   DVLOG(1) << "Mpeg2TS stream parser initialization done";
   init_cb_.Run(true, kInfiniteDuration());
   is_initialized_ = true;
 
   return true;
 }
 
@@ skipping 88 matching lines @@
     if (!segment_started_) {
       DVLOG(1) << "Starting a new segment";
       segment_started_ = true;
       new_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))
+                          queue_with_config.video_config,
+                          TextTrackConfigMap()))
         return false;
       queue_with_config.is_config_sent = true;
     }
 
     // Add buffers.
     if (!queue_with_config.audio_queue.empty() ||
         !queue_with_config.video_queue.empty()) {
       if (!new_buffers_cb_.Run(queue_with_config.audio_queue,
                                queue_with_config.video_queue)) {
         return false;
       }
     }
 
     buffer_queue_chain_.pop_front();
   }
 
   // Push an empty queue with the last audio/video config
   // 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