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

Unified Diff: media/base/android/media_codec_decoder_unittest.cc

Issue 1341883003: Prepare MediaDrmBridge to work with MediaCodecPlayer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bug526755
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_decoder_unittest.cc
diff --git a/media/base/android/media_codec_decoder_unittest.cc b/media/base/android/media_codec_decoder_unittest.cc
index 9d1b7ab8ae38cdc2bef6e5f8a8eedd2228675365..cb525d63ad59da43592e052857399a57c5e35bcf 100644
--- a/media/base/android/media_codec_decoder_unittest.cc
+++ b/media/base/android/media_codec_decoder_unittest.cc
@@ -183,6 +183,7 @@ class MediaCodecDecoderTest : public testing::Test {
void OnStarvation() { is_starved_ = true; }
void OnDecoderDrained() {}
void OnStopDone() { is_stopped_ = true; }
+ void OnKeyRequired() {}
void OnError() { DVLOG(0) << "MediaCodecDecoderTest::" << __FUNCTION__; }
void OnUpdateCurrentTime(base::TimeDelta now_playing,
base::TimeDelta last_buffered,
@@ -275,6 +276,7 @@ void MediaCodecDecoderTest::CreateAudioDecoder() {
base::Bind(&MediaCodecDecoderTest::OnDecoderDrained,
base::Unretained(this)),
base::Bind(&MediaCodecDecoderTest::OnStopDone, base::Unretained(this)),
+ base::Bind(&MediaCodecDecoderTest::OnKeyRequired, base::Unretained(this)),
base::Bind(&MediaCodecDecoderTest::OnError, base::Unretained(this)),
base::Bind(&MediaCodecDecoderTest::OnUpdateCurrentTime,
base::Unretained(this))));
@@ -291,6 +293,7 @@ void MediaCodecDecoderTest::CreateVideoDecoder() {
base::Bind(&MediaCodecDecoderTest::OnDecoderDrained,
base::Unretained(this)),
base::Bind(&MediaCodecDecoderTest::OnStopDone, base::Unretained(this)),
+ base::Bind(&MediaCodecDecoderTest::OnKeyRequired, base::Unretained(this)),
base::Bind(&MediaCodecDecoderTest::OnError, base::Unretained(this)),
base::Bind(&MediaCodecDecoderTest::OnUpdateCurrentTime,
base::Unretained(this)),

Powered by Google App Engine
This is Rietveld 408576698