Implement WebRTC in Chrome for TV

webkit/media/android/webmediaplayer_android.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.
 
 #ifndef WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
 #define WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
 
 #include <jni.h>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/time.h"
-#if defined(GOOGLE_TV)
-#include "media/base/demuxer_stream.h"
-#endif
 #include "cc/layers/video_frame_provider.h"
+#include "media/base/android/media_player_bridge.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h"
 #include "ui/gfx/rect_f.h"
 #include "webkit/media/android/stream_texture_factory_android.h"
 
+#if defined(GOOGLE_TV)
+#include "webkit/media/android/media_source_delegate.h"
+#endif
+
 namespace media {
+class Demuxer;
 class MediaLog;
 }
 
 namespace WebKit {
 class WebFrame;
 }
 
 namespace webkit {
 class WebLayerImpl;
 }
 
 namespace webkit_media {
 
 #if defined(GOOGLE_TV)
-class MediaSourceDelegate;
+class MediaStreamAudioRenderer;
 #endif
+class MediaStreamClient;
 class WebMediaPlayerManagerAndroid;
 class WebMediaPlayerProxyAndroid;
 
 // This class implements WebKit::WebMediaPlayer by keeping the android
 // media player in the browser process. It listens to all the status changes
 // sent from the browser process and sends playback controls to the media
 // player.
 class WebMediaPlayerAndroid
     : public WebKit::WebMediaPlayer,
       public cc::VideoFrameProvider,
@@ skipping 145 matching lines @@
       unsigned key_length,
       const unsigned char* init_data,
       unsigned init_data_length,
       const WebKit::WebString& session_id) OVERRIDE;
   virtual MediaKeyException cancelKeyRequest(
       const WebKit::WebString& key_system,
       const WebKit::WebString& session_id) OVERRIDE;
 
   // Called when DemuxerStreamPlayer needs to read data from ChunkDemuxer.
   void OnReadFromDemuxer(media::DemuxerStream::Type type, bool seek_done);
+
+  bool InjectMediaStream(MediaStreamClient* media_stream_client,
+                         media::Demuxer* demuxer,
+                         const base::Closure& destroy_demuxer_cb);
 #endif
 
  protected:
   // Helper method to update the playing state.
   void UpdatePlayingState(bool is_playing_);
 
   // Helper methods for posting task for setting states and update WebKit.
   void UpdateNetworkState(WebKit::WebMediaPlayer::NetworkState state);
   void UpdateReadyState(WebKit::WebMediaPlayer::ReadyState state);
 
   // Helper method to reestablish the surface texture peer for android
   // media player.
   void EstablishSurfaceTexturePeer();
 
   // Requesting whether the surface texture peer needs to be reestablished.
   void SetNeedsEstablishPeer(bool needs_establish_peer);
 
+  void InitializeMediaPlayer(
+      const WebKit::WebURL& url,
+      media::MediaPlayerAndroid::SourceType media_source_type);

[acolwell GONE FROM CHROMIUM, 2013/05/20 21:23:22]

nit:s/media_// here and everywhere else SourceType is used

[wonsik, 2013/05/21 10:09:29]

Done.

+
 #if defined(GOOGLE_TV)
   // Request external surface for out-of-band composition.
   void RequestExternalSurface();
 #endif
 
  private:
   void ReallocateVideoFrame();
 
   WebKit::WebFrame* const frame_;
 
@@ skipping 65 matching lines @@
   // not NULL while the compositor is actively using this webmediaplayer.
   cc::VideoFrameProvider::Client* video_frame_provider_client_;
 
   scoped_ptr<webkit::WebLayerImpl> video_weblayer_;
 
 #if defined(GOOGLE_TV)
   // A rectangle represents the geometry of video frame, when computed last
   // time.
   gfx::RectF last_computed_rect_;
 
+  // Media Source / Media Stream related fields.
   scoped_ptr<MediaSourceDelegate> media_source_delegate_;
+  media::Demuxer* demuxer_;
+  base::Closure destroy_demuxer_cb_;
 #endif
 
   // Proxy object that delegates method calls on Render Thread.
   // This object is created on the Render Thread and is only called in the
   // destructor.
   WebMediaPlayerProxyAndroid* proxy_;
 
   // The current playing time. Because the media player is in the browser
   // process, it will regularly update the |current_time_| by calling
   // OnTimeUpdate().
   float current_time_;
 
   media::MediaLog* media_log_;
+  MediaStreamClient* media_stream_client_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_