Media Source dispatches inband text tracks

webkit/media/webmediaplayer_impl.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 "webkit/media/webmediaplayer_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <string>
 #include <vector>
@@ skipping 13 matching lines @@
 #include "media/base/media_log.h"
 #include "media/base/pipeline.h"
 #include "media/base/video_frame.h"
 #include "media/filters/audio_renderer_impl.h"
 #include "media/filters/chunk_demuxer.h"
 #include "media/filters/video_renderer_base.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebInbandTextTrackClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaSource.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "v8/include/v8.h"
 #include "webkit/compositor_bindings/web_layer_impl.h"
 #include "webkit/media/buffered_data_source.h"
 #include "webkit/media/filter_helpers.h"
 #include "webkit/media/webaudiosourceprovider_impl.h"
+#include "webkit/media/webinbandtexttrack_impl.h"
 #include "webkit/media/webmediaplayer_delegate.h"
 #include "webkit/media/webmediaplayer_params.h"
 #include "webkit/media/webmediaplayer_util.h"
 #include "webkit/media/webmediasourceclient_impl.h"
 #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h"
 
 using WebKit::WebCanvas;
 using WebKit::WebMediaPlayer;
 using WebKit::WebRect;
 using WebKit::WebSize;
@@ skipping 247 matching lines @@
                               WebKit::WebMediaSource* media_source,
                               CORSMode cors_mode) {
   scoped_ptr<WebKit::WebMediaSource> ms(media_source);
   LoadSetup(url);
 
   // Media source pipelines can start immediately.
   chunk_demuxer_ = new media::ChunkDemuxer(
       BIND_TO_RENDER_LOOP_1(&WebMediaPlayerImpl::OnDemuxerOpened,
                             base::Passed(&ms)),
       BIND_TO_RENDER_LOOP_2(&WebMediaPlayerImpl::OnNeedKey, "", ""),
+      base::Bind(&WebMediaPlayerImpl::OnTextTrack, AsWeakPtr()),
+      base::Bind(&WebMediaPlayerImpl::OnText, AsWeakPtr()),
       base::Bind(&LogMediaSourceError, media_log_));
 
   BuildMediaSourceCollection(chunk_demuxer_,
                              media_thread_.message_loop_proxy(),
                              filter_collection_.get());
   supports_save_ = false;
   StartPipeline();
 }
 
 void WebMediaPlayerImpl::LoadSetup(const WebKit::WebURL& url) {
@@ skipping 713 matching lines @@
   DCHECK(init_data_type_.empty() || type.empty() || type == init_data_type_);
   if (init_data_type_.empty())
     init_data_type_ = type;
 
   GetClient()->keyNeeded(WebString::fromUTF8(key_system),
                          WebString::fromUTF8(session_id),
                          init_data.get(),
                          init_data_size);
 }
 
+void WebMediaPlayerImpl::OnTextTrack(const media::TextKind kind,
+                                     const std::string& label,
+                                     const std::string& language) {
+  const WebInbandTextTrackImpl::Kind kind_map[] = {
+    WebInbandTextTrackImpl::Subtitles,
+    WebInbandTextTrackImpl::Captions,
+    WebInbandTextTrackImpl::Descriptions,
+    WebInbandTextTrackImpl::Chapters,
+    WebInbandTextTrackImpl::Metadata,
+    WebInbandTextTrackImpl::None
+  };
+
+  const WebInbandTextTrackImpl::Kind webkind = kind_map[kind];

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

A simple cast should be possible here. You can also use a
COMPILE_ASSERT_MATCHING_ENUM() like the one above to make sure the enums always
stay in sync.

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

For now I just made it into a static_cast.

+  const WebKit::WebString weblabel = WebKit::WebString::fromUTF8(label);
+  const WebKit::WebString weblanguage = WebKit::WebString::fromUTF8(language);
+
+  // TODO(matthewjheaney): resolve lifetime issues for text_track_.
+  text_track_ = new WebInbandTextTrackImpl(webkind, weblabel, weblanguage);
+  GetClient()->addTextTrack(text_track_);
+}
+
+void WebMediaPlayerImpl::OnText(const base::TimeDelta& time) {
+  WebKit::WebInbandTextTrackClient* const client = text_track_->client();
+  // TODO(matthewjheaney): correct type?
+  const double start = time.InSecondsF();
+  const double end = start + 1.0;  // TODO(matthewjheaney)
+  const WebString id("id");  // TODO(matthewjheaney)
+  const WebString content("hello, world!");  // TODO
+  const WebString settings("");  // TODO
+
+  client->addWebVTTCue(start, end, id, content, settings);
+}
+
 #define COMPILE_ASSERT_MATCHING_ENUM(name) \
   COMPILE_ASSERT(static_cast<int>(WebKit::WebMediaPlayerClient::name) == \
                  static_cast<int>(media::Decryptor::k ## name), \
                  mismatching_enums)
 COMPILE_ASSERT_MATCHING_ENUM(UnknownError);
 COMPILE_ASSERT_MATCHING_ENUM(ClientError);
 COMPILE_ASSERT_MATCHING_ENUM(ServiceError);
 COMPILE_ASSERT_MATCHING_ENUM(OutputError);
 COMPILE_ASSERT_MATCHING_ENUM(HardwareChangeError);
 COMPILE_ASSERT_MATCHING_ENUM(DomainError);
@@ skipping 171 matching lines @@
 
   if (pending_repaint_)
     return;
 
   pending_repaint_ = true;
   main_loop_->PostTask(FROM_HERE, base::Bind(
       &WebMediaPlayerImpl::Repaint, AsWeakPtr()));
 }
 
 }  // namespace webkit_media