Implementation of MediaCodecPlayer stage 1

media/base/android/media_player_android.h

 // Copyright (c) 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.
 
 #ifndef MEDIA_BASE_ANDROID_MEDIA_PLAYER_ANDROID_H_
 #define MEDIA_BASE_ANDROID_MEDIA_PLAYER_ANDROID_H_
 
 #include <jni.h>
 #include <string>
 
@@ skipping 65 matching lines @@
   virtual GURL GetUrl();
   virtual GURL GetFirstPartyForCookies();
 
   // Associates the |cdm| with this player.
   virtual void SetCdm(BrowserCdm* cdm);
 
   int player_id() { return player_id_; }
 
   GURL frame_url() { return frame_url_; }
 
+  // Attach/Detaches |listener_| for listening to all the media events. If
+  // |j_media_player| is NULL, |listener_| only listens to the system media
+  // events. Otherwise, it also listens to the events from |j_media_player|.
+  void AttachListener(jobject j_media_player);
+  void DetachListener();
+
  protected:
   MediaPlayerAndroid(int player_id,
                      MediaPlayerManager* manager,
                      const RequestMediaResourcesCB& request_media_resources_cb,
                      const GURL& frame_url);
 
   // TODO(qinmin): Simplify the MediaPlayerListener class to only listen to
   // media interrupt events. And have a separate child class to listen to all
   // the events needed by MediaPlayerBridge. http://crbug.com/422597.
   // MediaPlayerListener callbacks.
   virtual void OnVideoSizeChanged(int width, int height);
   virtual void OnMediaError(int error_type);
   virtual void OnBufferingUpdate(int percent);
   virtual void OnPlaybackComplete();
   virtual void OnMediaInterrupted();
   virtual void OnSeekComplete();
   virtual void OnMediaPrepared();
 
-  // Attach/Detaches |listener_| for listening to all the media events. If
-  // |j_media_player| is NULL, |listener_| only listens to the system media
-  // events. Otherwise, it also listens to the events from |j_media_player|.
-  void AttachListener(jobject j_media_player);
-  void DetachListener();
-
   // When destroying a subclassed object on a non-UI thread
   // it is still required to destroy the |listener_| related stuff
   // on the UI thread.
   void DestroyListenerOnUIThread();
   void SetAudible(bool is_audible);
 
   MediaPlayerManager* manager() { return manager_; }
 
+  base::WeakPtr<MediaPlayerAndroid> WeakPtrForUIThread() {

[qinmin, 2015/05/14 17:54:08]

this shouldn't be inlined, not a simple getter/setter

[Tima Vaisburd, 2015/05/15 00:12:40]

Done.

+    return weak_factory_.GetWeakPtr();
+  }
+
   RequestMediaResourcesCB request_media_resources_cb_;
 
  private:
   friend class MediaPlayerListener;
 
   // Player ID assigned to this player.
   int player_id_;
 
   // Resource manager for all the media players.
   MediaPlayerManager* manager_;
@@ skipping 10 matching lines @@
   // Weak pointer passed to |listener_| for callbacks.
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<MediaPlayerAndroid> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaPlayerAndroid);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_PLAYER_ANDROID_H_