Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0764ef7 authored by Henry Fang's avatar Henry Fang Committed by Automerger Merge Worker
Browse files

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

Merge "support changing audio-hw-sync-id during playback." am: 507764f6 am: 2dd35768 am: 0abd962e am: 96529876

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

Change-Id: I00820ad7b2bdd8402e44a4062e10bd9eff2ec52d
parents 041b6c76 96529876

media/java/android/media/MediaCodec.java

+18 −7
Original line number Diff line number Diff line
@@ -4497,6 +4497,16 @@ final public class MediaCodec { 


        int i = 0;

        for (final String key: params.keySet()) {

            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 {

                keys[i] = key;

                Object value = params.get(key);
@@ -4506,6 +4516,7 @@ final public class MediaCodec { 
                } else {

                    values[i] = value;

                }

            }

            ++i;

        }