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

Merge "Add TvInputManager.Hardware overrideAudioSink with AudioDeviceInfo" am: 764afbbae0

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

Change-Id: I1110c02b5944d58503bef8e959a42e49c5d7f164
This commit is contained in:
Henry Fang
2022-01-14 02:17:39 +00:00
committed by Automerger Merge Worker
parent 17d16a9f73 764afbbae0
commit f1cec5bb49
2 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/system-current.txt
View File

@@ -5881,6 +5881,7 @@ package android.media.tv {
public static final class TvInputManager.Hardware {
method public void overrideAudioSink(int, String, int, int, int);
method public void overrideAudioSink(@NonNull android.media.AudioDeviceInfo, @IntRange(from=0) int, int, int);
method public void setStreamVolume(float);
method public boolean setSurface(android.view.Surface, android.media.tv.TvStreamConfig);
}

36
media/java/android/media/tv/TvInputManager.java
View File

@@ -18,6 +18,7 @@ package android.media.tv;
import android.annotation.CallbackExecutor;
import android.annotation.IntDef;
import android.annotation.IntRange;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.RequiresPermission;
@@ -27,6 +28,8 @@ import android.annotation.TestApi;
import android.content.Context;
import android.content.Intent;
import android.graphics.Rect;
import android.media.AudioDeviceInfo;
import android.media.AudioFormat.Encoding;
import android.media.PlaybackParams;
import android.net.Uri;
import android.os.Binder;
@@ -59,6 +62,7 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.Executor;
/**
@@ -2998,6 +3002,16 @@ public final class TvInputManager {
return false;
}
/**
* Override default audio sink from audio policy.
*
* @param audioType device type of the audio sink to override with.
* @param audioAddress device address of the audio sink to override with.
* @param samplingRate desired sampling rate. Use default when it's 0.
* @param channelMask desired channel mask. Use default when it's
* AudioFormat.CHANNEL_OUT_DEFAULT.
* @param format desired format. Use default when it's AudioFormat.ENCODING_DEFAULT.
*/
public void overrideAudioSink(int audioType, String audioAddress, int samplingRate,
int channelMask, int format) {
try {
@@ -3007,5 +3021,27 @@ public final class TvInputManager {
throw new RuntimeException(e);
}
}
/**
* Override default audio sink from audio policy.
*
* @param device {@link android.media.AudioDeviceInfo} to use.
* @param samplingRate desired sampling rate. Use default when it's 0.
* @param channelMask desired channel mask. Use default when it's
* AudioFormat.CHANNEL_OUT_DEFAULT.
* @param format desired format. Use default when it's AudioFormat.ENCODING_DEFAULT.
*/
public void overrideAudioSink(@NonNull AudioDeviceInfo device,
@IntRange(from = 0) int samplingRate,
int channelMask, @Encoding int format) {
Objects.requireNonNull(device);
try {
mInterface.overrideAudioSink(
AudioDeviceInfo.convertDeviceTypeToInternalDevice(device.getType()),
device.getAddress(), samplingRate, channelMask, format);
} catch (RemoteException e) {
throw new RuntimeException(e);
}
}
}
}