admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove LegacyAudioDeviceModule.java

Browse Source 
LegacyAudioDeviceModule depends on
org.webrtc.voiceengine.WebRtcAudioTrack and
org.webrtc.voiceengine.WebRtcAudioRecord, which were removed in
https://webrtc.googlesource.com/src/+/6fc700ec3d1f86d06e203011aa8f375f32b39d9e.

Including LegacyAudioDeviceModule results in build failures like:
> /builds/worker/checkouts/gecko/third_party/libwebrtc/sdk/android/api/org/webrtc/audio/LegacyAudioDeviceModule.java:13: error: package org.webrtc.voiceengine does not exist
> import org.webrtc.voiceengine.WebRtcAudioRecord;
>                              ^
> /builds/worker/checkouts/gecko/third_party/libwebrtc/sdk/android/api/org/webrtc/audio/LegacyAudioDeviceModule.java:14: error: package org.webrtc.voiceengine does not exist
> import org.webrtc.voiceengine.WebRtcAudioTrack;
>                              ^
> /builds/worker/checkouts/gecko/third_party/libwebrtc/sdk/android/api/org/webrtc/audio/LegacyAudioDeviceModule.java:39: error: non-static method setSpeakerMute(boolean) cannot be referenced from a static context
>     WebRtcAudioTrack.setSpeakerMute(mute);
>                     ^
> /builds/worker/checkouts/gecko/third_party/libwebrtc/sdk/android/api/org/webrtc/audio/LegacyAudioDeviceModule.java:44: error: non-static method setMicrophoneMute(boolean) cannot be referenced from a static context
>     WebRtcAudioRecord.setMicrophoneMute(mute);

Bug: webrtc:7452
Change-Id: Icaa4447ec6dc274d89f827ce4d1cc13c3e9f55ad
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/323880
Reviewed-by: Henrik Andreassson <henrika@webrtc.org>
Commit-Queue: Henrik Andreassson <henrika@webrtc.org>
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40953}
This commit is contained in:
Andreas Pehrson 2023-10-17 13:37:22 +02:00 committed by WebRTC LUCI CQ
parent f1d417eee5
commit 1d835705c9
1 changed files with 0 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
sdk/android/api/org/webrtc/audio/LegacyAudioDeviceModule.java
View File

@ -1,46 +0,0 @@
/*
* Copyright 2018 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
package org.webrtc.audio;
import org.webrtc.voiceengine.WebRtcAudioRecord;
import org.webrtc.voiceengine.WebRtcAudioTrack;
/**
* This class represents the legacy AudioDeviceModule that is currently hardcoded into C++ WebRTC.
* It will return a null native AudioDeviceModule pointer, leading to an internal object being
* created inside WebRTC that is controlled by static calls to the classes under the voiceengine
* package. Please use the new JavaAudioDeviceModule instead of this class.
*/
@Deprecated
public class LegacyAudioDeviceModule implements AudioDeviceModule {
@Override
public long getNativeAudioDeviceModulePointer() {
// Returning a null pointer will make WebRTC construct the built-in legacy AudioDeviceModule for
// Android internally.
return 0;
}
@Override
public void release() {
// All control for this ADM goes through static global methods and the C++ object is owned
// internally by WebRTC.
}
@Override
public void setSpeakerMute(boolean mute) {
WebRtcAudioTrack.setSpeakerMute(mute);
}
@Override
public void setMicrophoneMute(boolean mute) {
WebRtcAudioRecord.setMicrophoneMute(mute);
}
}