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

Merge "Audio presentation: Docs & Testability fixes" into pi-dev

Browse Source 
am: 397962981c

Change-Id: I6088df15fd85afd633f1111a7eb675bcd7c9ad95
This commit is contained in:
Mikhail Naganov
2018-03-22 16:43:54 +00:00
committed by android-build-merger
parent c0b6f1db3e 397962981c
commit 0056af933e
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
media/java/android/media/AudioPresentation.java
View File

@@ -17,6 +17,9 @@
package android.media;
import android.annotation.IntDef;
import android.annotation.NonNull;
import com.android.internal.annotations.VisibleForTesting;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -88,10 +91,14 @@ public final class AudioPresentation {
*/
public static final int MASTERED_FOR_HEADPHONE = 4;
AudioPresentation(int presentationId,
/**
* @hide
*/
@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
public AudioPresentation(int presentationId,
int programId,
Map<String, String> labels,
String language,
@NonNull Map<String, String> labels,
@NonNull String language,
@MasteringIndicationType int masteringIndication,
boolean audioDescriptionAvailable,
boolean spokenSubtitlesAvailable,
@@ -112,6 +119,7 @@ public final class AudioPresentation {
* decoder. Presentation id is typically sequential, but does not have to be.
* @hide
*/
@VisibleForTesting
public int getPresentationId() {
return mPresentationId;
}
@@ -121,13 +129,14 @@ public final class AudioPresentation {
* Program id can be used to further uniquely identify the presentation to a decoder.
* @hide
*/
@VisibleForTesting
public int getProgramId() {
return mProgramId;
}
/**
* @return a map of available text labels for this presentation. Each label is indexed by its
* locale corresponding to the language code as specified by ISO 639-2 [42]. Either ISO 639-2/B
* locale corresponding to the language code as specified by ISO 639-2. Either ISO 639-2/B
* or ISO 639-2/T could be used.
*/
public Map<Locale, String> getLabels() {

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

@@ -2012,9 +2012,10 @@ public class AudioTrack extends PlayerBase
* If the audio presentation is invalid then {@link #ERROR_BAD_VALUE} will be returned.
* If a multi-stream decoder (MSD) is not present, or the format does not support
* multiple presentations, then {@link #ERROR_INVALID_OPERATION} will be returned.
* {@link #ERROR} is returned in case of any other error.
* @param presentation see {@link AudioPresentation}. In particular, id should be set.
* @return error code or success, see {@link #SUCCESS}, {@link #ERROR_BAD_VALUE},
* {@link #ERROR_INVALID_OPERATION}
* @return error code or success, see {@link #SUCCESS}, {@link #ERROR},
* {@link #ERROR_BAD_VALUE}, {@link #ERROR_INVALID_OPERATION}
* @throws IllegalArgumentException if the audio presentation is null.
* @throws IllegalStateException if track is not initialized.
*/