[webkit-changes] [218634] trunk

Wed, 21 Jun 2017 09:05:08 -0700

Title: [218634] trunk
Revision
218634
Author
[email protected]
Date
2017-06-21 09:04:51 -0700 (Wed, 21 Jun 2017)

Log Message

Include audio/vnd.wave as a valid mime-type for wav files.
https://bugs.webkit.org/show_bug.cgi?id=173635
rdar://problem/32656568

Patch by Jeremy Jones <[email protected]> on 2017-06-21
Reviewed by Eric Carlson.

audio/vnd.wave is a valid mime-type for wav files per https://tools.ietf.org/html/rfc2361

Updated test and test results:
LayoutTests/media/media-can-play-wav-audio.html

* platform/MIMETypeRegistry.cpp:
(WebCore::initializeSupportedImageMIMETypes):
(WebCore::mimeTypeAssociationMap):
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
(WebCore::MediaPlayerPrivateAVFoundation::staticMIMETypeList):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::mimeTypeSet):

Modified Paths

Diff

Modified: trunk/LayoutTests/media/media-can-play-wav-audio-expected.txt (218633 => 218634)


--- trunk/LayoutTests/media/media-can-play-wav-audio-expected.txt	2017-06-21 15:58:53 UTC (rev 218633)
+++ trunk/LayoutTests/media/media-can-play-wav-audio-expected.txt	2017-06-21 16:04:51 UTC (rev 218634)
@@ -5,7 +5,9 @@
 
 EXPECTED (audio.canPlayType('audio/wav') == 'maybe') OK
 EXPECTED (audio.canPlayType('audio/x-wav') == 'maybe') OK
+EXPECTED (audio.canPlayType('audio/vnd.wave') == 'maybe') OK
 EXPECTED (audio.canPlayType('audio/wav; codecs=1') == 'probably') OK
 EXPECTED (audio.canPlayType('audio/x-wav; codecs=1') == 'probably') OK
+EXPECTED (audio.canPlayType('audio/vnd.wave; codecs=1') == 'probably') OK
 END OF TEST

Modified: trunk/LayoutTests/media/media-can-play-wav-audio.html (218633 => 218634)


--- trunk/LayoutTests/media/media-can-play-wav-audio.html	2017-06-21 15:58:53 UTC (rev 218633)
+++ trunk/LayoutTests/media/media-can-play-wav-audio.html	2017-06-21 16:04:51 UTC (rev 218634)
@@ -9,10 +9,12 @@
 
                 testExpected("audio.canPlayType('audio/wav')", "maybe");
                 testExpected("audio.canPlayType('audio/x-wav')", "maybe");
+                testExpected("audio.canPlayType('audio/vnd.wave')", "maybe");
 
                 // WAV codec 1 is basic PCM, refer to http://tools.ietf.org/html/rfc2361
                 testExpected("audio.canPlayType('audio/wav; codecs=1')", "probably");
                 testExpected("audio.canPlayType('audio/x-wav; codecs=1')", "probably");
+                testExpected("audio.canPlayType('audio/vnd.wave; codecs=1')", "probably");
 
                 endTest();
             }

Modified: trunk/LayoutTests/platform/mac/media/media-can-play-wav-audio-expected.txt (218633 => 218634)


--- trunk/LayoutTests/platform/mac/media/media-can-play-wav-audio-expected.txt	2017-06-21 15:58:53 UTC (rev 218633)
+++ trunk/LayoutTests/platform/mac/media/media-can-play-wav-audio-expected.txt	2017-06-21 16:04:51 UTC (rev 218634)
@@ -5,7 +5,9 @@
 
 EXPECTED (audio.canPlayType('audio/wav') == 'maybe') OK
 EXPECTED (audio.canPlayType('audio/x-wav') == 'maybe') OK
+EXPECTED (audio.canPlayType('audio/vnd.wave') == 'maybe') OK
 EXPECTED (audio.canPlayType('audio/wav; codecs=1') == 'probably'), OBSERVED 'maybe' FAIL
 EXPECTED (audio.canPlayType('audio/x-wav; codecs=1') == 'probably'), OBSERVED 'maybe' FAIL
+EXPECTED (audio.canPlayType('audio/vnd.wave; codecs=1') == 'probably'), OBSERVED 'maybe' FAIL
 END OF TEST

Modified: trunk/LayoutTests/platform/win/media/media-can-play-wav-audio-expected.txt (218633 => 218634)


--- trunk/LayoutTests/platform/win/media/media-can-play-wav-audio-expected.txt	2017-06-21 15:58:53 UTC (rev 218633)
+++ trunk/LayoutTests/platform/win/media/media-can-play-wav-audio-expected.txt	2017-06-21 16:04:51 UTC (rev 218634)
@@ -5,7 +5,9 @@
 
 EXPECTED (audio.canPlayType('audio/wav') == 'maybe') OK
 EXPECTED (audio.canPlayType('audio/x-wav') == 'maybe') OK
+EXPECTED (audio.canPlayType('audio/vnd.wave') == 'maybe') OK
 EXPECTED (audio.canPlayType('audio/wav; codecs=1') == 'probably') OK
 EXPECTED (audio.canPlayType('audio/x-wav; codecs=1') == 'probably') OK
