Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 245a606c authored by Dorin Drimus's avatar Dorin Drimus Committed by Automerger Merge Worker
Browse files

Merge "Audio: Add ENCODING_DTS_HD_MA, ENCODING_DTS_UHD_P2" am: 7edaca37 am:... 

Merge "Audio: Add ENCODING_DTS_HD_MA, ENCODING_DTS_UHD_P2" am: 7edaca37 am: 41264808 am: 5246e464

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



Change-Id: Ie1e5a863c1670a0bd45b8149927eb0d00509e269
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 05ce5e9c 5246e464

core/api/current.txt

+4 −1
Original line number Diff line number Diff line
@@ -20407,7 +20407,10 @@ package android.media { 
    field public static final int ENCODING_DRA = 28; // 0x1c

    field public static final int ENCODING_DTS = 7; // 0x7

    field public static final int ENCODING_DTS_HD = 8; // 0x8

    field public static final int ENCODING_DTS_UHD = 27; // 0x1b

    field public static final int ENCODING_DTS_HD_MA = 29; // 0x1d

    field @Deprecated public static final int ENCODING_DTS_UHD = 27; // 0x1b

    field public static final int ENCODING_DTS_UHD_P1 = 27; // 0x1b

    field public static final int ENCODING_DTS_UHD_P2 = 30; // 0x1e

    field public static final int ENCODING_E_AC3 = 6; // 0x6

    field public static final int ENCODING_E_AC3_JOC = 18; // 0x12

    field public static final int ENCODING_IEC61937 = 13; // 0xd

core/jni/android_media_AudioFormat.h

+13 −3
Original line number Diff line number Diff line
@@ -45,8 +45,10 @@ 
#define ENCODING_MPEGH_BL_L4 24

#define ENCODING_MPEGH_LC_L3 25

#define ENCODING_MPEGH_LC_L4 26

#define ENCODING_DTS_UHD 27

#define ENCODING_DTS_UHD_P1 27

#define ENCODING_DRA 28

#define ENCODING_DTS_HD_MA 29

#define ENCODING_DTS_UHD_P2 30



#define ENCODING_INVALID    0

#define ENCODING_DEFAULT    1
@@ -112,10 +114,14 @@ static inline audio_format_t audioFormatToNative(int audioFormat) 
        return AUDIO_FORMAT_MPEGH_LC_L3;

    case ENCODING_MPEGH_LC_L4:

        return AUDIO_FORMAT_MPEGH_LC_L4;

    case ENCODING_DTS_UHD:

    case ENCODING_DTS_UHD_P1:

        return AUDIO_FORMAT_DTS_UHD;

    case ENCODING_DRA:

        return AUDIO_FORMAT_DRA;

    case ENCODING_DTS_HD_MA:

        return AUDIO_FORMAT_DTS_HD_MA;

    case ENCODING_DTS_UHD_P2:

        return AUDIO_FORMAT_DTS_UHD_P2;

    default:

        return AUDIO_FORMAT_INVALID;

    }
@@ -186,9 +192,13 @@ static inline int audioFormatFromNative(audio_format_t nativeFormat) 
    case AUDIO_FORMAT_MPEGH_LC_L4:

        return ENCODING_MPEGH_LC_L4;

    case AUDIO_FORMAT_DTS_UHD:

        return ENCODING_DTS_UHD;

        return ENCODING_DTS_UHD_P1;

    case AUDIO_FORMAT_DRA:

        return ENCODING_DRA;

    case AUDIO_FORMAT_DTS_HD_MA:

        return ENCODING_DTS_HD_MA;

    case AUDIO_FORMAT_DTS_UHD_P2:

        return ENCODING_DTS_UHD_P2;

    case AUDIO_FORMAT_DEFAULT:

        return ENCODING_DEFAULT;

    default:

media/java/android/media/AudioFormat.java

