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

Merge "Add constant values for MPEG-H."

Browse Source
This commit is contained in:
Treehugger Robot
2021-04-23 22:51:55 +00:00
committed by Gerrit Code Review
parent 1f9d1566c2 b08f66b72d
commit 6286d0952d
3 changed files with 83 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/current.txt
View File

@@ -19384,6 +19384,10 @@ package android.media {
field public static final int ENCODING_IEC61937 = 13; // 0xd
field public static final int ENCODING_INVALID = 0; // 0x0
field public static final int ENCODING_MP3 = 9; // 0x9
field public static final int ENCODING_MPEGH_BL_L3 = 23; // 0x17
field public static final int ENCODING_MPEGH_BL_L4 = 24; // 0x18
field public static final int ENCODING_MPEGH_LC_L3 = 25; // 0x19
field public static final int ENCODING_MPEGH_LC_L4 = 26; // 0x1a
field public static final int ENCODING_OPUS = 20; // 0x14
field public static final int ENCODING_PCM_16BIT = 2; // 0x2
field public static final int ENCODING_PCM_24BIT_PACKED = 21; // 0x15

20
core/jni/android_media_AudioFormat.h
View File

@@ -41,6 +41,10 @@
#define ENCODING_OPUS 20
#define ENCODING_PCM_24BIT_PACKED 21
#define ENCODING_PCM_32BIT 22
#define ENCODING_MPEGH_BL_L3 23
#define ENCODING_MPEGH_BL_L4 24
#define ENCODING_MPEGH_LC_L3 25
#define ENCODING_MPEGH_LC_L4 26
#define ENCODING_INVALID 0
#define ENCODING_DEFAULT 1
@@ -98,6 +102,14 @@ static inline audio_format_t audioFormatToNative(int audioFormat)
return AUDIO_FORMAT_PCM_24_BIT_PACKED;
case ENCODING_PCM_32BIT:
return AUDIO_FORMAT_PCM_32_BIT;
case ENCODING_MPEGH_BL_L3:
return AUDIO_FORMAT_MPEGH_BL_L3;
case ENCODING_MPEGH_BL_L4:
return AUDIO_FORMAT_MPEGH_BL_L4;
case ENCODING_MPEGH_LC_L3:
return AUDIO_FORMAT_MPEGH_LC_L3;
case ENCODING_MPEGH_LC_L4:
return AUDIO_FORMAT_MPEGH_LC_L4;
default:
return AUDIO_FORMAT_INVALID;
}
@@ -159,6 +171,14 @@ static inline int audioFormatFromNative(audio_format_t nativeFormat)
return ENCODING_DOLBY_MAT;
case AUDIO_FORMAT_OPUS:
return ENCODING_OPUS;
case AUDIO_FORMAT_MPEGH_BL_L3:
return ENCODING_MPEGH_BL_L3;
case AUDIO_FORMAT_MPEGH_BL_L4:
return ENCODING_MPEGH_BL_L4;
case AUDIO_FORMAT_MPEGH_LC_L3:
return ENCODING_MPEGH_LC_L3;
case AUDIO_FORMAT_MPEGH_LC_L4:
return ENCODING_MPEGH_LC_L4;
case AUDIO_FORMAT_DEFAULT:
return ENCODING_DEFAULT;
default:

61
media/java/android/media/AudioFormat.java
View File

