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

Unified Diff: media/base/mock_filters.h

Issue 1447533006: media: Pass SetCdmReadyCB in {Audio|Video}Decoder::Initialize(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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
« no previous file with comments | « media/base/audio_decoder.h ('k') | media/base/video_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/mock_filters.h
diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h
index 5fb2a3e9e6c60775772fef061f6023682f1e1ad6..c55843055a24d1209d3f9b2db75d74c6bb558055 100644
--- a/media/base/mock_filters.h
+++ b/media/base/mock_filters.h
@@ -86,9 +86,10 @@ class MockVideoDecoder : public VideoDecoder {
// VideoDecoder implementation.
virtual std::string GetDisplayName() const;
- MOCK_METHOD4(Initialize,
+ MOCK_METHOD5(Initialize,
void(const VideoDecoderConfig& config,
bool low_delay,
+ const SetCdmReadyCB& set_cdm_ready_cb,
const InitCB& init_cb,
const OutputCB& output_cb));
MOCK_METHOD2(Decode, void(const scoped_refptr<DecoderBuffer>& buffer,
@@ -107,8 +108,9 @@ class MockAudioDecoder : public AudioDecoder {
// AudioDecoder implementation.
virtual std::string GetDisplayName() const;
- MOCK_METHOD3(Initialize,
+ MOCK_METHOD4(Initialize,
void(const AudioDecoderConfig& config,
+ const SetCdmReadyCB& set_cdm_ready_cb,
const InitCB& init_cb,
const OutputCB& output_cb));
MOCK_METHOD2(Decode,
« no previous file with comments | « media/base/audio_decoder.h ('k') | media/base/video_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698