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

Commit 88f2bb87 authored by Tanguy Pruvot's avatar Tanguy Pruvot
Browse files

Mediadefs: Allow use of mime types keys for all 

This table is used in a lot of aosp forks : Tegra, Moto Omap3/4...

Safe part of OMAP_COMPAT patch

Change-Id: I0ca47b6bf503731b379c7b2b57f5c6f41080bb45
parent 663ba31c

include/media/stagefright/MediaDefs.h

+6 −13
Original line number Diff line number Diff line
@@ -27,17 +27,9 @@ extern const char *MEDIA_MIMETYPE_VIDEO_AVC; 
extern const char *MEDIA_MIMETYPE_VIDEO_MPEG4;

extern const char *MEDIA_MIMETYPE_VIDEO_H263;

extern const char *MEDIA_MIMETYPE_VIDEO_RAW;

#if defined(OMAP_ENHANCEMENT)

#if defined(TARGET_OMAP4)

extern const char *MEDIA_MIMETYPE_VIDEO_WMV;

extern const char *MEDIA_MIMETYPE_VIDEO_VP6;

extern const char *MEDIA_MIMETYPE_VIDEO_VP7;

#endif

extern const char *MEDIA_MIMETYPE_CONTAINER_ASF;

extern const char *MEDIA_MIMETYPE_VIDEO_WMV;

extern const char *MEDIA_MIMETYPE_AUDIO_WMA;

extern const char *MEDIA_MIMETYPE_AUDIO_WMAPRO;

extern const char *MEDIA_MIMETYPE_AUDIO_WMALSL;

#endif



extern const char *MEDIA_MIMETYPE_AUDIO_AMR_NB;

extern const char *MEDIA_MIMETYPE_AUDIO_AMR_WB;
@@ -48,17 +40,18 @@ extern const char *MEDIA_MIMETYPE_AUDIO_VORBIS; 
extern const char *MEDIA_MIMETYPE_AUDIO_G711_ALAW;

extern const char *MEDIA_MIMETYPE_AUDIO_G711_MLAW;

extern const char *MEDIA_MIMETYPE_AUDIO_RAW;

extern const char *MEDIA_MIMETYPE_AUDIO_WMA;

extern const char *MEDIA_MIMETYPE_AUDIO_WMAPRO;

extern const char *MEDIA_MIMETYPE_AUDIO_WMALSL;



extern const char *MEDIA_MIMETYPE_CONTAINER_MPEG4;

extern const char *MEDIA_MIMETYPE_CONTAINER_WAV;

extern const char *MEDIA_MIMETYPE_CONTAINER_OGG;



extern const char *MEDIA_MIMETYPE_CONTAINER_MATROSKA;

extern const char *MEDIA_MIMETYPE_CONTAINER_MPEG2TS;



#if defined(OMAP_ENHANCEMENT) && defined(TARGET_OMAP4)

extern const char *MEDIA_MIMETYPE_CONTAINER_ASF;

extern const char *MEDIA_MIMETYPE_CONTAINER_AVI;

#endif



}  // namespace android



#endif  // MEDIA_DEFS_H_

media/libstagefright/MediaDefs.cpp

+5 −11
Original line number Diff line number Diff line
@@ -25,17 +25,13 @@ const char *MEDIA_MIMETYPE_VIDEO_AVC = "video/avc"; 
const char *MEDIA_MIMETYPE_VIDEO_MPEG4 = "video/mp4v-es";

const char *MEDIA_MIMETYPE_VIDEO_H263 = "video/3gpp";

const char *MEDIA_MIMETYPE_VIDEO_RAW = "video/raw";

#if defined(OMAP_ENHANCEMENT)

#if  defined(TARGET_OMAP4)

const char *MEDIA_MIMETYPE_VIDEO_VP6 = "video/x-vp6";

const char *MEDIA_MIMETYPE_VIDEO_VP7 = "video/x-vp7";

#endif

const char *MEDIA_MIMETYPE_CONTAINER_ASF = "video/asf";

const char *MEDIA_MIMETYPE_VIDEO_WMV  = "video/wmv9";

const char *MEDIA_MIMETYPE_AUDIO_WMA = "audio/wma";

const char *MEDIA_MIMETYPE_VIDEO_WMV  = "video/x-ms-wmv";



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

const char *MEDIA_MIMETYPE_AUDIO_WMAPRO = "audio/wmapro";

const char *MEDIA_MIMETYPE_AUDIO_WMALSL = "audio/wmalsl";

#endif



const char *MEDIA_MIMETYPE_AUDIO_AMR_NB = "audio/3gpp";

const char *MEDIA_MIMETYPE_AUDIO_AMR_WB = "audio/amr-wb";
@@ -50,11 +46,9 @@ const char *MEDIA_MIMETYPE_AUDIO_RAW = "audio/raw"; 
const char *MEDIA_MIMETYPE_CONTAINER_MPEG4 = "video/mpeg4";

const char *MEDIA_MIMETYPE_CONTAINER_WAV = "audio/wav";

const char *MEDIA_MIMETYPE_CONTAINER_OGG = "application/ogg";



const char *MEDIA_MIMETYPE_CONTAINER_MATROSKA = "video/x-matroska";

const char *MEDIA_MIMETYPE_CONTAINER_MPEG2TS = "video/mp2ts";



#if defined(OMAP_ENHANCEMENT) && defined(TARGET_OMAP4)

const char *MEDIA_MIMETYPE_CONTAINER_ASF = "video/x-ms-asf";

const char *MEDIA_MIMETYPE_CONTAINER_AVI = "video/x-msvideo";

#endif



}  // namespace android