Media Source dispatches inband text tracks

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 @@
       waiting_for_buffers_(false) {
 }
 
 WebMStreamParser::~WebMStreamParser() {}
 
 void WebMStreamParser::Init(const InitCB& init_cb,
                             const NewConfigCB& config_cb,
                             const NewBuffersCB& audio_cb,
                             const NewBuffersCB& video_cb,
                             const NeedKeyCB& need_key_cb,
+                            const TextTrackCB& text_track_cb,
+                            const NewBuffersCB& text_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(!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;
   need_key_cb_ = need_key_cb;
+  text_track_cb_ = text_track_cb;
+  text_cb_ = text_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);
 
   byte_queue_.Reset();
 
@@ skipping 131 matching lines @@
 
   const VideoDecoderConfig& video_config = tracks_parser.video_decoder_config();
   if (video_config.is_encrypted())
     FireNeedKey(tracks_parser.video_encryption_key_id());
 
   if (!config_cb_.Run(audio_config, video_config)) {
     DVLOG(1) << "New config data isn't allowed.";
     return -1;
   }
 
+  const std::set<int>& text_tracks = tracks_parser.text_tracks();
+
+  if (!text_tracks.empty()) {
+    // TODO(matthewjheaney): resolve cardinality, and track kind, name, lang
+    text_track_cb_.Run(kTextSubtitles, "", "");

[acolwell GONE FROM CHROMIUM, 2013/04/05 16:29:23]

If text_track_cb_ returns a NewBuffersCB then you should be able to simply
resolve this w/ a std::map<int, NewBuffersCB>.

[Matthew Heaney (Chromium), 2013/05/09 03:53:11]

OK, I implemented this roughly as you describe.

+  }
+
   cluster_parser_.reset(new WebMClusterParser(
       info_parser.timecode_scale(),
       tracks_parser.audio_track_num(),
       tracks_parser.video_track_num(),
       tracks_parser.text_tracks(),
       tracks_parser.ignored_tracks(),
       tracks_parser.audio_encryption_key_id(),
       tracks_parser.video_encryption_key_id(),
       log_cb_));
 
@@ skipping 50 matching lines @@
     new_segment_cb_.Run(cluster_start_time);
     waiting_for_buffers_ = false;
   }
 
   if (!audio_buffers.empty() && !audio_cb_.Run(audio_buffers))
     return -1;
 
   if (!video_buffers.empty() && !video_cb_.Run(video_buffers))
     return -1;
 
+  WebMClusterParser::TextTrackIterator tt_iter =
+    cluster_parser_->CreateTextTrackIterator();
+
+  int tt_num;
+  const BufferQueue* tt_buffers;
+
+  // TODO(matthewjheaney): resolve cardinality
+  if (tt_iter(&tt_num, &tt_buffers)) {
+    if (!text_cb_.Run(*tt_buffers))
+      return -1;
+  }
+
   if (cluster_ended)
     end_of_segment_cb_.Run();
 
   return bytes_parsed;
 }
 
 void WebMStreamParser::FireNeedKey(const std::string& key_id) {
   int key_id_size = key_id.size();
   DCHECK_GT(key_id_size, 0);
   scoped_array<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