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

Commit 0be34b3c authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "NdkMediaFormat: Add MPEG-H constants" into sc-v2-dev am: b02ec56b am: a5156cbd 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/15351032

Change-Id: I25398ec0fb339e05a2402415075693d2405e6b51
parents 186b11a8 a5156cbd

media/ndk/NdkMediaFormat.cpp

+5 −0
Original line number Original line Diff line number Diff line
@@ -351,6 +351,11 @@ EXPORT const char* AMEDIAFORMAT_KEY_MAX_WIDTH = "max-width"; 
EXPORT const char* AMEDIAFORMAT_KEY_MIME = "mime";

EXPORT const char* AMEDIAFORMAT_KEY_MIME = "mime";

EXPORT const char* AMEDIAFORMAT_KEY_MPEG_USER_DATA = "mpeg-user-data";

EXPORT const char* AMEDIAFORMAT_KEY_MPEG_USER_DATA = "mpeg-user-data";

EXPORT const char* AMEDIAFORMAT_KEY_MPEG2_STREAM_HEADER = "mpeg2-stream-header";

EXPORT const char* AMEDIAFORMAT_KEY_MPEG2_STREAM_HEADER = "mpeg2-stream-header";

EXPORT const char* AMEDIAFORMAT_KEY_MPEGH_COMPATIBLE_SETS = "mpegh-compatible-sets";

EXPORT const char* AMEDIAFORMAT_KEY_MPEGH_PROFILE_LEVEL_INDICATION =

        "mpegh-profile-level-indication";

EXPORT const char* AMEDIAFORMAT_KEY_MPEGH_REFERENCE_CHANNEL_LAYOUT =

        "mpegh-reference-channel-layout";

EXPORT const char* AMEDIAFORMAT_KEY_OPERATING_RATE = "operating-rate";

EXPORT const char* AMEDIAFORMAT_KEY_OPERATING_RATE = "operating-rate";

EXPORT const char* AMEDIAFORMAT_KEY_PCM_ENCODING = "pcm-encoding";

EXPORT const char* AMEDIAFORMAT_KEY_PCM_ENCODING = "pcm-encoding";

EXPORT const char* AMEDIAFORMAT_KEY_PRIORITY = "priority";

EXPORT const char* AMEDIAFORMAT_KEY_PRIORITY = "priority";

media/ndk/include/media/NdkMediaFormat.h

+28 −0
Original line number Original line Diff line number Diff line
@@ -320,6 +320,34 @@ extern const char* AMEDIAFORMAT_VIDEO_QP_MIN __INTRODUCED_IN(31); 
extern const char* AMEDIAFORMAT_VIDEO_QP_P_MAX __INTRODUCED_IN(31);

extern const char* AMEDIAFORMAT_VIDEO_QP_P_MAX __INTRODUCED_IN(31);

extern const char* AMEDIAFORMAT_VIDEO_QP_P_MIN __INTRODUCED_IN(31);

extern const char* AMEDIAFORMAT_VIDEO_QP_P_MIN __INTRODUCED_IN(31);





/**

 * MPEG-H audio profile and level compatibility.

 *

 * See FDAmd_2 of ISO_IEC_23008-3;2019 MHAProfileAndLevelCompatibilitySetBox.

 *

 * Available since API level 32.

 */

extern const char* AMEDIAFORMAT_KEY_MPEGH_COMPATIBLE_SETS __INTRODUCED_IN(32);



/**

 * MPEG-H audio profile level indication.

 *

 * See ISO_IEC_23008-3;2019 MHADecoderConfigurationRecord mpegh3daProfileLevelIndication.

 *

 * Available since API level 32.

 */

extern const char* AMEDIAFORMAT_KEY_MPEGH_PROFILE_LEVEL_INDICATION __INTRODUCED_IN(32);



/**

 * MPEG-H audio reference channel layout.

 *

 * See ISO_IEC_23008-3;2019 MHADecoderConfigurationRecord referenceChannelLayout

 * and ISO_IEC_23001‐8 ChannelConfiguration value.

 *

 * Available since API level 32.

 */

extern const char* AMEDIAFORMAT_KEY_MPEGH_REFERENCE_CHANNEL_LAYOUT __INTRODUCED_IN(32);



__END_DECLS

__END_DECLS





#endif // _NDK_MEDIA_FORMAT_H

#endif // _NDK_MEDIA_FORMAT_H

media/ndk/libmediandk.map.txt

+3 −0
Original line number Original line Diff line number Diff line
@@ -126,6 +126,9 @@ LIBMEDIANDK { 
    AMEDIAFORMAT_KEY_MIME; # var introduced=21

    AMEDIAFORMAT_KEY_MIME; # var introduced=21

    AMEDIAFORMAT_KEY_MPEG_USER_DATA; # var introduced=28

    AMEDIAFORMAT_KEY_MPEG_USER_DATA; # var introduced=28

    AMEDIAFORMAT_KEY_MPEG2_STREAM_HEADER; # var introduced=29

    AMEDIAFORMAT_KEY_MPEG2_STREAM_HEADER; # var introduced=29

    AMEDIAFORMAT_KEY_MPEGH_COMPATIBLE_SETS; # var introduced=32

    AMEDIAFORMAT_KEY_MPEGH_PROFILE_LEVEL_INDICATION; # var introduced=32

    AMEDIAFORMAT_KEY_MPEGH_REFERENCE_CHANNEL_LAYOUT; # var introduced=32

    AMEDIAFORMAT_KEY_OPERATING_RATE; # var introduced=28

    AMEDIAFORMAT_KEY_OPERATING_RATE; # var introduced=28

    AMEDIAFORMAT_KEY_PCM_BIG_ENDIAN; # var introduced=29

    AMEDIAFORMAT_KEY_PCM_BIG_ENDIAN; # var introduced=29

    AMEDIAFORMAT_KEY_PCM_ENCODING; # var introduced=28

    AMEDIAFORMAT_KEY_PCM_ENCODING; # var introduced=28