drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Report AC-4 decoder profile and level" am: e091cebf12

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

Change-Id: I5cbf9727a4a6eec89970b2309129e9fe26733cc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Andy Hung 2023-02-16 03:09:04 +00:00 committed by Automerger Merge Worker
commit 452cd4a7e9
2 changed files with 81 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/api/current.txt
View File

@ -21527,6 +21527,16 @@ package android.media {
field public static final int AACObjectSSR = 3; // 0x3
field public static final int AACObjectScalable = 6; // 0x6
field public static final int AACObjectXHE = 42; // 0x2a
field public static final int AC4Level0 = 1; // 0x1
field public static final int AC4Level1 = 2; // 0x2
field public static final int AC4Level2 = 4; // 0x4
field public static final int AC4Level3 = 8; // 0x8
field public static final int AC4Level4 = 16; // 0x10
field public static final int AC4Profile00 = 257; // 0x101
field public static final int AC4Profile10 = 513; // 0x201
field public static final int AC4Profile11 = 514; // 0x202
field public static final int AC4Profile21 = 1026; // 0x402
field public static final int AC4Profile22 = 1028; // 0x404
field public static final int AV1Level2 = 1; // 0x1
field public static final int AV1Level21 = 2; // 0x2
field public static final int AV1Level22 = 4; // 0x4

71
media/java/android/media/MediaCodecInfo.java
View File

@ -4182,6 +4182,77 @@ public final class MediaCodecInfo {
@SuppressLint("AllUpper")
public static final int DTS_UHDProfileP2 = 0x2;
// Profiles and levels for AC-4 Codec, corresponding to the definitions in
// "The MIME codecs parameter", Annex E.13
// found at https://www.etsi.org/deliver/etsi_ts/103100_103199/10319002/01.02.01_60/ts_10319002v010201p.pdf
// profile = ((1 << bitstream_version) << 8) | (1 << presentation_version);
// level = 1 << mdcompat;
@SuppressLint("AllUpper")
private static final int AC4BitstreamVersion0 = 0x01;
@SuppressLint("AllUpper")
private static final int AC4BitstreamVersion1 = 0x02;
@SuppressLint("AllUpper")
private static final int AC4BitstreamVersion2 = 0x04;
@SuppressLint("AllUpper")
private static final int AC4PresentationVersion0 = 0x01;
@SuppressLint("AllUpper")
private static final int AC4PresentationVersion1 = 0x02;
@SuppressLint("AllUpper")
private static final int AC4PresentationVersion2 = 0x04;
/**
* AC-4 codec profile with bitstream_version 0 and presentation_version 0
* as per ETSI TS 103 190-2 v1.2.1
*/
@SuppressLint("AllUpper")
public static final int AC4Profile00 = AC4BitstreamVersion0 << 8 | AC4PresentationVersion0;
/**
* AC-4 codec profile with bitstream_version 1 and presentation_version 0
* as per ETSI TS 103 190-2 v1.2.1
*/
@SuppressLint("AllUpper")
public static final int AC4Profile10 = AC4BitstreamVersion1 << 8 | AC4PresentationVersion0;
/**
* AC-4 codec profile with bitstream_version 1 and presentation_version 1
* as per ETSI TS 103 190-2 v1.2.1
*/
@SuppressLint("AllUpper")
public static final int AC4Profile11 = AC4BitstreamVersion1 << 8 | AC4PresentationVersion1;
/**
* AC-4 codec profile with bitstream_version 2 and presentation_version 1
* as per ETSI TS 103 190-2 v1.2.1
*/
@SuppressLint("AllUpper")
public static final int AC4Profile21 = AC4BitstreamVersion2 << 8 | AC4PresentationVersion1;
/**
* AC-4 codec profile with bitstream_version 2 and presentation_version 2
* as per ETSI TS 103 190-2 v1.2.1
*/
@SuppressLint("AllUpper")
public static final int AC4Profile22 = AC4BitstreamVersion2 << 8 | AC4PresentationVersion2;
/** AC-4 codec level corresponding to mdcompat 0 as per ETSI TS 103 190-2 v1.2.1 */
@SuppressLint("AllUpper")
public static final int AC4Level0 = 0x01;
/** AC-4 codec level corresponding to mdcompat 1 as per ETSI TS 103 190-2 v1.2.1 */
@SuppressLint("AllUpper")
public static final int AC4Level1 = 0x02;
/** AC-4 codec level corresponding to mdcompat 2 as per ETSI TS 103 190-2 v1.2.1 */
@SuppressLint("AllUpper")
public static final int AC4Level2 = 0x04;
/** AC-4 codec level corresponding to mdcompat 3 as per ETSI TS 103 190-2 v1.2.1 */
@SuppressLint("AllUpper")
public static final int AC4Level3 = 0x08;
/** AC-4 codec level corresponding to mdcompat 4 as per ETSI TS 103 190-2 v1.2.1 */
@SuppressLint("AllUpper")
public static final int AC4Level4 = 0x10;
/**
* The profile of the media content. Depending on the type of media this can be
* one of the profile values defined in this class.