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

Unified Diff: media/test/pipeline_integration_test.cc

Issue 1812543003: Allow muting/unmuting audio through media track API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@blink-sb-tracks6
Patch Set: rebase Created 4 years, 9 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
Index: media/test/pipeline_integration_test.cc
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc
index ea8cd6e8c0c97eefdad2279f2c2917ed69362621..962bf45eebc02a512ede13b1831c7bdb76b0333d 100644
--- a/media/test/pipeline_integration_test.cc
+++ b/media/test/pipeline_integration_test.cc
@@ -617,7 +617,7 @@ class MockMediaSource {
CHECK_EQ(chunk_demuxer_->AddId(kSourceId, type, codecs), ChunkDemuxer::kOk);
chunk_demuxer_->SetTracksWatcher(
- kSourceId, base::Bind(&MockMediaSource::InitSegmentReceivedWrapper,
+ kSourceId, base::Bind(&MockMediaSource::InitSegmentReceived,
base::Unretained(this)));
AppendData(initial_append_size_);
@@ -634,12 +634,18 @@ class MockMediaSource {
return last_timestamp_offset_;
}
- // A workaround for gtest mocks not allowing moving scoped_ptrs.
- void InitSegmentReceivedWrapper(scoped_ptr<MediaTracks> tracks) {
- InitSegmentReceived(tracks);
+ void InitSegmentReceived(scoped_ptr<MediaTracks> tracks) {
+ CHECK(tracks.get());
+ EXPECT_GT(tracks->tracks().size(), 0u);
+ media_tracks_ = std::move(tracks);
+ CHECK(chunk_demuxer_);
+ static unsigned track_id = 0;
+ for (const auto& track : media_tracks_->tracks()) {
+ chunk_demuxer_->OnTrackIdAssigned(++track_id, track.get());
+ }
}
- MOCK_METHOD1(InitSegmentReceived, void(scoped_ptr<MediaTracks>&));
+ const MediaTracks* GetMediaTracks() const { return media_tracks_.get(); }
private:
scoped_refptr<DecoderBuffer> file_data_;
@@ -648,6 +654,7 @@ class MockMediaSource {
std::string mimetype_;
ChunkDemuxer* chunk_demuxer_;
scoped_ptr<Demuxer> owned_chunk_demuxer_;
+ scoped_ptr<MediaTracks> media_tracks_;
Demuxer::EncryptedMediaInitDataCB encrypted_media_init_data_cb_;
base::TimeDelta last_timestamp_offset_;
};
@@ -693,7 +700,6 @@ class PipelineIntegrationTest : public PipelineIntegrationTestHost {
hashing_enabled_ = test_type & kHashed;
clockless_playback_ = test_type & kClockless;
- EXPECT_CALL(*source, InitSegmentReceived(_)).Times(AtLeast(1));
EXPECT_CALL(*this, OnMetadata(_))
.Times(AtMost(1))
.WillRepeatedly(SaveArg<0>(&metadata_));
@@ -722,12 +728,23 @@ class PipelineIntegrationTest : public PipelineIntegrationTestHost {
base::Unretained(this)));
message_loop_.Run();
EXPECT_EQ(PIPELINE_OK, pipeline_status_);
+ EXPECT_GT(source->GetMediaTracks()->tracks().size(), 0u);
return pipeline_status_;
}
+ void StartHashedPipelineWithMediaSource(MockMediaSource* source) {
+ hashing_enabled_ = true;
+ StartPipelineWithMediaSource(source);
+ }
+
+ void StartHashedClocklessPipelineWithMediaSource(MockMediaSource* source) {
+ hashing_enabled_ = true;
+ clockless_playback_ = true;
+ StartPipelineWithMediaSource(source);
+ }
+
void StartPipelineWithEncryptedMedia(MockMediaSource* source,
FakeEncryptedMedia* encrypted_media) {
- EXPECT_CALL(*source, InitSegmentReceived(_)).Times(AtLeast(1));
EXPECT_CALL(*this, OnMetadata(_))
.Times(AtMost(1))
.WillRepeatedly(SaveArg<0>(&metadata_));
@@ -768,6 +785,7 @@ class PipelineIntegrationTest : public PipelineIntegrationTestHost {
message_loop_.Run();
EXPECT_EQ(PIPELINE_OK, pipeline_status_);
+ EXPECT_GT(source->GetMediaTracks()->tracks().size(), 0u);
}
// Verifies that seeking works properly for ChunkDemuxer when the
@@ -2135,4 +2153,29 @@ TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) {
demuxer_->GetStartTime());
}
+TEST_F(PipelineIntegrationTest, AudioTrackMuteUnmute) {
+ ASSERT_EQ(PIPELINE_OK, Start("bear-320x240.webm"));
+
+ // Start playback and play a little, to ensure demuxer streams are created.
+ Play();
+ ASSERT_TRUE(
+ WaitUntilCurrentTimeIsAfter(base::TimeDelta::FromMilliseconds(500)));
+ Pause();
+
+ const DemuxerStream* demux_stream = demuxer_->GetDemuxerStreamByTrackId(2);
+ EXPECT_NE(demux_stream, nullptr);
+ EXPECT_EQ(demux_stream->type(), DemuxerStream::AUDIO);
+
+ // TODO(servolk): Find a way to verify that audio is really muted/unmuted.
+ // This should mute the audio stream.
+ std::vector<const DemuxerStream*> enabledAudioStreams;
+ pipeline_->OnEnabledAudioStreamsChanged(enabledAudioStreams);
+ // This should unmute the audio stream.
+ enabledAudioStreams.push_back(demux_stream);
+ pipeline_->OnEnabledAudioStreamsChanged(enabledAudioStreams);
+
+ Play();
+ ASSERT_TRUE(WaitUntilOnEnded());
+}
+
} // namespace media

Powered by Google App Engine
This is Rietveld 408576698