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

am ff09c60d: am ba5fd177: Merge "Tunneled Video Playback: Fixed missing AudioHwSync for provided Audio session ID" into lmp-dev

Browse Source 
* commit 'ff09c60d4da75eb12c6b01968ee661bc5e16a75c':
  Tunneled Video Playback: Fixed missing AudioHwSync for provided Audio session ID
This commit is contained in:
Rachad
2014-08-30 18:42:16 +00:00
committed by Android Git Automerger
parent 56ec676209 2875858533
commit 350fe32550
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -557,12 +557,15 @@ final public class MediaCodec {
int i = 0;
for (Map.Entry<String, Object> entry: formatMap.entrySet()) {
if (entry.getKey().equals(MediaFormat.KEY_AUDIO_SESSION_ID)) {
// TODO: Wire up as soon as AudioService is ready. Check entry.getValue() for
// non-integral type.
// long audioHwSync = audioService.getAudioHwSyncForSession(entry.getValue());
long audioHwSync = 0;
int sessionId = 0;
try {
sessionId = (Integer)entry.getValue();
}
catch (Exception e) {
throw new IllegalArgumentException("Wrong Session ID Parameter!");
}
keys[i] = "audio-hw-sync";
values[i] = audioHwSync;
values[i] = AudioSystem.getAudioHwSyncForSession(sessionId);
} else {
keys[i] = entry.getKey();
values[i] = entry.getValue();