Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Dynamic Audio Buffer (1/3)" am: 75da9f9f27 am: 6b3d9261b0" into rvc-qpr-dev-plus-aosp

Browse Source
This commit is contained in:
Automerger Merge Worker
2021-01-21 18:56:42 +00:00
committed by Android (Google) Code Review
parent 617e4570cb d313320f6b
commit d01a6469d9
4 changed files with 340 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/api/system-current.txt
View File

@@ -1413,8 +1413,14 @@ package android.app.usage {
package android.bluetooth {
public final class BluetoothA2dp implements android.bluetooth.BluetoothProfile {
method @Nullable @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public android.bluetooth.BufferConstraints getBufferConstraints();
method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public int getConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice);
method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public int getDynamicBufferSupport();
method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setBufferMillis(int, int);
method @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public boolean setConnectionPolicy(@NonNull android.bluetooth.BluetoothDevice, int);
field public static final int DYNAMIC_BUFFER_SUPPORT_A2DP_OFFLOAD = 1; // 0x1
field public static final int DYNAMIC_BUFFER_SUPPORT_A2DP_SOFTWARE_ENCODING = 2; // 0x2
field public static final int DYNAMIC_BUFFER_SUPPORT_NONE = 0; // 0x0
field public static final int OPTIONAL_CODECS_NOT_SUPPORTED = 0; // 0x0
field public static final int OPTIONAL_CODECS_PREF_DISABLED = 0; // 0x0
field public static final int OPTIONAL_CODECS_PREF_ENABLED = 1; // 0x1
@@ -1596,6 +1602,25 @@ package android.bluetooth {
field public static final int UUID_BYTES_32_BIT = 4; // 0x4
}
public final class BufferConstraint implements android.os.Parcelable {
ctor public BufferConstraint(int, int, int);
method public int describeContents();
method public int getDefaultMillis();
method public int getMaxMillis();
method public int getMinMillis();
method public void writeToParcel(@NonNull android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.BufferConstraint> CREATOR;
}
public final class BufferConstraints implements android.os.Parcelable {
ctor public BufferConstraints(@NonNull java.util.List<android.bluetooth.BufferConstraint>);
method public int describeContents();
method @Nullable public android.bluetooth.BufferConstraint getCodec(int);
method public void writeToParcel(@NonNull android.os.Parcel, int);
field public static final int BUFFER_CODEC_MAX_NUM = 32; // 0x20
field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.BufferConstraints> CREATOR;
}
}
package android.bluetooth.le {

114
core/java/android/bluetooth/BluetoothA2dp.java
View File

@@ -225,6 +225,39 @@ public final class BluetoothA2dp implements BluetoothProfile {
@SystemApi
public static final int OPTIONAL_CODECS_PREF_ENABLED = 1;
/** @hide */
@IntDef(prefix = "DYNAMIC_BUFFER_SUPPORT_", value = {
DYNAMIC_BUFFER_SUPPORT_NONE,
DYNAMIC_BUFFER_SUPPORT_A2DP_OFFLOAD,
DYNAMIC_BUFFER_SUPPORT_A2DP_SOFTWARE_ENCODING
})
@Retention(RetentionPolicy.SOURCE)
public @interface Type {}
/**
* Indicates the supported type of Dynamic Audio Buffer is not supported.
*
* @hide
*/
@SystemApi
public static final int DYNAMIC_BUFFER_SUPPORT_NONE = 0;
/**
* Indicates the supported type of Dynamic Audio Buffer is A2DP offload.
*
* @hide
*/
@SystemApi
public static final int DYNAMIC_BUFFER_SUPPORT_A2DP_OFFLOAD = 1;
/**
* Indicates the supported type of Dynamic Audio Buffer is A2DP software encoding.
*
* @hide
*/
@SystemApi
public static final int DYNAMIC_BUFFER_SUPPORT_A2DP_SOFTWARE_ENCODING = 2;
private BluetoothAdapter mAdapter;
private final BluetoothProfileConnector<IBluetoothA2dp> mProfileConnector =
new BluetoothProfileConnector(this, BluetoothProfile.A2DP, "BluetoothA2dp",
@@ -844,6 +877,87 @@ public final class BluetoothA2dp implements BluetoothProfile {
}
}
/**
* Get the supported type of the Dynamic Audio Buffer.
* <p>Possible return values are
* {@link #DYNAMIC_BUFFER_SUPPORT_NONE},
* {@link #DYNAMIC_BUFFER_SUPPORT_A2DP_OFFLOAD},
* {@link #DYNAMIC_BUFFER_SUPPORT_A2DP_SOFTWARE_ENCODING}.
*
* @return supported type of Dynamic Audio Buffer feature
*
* @hide
*/
@SystemApi
@RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)
public @Type int getDynamicBufferSupport() {
if (VDBG) log("getDynamicBufferSupport()");
try {
final IBluetoothA2dp service = getService();
if (service != null && isEnabled()) {
return service.getDynamicBufferSupport();
}
if (service == null) Log.w(TAG, "Proxy not attached to service");
return DYNAMIC_BUFFER_SUPPORT_NONE;
} catch (RemoteException e) {
Log.e(TAG, "failed to get getDynamicBufferSupport, error: ", e);
return DYNAMIC_BUFFER_SUPPORT_NONE;
}
}
/**
* Return the record of {@link BufferConstraints} object that
* has the default/maximum/minimum audio buffer. This can be used to inform what the controller
* has support for the audio buffer.
*
* @return a record with {@link BufferConstraints} or null if report is unavailable
* or unsupported
*
* @hide
*/
@SystemApi
@RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)
public @Nullable BufferConstraints getBufferConstraints() {
if (VDBG) log("getBufferConstraints()");
try {
final IBluetoothA2dp service = getService();
if (service != null && isEnabled()) {
return service.getBufferConstraints();
}
if (service == null) Log.w(TAG, "Proxy not attached to service");
return null;
} catch (RemoteException e) {
Log.e(TAG, "", e);
return null;
}
}
/**
* Set Dynamic Audio Buffer Size.
*
* @param codec audio codec
* @param value buffer millis
* @return true to indicate success, or false on immediate error
*
* @hide
*/
@SystemApi
@RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)
public boolean setBufferMillis(@BluetoothCodecConfig.SourceCodecType int codec, int value) {
if (VDBG) log("setBufferMillis(" + codec + ", " + value + ")");
try {
final IBluetoothA2dp service = getService();
if (service != null && isEnabled()) {
return service.setBufferMillis(codec, value);
}
if (service == null) Log.w(TAG, "Proxy not attached to service");
return false;
} catch (RemoteException e) {
Log.e(TAG, "", e);
return false;
}
}
/**
* Helper for converting a state to a string.
*

105
core/java/android/bluetooth/BufferConstraint.java Normal file
View File

@@ -0,0 +1,105 @@
/*
* Copyright (C) 2020 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.bluetooth;
import android.annotation.NonNull;
import android.annotation.SystemApi;
import android.os.Parcel;
import android.os.Parcelable;
/**
* Stores a codec's constraints on buffering length in milliseconds.
*
* {@hide}
*/
@SystemApi
public final class BufferConstraint implements Parcelable {
private static final String TAG = "BufferConstraint";
private int mDefaultMillis;
private int mMaxMillis;
private int mMinMillis;
public BufferConstraint(int defaultMillis, int maxMillis,
int minMillis) {
mDefaultMillis = defaultMillis;
mMaxMillis = maxMillis;
mMinMillis = minMillis;
}
BufferConstraint(Parcel in) {
mDefaultMillis = in.readInt();
mMaxMillis = in.readInt();
mMinMillis = in.readInt();
}
public static final @NonNull Parcelable.Creator<BufferConstraint> CREATOR =
new Parcelable.Creator<BufferConstraint>() {
public BufferConstraint createFromParcel(Parcel in) {
return new BufferConstraint(in);
}
public BufferConstraint[] newArray(int size) {
return new BufferConstraint[size];
}
};
@Override
public void writeToParcel(@NonNull Parcel out, int flags) {
out.writeInt(mDefaultMillis);
out.writeInt(mMaxMillis);
out.writeInt(mMinMillis);
}
@Override
public int describeContents() {
return 0;
}
/**
* Get the default buffer millis
*
* @return default buffer millis
* @hide
*/
@SystemApi
public int getDefaultMillis() {
return mDefaultMillis;
}
/**
* Get the maximum buffer millis
*
* @return maximum buffer millis
* @hide
*/
@SystemApi
public int getMaxMillis() {
return mMaxMillis;
}
/**
* Get the minimum buffer millis
*
* @return minimum buffer millis
* @hide
*/
@SystemApi
public int getMinMillis() {
return mMinMillis;
}
}

96
core/java/android/bluetooth/BufferConstraints.java Normal file
View File

@@ -0,0 +1,96 @@
/*
* Copyright (C) 2020 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.bluetooth;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.os.Parcel;
import android.os.Parcelable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* A parcelable collection of buffer constraints by codec type.
*
* {@hide}
*/
@SystemApi
public final class BufferConstraints implements Parcelable {
public static final int BUFFER_CODEC_MAX_NUM = 32;
private static final String TAG = "BufferConstraints";
private Map<Integer, BufferConstraint> mBufferConstraints;
private List<BufferConstraint> mBufferConstraintList;
public BufferConstraints(@NonNull List<BufferConstraint>
bufferConstraintList) {
mBufferConstraintList = new ArrayList<BufferConstraint>(bufferConstraintList);
mBufferConstraints = new HashMap<Integer, BufferConstraint>();
for (int i = 0; i < BUFFER_CODEC_MAX_NUM; i++) {
mBufferConstraints.put(i, bufferConstraintList.get(i));
}
}
BufferConstraints(Parcel in) {
mBufferConstraintList = new ArrayList<BufferConstraint>();
mBufferConstraints = new HashMap<Integer, BufferConstraint>();
in.readList(mBufferConstraintList, BufferConstraint.class.getClassLoader());
for (int i = 0; i < mBufferConstraintList.size(); i++) {
mBufferConstraints.put(i, mBufferConstraintList.get(i));
}
}
public static final @NonNull Parcelable.Creator<BufferConstraints> CREATOR =
new Parcelable.Creator<BufferConstraints>() {
public BufferConstraints createFromParcel(Parcel in) {
return new BufferConstraints(in);
}
public BufferConstraints[] newArray(int size) {
return new BufferConstraints[size];
}
};
@Override
public void writeToParcel(@NonNull Parcel out, int flags) {
out.writeList(mBufferConstraintList);
}
@Override
public int describeContents() {
return 0;
}
/**
* Get the buffer constraints by codec type.
*
* @param codec Audio codec
* @return buffer constraints by codec type.
* @hide
*/
@SystemApi
public @Nullable BufferConstraint getCodec(@BluetoothCodecConfig.SourceCodecType int codec) {
return mBufferConstraints.get(codec);
}
}