Reland "Reland "Delete old Android ADM.""
This reverts commit 38a28603fd7b2eec46a362105b225dd6f08b4137. Reason for revert: Attempt to reland, now that WebRTC dependency cycle has been broken. Original change's description: > Revert "Reland "Delete old Android ADM."" > > This reverts commit 6e4d7e606c4327eaa9298193e22794fcb9b30218. > > Reason for revert: Still breaks downstream build (though in a different way this time) > > Original change's description: > > Reland "Delete old Android ADM." > > > > This is a reland of commit 4ec3e9c98873520b3171d40ab0426b2f05edbbd2 > > > > Original change's description: > > > Delete old Android ADM. > > > > > > The schedule move Android ADM code to sdk directory have been around > > > for several years, but the old code still not delete. > > > > > > Bug: webrtc:7452 > > > Change-Id: I0f75c680f71f0b2ce614de6cbd9f124c2a59d453 > > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/264620 > > > Reviewed-by: Magnus Jedvert <magjed@webrtc.org> > > > Commit-Queue: Henrik Andreassson <henrika@webrtc.org> > > > Reviewed-by: Henrik Andreassson <henrika@webrtc.org> > > > Cr-Commit-Position: refs/heads/main@{#37174} > > > > Bug: webrtc:7452 > > Change-Id: Icabad23e72c8258a854b7809a93811161517266c > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/265872 > > Reviewed-by: Henrik Andreassson <henrika@webrtc.org> > > Commit-Queue: Björn Terelius <terelius@webrtc.org> > > Cr-Commit-Position: refs/heads/main@{#37236} > > Bug: webrtc:7452 > Change-Id: Ide8fbd55fadd7aed9989053afff7c63c04f1320f > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/266023 > Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> > Commit-Queue: Björn Terelius <terelius@webrtc.org> > Owners-Override: Björn Terelius <terelius@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#37242} Bug: webrtc:7452 Change-Id: I6946d0fc28cf4c08387e451e6a07765f7410ce7c Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/266980 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Reviewed-by: Henrik Andreassson <henrika@webrtc.org> Commit-Queue: Björn Terelius <terelius@webrtc.org> Cr-Commit-Position: refs/heads/main@{#37356}
This commit is contained in:
committed by
WebRTC LUCI CQ
parent
a2476e3783
commit
db30009304
@ -0,0 +1,20 @@
|
||||
/*
|
||||
* Copyright (c) 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;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
public class ApplicationContextProvider {
|
||||
@CalledByNative
|
||||
public static Context getApplicationContext() {
|
||||
return ContextUtils.getApplicationContext();
|
||||
}
|
||||
}
|
||||
@ -55,11 +55,13 @@ class WebRtcAudioManager {
|
||||
: getMinInputFrameSize(sampleRate, numberOfInputChannels);
|
||||
}
|
||||
|
||||
private static boolean isLowLatencyOutputSupported(Context context) {
|
||||
@CalledByNative
|
||||
static boolean isLowLatencyOutputSupported(Context context) {
|
||||
return context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUDIO_LOW_LATENCY);
|
||||
}
|
||||
|
||||
private static boolean isLowLatencyInputSupported(Context context) {
|
||||
@CalledByNative
|
||||
static boolean isLowLatencyInputSupported(Context context) {
|
||||
// TODO(henrika): investigate if some sort of device list is needed here
|
||||
// as well. The NDK doc states that: "As of API level 21, lower latency
|
||||
// audio input is supported on select devices. To take advantage of this
|
||||
|
||||
@ -633,6 +633,14 @@ void GetAudioParameters(JNIEnv* env,
|
||||
RTC_CHECK(output_parameters->is_valid());
|
||||
}
|
||||
|
||||
bool IsLowLatencyInputSupported(JNIEnv* env, const JavaRef<jobject>& j_context) {
|
||||
return Java_WebRtcAudioManager_isLowLatencyInputSupported(env, j_context);
|
||||
}
|
||||
|
||||
bool IsLowLatencyOutputSupported(JNIEnv* env, const JavaRef<jobject>& j_context) {
|
||||
return Java_WebRtcAudioManager_isLowLatencyOutputSupported(env, j_context);
|
||||
}
|
||||
|
||||
rtc::scoped_refptr<AudioDeviceModule> CreateAudioDeviceModuleFromInputAndOutput(
|
||||
AudioDeviceModule::AudioLayer audio_layer,
|
||||
bool is_stereo_playout_supported,
|
||||
|
||||
@ -86,6 +86,10 @@ void GetAudioParameters(JNIEnv* env,
|
||||
AudioParameters* input_parameters,
|
||||
AudioParameters* output_parameters);
|
||||
|
||||
bool IsLowLatencyInputSupported(JNIEnv* env, const JavaRef<jobject>& j_context);
|
||||
|
||||
bool IsLowLatencyOutputSupported(JNIEnv* env, const JavaRef<jobject>& j_context);
|
||||
|
||||
// Glue together an audio input and audio output to get an AudioDeviceModule.
|
||||
rtc::scoped_refptr<AudioDeviceModule> CreateAudioDeviceModuleFromInputAndOutput(
|
||||
AudioDeviceModule::AudioLayer audio_layer,
|
||||
|
||||
Reference in New Issue
Block a user