Skip to content

Commit 6f64c90

Browse files
committed
Fix the file mimetype reported by the mpeg4 extractor.
Change-Id: I72474c17757dba5867f55b0e99e76e9e4e32ce7b related-to-bug: 6217289
1 parent 2e842a5 commit 6f64c90

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

media/libstagefright/MPEG4Extractor.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,8 @@ status_t MPEG4Extractor::readMetaData() {
373373

374374
if (mInitCheck == OK) {
375375
if (mHasVideo) {
376-
mFileMetaData->setCString(kKeyMIMEType, "video/mp4");
376+
mFileMetaData->setCString(
377+
kKeyMIMEType, MEDIA_MIMETYPE_CONTAINER_MPEG4);
377378
} else {
378379
mFileMetaData->setCString(kKeyMIMEType, "audio/mp4");
379380
}

media/libstagefright/MediaDefs.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const char *MEDIA_MIMETYPE_AUDIO_RAW = "audio/raw";
4141
const char *MEDIA_MIMETYPE_AUDIO_FLAC = "audio/flac";
4242
const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS = "audio/aac-adts";
4343

44-
const char *MEDIA_MIMETYPE_CONTAINER_MPEG4 = "video/mpeg4";
44+
const char *MEDIA_MIMETYPE_CONTAINER_MPEG4 = "video/mp4";
4545
const char *MEDIA_MIMETYPE_CONTAINER_WAV = "audio/wav";
4646
const char *MEDIA_MIMETYPE_CONTAINER_OGG = "application/ogg";
4747
const char *MEDIA_MIMETYPE_CONTAINER_MATROSKA = "video/x-matroska";

0 commit comments

Comments
 (0)