Media Source dispatches inband text tracks

webkit/media/webmediaplayer_impl.h

 // 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.
 
 // 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.
@@ skipping 13 matching lines @@
 
 #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 "googleurl/src/gurl.h"
 #include "media/base/audio_renderer_sink.h"
 #include "media/base/decryptor.h"
 #include "media/base/pipeline.h"
+#include "media/base/text_track.h"
 #include "media/filters/gpu_video_decoder.h"
 #include "media/filters/skcanvas_video_renderer.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAudioSourceProvider.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.h"
 #include "webkit/media/crypto/key_systems.h"
 #include "webkit/media/crypto/proxy_decryptor.h"
 
 class RenderAudioSourceProvider;
 
 namespace WebKit {
 class WebFrame;
 }
 
 namespace base {
 class MessageLoopProxy;
 }
 
 namespace media {
 class ChunkDemuxer;
 class FFmpegDemuxer;
 class MediaLog;
+class TextTrack;
 }
 
 namespace webkit {
 class WebLayerImpl;
 }
 
 namespace webkit_media {
 
 class BufferedDataSource;
 class MediaStreamClient;
 class WebAudioSourceProviderImpl;
 class WebMediaPlayerDelegate;
 class WebMediaPlayerParams;
+class WebTextTrackImpl;
 
 class WebMediaPlayerImpl
     : public WebKit::WebMediaPlayer,
       public cc::VideoFrameProvider,
       public base::MessageLoop::DestructionObserver,
       public base::SupportsWeakPtr<WebMediaPlayerImpl> {
  public:
   // Constructs a WebMediaPlayer implementation using Chromium's media stack.
   //
   // |delegate| may be null.
@@ skipping 121 matching lines @@
                   int system_code);
   void OnKeyMessage(const std::string& key_system,
                     const std::string& session_id,
                     const std::string& message,
                     const std::string& default_url);
   void OnNeedKey(const std::string& key_system,
                  const std::string& type,
                  const std::string& session_id,
                  scoped_ptr<uint8[]> init_data,
                  int init_data_size);
+
+  // TODO(matthewjheaney): need ruling about this return type
+  media::TextTrack* OnTextTrack(media::TextKind kind,

[acolwell GONE FROM CHROMIUM, 2013/05/10 02:22:08]

scoped_ptr<TextTrack>

[Matthew Heaney (Chromium), 2013/05/10 05:21:08]

Done.

+                                const std::string& label,
+                                const std::string& language);
   void SetOpaque(bool);
 
  private:
   // Contains common logic used across the different types loading.
   void LoadSetup(const WebKit::WebURL& url);
 
   // Called after asynchronous initialization of a data source completed.
   void DataSourceInitialized(const GURL& gurl, bool success);
 
   // Called when the data source is downloading or paused.
@@ skipping 140 matching lines @@
   bool pending_size_change_;
 
   // The compositor layer for displaying the video content when using composited
   // playback.
   scoped_ptr<webkit::WebLayerImpl> video_weblayer_;
 
   // A pointer back to the compositor to inform it about state changes. This is
   // not NULL while the compositor is actively using this webmediaplayer.
   cc::VideoFrameProvider::Client* video_frame_provider_client_;
 
+  // TODO(matthewjheaney): must resolve ptr type, and lifetime issues
+  //std::set<WebTextTrackImpl*> text_tracks_;
+  int text_track_index_;
+
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_