diff options
| author | Marco Nelissen <marcone@google.com> | 2012-09-05 19:19:52 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-05 19:19:52 -0700 |
| commit | b9342ac53966c722758602b64d6339863ac26e41 (patch) | |
| tree | 6d50e843796005ef167c7856043336d2267655e8 | |
| parent | 19b247a8531b27cd32df84fc90f87a21e011d7a6 (diff) | |
| parent | 4a315abd2fa975ab31ec8fcef8f4a790dfda9416 (diff) | |
| download | frameworks_av-b9342ac53966c722758602b64d6339863ac26e41.zip frameworks_av-b9342ac53966c722758602b64d6339863ac26e41.tar.gz frameworks_av-b9342ac53966c722758602b64d6339863ac26e41.tar.bz2 | |
Merge "To make mimetype for WAV file consistent over SF." into jb-mr1-dev
| -rw-r--r-- | media/libstagefright/MediaDefs.cpp | 2 | ||||
| -rw-r--r-- | media/libstagefright/WAVExtractor.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/media/libstagefright/MediaDefs.cpp b/media/libstagefright/MediaDefs.cpp index 2740d6b..e7b5903 100644 --- a/media/libstagefright/MediaDefs.cpp +++ b/media/libstagefright/MediaDefs.cpp @@ -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"; diff --git a/media/libstagefright/WAVExtractor.cpp b/media/libstagefright/WAVExtractor.cpp index 851321d..a38400b 100644 --- a/media/libstagefright/WAVExtractor.cpp +++ b/media/libstagefright/WAVExtractor.cpp @@ -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 - |