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

Unified Diff: chromecast/media/cma/filters/demuxer_stream_adapter_unittest.cc

Issue 741863002: Chromecast: adds a media pipeline feeding data to CMA device backends. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cma-cdm
Patch Set: address nits, merge Pause/Flush 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 | « chromecast/media/cma/base/buffering_defs.cc ('k') | chromecast/media/cma/pipeline/audio_pipeline.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromecast/media/cma/filters/demuxer_stream_adapter_unittest.cc
diff --git a/chromecast/media/cma/filters/demuxer_stream_adapter_unittest.cc b/chromecast/media/cma/filters/demuxer_stream_adapter_unittest.cc
index bee63eb4d452f852da9ccf16c8b83b7ab7057e66..d0573abd75f18a6d20c5f1a922a9fae54ebfed4f 100644
--- a/chromecast/media/cma/filters/demuxer_stream_adapter_unittest.cc
+++ b/chromecast/media/cma/filters/demuxer_stream_adapter_unittest.cc
@@ -44,12 +44,12 @@ class DummyDemuxerStream : public ::media::DemuxerStream {
virtual ~DummyDemuxerStream();
// ::media::DemuxerStream implementation.
- virtual void Read(const ReadCB& read_cb) override;
- virtual ::media::AudioDecoderConfig audio_decoder_config() override;
- virtual ::media::VideoDecoderConfig video_decoder_config() override;
- virtual Type type() override;
- virtual bool SupportsConfigChanges() override;
- virtual ::media::VideoRotation video_rotation() override;
+ void Read(const ReadCB& read_cb) override;
+ ::media::AudioDecoderConfig audio_decoder_config() override;
+ ::media::VideoDecoderConfig video_decoder_config() override;
+ Type type() const override;
+ bool SupportsConfigChanges() override;
+ ::media::VideoRotation video_rotation() override;
bool has_pending_read() const {
return has_pending_read_;
@@ -127,7 +127,7 @@ void DummyDemuxerStream::Read(const ReadCB& read_cb) {
false);
}
-::media::DemuxerStream::Type DummyDemuxerStream::type() {
+::media::DemuxerStream::Type DummyDemuxerStream::type() const {
return VIDEO;
}
« no previous file with comments | « chromecast/media/cma/base/buffering_defs.cc ('k') | chromecast/media/cma/pipeline/audio_pipeline.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698