+EXPECTED (audio.canPlayType('audio/vnd.wave; codecs=1') == 'probably') OK
 END OF TEST

Modified: trunk/Source/WebCore/ChangeLog (218633 => 218634)


--- trunk/Source/WebCore/ChangeLog	2017-06-21 15:58:53 UTC (rev 218633)
+++ trunk/Source/WebCore/ChangeLog	2017-06-21 16:04:51 UTC (rev 218634)
@@ -1,3 +1,24 @@
+2017-06-21  Jeremy Jones  <[email protected]>
+
+        Include audio/vnd.wave as a valid mime-type for wav files.
+        https://bugs.webkit.org/show_bug.cgi?id=173635
+        rdar://problem/32656568
+
+        Reviewed by Eric Carlson.
+
+        audio/vnd.wave is a valid mime-type for wav files per https://tools.ietf.org/html/rfc2361
+
+        Updated test and test results:
+        LayoutTests/media/media-can-play-wav-audio.html
+
+        * platform/MIMETypeRegistry.cpp:
+        (WebCore::initializeSupportedImageMIMETypes):
+        (WebCore::mimeTypeAssociationMap):
+        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
+        (WebCore::MediaPlayerPrivateAVFoundation::staticMIMETypeList):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::mimeTypeSet):
+
 2017-06-21  Chris Fleizach  <[email protected]>
 
         AX: Cannot call setValue() on contenteditable or ARIA text controls

Modified: trunk/Source/WebCore/platform/MIMETypeRegistry.cpp (218633 => 218634)


--- trunk/Source/WebCore/platform/MIMETypeRegistry.cpp	2017-06-21 15:58:53 UTC (rev 218633)
+++ trunk/Source/WebCore/platform/MIMETypeRegistry.cpp	2017-06-21 16:04:51 UTC (rev 218634)
@@ -139,7 +139,8 @@
     { "audio/x-gsm", "gsm" },
 
     // ADPCM
-    { "audio/x-wav", "wav" }
+    { "audio/x-wav", "wav" },
+    { "audio/vnd.wave", "wav" }
 };
 
 static HashSet<String, ASCIICaseInsensitiveHash>* supportedImageResourceMIMETypes;
@@ -771,6 +772,7 @@
     mimeTypeMap->add(ASCIILiteral("audio/qcp"), ASCIILiteral("audio/qcelp"));
     mimeTypeMap->add(ASCIILiteral("audio/vnd.qcp"), ASCIILiteral("audio/qcelp"));
     mimeTypeMap->add(ASCIILiteral("audio/wav"), ASCIILiteral("audio/x-wav"));
+    mimeTypeMap->add(ASCIILiteral("audio/vnd.wave"), ASCIILiteral("audio/x-wav"));
     mimeTypeMap->add(ASCIILiteral("audio/mid"), ASCIILiteral("audio/midi"));
     mimeTypeMap->add(ASCIILiteral("audio/sp-midi"), ASCIILiteral("audio/midi"));
     mimeTypeMap->add(ASCIILiteral("audio/x-mid"), ASCIILiteral("audio/midi"));

Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp (218633 => 218634)


--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp	2017-06-21 15:58:53 UTC (rev 218633)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp	2017-06-21 16:04:51 UTC (rev 218634)
@@ -1141,6 +1141,7 @@
             "audio/mpeg3",
             "audio/mpegurl",
             "audio/mpg",
+            "audio/vnd.wave",
             "audio/wav",
             "audio/wave",
             "audio/x-aac",

Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (218633 => 218634)


--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp	2017-06-21 15:58:53 UTC (rev 218633)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp	2017-06-21 16:04:51 UTC (rev 218634)
@@ -1776,7 +1776,7 @@
             {AudioDecoder, "audio/x-sbc", { }},
             {AudioDecoder, "audio/x-sid", { }},
             {AudioDecoder, "audio/x-flac", {"audio/x-flac", "audio/flac"}},
-            {AudioDecoder, "audio/x-wav", {"audio/x-wav", "audio/wav"}},
+            {AudioDecoder, "audio/x-wav", {"audio/x-wav", "audio/wav", "audio/vnd.wave"}},
             {AudioDecoder, "audio/x-wavpack", {"audio/x-wavpack"}},
             {AudioDecoder, "audio/x-speex", {"audio/speex", "audio/x-speex"}},
             {AudioDecoder, "audio/x-ac3", { }},
@@ -1796,7 +1796,7 @@
             {Demuxer, "audio/x-aiff", { }},
             {Demuxer, "application/x-pn-realaudio", { }},
             {Demuxer, "application/vnd.rn-realmedia", { }},
-            {Demuxer, "audio/x-wav", {"audio/x-wav", "audio/wav"}},
+            {Demuxer, "audio/x-wav", {"audio/x-wav", "audio/wav", "audio/vnd.wave"}},
             {Demuxer, "application/x-hls", {"application/vnd.apple.mpegurl", "application/x-mpegurl"}}
         };
 

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to