diff options
| author | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-14 02:01:52 +0000 |
|---|---|---|
| committer | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-14 02:01:52 +0000 |
| commit | 085c042cb2466d7e2032bc03439f98aaa3daf579 (patch) | |
| tree | 6c8e9192282de397289bfeb7e23de26b7e848827 /media/base/android/media_source_player.h | |
| parent | 746f647cbdc7776ad599aa09affbc58810542dbc (diff) | |
| download | chromium_src-085c042cb2466d7e2032bc03439f98aaa3daf579.zip chromium_src-085c042cb2466d7e2032bc03439f98aaa3daf579.tar.gz chromium_src-085c042cb2466d7e2032bc03439f98aaa3daf579.tar.bz2 | |
Revert 206267 "This change adds VideoDecoderJob::Create() and Au..."
> This change adds VideoDecoderJob::Create() and AudioDecoderJob::Create() so that the decoder jobs can be NULL if we cannot configure it correctly.
> It solves a problem that we may pass an invalid surface to the MediaCodec instance during the shut down phase. In this case, the Configure() will return false and we should not use the codec anymore.
>
> BUG=248726
> R=acolwell@chromium.org, dwkang@chromium.org, wolenetz@chromium.org
>
> Review URL: https://codereview.chromium.org/16093045
TBR=qinmin@chromium.org
Review URL: https://codereview.chromium.org/17038003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206273 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/android/media_source_player.h')
| -rw-r--r-- | media/base/android/media_source_player.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/media/base/android/media_source_player.h b/media/base/android/media_source_player.h index 743a9e9..836482c 100644 --- a/media/base/android/media_source_player.h +++ b/media/base/android/media_source_player.h @@ -69,9 +69,7 @@ class MediaDecoderJob { void OnDecodeCompleted(); protected: - MediaDecoderJob(base::Thread* thread, - MediaCodecBridge* media_codec_bridge, - bool is_audio); + MediaDecoderJob(base::Thread* thread, bool is_audio); // Release the output buffer and render it. void ReleaseOutputBuffer( @@ -259,7 +257,6 @@ class MEDIA_EXPORT MediaSourcePlayer : public MediaPlayerAndroid { // Weak pointer passed to media decoder jobs for callbacks. base::WeakPtrFactory<MediaSourcePlayer> weak_this_; - friend class MediaSourcePlayerTest; DISALLOW_COPY_AND_ASSIGN(MediaSourcePlayer); }; |