Commit fdd2122d authored by Antonio Gomes's avatar Antonio Gomes Committed by Commit Bot

Change ProcessedLocalAudioSourceTest to operate over MediaStreamComponent

.. instead of WebMediaStreamTrack.

This is part of the effort to reduce the needless use of
public Blink APIs (wrappers) within renderer/modules.

BUG=407136
R=guidou@chromium.org

Change-Id: Ibc60f16f8aab681fab91b5fff9b5c7b004d49607
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2248160
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Reviewed-by: default avatarGuido Urdaneta <guidou@chromium.org>
Cr-Commit-Position: refs/heads/master@{#779839}
parent 25db010d
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
#include "third_party/blink/renderer/platform/mediastream/media_constraints.h" #include "third_party/blink/renderer/platform/mediastream/media_constraints.h"
#include "third_party/blink/renderer/platform/mediastream/media_stream_audio_processor_options.h" #include "third_party/blink/renderer/platform/mediastream/media_stream_audio_processor_options.h"
#include "third_party/blink/renderer/platform/mediastream/media_stream_audio_track.h" #include "third_party/blink/renderer/platform/mediastream/media_stream_audio_track.h"
#include "third_party/blink/renderer/platform/mediastream/media_stream_component.h"
#include "third_party/blink/renderer/platform/mediastream/media_stream_source.h"
using ::testing::_; using ::testing::_;
using ::testing::AtLeast; using ::testing::AtLeast;
...@@ -81,17 +83,16 @@ class ProcessedLocalAudioSourceTest : public testing::Test { ...@@ -81,17 +83,16 @@ class ProcessedLocalAudioSourceTest : public testing::Test {
~ProcessedLocalAudioSourceTest() override {} ~ProcessedLocalAudioSourceTest() override {}
void SetUp() override { void SetUp() override {
blink_audio_source_.Initialize(blink::WebString::FromUTF8("audio_label"), audio_source_ = MakeGarbageCollected<MediaStreamSource>(
WebMediaStreamSource::kTypeAudio, String::FromUTF8("audio_label"), MediaStreamSource::kTypeAudio,
WebString::FromUTF8("audio_track"), String::FromUTF8("audio_track"), false /* remote */);
false /* remote */); audio_component_ = MakeGarbageCollected<MediaStreamComponent>(
blink_audio_track_.Initialize(blink_audio_source_.Id(), audio_source_->Id(), audio_source_);
blink_audio_source_);
} }
void TearDown() override { void TearDown() override {
blink_audio_track_.Reset(); audio_source_ = nullptr;
blink_audio_source_.Reset(); audio_component_ = nullptr;
WebHeap::CollectAllGarbageForTesting(); WebHeap::CollectAllGarbageForTesting();
} }
...@@ -107,8 +108,8 @@ class ProcessedLocalAudioSourceTest : public testing::Test { ...@@ -107,8 +108,8 @@ class ProcessedLocalAudioSourceTest : public testing::Test {
false /* disable_local_echo */, properties, base::DoNothing(), false /* disable_local_echo */, properties, base::DoNothing(),
scheduler::GetSingleThreadTaskRunnerForTesting()); scheduler::GetSingleThreadTaskRunnerForTesting());
source->SetAllowInvalidRenderFrameIdForTesting(true); source->SetAllowInvalidRenderFrameIdForTesting(true);
blink_audio_source_.SetPlatformSource( source->SetOwner(audio_source_.Get());
std::move(source)); // Takes ownership. audio_source_->SetPlatformSource(std::move(source));
} }
void CheckSourceFormatMatches(const media::AudioParameters& params) { void CheckSourceFormatMatches(const media::AudioParameters& params) {
...@@ -129,10 +130,11 @@ class ProcessedLocalAudioSourceTest : public testing::Test { ...@@ -129,10 +130,11 @@ class ProcessedLocalAudioSourceTest : public testing::Test {
} }
MediaStreamAudioSource* audio_source() const { MediaStreamAudioSource* audio_source() const {
return MediaStreamAudioSource::From(blink_audio_source_); return MediaStreamAudioSource::From(
WebMediaStreamSource(audio_source_.Get()));
} }
const WebMediaStreamTrack& blink_audio_track() { return blink_audio_track_; } MediaStreamComponent* audio_track() { return audio_component_; }
MockAudioCapturerSource* mock_audio_capturer_source() { MockAudioCapturerSource* mock_audio_capturer_source() {
return webrtc_audio_device_platform_support_->mock_audio_capturer_source(); return webrtc_audio_device_platform_support_->mock_audio_capturer_source();
...@@ -141,8 +143,8 @@ class ProcessedLocalAudioSourceTest : public testing::Test { ...@@ -141,8 +143,8 @@ class ProcessedLocalAudioSourceTest : public testing::Test {
private: private:
ScopedTestingPlatformSupport<AudioCapturerSourceTestingPlatformSupport> ScopedTestingPlatformSupport<AudioCapturerSourceTestingPlatformSupport>
webrtc_audio_device_platform_support_; webrtc_audio_device_platform_support_;
WebMediaStreamSource blink_audio_source_; Persistent<MediaStreamSource> audio_source_;
WebMediaStreamTrack blink_audio_track_; Persistent<MediaStreamComponent> audio_component_;
}; };
// Tests a basic end-to-end start-up, track+sink connections, audio flow, and // Tests a basic end-to-end start-up, track+sink connections, audio flow, and
...@@ -169,7 +171,7 @@ TEST_F(ProcessedLocalAudioSourceTest, VerifyAudioFlowWithoutAudioProcessing) { ...@@ -169,7 +171,7 @@ TEST_F(ProcessedLocalAudioSourceTest, VerifyAudioFlowWithoutAudioProcessing) {
.WillOnce(Invoke( .WillOnce(Invoke(
capture_source_callback(), capture_source_callback(),
&media::AudioCapturerSource::CaptureCallback::OnCaptureStarted)); &media::AudioCapturerSource::CaptureCallback::OnCaptureStarted));
ASSERT_TRUE(audio_source()->ConnectToTrack(blink_audio_track())); ASSERT_TRUE(audio_source()->ConnectToTrack(audio_track()));
CheckOutputFormatMatches(audio_source()->GetAudioParameters()); CheckOutputFormatMatches(audio_source()->GetAudioParameters());
// Connect a sink to the track. // Connect a sink to the track.
...@@ -177,7 +179,7 @@ TEST_F(ProcessedLocalAudioSourceTest, VerifyAudioFlowWithoutAudioProcessing) { ...@@ -177,7 +179,7 @@ TEST_F(ProcessedLocalAudioSourceTest, VerifyAudioFlowWithoutAudioProcessing) {
new MockMediaStreamAudioSink()); new MockMediaStreamAudioSink());
EXPECT_CALL(*sink, FormatIsSet(_)) EXPECT_CALL(*sink, FormatIsSet(_))
.WillOnce(Invoke(this, &ThisTest::CheckOutputFormatMatches)); .WillOnce(Invoke(this, &ThisTest::CheckOutputFormatMatches));
MediaStreamAudioTrack::From(blink_audio_track())->AddSink(sink.get()); MediaStreamAudioTrack::From(audio_track())->AddSink(sink.get());
// Feed audio data into the ProcessedLocalAudioSource and expect it to reach // Feed audio data into the ProcessedLocalAudioSource and expect it to reach
// the sink. // the sink.
...@@ -196,7 +198,7 @@ TEST_F(ProcessedLocalAudioSourceTest, VerifyAudioFlowWithoutAudioProcessing) { ...@@ -196,7 +198,7 @@ TEST_F(ProcessedLocalAudioSourceTest, VerifyAudioFlowWithoutAudioProcessing) {
// Expect the ProcessedLocalAudioSource to auto-stop the MockCapturerSource // Expect the ProcessedLocalAudioSource to auto-stop the MockCapturerSource
// when the track is stopped. // when the track is stopped.
EXPECT_CALL(*mock_audio_capturer_source(), Stop()); EXPECT_CALL(*mock_audio_capturer_source(), Stop());
MediaStreamAudioTrack::From(blink_audio_track())->Stop(); MediaStreamAudioTrack::From(audio_track())->Stop();
} }
} // namespace blink } // namespace blink
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment