Render inband text tracks in the media pipeline

content/renderer/media/webmediaplayer_impl.h

 // 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.
 
 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player.
 // It contains Pipeline which is the actual media player pipeline, it glues
 // the media player pipeline, data source, audio renderer and renderer.
 // Pipeline would creates multiple threads and access some public methods
 // of this class, so we need to be extra careful about concurrent access of
 // methods and members.
 //
 // Other issues:
 // During tear down of the whole browser or a tab, the DOM tree may not be
 // destructed nicely, and there will be some dangling media threads trying to
 // the main thread, so we need this class to listen to destruction event of the
 // main thread and cleanup the media threads when the even is received. Also
 // at destruction of this class we will need to unhook it from destruction event
 // list of the main thread.
 
 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
 
+#include <map>

[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 <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread.h"
 #include "cc/layers/video_frame_provider.h"
 #include "content/renderer/media/crypto/proxy_decryptor.h"
@@ skipping 15 matching lines @@
 namespace WebKit {
 class WebFrame;
 }
 
 namespace base {
 class MessageLoopProxy;
 }
 
 namespace media {
 class ChunkDemuxer;
-class FFmpegDemuxer;
+class DemuxerStream;
 class GpuVideoAcceleratorFactories;
 class MediaLog;
+class TextCue;

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

nit: Not needed

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

Done.

 }
 
 namespace webkit {
 class WebLayerImpl;
 }
 
 namespace content {
 class BufferedDataSource;
 class WebAudioSourceProviderImpl;
 class WebMediaPlayerDelegate;
@@ skipping 119 matching lines @@
   void OnKeyAdded(const std::string& session_id);
   void OnKeyError(const std::string& session_id,
                   media::MediaKeys::KeyError error_code,
                   int system_code);
   void OnKeyMessage(const std::string& session_id,
                     const std::vector<uint8>& message,
                     const std::string& default_url);
   void OnNeedKey(const std::string& type,
                  const std::string& session_id,
                  const std::vector<uint8>& init_data);
+  // TODO(matthewjheaney): Once we're satisfied that we have the threading model
+  // correct for handling text cues, move the media source from OnTextTrack over
+  // to AddTextStream.

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

I'd like this fixed in this CL. Now that OnAddTextStream provides a TextTrack, I
think this should be pretty straight forward.

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

I modified the chunk demuxer and friends to handle the new schema.  I'm a little
fuzzy still about sources and source ids (you obviously know the Media Source
API way better than I do), so there's a bit of chunk demuxer stream cleanup that
needs to be added, but otherwise it's working.

   scoped_ptr<media::TextTrack> OnTextTrack(media::TextKind kind,
                                            const std::string& label,
                                            const std::string& language);
+
+  void OnAddTextStream(media::DemuxerStream*,
+                       media::TextKind kind,
+                       const std::string& label,
+                       const std::string& language,
+                       const media::AddTextTrackDoneCB& done_cb);
+
   void SetOpaque(bool);
 
  private:
   // Called after |defer_load_cb_| has decided to allow the load. If
   // |defer_load_cb_| is null this is called immediately.
   void DoLoad(LoadType load_type,
               const WebKit::WebURL& url,
               CORSMode cors_mode);
 
   // Called after asynchronous initialization of a data source completed.
@@ skipping 153 matching lines @@
 
   // Text track objects get a unique index value when they're created.
   int text_track_index_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_