Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(767)

Unified Diff: media/base/android/media_codec_player.h

Issue 1372203002: Throttle media decoding after excessive Android media server crashes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/base/android/media_codec_player.h
diff --git a/media/base/android/media_codec_player.h b/media/base/android/media_codec_player.h
index edc17da00145944f6d1c3204423ddbebb5f6b9a2..042559fdc3e0790813b8acf5dd58bc78416652d9 100644
--- a/media/base/android/media_codec_player.h
+++ b/media/base/android/media_codec_player.h
@@ -167,11 +167,12 @@ class MEDIA_EXPORT MediaCodecPlayer : public MediaPlayerAndroid,
// Constructs a player with the given ID and demuxer. |manager| must outlive
// the lifetime of this object.
- MediaCodecPlayer(int player_id,
- base::WeakPtr<MediaPlayerManager> manager,
- const RequestMediaResourcesCB& request_media_resources_cb,
- scoped_ptr<DemuxerAndroid> demuxer,
- const GURL& frame_url);
+ MediaCodecPlayer(
+ int player_id,
+ base::WeakPtr<MediaPlayerManager> manager,
+ const OnPlayerReleasedCB& on_player_released_cb,
+ scoped_ptr<DemuxerAndroid> demuxer,
+ const GURL& frame_url);
~MediaCodecPlayer() override;
// A helper method that performs the media thread part of initialization.
@@ -264,7 +265,6 @@ class MEDIA_EXPORT MediaCodecPlayer : public MediaPlayerAndroid,
bool postpone);
// Callbacks from video decoder
- void OnVideoCodecCreated();
void OnVideoResolutionChanged(const gfx::Size& size);
// Operations called from the state machine.
@@ -310,7 +310,6 @@ class MEDIA_EXPORT MediaCodecPlayer : public MediaPlayerAndroid,
PlayerState state_;
// Notification callbacks, they call MediaPlayerManager.
- base::Closure request_resources_cb_;
TimeUpdateCallback time_update_cb_;
base::Closure completion_cb_;
SeekDoneCallback seek_done_cb_;

Powered by Google App Engine
This is Rietveld 408576698