[DO NOT COMMIT] Initial MediaPlayerRenderer plumbing and basic features

media/base/android/media_player_renderer.h

Index: media/base/android/media_player_renderer.h
diff --git a/media/base/android/media_player_renderer.h b/media/base/android/media_player_renderer.h
new file mode 100644
index 0000000000000000000000000000000000000000..00ab84db3890b5f9c7a7629a1832546c8315e683
--- /dev/null
+++ b/media/base/android/media_player_renderer.h
@@ -0,0 +1,125 @@
+// Copyright 2016 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 MEDIA_BASE_ANDROID_MEDIA_PLAYER_RENDERER_H_
+#define MEDIA_BASE_ANDROID_MEDIA_PLAYER_RENDERER_H_
+
+#include "base/callback.h"
+#include "base/macros.h"
+#include "base/memory/weak_ptr.h"
+#include "content/public/browser/render_frame_host.h"
+#include "media/base/android/media_player_bridge.h"
+#include "media/base/android/media_player_manager.h"
+#include "media/base/media_log.h"
+#include "media/base/renderer.h"
+#include "media/base/renderer_client.h"
+#include "url/gurl.h"
+
+namespace content {
+class WebContents;
+}
+
+namespace media {
+
+class DemuxerStreamProvider;
+class VideoFrame;
+
+// MediaPlayerRenderer wraps a MediaPlayerBridge (itself a wrapper for an
+// Android MediaPlayer). MediaPlayerRenderer adapts the MediaPlayer's API and
+// state, exposing it as the media::Renderer interface instead.
+//
+// MediaPlayerRenderer forwards appropriate callbacks to the given
+// RendererClient.
+//
+// MediaPlayerRenderer also implements MediaPlayerManager, since
+// MediaPlayerBridge is tightly coupled with the abstraction.
+// |player_id| is ignored in all MediaPlayerManager calls, as the
+// MediaPlayerRenderer has a 1:1 mapping with a MediaPlayer.
+// TODO(tguilbert): Once it is safe to remove WMPA code,
+// MediaPlayerRenderer should directly implement the relevant methods
+// called back by MediaPlayerBridge, instead of using the MediaPlayerManager
+// interface. See http://crbug.com/580626
+//
+// N.B: This class is still a work in progress.
+class MEDIA_EXPORT MediaPlayerRenderer : public Renderer,
+                                         public MediaPlayerManager {
+ public:
+  MediaPlayerRenderer(content::RenderFrameHost* render_frame_host);
+
+  virtual ~MediaPlayerRenderer();
+
+  // media::Renderer implementation
+  virtual void Initialize(DemuxerStreamProvider* demuxer_stream_provider,
+                          RendererClient* client,
+                          const PipelineStatusCB& init_cb) override;

[xhwang, 2016/06/22 17:39:02]

nit: drop "virtual" in overrides

+  virtual void SetCdm(CdmContext* cdm_context,
+                      const CdmAttachedCB& cdm_attached_cb) override;
+  virtual void Flush(const base::Closure& flush_cb) override;
+  virtual void StartPlayingFrom(base::TimeDelta time) override;
+  virtual void SetPlaybackRate(double playback_rate) override;
+  virtual void SetVolume(float volume) override;
+  virtual base::TimeDelta GetMediaTime() override;
+  virtual bool HasAudio() override;
+  virtual bool HasVideo() override;
+
+  // media::MediaPlayerManager implementation
+  virtual MediaResourceGetter* GetMediaResourceGetter() override;
+  virtual MediaUrlInterceptor* GetMediaUrlInterceptor() override;
+  virtual void OnTimeUpdate(int player_id,
+                            base::TimeDelta current_timestamp,
+                            base::TimeTicks current_time_ticks) override;
+  virtual void OnMediaMetadataChanged(int player_id,
+                                      base::TimeDelta duration,
+                                      int width,
+                                      int height,
+                                      bool success) override;
+  virtual void OnPlaybackComplete(int player_id) override;
+  virtual void OnMediaInterrupted(int player_id) override;
+  virtual void OnBufferingUpdate(int player_id, int percentage) override;
+  virtual void OnSeekComplete(int player_id,
+                              const base::TimeDelta& current_time) override;
+  virtual void OnError(int player_id, int error) override;
+  virtual void OnVideoSizeChanged(int player_id,
+                                  int width,
+                                  int height) override;
+  virtual void OnWaitingForDecryptionKey(int player_id) override;
+  virtual MediaPlayerAndroid* GetFullscreenPlayer() override;
+  virtual MediaPlayerAndroid* GetPlayer(int player_id) override;
+  virtual bool RequestPlay(int player_id,
+                           base::TimeDelta duration,
+                           bool has_audio) override;
+
+  void SetSurfaceId(int surface_id);
+
+ private:
+  content::RenderFrameHost* render_frame_host_;
+  RendererClient* renderer_client_;
+
+  // ID of the existing SurfaceView that will be used by |media_player_|.
+  int surface_id_;

[liberato (no reviews please), 2016/06/23 21:31:38]

i don't see any calls to SetSurfaceId.  is your plan that WMPI will call it?

also, |surface_id_| is left uninitialized after construction.

+
+  // URL of the media source to be used by |media_player_|.
+  GURL url_;
+
+  std::unique_ptr<MediaPlayerBridge> media_player_;
+
+  // Used when the creating |media_player_|.
+  void OnDecoderResourcesReleased(int player_id);
+
+  scoped_refptr<media::MediaLog> media_log_;
+
+  base::TimeDelta duration_;
+
+  // Object for retrieving resources media players.
+  std::unique_ptr<MediaResourceGetter> media_resource_getter_;
+
+  // NOTE: Weak pointers must be invalidated before all other member variables.
+  base::WeakPtrFactory<MediaPlayerRenderer> weak_factory_;
+
+  DISALLOW_COPY_AND_ASSIGN(MediaPlayerRenderer);
+};
+
+}  // namespace media
+
+#endif  // MEDIA_BASE_ANDROID_MEDIA_PLAYER_RENDERER_H_