+60 −17
Original line number Diff line number Diff line
@@ -350,10 +350,29 @@ public final class AudioFormat implements Parcelable { 
    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;

    /** Audio data format: DTS UHD compressed */

    public static final int ENCODING_DTS_UHD = 27;

    /** Audio data format: DTS UHD Profile-1 compressed (aka DTS:X Profile 1)

     * Has the same meaning and value as ENCODING_DTS_UHD_P1.

     * @deprecated Use {@link #ENCODING_DTS_UHD_P1} instead. */

    @Deprecated public static final int ENCODING_DTS_UHD = 27;

    /** Audio data format: DRA compressed */

    public static final int ENCODING_DRA = 28;

    /** Audio data format: DTS HD Master Audio compressed

     * DTS HD Master Audio stream is variable bit rate and contains lossless audio.

     * Use {@link #ENCODING_DTS_HD_MA} for lossless audio content (DTS-HD MA Lossless)

     * and use {@link #ENCODING_DTS_HD} for other DTS bitstreams with extension substream

     * (DTS 8Ch Discrete, DTS Hi Res, DTS Express). */

    public static final int ENCODING_DTS_HD_MA = 29;

    /** Audio data format: DTS UHD Profile-1 compressed (aka DTS:X Profile 1)

     * Has the same meaning and value as the deprecated {@link #ENCODING_DTS_UHD}.*/

    public static final int ENCODING_DTS_UHD_P1 = 27;

    /** Audio data format: DTS UHD Profile-2 compressed

     * DTS-UHD Profile-2 supports delivery of Channel-Based Audio, Object-Based Audio

     * and High Order Ambisonic presentations up to the fourth order.

     * Use {@link #ENCODING_DTS_UHD_P1} to transmit DTS UHD Profile 1 (aka DTS:X Profile 1)

     * bitstream.

     * Use {@link #ENCODING_DTS_UHD_P2} to transmit DTS UHD Profile 2 (aka DTS:X Profile 2)

     * bitstream. */

    public static final int ENCODING_DTS_UHD_P2 = 30;



    /** @hide */

    public static String toLogFriendlyEncoding(int enc) {
@@ -410,10 +429,14 @@ public final class AudioFormat implements Parcelable { 
                return "ENCODING_MPEGH_LC_L3";

            case ENCODING_MPEGH_LC_L4:

                return "ENCODING_MPEGH_LC_L4";

            case ENCODING_DTS_UHD:

                return "ENCODING_DTS_UHD";

            case ENCODING_DTS_UHD_P1:

                return "ENCODING_DTS_UHD_P1";

            case ENCODING_DRA:

                return "ENCODING_DRA";

            case ENCODING_DTS_HD_MA:

                return "ENCODING_DTS_HD_MA";

            case ENCODING_DTS_UHD_P2:

                return "ENCODING_DTS_UHD_P2";

            default :

                return "invalid encoding " + enc;

        }
@@ -771,8 +794,10 @@ public final class AudioFormat implements Parcelable { 
            case ENCODING_MPEGH_BL_L4:

            case ENCODING_MPEGH_LC_L3:

            case ENCODING_MPEGH_LC_L4:

            case ENCODING_DTS_UHD:

            case ENCODING_DTS_UHD_P1:

            case ENCODING_DRA:

            case ENCODING_DTS_HD_MA:

            case ENCODING_DTS_UHD_P2:

                return true;

            default:

                return false;
@@ -808,8 +833,10 @@ public final class AudioFormat implements Parcelable { 
            case ENCODING_MPEGH_BL_L4:

            case ENCODING_MPEGH_LC_L3:

            case ENCODING_MPEGH_LC_L4:

            case ENCODING_DTS_UHD:

            case ENCODING_DTS_UHD_P1:

            case ENCODING_DRA:

            case ENCODING_DTS_HD_MA:

            case ENCODING_DTS_UHD_P2:

                return true;

            default:

                return false;
@@ -848,8 +875,10 @@ public final class AudioFormat implements Parcelable { 
            case ENCODING_MPEGH_BL_L4:

            case ENCODING_MPEGH_LC_L3:

            case ENCODING_MPEGH_LC_L4:

            case ENCODING_DTS_UHD:

            case ENCODING_DTS_UHD_P1:

            case ENCODING_DRA:

            case ENCODING_DTS_HD_MA:

            case ENCODING_DTS_UHD_P2:

                return false;

            case ENCODING_INVALID:

            default:
@@ -888,8 +917,10 @@ public final class AudioFormat implements Parcelable { 
            case ENCODING_MPEGH_BL_L4:

            case ENCODING_MPEGH_LC_L3:

            case ENCODING_MPEGH_LC_L4:

            case ENCODING_DTS_UHD:

            case ENCODING_DTS_UHD_P1:

            case ENCODING_DRA:

            case ENCODING_DTS_HD_MA:

            case ENCODING_DTS_UHD_P2:

                return false;

            case ENCODING_INVALID:

            default:
@@ -1176,8 +1207,10 @@ public final class AudioFormat implements Parcelable { 
                case ENCODING_MPEGH_BL_L4:

                case ENCODING_MPEGH_LC_L3:

                case ENCODING_MPEGH_LC_L4:

                case ENCODING_DTS_UHD:

                case ENCODING_DTS_UHD_P1:

                case ENCODING_DRA:

                case ENCODING_DTS_HD_MA:

                case ENCODING_DTS_UHD_P2:

                    mEncoding = encoding;

                    break;

                case ENCODING_INVALID:
@@ -1405,8 +1438,10 @@ public final class AudioFormat implements Parcelable { 
        ENCODING_MPEGH_BL_L4,

        ENCODING_MPEGH_LC_L3,

        ENCODING_MPEGH_LC_L4,

        ENCODING_DTS_UHD,

        ENCODING_DRA }

        ENCODING_DTS_UHD_P1,

        ENCODING_DRA,

        ENCODING_DTS_HD_MA,

        ENCODING_DTS_UHD_P2 }

    )

    @Retention(RetentionPolicy.SOURCE)

    public @interface Encoding {}
@@ -1426,8 +1461,10 @@ public final class AudioFormat implements Parcelable { 
            ENCODING_MPEGH_BL_L4,

            ENCODING_MPEGH_LC_L3,

            ENCODING_MPEGH_LC_L4,

            ENCODING_DTS_UHD,

            ENCODING_DRA

            ENCODING_DTS_UHD_P1,

            ENCODING_DRA,

            ENCODING_DTS_HD_MA,

            ENCODING_DTS_UHD_P2

    };



    /** @hide */
@@ -1445,8 +1482,10 @@ public final class AudioFormat implements Parcelable { 
            ENCODING_MPEGH_BL_L4,

            ENCODING_MPEGH_LC_L3,

            ENCODING_MPEGH_LC_L4,

            ENCODING_DTS_UHD,

            ENCODING_DRA }

            ENCODING_DTS_UHD_P1,

            ENCODING_DRA,

            ENCODING_DTS_HD_MA,

            ENCODING_DTS_UHD_P2 }

    )

    @Retention(RetentionPolicy.SOURCE)

    public @interface SurroundSoundEncoding {}
@@ -1488,10 +1527,14 @@ public final class AudioFormat implements Parcelable { 
                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";

            case ENCODING_DTS_UHD:

                return "DTS UHD";

            case ENCODING_DTS_UHD_P1:

                return "DTS UHD Profile 1";

            case ENCODING_DRA:

                return "DRA";

            case ENCODING_DTS_HD_MA:

                return "DTS HD Master Audio";

            case ENCODING_DTS_UHD_P2:

                return "DTS UHD Profile 2";

            default:

                return "Unknown surround sound format";

        }

media/java/android/media/AudioSystem.java

+4 −0
Original line number Diff line number Diff line
@@ -450,6 +450,10 @@ public class AudioSystem 
                return "AUDIO_FORMAT_APTX_ADAPTIVE_QLEA";

            case /* AUDIO_FORMAT_APTX_ADAPTIVE_R4   */ 0x31000000:

                return "AUDIO_FORMAT_APTX_ADAPTIVE_R4";

            case /* AUDIO_FORMAT_DTS_HD_MA       */ 0x32000000:

                return "AUDIO_FORMAT_DTS_HD_MA";

            case /* AUDIO_FORMAT_DTS_UHD_P2      */ 0x33000000:

                return "AUDIO_FORMAT_DTS_UHD_P2";



            /* Aliases */

            case /* AUDIO_FORMAT_PCM_16_BIT        */ 0x1:

media/java/android/media/audio/common/AidlConversion.java

+1 −1
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ public class AidlConversion { 
                    } else if (MediaFormat.MIMETYPE_AUDIO_MPEGH_LC_L4.equals(aidl.encoding)) {

                        return AudioFormat.ENCODING_MPEGH_LC_L4;

                    } else if (MediaFormat.MIMETYPE_AUDIO_DTS_UHD.equals(aidl.encoding)) {

                        return AudioFormat.ENCODING_DTS_UHD;

                        return AudioFormat.ENCODING_DTS_UHD_P1;

                    } else if (MediaFormat.MIMETYPE_AUDIO_DRA.equals(aidl.encoding)) {

                        return AudioFormat.ENCODING_DRA;

                    } else {