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 am: 2dd3576872 am: 0abd962e42

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

Change-Id: Ic60a0a502de6297278e253547321d782026564c5
This commit is contained in:
Henry Fang
2021-03-31 00:39:42 +00:00
committed by Automerger Merge Worker
parent 68a6b1a97b 0abd962e42
commit 96529876e7
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

@@ -4499,14 +4499,25 @@ final public class MediaCodec {
int i = 0;
for (final String key: params.keySet()) {
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);
if (key.equals(MediaFormat.KEY_AUDIO_SESSION_ID)) {
int sessionId = 0;
try {
sessionId = (Integer)params.get(key);
} catch (Exception e) {
throw new IllegalArgumentException("Wrong Session ID Parameter!");
}
keys[i] = "audio-hw-sync";
values[i] = AudioSystem.getAudioHwSyncForSession(sessionId);
} 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;
}