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

Unified Diff: media/base/mock_filters.cc

Issue 692323002: Move Liveness from DemuxerStreamProvider to DemuxerStream. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix mojo Created 6 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/mock_filters.h ('k') | media/base/pipeline_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/mock_filters.cc
diff --git a/media/base/mock_filters.cc b/media/base/mock_filters.cc
index 0dc6d4e1fd14db38b3862a30699fb92d223e0fb5..0a66c466b9bcfae3da3953243b6a9ca5b14df4d8 100644
--- a/media/base/mock_filters.cc
+++ b/media/base/mock_filters.cc
@@ -18,14 +18,20 @@ MockDemuxer::MockDemuxer() {}
MockDemuxer::~MockDemuxer() {}
-MockDemuxerStream::MockDemuxerStream(DemuxerStream::Type type) : type_(type) {}
+MockDemuxerStream::MockDemuxerStream(DemuxerStream::Type type)
+ : type_(type), liveness_(LIVENESS_UNKNOWN) {
+}
MockDemuxerStream::~MockDemuxerStream() {}
-DemuxerStream::Type MockDemuxerStream::type() {
+DemuxerStream::Type MockDemuxerStream::type() const {
return type_;
}
+DemuxerStream::Liveness MockDemuxerStream::liveness() const {
+ return liveness_;
+}
+
AudioDecoderConfig MockDemuxerStream::audio_decoder_config() {
DCHECK_EQ(type_, DemuxerStream::AUDIO);
return audio_decoder_config_;
@@ -48,6 +54,10 @@ void MockDemuxerStream::set_video_decoder_config(
video_decoder_config_ = config;
}
+void MockDemuxerStream::set_liveness(DemuxerStream::Liveness liveness) {
+ liveness_ = liveness;
+}
+
VideoRotation MockDemuxerStream::video_rotation() {
return VIDEO_ROTATION_0;
}
« no previous file with comments | « media/base/mock_filters.h ('k') | media/base/pipeline_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698