Render inband text tracks in the media pipeline

content/renderer/media/webmediaplayer_impl.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 "content/renderer/media/webmediaplayer_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <string>
 #include <vector>
@@ skipping 19 matching lines @@
 #include "content/renderer/media/webmediasource_impl.h"
 #include "content/renderer/pepper/pepper_webplugin_impl.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "media/audio/null_audio_sink.h"
 #include "media/base/bind_to_loop.h"
 #include "media/base/filter_collection.h"
 #include "media/base/limits.h"
 #include "media/base/media_log.h"
 #include "media/base/media_switches.h"
 #include "media/base/pipeline.h"
+#include "media/base/text_cue.h"

[acolwell GONE FROM CHROMIUM, 2013/10/08 15:45:24]

nit: no longer needed.

[Matthew Heaney (Chromium), 2013/10/13 05:30:17]

Done.

+#include "media/base/text_renderer.h"
 #include "media/base/video_frame.h"
 #include "media/filters/audio_renderer_impl.h"
 #include "media/filters/chunk_demuxer.h"
 #include "media/filters/ffmpeg_audio_decoder.h"
 #include "media/filters/ffmpeg_demuxer.h"
 #include "media/filters/ffmpeg_video_decoder.h"
 #include "media/filters/gpu_video_accelerator_factories.h"
 #include "media/filters/gpu_video_decoder.h"
 #include "media/filters/opus_audio_decoder.h"
+#include "media/filters/text_decoder_impl.h"
 #include "media/filters/video_renderer_base.h"
 #include "media/filters/vpx_video_decoder.h"
 #include "third_party/WebKit/public/platform/WebMediaSource.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 #include "third_party/WebKit/public/web/WebView.h"
