Skip to content

Commit 591eb97

Browse files
committed
Re-wire manual audio input
1 parent 917c720 commit 591eb97

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

modules/audio_device/audio_engine_device.mm

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -989,15 +989,16 @@
989989
fine_audio_buffer_.reset(new FineAudioBuffer(audio_device_buffer_.get()));
990990

991991
if (!(this->observer_ != nullptr &&
992-
this->observer_->OnEngineWillConnectOutput(
993-
engine_manual_input_, engine_manual_input_.mainMixerNode, this->OutputNode(),
994-
manual_render_rtc_format_))) {
995-
// Default implementation.
996-
[engine_manual_input_ connect:engine_manual_input_.mainMixerNode
997-
to:this->OutputNode()
998-
format:manual_render_rtc_format_];
992+
this->observer_->OnEngineWillConnectInput(engine_manual_input_, nil,
993+
engine_manual_input_.mainMixerNode,
994+
manual_render_rtc_format_))) {
995+
// No default implementation since device is not used.
999996
}
1000997

998+
[engine_manual_input_ connect:engine_manual_input_.mainMixerNode
999+
to:this->OutputNode()
1000+
format:manual_render_rtc_format_];
1001+
10011002
} else if (state.prev.IsInputEnabled() && !state.next.IsInputEnabled()) {
10021003
LOGI() << "Disabling input for AVAudioEngine...";
10031004
RTC_DCHECK(!engine_manual_input_.running);
@@ -1060,10 +1061,7 @@
10601061
render_thread_ = rtc::Thread::Create();
10611062
render_thread_->SetName("render_thread", nullptr);
10621063
render_thread_->Start();
1063-
render_thread_->PostTask([this] {
1064-
// RTC_DCHECK_RUN_ON(thread_);
1065-
this->StartRenderLoop();
1066-
});
1064+
render_thread_->PostTask([this] { this->StartRenderLoop(); });
10671065
}
10681066

10691067
if (state.prev.IsAnyEnabled() && !state.next.IsAnyEnabled()) {

0 commit comments

Comments
 (0)