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

Commit 4969d96c authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "MPEG4Extractor: support MPEG-H 3D Audio (1/2)" am: d7d1ca10 am: 59921f77 

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

Change-Id: I9336b2bd695f8197992c15321821d05dcda51043
parents 5f9984fc 59921f77

media/libstagefright/foundation/MediaDefs.cpp

+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ const char *MEDIA_MIMETYPE_AUDIO_AC3 = "audio/ac3"; 
const char *MEDIA_MIMETYPE_AUDIO_EAC3 = "audio/eac3";

const char *MEDIA_MIMETYPE_AUDIO_EAC3_JOC = "audio/eac3-joc";

const char *MEDIA_MIMETYPE_AUDIO_AC4 = "audio/ac4";

const char *MEDIA_MIMETYPE_AUDIO_MPEGH_MHA1 = "audio/mha1";

const char *MEDIA_MIMETYPE_AUDIO_MPEGH_MHM1 = "audio/mhm1";

const char *MEDIA_MIMETYPE_AUDIO_SCRAMBLED = "audio/scrambled";

const char *MEDIA_MIMETYPE_AUDIO_ALAC = "audio/alac";

const char *MEDIA_MIMETYPE_AUDIO_WMA = "audio/x-ms-wma";

media/libstagefright/foundation/include/media/stagefright/foundation/MediaDefs.h

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ extern const char *MEDIA_MIMETYPE_AUDIO_AC3; 
extern const char *MEDIA_MIMETYPE_AUDIO_EAC3;

extern const char *MEDIA_MIMETYPE_AUDIO_EAC3_JOC;

extern const char *MEDIA_MIMETYPE_AUDIO_AC4;

extern const char *MEDIA_MIMETYPE_AUDIO_MPEGH_MHA1;

extern const char *MEDIA_MIMETYPE_AUDIO_MPEGH_MHM1;

extern const char *MEDIA_MIMETYPE_AUDIO_SCRAMBLED;

extern const char *MEDIA_MIMETYPE_AUDIO_ALAC;

extern const char *MEDIA_MIMETYPE_AUDIO_WMA;