@@ skipping 882 matching lines @@
   GetClient()->keyNeeded(WebString(),
                          WebString::fromUTF8(session_id),
                          init_data_ptr,
                          init_data.size());
 }
 
 scoped_ptr<media::TextTrack>
 WebMediaPlayerImpl::OnTextTrack(media::TextKind kind,
                                 const std::string& label,
                                 const std::string& language) {
+  DCHECK(main_loop_->BelongsToCurrentThread());
+
   typedef WebInbandTextTrackImpl::Kind webkind_t;
   const webkind_t webkind = static_cast<webkind_t>(kind);
   const WebKit::WebString weblabel = WebKit::WebString::fromUTF8(label);
   const WebKit::WebString weblanguage = WebKit::WebString::fromUTF8(language);
 
   WebInbandTextTrackImpl* const text_track =
     new WebInbandTextTrackImpl(webkind, weblabel, weblanguage,
                                text_track_index_++);
 
-  return scoped_ptr<media::TextTrack>(new TextTrackImpl(GetClient(),
+  return scoped_ptr<media::TextTrack>(new TextTrackImpl(main_loop_,
+                                                        GetClient(),
                                                         text_track));
 }
 
+void WebMediaPlayerImpl::OnAddTextStream(
+    media::DemuxerStream* text_stream,
+    media::TextKind kind,
+    const std::string& label,
+    const std::string& language,
+    const media::AddTextTrackDoneCB& done_cb) {
+  DCHECK(main_loop_->BelongsToCurrentThread());
+  scoped_ptr<media::TextTrack> text_track = OnTextTrack(kind, label, language);
+  done_cb.Run(text_stream, text_track.Pass());

[acolwell GONE FROM CHROMIUM, 2013/10/08 15:45:24]

WebMediaPlayerImpl should not need to know about DemuxerStream. If you need it
in lower layers, just use base::Bind to bind the value when creating done_cb.

[Matthew Heaney (Chromium), 2013/10/13 05:30:17]

Done.

+}
+
 void WebMediaPlayerImpl::OnKeyError(const std::string& session_id,
                                     media::MediaKeys::KeyError error_code,
                                     int system_code) {
   DCHECK(main_loop_->BelongsToCurrentThread());
 
   EmeUMAHistogramEnumeration(current_key_system_, "KeyError",
                              error_code, media::MediaKeys::kMaxKeyError);
 
   GetClient()->keyError(
       current_key_system_,
@@ skipping 48 matching lines @@
 }
 
 void WebMediaPlayerImpl::StartPipeline() {
   const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
   bool increase_preroll_on_underflow = true;
 
   // Keep track if this is a MSE or non-MSE playback.
   UMA_HISTOGRAM_BOOLEAN("Media.MSE.Playback",
                         (load_type_ == LoadTypeMediaSource));
 
+  const bool enable_inband_text_tracks =
+      cmd_line->HasSwitch(switches::kEnableInbandTextTracks);
+
   // Figure out which demuxer to use.
   if (load_type_ != LoadTypeMediaSource) {
     DCHECK(!chunk_demuxer_);
     DCHECK(data_source_);
 
     demuxer_.reset(new media::FFmpegDemuxer(
         media_loop_, data_source_.get(),
         BIND_TO_RENDER_LOOP_1(&WebMediaPlayerImpl::OnNeedKey, ""),
+        enable_inband_text_tracks,
         media_log_));
   } else {
     DCHECK(!chunk_demuxer_);
     DCHECK(!data_source_);
 
+    // TODO(matthewjheaney): Once we have resolved the threading issues,
+    // change the chunk demuxer to user the same mechanism as for ffmpeg.

[acolwell GONE FROM CHROMIUM, 2013/10/08 15:45:24]

nit: s/user/use/.

[Matthew Heaney (Chromium), 2013/10/13 05:30:17]

Done.

     media::AddTextTrackCB add_text_track_cb;
 
-    if (cmd_line->HasSwitch(switches::kEnableInbandTextTracks)) {
+    if (enable_inband_text_tracks) {
       add_text_track_cb =
           base::Bind(&WebMediaPlayerImpl::OnTextTrack, base::Unretained(this));
     }
 
     chunk_demuxer_ = new media::ChunkDemuxer(
         BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnDemuxerOpened),
         BIND_TO_RENDER_LOOP_1(&WebMediaPlayerImpl::OnNeedKey, ""),
         add_text_track_cb,
         base::Bind(&LogMediaSourceError, media_log_));
     demuxer_.reset(chunk_demuxer_);
@@ skipping 57 matching lines @@
   scoped_ptr<media::VideoRenderer> video_renderer(
       new media::VideoRendererBase(
           media_loop_,
           video_decoders.Pass(),
           set_decryptor_ready_cb,
           base::Bind(&WebMediaPlayerImpl::FrameReady, base::Unretained(this)),
           BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::SetOpaque),
           true));
   filter_collection->SetVideoRenderer(video_renderer.Pass());
 
+  if (load_type_ != LoadTypeMediaSource && enable_inband_text_tracks) {
+    scoped_ptr<media::TextDecoder> text_decoder(
+        new media::TextDecoderImpl(media_loop_));

[acolwell GONE FROM CHROMIUM, 2013/10/08 15:45:24]

Move this into the TextRenderer constructor since there is no need for this
class to be aware of its existence.

[Matthew Heaney (Chromium), 2013/10/13 05:30:17]

Done.

+
+    media::AddTextTrackCB2 add_text_track_cb =
+        BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnAddTextStream);
+
+    scoped_ptr<media::TextRenderer> text_renderer(
+        new media::TextRenderer(
+            media_loop_,
+            text_decoder.Pass(),
+            add_text_track_cb));
+
+    filter_collection->SetTextRenderer(text_renderer.Pass());
+  }
+
   // ... and we're ready to go!
   starting_ = true;
   pipeline_->Start(
       filter_collection.Pass(),
       BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineEnded),
       BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineError),
       BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineSeek),
       BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineBufferingState),
       BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnDurationChange));
 }
@@ skipping 103 matching lines @@
 
   if (pending_repaint_)
     return;
 
   pending_repaint_ = true;
   main_loop_->PostTask(FROM_HERE, base::Bind(
       &WebMediaPlayerImpl::Repaint, AsWeakPtr()));
 }
 
 }  // namespace content