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

Merge "Default compressed audio bytes per sample to 1" am: aa2884ac69 am: ce94c11c87 am: 313ffe6d31

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1444316

Change-Id: I944e555922d1c1acdd2f196cb4e11b532fe8a507
This commit is contained in:
Treehugger Robot
2020-10-15 18:19:27 +00:00
committed by Automerger Merge Worker
parent 9a46d248ed 313ffe6d31
commit 32039640df
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
media/java/android/media/AudioTrack.java
View File

@@ -1263,14 +1263,20 @@ public class AudioTrack extends PlayerBase
// TODO: Check mEncapsulationMode compatibility with MODE_STATIC, etc? // TODO: Check mEncapsulationMode compatibility with MODE_STATIC, etc?
try { // If the buffer size is not specified in streaming mode,
// If the buffer size is not specified in streaming mode, // use a single frame for the buffer size and let the
// use a single frame for the buffer size and let the // native code figure out the minimum buffer size.
// native code figure out the minimum buffer size. if (mMode == MODE_STREAM && mBufferSizeInBytes == 0) {
if (mMode == MODE_STREAM && mBufferSizeInBytes == 0) { int bytesPerSample = 1;
mBufferSizeInBytes = mFormat.getChannelCount() try {
* mFormat.getBytesPerSample(mFormat.getEncoding()); bytesPerSample = mFormat.getBytesPerSample(mFormat.getEncoding());
} catch (IllegalArgumentException e) {
// do nothing
} }
mBufferSizeInBytes = mFormat.getChannelCount() * bytesPerSample;
}
try {
final AudioTrack track = new AudioTrack( final AudioTrack track = new AudioTrack(
mAttributes, mFormat, mBufferSizeInBytes, mMode, mSessionId, mOffload, mAttributes, mFormat, mBufferSizeInBytes, mMode, mSessionId, mOffload,
mEncapsulationMode, mTunerConfiguration); mEncapsulationMode, mTunerConfiguration);