Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

RTCAudioDevice missing delegate and RTCPeerConnectionFactory misses initialisation with audioDevice #94

Closed
wants to merge 1 commit into from
Closed

RTCAudioDevice missing delegate and RTCPeerConnectionFactory misses initialisation with audioDevice #94

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,18 +265,19 @@ - (instancetype)initWithNativeAudioEncoderFactory:
dependencies.task_queue_factory =
webrtc::CreateDefaultTaskQueueFactory(dependencies.trials.get());
cricket::MediaEngineDependencies media_deps;

// always create ADM on worker thread
_nativeAudioDeviceModule = _workerThread->BlockingCall([&dependencies, &bypassVoiceProcessing]() {
return webrtc::AudioDeviceModule::Create(webrtc::AudioDeviceModule::AudioLayer::kPlatformDefaultAudio,
dependencies.task_queue_factory.get(),
bypassVoiceProcessing == YES);
});

_audioDeviceModule = [[RTCAudioDeviceModule alloc] initWithNativeModule: _nativeAudioDeviceModule
if (bypassVoiceProcessing) {
// always create ADM on worker thread
_nativeAudioDeviceModule = _workerThread->BlockingCall([&dependencies, &bypassVoiceProcessing]() {
return webrtc::AudioDeviceModule::Create(webrtc::AudioDeviceModule::AudioLayer::kPlatformDefaultAudio,
dependencies.task_queue_factory.get(),
bypassVoiceProcessing == YES);
});
_audioDeviceModule = [[RTCAudioDeviceModule alloc] initWithNativeModule: _nativeAudioDeviceModule
workerThread: _workerThread.get()];

media_deps.adm = _nativeAudioDeviceModule;
media_deps.adm = _nativeAudioDeviceModule;
} else {
media_deps.adm = std::move(audioDeviceModule);
}
media_deps.task_queue_factory = dependencies.task_queue_factory.get();
media_deps.audio_encoder_factory = std::move(audioEncoderFactory);
media_deps.audio_decoder_factory = std::move(audioDecoderFactory);
Expand Down