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

Unified Diff: media/filters/ffmpeg_demuxer_unittest.cc

Issue 2698713003: Remove enabled/set_enabled from DemuxerStream interface (Closed)
Patch Set: cast_shell build fix Created 3 years, 10 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/filters/ffmpeg_demuxer.cc ('k') | media/mojo/services/mojo_demuxer_stream_adapter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_demuxer_unittest.cc
diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc
index 36ff7e1afae4e3b6fe1ba8c9b65a0a98e18ceb50..25385bfe1e93280859d4c7d79e71d058c8f7dfaf 100644
--- a/media/filters/ffmpeg_demuxer_unittest.cc
+++ b/media/filters/ffmpeg_demuxer_unittest.cc
@@ -534,8 +534,10 @@ TEST_F(FFmpegDemuxerTest, Seeking_PreferredStreamSelection) {
InitializeDemuxerWithTimelineOffset(
base::Time::FromJsTime(kTimelineOffsetMs));
- DemuxerStream* video = GetStream(DemuxerStream::VIDEO);
- DemuxerStream* audio = GetStream(DemuxerStream::AUDIO);
+ FFmpegDemuxerStream* video =
+ static_cast<FFmpegDemuxerStream*>(GetStream(DemuxerStream::VIDEO));
+ FFmpegDemuxerStream* audio =
+ static_cast<FFmpegDemuxerStream*>(GetStream(DemuxerStream::AUDIO));
const base::TimeDelta video_start_time =
base::TimeDelta::FromMicroseconds(400000);
@@ -1493,7 +1495,8 @@ TEST_F(FFmpegDemuxerTest, Seek_FallbackToDisabledVideoStream) {
CreateDemuxer("bear-320x240-video-only.webm");
InitializeDemuxer();
EXPECT_EQ(nullptr, GetStream(DemuxerStream::AUDIO));
- DemuxerStream* vstream = GetStream(DemuxerStream::VIDEO);
+ FFmpegDemuxerStream* vstream =
+ static_cast<FFmpegDemuxerStream*>(GetStream(DemuxerStream::VIDEO));
EXPECT_NE(nullptr, vstream);
EXPECT_EQ(vstream, preferred_seeking_stream(base::TimeDelta()));
@@ -1508,7 +1511,8 @@ TEST_F(FFmpegDemuxerTest, Seek_FallbackToDisabledVideoStream) {
TEST_F(FFmpegDemuxerTest, Seek_FallbackToDisabledAudioStream) {
CreateDemuxer("bear-320x240-audio-only.webm");
InitializeDemuxer();
- DemuxerStream* astream = GetStream(DemuxerStream::AUDIO);
+ FFmpegDemuxerStream* astream =
+ static_cast<FFmpegDemuxerStream*>(GetStream(DemuxerStream::AUDIO));
EXPECT_NE(nullptr, astream);
EXPECT_EQ(nullptr, GetStream(DemuxerStream::VIDEO));
EXPECT_EQ(astream, preferred_seeking_stream(base::TimeDelta()));
« no previous file with comments | « media/filters/ffmpeg_demuxer.cc ('k') | media/mojo/services/mojo_demuxer_stream_adapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698