diff options
| author | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-20 05:40:11 +0000 |
|---|---|---|
| committer | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-20 05:40:11 +0000 |
| commit | c1b61abe9cfb2fd8d4ea632ae7bb3b7461dd3c46 (patch) | |
| tree | 0c19227d8ce4690ed747503e5f9213a3417e8e79 /content/browser/android/media_player_manager_impl.h | |
| parent | f94283f099229c2fdf9960c50848d3ec9e36039e (diff) | |
| download | chromium_src-c1b61abe9cfb2fd8d4ea632ae7bb3b7461dd3c46.zip chromium_src-c1b61abe9cfb2fd8d4ea632ae7bb3b7461dd3c46.tar.gz chromium_src-c1b61abe9cfb2fd8d4ea632ae7bb3b7461dd3c46.tar.bz2 | |
Add MSE implementation on android
Here are the changes included in this CL:
1. Adds a MediaSourcePlayer for android to play media source extensions. Only embedded mode are working currently.
2. Rewrite the MediaCodecBridge code in java. The current MediaCodecBridge code is not very suitable for exception handling. Also, this refactoring adds support for audio playback.
BUG=233420
Review URL: https://chromiumcodereview.appspot.com/15113002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201031 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/android/media_player_manager_impl.h')
| -rw-r--r-- | content/browser/android/media_player_manager_impl.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/content/browser/android/media_player_manager_impl.h b/content/browser/android/media_player_manager_impl.h index 8eefbee..7c07679 100644 --- a/content/browser/android/media_player_manager_impl.h +++ b/content/browser/android/media_player_manager_impl.h @@ -14,9 +14,7 @@ #include "content/browser/android/content_video_view.h" #include "content/public/browser/render_view_host_observer.h" #include "googleurl/src/gurl.h" -#if defined(GOOGLE_TV) #include "media/base/android/demuxer_stream_player_params.h" -#endif #include "media/base/android/media_player_android.h" #include "media/base/android/media_player_manager.h" #include "ui/gfx/rect_f.h" @@ -65,12 +63,10 @@ class MediaPlayerManagerImpl virtual void OnError(int player_id, int error) OVERRIDE; virtual void OnVideoSizeChanged( int player_id, int width, int height) OVERRIDE; -#if defined(GOOGLE_TV) virtual void OnReadFromDemuxer( int player_id, media::DemuxerStream::Type type, bool seek_done) OVERRIDE; -#endif virtual void RequestMediaResources( media::MediaPlayerAndroid* player) OVERRIDE; virtual void ReleaseMediaResources( @@ -100,15 +96,16 @@ class MediaPlayerManagerImpl void OnPause(int player_id); void OnReleaseResources(int player_id); void OnDestroyPlayer(int player_id); -#if defined(GOOGLE_TV) - void OnNotifyExternalSurface( - int player_id, bool is_request, const gfx::RectF& rect); void OnDemuxerReady( int player_id, const media::MediaPlayerHostMsg_DemuxerReady_Params& params); void OnReadFromDemuxerAck( int player_id, const media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params); + +#if defined(GOOGLE_TV) + void OnNotifyExternalSurface( + int player_id, bool is_request, const gfx::RectF& rect); #endif // An array of managed players. |