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

Merge "support changing audio-hw-sync-id during playback." am: 507764f6a8

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

Change-Id: Ib2e72344a56be5393527f882514468982273ad8d
This commit is contained in:
Henry Fang
2021-03-30 23:29:51 +00:00
committed by Automerger Merge Worker
parent 01f78374ee 507764f6a8
commit 2dd3576872
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
media/java/android/media/MediaCodec.java
View File

@@ -4412,14 +4412,25 @@ final public class MediaCodec {
int i = 0; int i = 0;
for (final String key: params.keySet()) { for (final String key: params.keySet()) {
keys[i] = key; if (key.equals(MediaFormat.KEY_AUDIO_SESSION_ID)) {
Object value = params.get(key); int sessionId = 0;
try {
// Bundle's byte array is a byte[], JNI layer only takes ByteBuffer sessionId = (Integer)params.get(key);
if (value instanceof byte[]) { } catch (Exception e) {
values[i] = ByteBuffer.wrap((byte[])value); throw new IllegalArgumentException("Wrong Session ID Parameter!");
}
keys[i] = "audio-hw-sync";
values[i] = AudioSystem.getAudioHwSyncForSession(sessionId);
} else { } else {
values[i] = value; keys[i] = key;
Object value = params.get(key);
// Bundle's byte array is a byte[], JNI layer only takes ByteBuffer
if (value instanceof byte[]) {
values[i] = ByteBuffer.wrap((byte[])value);
} else {
values[i] = value;
}
} }
++i; ++i;
} }