@@ -316,6 +316,15 @@ public final class AudioFormat implements Parcelable {
* Not guaranteed to be supported by devices, may be emulated if not supported. */
public static final int ENCODING_PCM_32BIT = 22;
/** Audio data format: MPEG-H baseline profile, level 3 */
public static final int ENCODING_MPEGH_BL_L3 = 23;
/** Audio data format: MPEG-H baseline profile, level 4 */
public static final int ENCODING_MPEGH_BL_L4 = 24;
/** Audio data format: MPEG-H low complexity profile, level 3 */
public static final int ENCODING_MPEGH_LC_L3 = 25;
/** Audio data format: MPEG-H low complexity profile, level 4 */
public static final int ENCODING_MPEGH_LC_L4 = 26;
/** @hide */
public static String toLogFriendlyEncoding(int enc) {
switch(enc) {
@@ -363,6 +372,14 @@ public final class AudioFormat implements Parcelable {
return "ENCODING_PCM_24BIT_PACKED";
case ENCODING_PCM_32BIT:
return "ENCODING_PCM_32BIT";
case ENCODING_MPEGH_BL_L3:
return "ENCODING_MPEGH_BL_L3";
case ENCODING_MPEGH_BL_L4:
return "ENCODING_MPEGH_BL_L4";
case ENCODING_MPEGH_LC_L3:
return "ENCODING_MPEGH_LC_L3";
case ENCODING_MPEGH_LC_L4:
return "ENCODING_MPEGH_LC_L4";
default :
return "invalid encoding " + enc;
}
@@ -638,6 +655,10 @@ public final class AudioFormat implements Parcelable {
case ENCODING_OPUS:
case ENCODING_PCM_24BIT_PACKED:
case ENCODING_PCM_32BIT:
case ENCODING_MPEGH_BL_L3:
case ENCODING_MPEGH_BL_L4:
case ENCODING_MPEGH_LC_L3:
case ENCODING_MPEGH_LC_L4:
return true;
default:
return false;
@@ -669,6 +690,10 @@ public final class AudioFormat implements Parcelable {
case ENCODING_OPUS:
case ENCODING_PCM_24BIT_PACKED:
case ENCODING_PCM_32BIT:
case ENCODING_MPEGH_BL_L3:
case ENCODING_MPEGH_BL_L4:
case ENCODING_MPEGH_LC_L3:
case ENCODING_MPEGH_LC_L4:
return true;
default:
return false;
@@ -703,6 +728,10 @@ public final class AudioFormat implements Parcelable {
case ENCODING_E_AC3_JOC:
case ENCODING_DOLBY_MAT:
case ENCODING_OPUS:
case ENCODING_MPEGH_BL_L3:
case ENCODING_MPEGH_BL_L4:
case ENCODING_MPEGH_LC_L3:
case ENCODING_MPEGH_LC_L4:
return false;
case ENCODING_INVALID:
default:
@@ -737,6 +766,10 @@ public final class AudioFormat implements Parcelable {
case ENCODING_E_AC3_JOC:
case ENCODING_DOLBY_MAT:
case ENCODING_OPUS:
case ENCODING_MPEGH_BL_L3:
case ENCODING_MPEGH_BL_L4:
case ENCODING_MPEGH_LC_L3:
case ENCODING_MPEGH_LC_L4:
return false;
case ENCODING_INVALID:
default:
@@ -1019,6 +1052,10 @@ public final class AudioFormat implements Parcelable {
case ENCODING_OPUS:
case ENCODING_PCM_24BIT_PACKED:
case ENCODING_PCM_32BIT:
case ENCODING_MPEGH_BL_L3:
case ENCODING_MPEGH_BL_L4:
case ENCODING_MPEGH_LC_L3:
case ENCODING_MPEGH_LC_L4:
mEncoding = encoding;
break;
case ENCODING_INVALID:
@@ -1241,7 +1278,11 @@ public final class AudioFormat implements Parcelable {
ENCODING_DOLBY_MAT,
ENCODING_OPUS,
ENCODING_PCM_24BIT_PACKED,
ENCODING_PCM_32BIT }
ENCODING_PCM_32BIT,
ENCODING_MPEGH_BL_L3,
ENCODING_MPEGH_BL_L4,
ENCODING_MPEGH_LC_L3,
ENCODING_MPEGH_LC_L4 }
)
@Retention(RetentionPolicy.SOURCE)
public @interface Encoding {}
@@ -1257,6 +1298,10 @@ public final class AudioFormat implements Parcelable {
ENCODING_AC4,
ENCODING_E_AC3_JOC,
ENCODING_DOLBY_MAT,
ENCODING_MPEGH_BL_L3,
ENCODING_MPEGH_BL_L4,
ENCODING_MPEGH_LC_L3,
ENCODING_MPEGH_LC_L4,
};
/** @hide */
@@ -1269,7 +1314,11 @@ public final class AudioFormat implements Parcelable {
ENCODING_DOLBY_TRUEHD,
ENCODING_AC4,
ENCODING_E_AC3_JOC,
ENCODING_DOLBY_MAT }
ENCODING_DOLBY_MAT,
ENCODING_MPEGH_BL_L3,
ENCODING_MPEGH_BL_L4,
ENCODING_MPEGH_LC_L3,
ENCODING_MPEGH_LC_L4 }
)
@Retention(RetentionPolicy.SOURCE)
public @interface SurroundSoundEncoding {}
@@ -1303,6 +1352,14 @@ public final class AudioFormat implements Parcelable {
return "Dolby Atmos in Dolby Digital Plus";
case ENCODING_DOLBY_MAT:
return "Dolby MAT";
case ENCODING_MPEGH_BL_L3:
return "MPEG-H 3D Audio baseline profile level 3";
case ENCODING_MPEGH_BL_L4:
return "MPEG-H 3D Audio baseline profile level 4";
case ENCODING_MPEGH_LC_L3:
return "MPEG-H 3D Audio low complexity profile level 3";
case ENCODING_MPEGH_LC_L4:
return "MPEG-H 3D Audio low complexity profile level 4";
default:
return "Unknown surround sound format";
}