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

Side by Side 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/filters/chunk_demuxer.h" 5 #include "media/filters/chunk_demuxer.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 #include <algorithm> 9 #include <algorithm>
10 #include <utility> 10 #include <utility>
11 11
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/message_loop/message_loop.h" 14 #include "base/message_loop/message_loop.h"
15 #include "base/run_loop.h" 15 #include "base/run_loop.h"
16 #include "base/strings/string_number_conversions.h" 16 #include "base/strings/string_number_conversions.h"
17 #include "base/strings/string_split.h" 17 #include "base/strings/string_split.h"
18 #include "base/strings/string_util.h" 18 #include "base/strings/string_util.h"
19 #include "base/synchronization/waitable_event.h"
19 #include "media/base/audio_decoder_config.h" 20 #include "media/base/audio_decoder_config.h"
20 #include "media/base/decoder_buffer.h" 21 #include "media/base/decoder_buffer.h"
21 #include "media/base/decrypt_config.h" 22 #include "media/base/decrypt_config.h"
22 #include "media/base/media.h" 23 #include "media/base/media.h"
23 #include "media/base/media_tracks.h" 24 #include "media/base/media_tracks.h"
24 #include "media/base/mock_demuxer_host.h" 25 #include "media/base/mock_demuxer_host.h"
25 #include "media/base/mock_media_log.h" 26 #include "media/base/mock_media_log.h"
26 #include "media/base/test_data_util.h" 27 #include "media/base/test_data_util.h"
27 #include "media/base/test_helpers.h" 28 #include "media/base/test_helpers.h"
28 #include "media/base/timestamp_constants.h" 29 #include "media/base/timestamp_constants.h"
(...skipping 4670 matching lines...) Expand 10 before | Expand all | Expand 10 after
4699 ASSERT_TRUE(AppendData(kSourceId, cluster->data() + video_start, 4700 ASSERT_TRUE(AppendData(kSourceId, cluster->data() + video_start,
4700 cluster->size() - video_start)); 4701 cluster->size() - video_start));
4701 4702
4702 CheckExpectedRanges(DemuxerStream::AUDIO, "{ [30,90) }"); 4703 CheckExpectedRanges(DemuxerStream::AUDIO, "{ [30,90) }");
4703 CheckExpectedRanges(DemuxerStream::VIDEO, "{ [0,91) }"); 4704 CheckExpectedRanges(DemuxerStream::VIDEO, "{ [0,91) }");
4704 CheckExpectedRanges("{ [30,90) }"); 4705 CheckExpectedRanges("{ [30,90) }");
4705 CheckExpectedBuffers(audio_stream, "30K 40K 50K 60K 70K 80K"); 4706 CheckExpectedBuffers(audio_stream, "30K 40K 50K 60K 70K 80K");
4706 CheckExpectedBuffers(video_stream, "71K 81"); 4707 CheckExpectedBuffers(video_stream, "71K 81");
4707 } 4708 }
4708 4709
4710 void OnStreamStatusChanged(base::WaitableEvent* event,
4711 DemuxerStream* stream,
4712 bool enabled,
4713 base::TimeDelta) {
4714 EXPECT_EQ(enabled, stream->enabled());
4715 event->Signal();
4716 }
4717
4718 void CheckStreamStatusNotifications(DemuxerStream* stream) {
4719 base::WaitableEvent event(base::WaitableEvent::ResetPolicy::AUTOMATIC,
4720 base::WaitableEvent::InitialState::NOT_SIGNALED);
4721
4722 ASSERT_TRUE(stream->enabled());
4723 stream->SetStreamStatusChangeCB(base::Bind(&OnStreamStatusChanged,
4724 base::Unretained(&event),
4725 base::Unretained(stream)));
4726
4727 stream->set_enabled(false, base::TimeDelta());
4728 base::RunLoop().RunUntilIdle();
4729 ASSERT_TRUE(event.IsSignaled());
4730
4731 event.Reset();
4732 stream->set_enabled(true, base::TimeDelta());
4733 base::RunLoop().RunUntilIdle();
4734 ASSERT_TRUE(event.IsSignaled());
4735 }
4736
4737 TEST_F(ChunkDemuxerTest, StreamStatusNotifications) {
4738 ASSERT_TRUE(InitDemuxer(HAS_AUDIO | HAS_VIDEO));
4739 DemuxerStream* audio_stream = demuxer_->GetStream(DemuxerStream::AUDIO);
4740 EXPECT_NE(nullptr, audio_stream);
4741 CheckStreamStatusNotifications(audio_stream);
4742 DemuxerStream* video_stream = demuxer_->GetStream(DemuxerStream::VIDEO);
4743 EXPECT_NE(nullptr, video_stream);
4744 CheckStreamStatusNotifications(video_stream);
4745 }
4746
4709 } // namespace media 4747 } // namespace media
OLDNEW
« 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