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

Commit b9342ac5 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "To make mimetype for WAV file consistent over SF." into jb-mr1-dev

parents 19b247a8 4a315abd

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