| Index: media/base/android/media_player_android.h
|
| diff --git a/media/base/android/media_player_android.h b/media/base/android/media_player_android.h
|
| index 8928222156bc3078098507ac81452009c0d44185..ad38bfcf7816a16b772b1d4bf36d37ecb1be9be1 100644
|
| --- a/media/base/android/media_player_android.h
|
| +++ b/media/base/android/media_player_android.h
|
| @@ -13,6 +13,7 @@
|
| #include "base/time/time.h"
|
| #include "media/base/android/media_player_listener.h"
|
| #include "media/base/media_export.h"
|
| +#include "ui/gfx/geometry/size.h"
|
| #include "ui/gl/android/scoped_java_surface.h"
|
| #include "url/gurl.h"
|
|
|
| @@ -79,10 +80,24 @@ class MEDIA_EXPORT MediaPlayerAndroid {
|
| // Associates the |cdm| with this player.
|
| virtual void SetCdm(BrowserCdm* cdm);
|
|
|
| + // Overridden in MediaCodecPlayer to pass data between threads.
|
| + virtual void OnMediaMetadataChanged(
|
| + base::TimeDelta duration, const gfx::Size& video_size) {}
|
| +
|
| + // Overridden in MediaCodecPlayer to pass data between threads.
|
| + virtual void OnTimeUpdate(base::TimeDelta current_timestamp,
|
| + base::TimeTicks current_time_ticks) {}
|
| +
|
| 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,
|
| @@ -101,12 +116,6 @@ class MEDIA_EXPORT MediaPlayerAndroid {
|
| 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.
|
| @@ -115,6 +124,8 @@ class MEDIA_EXPORT MediaPlayerAndroid {
|
|
|
| MediaPlayerManager* manager() { return manager_; }
|
|
|
| + base::WeakPtr<MediaPlayerAndroid> WeakPtrForUIThread();
|
| +
|
| RequestMediaResourcesCB request_media_resources_cb_;
|
|
|
| private:
|
|
|