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

Unified Diff: media/base/mock_filters.h

Issue 2837613004: media: Support better decoder switching (Closed)
Patch Set: do not always keep decoder selector Created 3 years, 7 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
« no previous file with comments | « media/base/audio_decoder_config.h ('k') | media/base/mock_filters.cc » ('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 96f07a5b5466b2a282e050fe7c915de7fc9cc37e..f5f13360ed1017676c32538789c50534253f393a 100644
--- a/media/base/mock_filters.h
+++ b/media/base/mock_filters.h
@@ -179,7 +179,7 @@ class MockDemuxerStream : public DemuxerStream {
class MockVideoDecoder : public VideoDecoder {
public:
- MockVideoDecoder();
+ explicit MockVideoDecoder(const std::string& decoder_name = "");
watk 2017/05/04 23:58:36 repeating: You could put the default name here ins
xhwang 2017/05/05 00:07:46 Done.
virtual ~MockVideoDecoder();
// VideoDecoder implementation.
@@ -197,12 +197,13 @@ class MockVideoDecoder : public VideoDecoder {
MOCK_CONST_METHOD0(CanReadWithoutStalling, bool());
private:
+ std::string decoder_name_;
DISALLOW_COPY_AND_ASSIGN(MockVideoDecoder);
};
class MockAudioDecoder : public AudioDecoder {
public:
- MockAudioDecoder();
+ explicit MockAudioDecoder(const std::string& decoder_name = "");
virtual ~MockAudioDecoder();
// AudioDecoder implementation.
@@ -218,6 +219,7 @@ class MockAudioDecoder : public AudioDecoder {
MOCK_METHOD1(Reset, void(const base::Closure&));
private:
+ std::string decoder_name_;
DISALLOW_COPY_AND_ASSIGN(MockAudioDecoder);
};
« no previous file with comments | « media/base/audio_decoder_config.h ('k') | media/base/mock_filters.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698