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

Commit 06096f95 authored by Dongwon Kang's avatar Dongwon Kang
Browse files

To make mimetype for WAV file consistent over SF. 

(audio/x-wav is chosen because it was also used in MediaFile.java.)
Tested: checked wav files plays well on Music app.

Change-Id: Ifc07bcbed681e509176b1c144626f6f1009e69be
parent 31238033

media/libstagefright/MediaDefs.cpp

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 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/mp4";

const char *MEDIA_MIMETYPE_CONTAINER_WAV = "audio/wav";

const char *MEDIA_MIMETYPE_CONTAINER_WAV = "audio/x-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";

media/libstagefright/WAVExtractor.cpp

+1 −2
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ sp<MetaData> WAVExtractor::getMetaData() { 
        return meta;

    }



    meta->setCString(kKeyMIMEType, "audio/x-wav");

    meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_CONTAINER_WAV);



    return meta;

}
@@ -509,4 +509,3 @@ bool SniffWAV( 
}



}  // namespace android