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

Commit e572170f authored by Phil Burk's avatar Phil Burk Committed by Automerger Merge Worker
Browse files

Merge "audio: E_AC3 is also Dolby Digital Plus" into rvc-dev am: abaa4813... 

Merge "audio: E_AC3 is also Dolby Digital Plus" into rvc-dev am: abaa4813 am: 2b4d63a4 am: 87d75921

Change-Id: I40e32b2ccfaadc44d762909a317c659d307f7c94
parents 7119bdfb 87d75921

media/java/android/media/AudioFormat.java

+2 −2
Original line number Diff line number Diff line
@@ -235,9 +235,9 @@ public final class AudioFormat implements Parcelable { 
    public static final int ENCODING_PCM_8BIT = 3;

    /** Audio data format: single-precision floating-point per sample */

    public static final int ENCODING_PCM_FLOAT = 4;

    /** Audio data format: AC-3 compressed */

    /** Audio data format: AC-3 compressed, also known as Dolby Digital */

    public static final int ENCODING_AC3 = 5;

    /** Audio data format: E-AC-3 compressed */

    /** Audio data format: E-AC-3 compressed, also known as Dolby Digital Plus or DD+ */

    public static final int ENCODING_E_AC3 = 6;

    /** Audio data format: DTS compressed */

    public static final int ENCODING_DTS = 7;