From bc8b5faec8a0a9ad7c8d94945e7b000d63f0afe6 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Fri, 23 Mar 2012 08:39:04 -0700 Subject: [PATCH] Fix the file mimetype reported by the mpeg4 extractor. Change-Id: I72474c17757dba5867f55b0e99e76e9e4e32ce7b related-to-bug: 6217289 --- media/libstagefright/MPEG4Extractor.cpp | 3 ++- media/libstagefright/MediaDefs.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 663f285927..9385b8aff3 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -373,7 +373,8 @@ status_t MPEG4Extractor::readMetaData() { if (mInitCheck == OK) { if (mHasVideo) { - mFileMetaData->setCString(kKeyMIMEType, "video/mp4"); + mFileMetaData->setCString( + kKeyMIMEType, MEDIA_MIMETYPE_CONTAINER_MPEG4); } else { mFileMetaData->setCString(kKeyMIMEType, "audio/mp4"); } diff --git a/media/libstagefright/MediaDefs.cpp b/media/libstagefright/MediaDefs.cpp index 2549de68af..2740d6b589 100644 --- a/media/libstagefright/MediaDefs.cpp +++ b/media/libstagefright/MediaDefs.cpp @@ -41,7 +41,7 @@ const char *MEDIA_MIMETYPE_AUDIO_RAW = "audio/raw"; const char *MEDIA_MIMETYPE_AUDIO_FLAC = "audio/flac"; const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS = "audio/aac-adts"; -const char *MEDIA_MIMETYPE_CONTAINER_MPEG4 = "video/mpeg4"; +const char *MEDIA_MIMETYPE_CONTAINER_MPEG4 = "video/mp4"; 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"; -- 2.11.0