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

Unified Diff: media/filters/chunk_demuxer_unittest.cc

Issue 2199913002: Notify demux stream clients when a stream is disabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Don't pass DemuxerStream into the status callback Created 4 years, 4 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/chunk_demuxer.cc ('k') | media/filters/decrypting_demuxer_stream.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/chunk_demuxer_unittest.cc
diff --git a/media/filters/chunk_demuxer_unittest.cc b/media/filters/chunk_demuxer_unittest.cc
index 419c6cd542bca3d83cc8ce17897dbe32c465f184..0d7c9a1c0d04b668ef4789ac40576f72dcad1290 100644
--- a/media/filters/chunk_demuxer_unittest.cc
+++ b/media/filters/chunk_demuxer_unittest.cc
@@ -16,6 +16,7 @@
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
+#include "base/synchronization/waitable_event.h"
#include "media/base/audio_decoder_config.h"
#include "media/base/decoder_buffer.h"
#include "media/base/decrypt_config.h"
@@ -4706,4 +4707,41 @@ TEST_F(ChunkDemuxerTest,
CheckExpectedBuffers(video_stream, "71K 81");
}
+void OnStreamStatusChanged(base::WaitableEvent* event,
+ DemuxerStream* stream,
+ bool enabled,
+ base::TimeDelta) {
+ EXPECT_EQ(enabled, stream->enabled());
+ event->Signal();
+}
+
+void CheckStreamStatusNotifications(DemuxerStream* stream) {
+ base::WaitableEvent event(base::WaitableEvent::ResetPolicy::AUTOMATIC,
+ base::WaitableEvent::InitialState::NOT_SIGNALED);
+
+ ASSERT_TRUE(stream->enabled());
+ stream->SetStreamStatusChangeCB(base::Bind(&OnStreamStatusChanged,
+ base::Unretained(&event),
+ base::Unretained(stream)));
+
+ stream->set_enabled(false, base::TimeDelta());
+ base::RunLoop().RunUntilIdle();
+ ASSERT_TRUE(event.IsSignaled());
+
+ event.Reset();
+ stream->set_enabled(true, base::TimeDelta());
+ base::RunLoop().RunUntilIdle();
+ ASSERT_TRUE(event.IsSignaled());
+}
+
+TEST_F(ChunkDemuxerTest, StreamStatusNotifications) {
+ ASSERT_TRUE(InitDemuxer(HAS_AUDIO | HAS_VIDEO));
+ DemuxerStream* audio_stream = demuxer_->GetStream(DemuxerStream::AUDIO);
+ EXPECT_NE(nullptr, audio_stream);
+ CheckStreamStatusNotifications(audio_stream);
+ DemuxerStream* video_stream = demuxer_->GetStream(DemuxerStream::VIDEO);
+ EXPECT_NE(nullptr, video_stream);
+ CheckStreamStatusNotifications(video_stream);
+}
+
} // namespace media
« no previous file with comments | « media/filters/chunk_demuxer.cc ('k') | media/filters/decrypting_demuxer_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698