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

Merge "AudioTrack: Add TunerConfiguration.CONTENT_ID_NONE"

Browse Source
This commit is contained in:
Andy Hung
2021-03-02 20:07:50 +00:00
committed by Gerrit Code Review
parent 391145ab85 6bb7c589b2
commit 1e21d8530b
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4309,9 +4309,10 @@ package android.media {
}
public static class AudioTrack.TunerConfiguration {
ctor @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public AudioTrack.TunerConfiguration(@IntRange(from=1) int, @IntRange(from=1) int);
ctor @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public AudioTrack.TunerConfiguration(@IntRange(from=0) int, @IntRange(from=1) int);
method @IntRange(from=1) @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int getContentId();
method @IntRange(from=1) @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public int getSyncId();
field public static final int CONTENT_ID_NONE = 0; // 0x0
}
public class HwAudioSource {

19
media/java/android/media/AudioTrack.java
View File

@@ -921,13 +921,22 @@ public class AudioTrack extends PlayerBase
private final int mContentId;
private final int mSyncId;
/**
* A special content id for {@link #TunerConfiguration(int, int)}
* indicating audio is delivered
* from an {@code AudioTrack} write, not tunneled from the tuner stack.
*/
public static final int CONTENT_ID_NONE = 0;
/**
* Constructs a TunerConfiguration instance for use in {@link AudioTrack.Builder}
*
* @param contentId selects the audio stream to use.
* The contentId may be obtained from
* {@link android.media.tv.tuner.filter.Filter#getId()}.
* This is always a positive number.
* {@link android.media.tv.tuner.filter.Filter#getId()},
* such obtained id is always a positive number.
* If audio is to be delivered through an {@code AudioTrack} write
* then {@code CONTENT_ID_NONE} may be used.
* @param syncId selects the clock to use for synchronization
* of audio with other streams such as video.
* The syncId may be obtained from
@@ -936,10 +945,10 @@ public class AudioTrack extends PlayerBase
*/
@RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING)
public TunerConfiguration(
@IntRange(from = 1) int contentId, @IntRange(from = 1)int syncId) {
if (contentId < 1) {
@IntRange(from = 0) int contentId, @IntRange(from = 1)int syncId) {
if (contentId < 0) {
throw new IllegalArgumentException(
"contentId " + contentId + " must be positive");
"contentId " + contentId + " must be positive or CONTENT_ID_NONE");
}
if (syncId < 1) {
throw new IllegalArgumentException("syncId " + syncId + " must be positive");