8282054: Mediaplayer not working with HTTP Live Stream link with query parameter appended with file extension m3u8

Reviewed-by: kcr, arapte

Author: Alexander Matveev

modules/javafx.media/src/main/java/com/sun/media/jfxmedia/locator/Locator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -422,7 +422,7 @@ public void init() throws URISyntaxException, IOException, FileNotFoundException
                             InputStream stream = getInputStream(uri);
                             stream.close();
                             isConnected = true;
-                            contentType = MediaUtils.filenameToContentType(uriString); // We need to provide at least something
+                            contentType = MediaUtils.filenameToContentType(uri.getPath()); // We need to provide at least something
                         }
 
                         if (isConnected) {
@@ -438,7 +438,7 @@ public void init() throws URISyntaxException, IOException, FileNotFoundException
                             } else {
                                 if (contentType == null || !MediaManager.canPlayContentType(contentType)) {
                                     // Try content based on file name.
-                                    contentType = MediaUtils.filenameToContentType(uriString);
+                                    contentType = MediaUtils.filenameToContentType(uri.getPath());
 
                                     if (Locator.DEFAULT_CONTENT_TYPE.equals(contentType)) {
                                         // Try content based on file signature.
@@ -469,7 +469,7 @@ public void init() throws URISyntaxException, IOException, FileNotFoundException
             }
             else {
                 // in case of iPod files we can be sure all files are supported
-                contentType = MediaUtils.filenameToContentType(uriString);
+                contentType = MediaUtils.filenameToContentType(uri.getPath());
             }
 
             if (Logger.canLog(Logger.WARNING)) {
@@ -597,27 +597,38 @@ public void setConnectionProperty(String property, Object value) {
     }
 
     public ConnectionHolder createConnectionHolder() throws IOException {
-        // first check if it's cached
+        // check if it's cached
         if (null != cacheEntry) {
             if (Logger.canLog(Logger.DEBUG)) {
                 Logger.logMsg(Logger.DEBUG, "Locator.createConnectionHolder: media cached, creating memory connection holder");
             }
             return ConnectionHolder.createMemoryConnectionHolder(cacheEntry.getBuffer());
         }
 
-        // then fall back on other methods
-        ConnectionHolder holder;
+        // check if it is local file
         if ("file".equals(scheme)) {
-            holder = ConnectionHolder.createFileConnectionHolder(uri);
-        } else if (uri.toString().endsWith(".m3u8") || uri.toString().endsWith(".m3u")) {
-            holder = ConnectionHolder.createHLSConnectionHolder(uri);
-        } else {
-            synchronized (propertyLock) {
-                holder = ConnectionHolder.createURIConnectionHolder(uri, connectionProperties);
-            }
+            return ConnectionHolder.createFileConnectionHolder(uri);
+        }
+
+        // check if it is HTTP Live Streaming
+        //    - uri path ends with .m3u8 or .m3u
+        //    - contentType is "application/vnd.apple.mpegurl" or "audio/mpegurl"
+        String uriPath = uri.getPath();
+        if (uriPath != null && (uriPath.endsWith(".m3u8") ||
+                                uriPath.endsWith(".m3u"))) {
+            return ConnectionHolder.createHLSConnectionHolder(uri);
         }
 
-        return holder;
+        String type = getContentType(); // Should be ready by now
+        if (type != null && (type.equals(MediaUtils.CONTENT_TYPE_M3U8) ||
+                             type.equals(MediaUtils.CONTENT_TYPE_M3U))) {
+            return ConnectionHolder.createHLSConnectionHolder(uri);
+        }
+
+        // media file over http/https
+        synchronized  (propertyLock) {
+            return ConnectionHolder.createURIConnectionHolder(uri, connectionProperties);
+        }
     }
 
     private String getContentTypeFromFileSignature(URI uri) throws MalformedURLException, IOException {

modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/MediaUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -158,49 +158,62 @@ else if ((buf[8] & 0xff) == 0x69 && (buf[9] & 0xff) == 0x73 && (buf[10] & 0xff)
                 contentType = CONTENT_TYPE_MP4;
             else if ((buf[8] & 0xff) == 0x4D && (buf[9] & 0xff) == 0x50 && (buf[10] & 0xff) == 0x34 && (buf[11] & 0xff) == 0x20) // 'MP4 '
                 contentType = CONTENT_TYPE_MP4;
+        } else if ((buf[0] & 0xff) == 0x23
+                && (buf[1] & 0xff) == 0x45
+                && (buf[2] & 0xff) == 0x58
+                && (buf[3] & 0xff) == 0x54
+                && (buf[4] & 0xff) == 0x4d
+                && (buf[5] & 0xff) == 0x33
+                && (buf[6] & 0xff) == 0x55) { // "#EXTM3U"
+            contentType = CONTENT_TYPE_M3U8;
         } else {
             throw new MediaException("Unrecognized file signature!");
         }
 
         return contentType;
     }
-
     /**
      * Returns the content type given the file name.
      *
      * @param filename
      * @return content type
      */
     public static String filenameToContentType(String filename) {
-        String contentType = Locator.DEFAULT_CONTENT_TYPE;
+        if (filename == null) {
+            return Locator.DEFAULT_CONTENT_TYPE;
+        }
 
         int dotIndex = filename.lastIndexOf(".");
-
         if (dotIndex != -1) {
             String extension = filename.toLowerCase().substring(dotIndex + 1);
 
-            if (extension.equals(FILE_TYPE_AIF) || extension.equals(FILE_TYPE_AIFF)) {
-                contentType = CONTENT_TYPE_AIFF;
-            } else if (extension.equals(FILE_TYPE_FLV) || extension.equals(FILE_TYPE_FXM)) {
-                contentType = CONTENT_TYPE_JFX;
-            } else if (extension.equals(FILE_TYPE_MPA)) {
-                contentType = CONTENT_TYPE_MPA;
-            } else if (extension.equals(FILE_TYPE_WAV)) {
-                contentType = CONTENT_TYPE_WAV;
-            } else if (extension.equals(FILE_TYPE_MP4)) {
-                contentType = CONTENT_TYPE_MP4;
-            } else if (extension.equals(FILE_TYPE_M4A)) {
-                contentType = CONTENT_TYPE_M4A;
-            } else if (extension.equals(FILE_TYPE_M4V)) {
-                contentType = CONTENT_TYPE_M4V;
-            } else if (extension.equals(FILE_TYPE_M3U8)) {
-                contentType = CONTENT_TYPE_M3U8;
-            } else if (extension.equals(FILE_TYPE_M3U)) {
-                contentType = CONTENT_TYPE_M3U;
+            switch (extension) {
+                case FILE_TYPE_AIF:
+                case FILE_TYPE_AIFF:
+                    return CONTENT_TYPE_AIFF;
+                case FILE_TYPE_FLV:
+                case FILE_TYPE_FXM:
+                    return CONTENT_TYPE_JFX;
+                case FILE_TYPE_MPA:
+                    return CONTENT_TYPE_MPA;
+                case FILE_TYPE_WAV:
+                    return CONTENT_TYPE_WAV;
+                case FILE_TYPE_MP4:
+                    return CONTENT_TYPE_MP4;
+                case FILE_TYPE_M4A:
+                    return CONTENT_TYPE_M4A;
+                case FILE_TYPE_M4V:
+                    return CONTENT_TYPE_M4V;
+                case FILE_TYPE_M3U8:
+                    return CONTENT_TYPE_M3U8;
+                case FILE_TYPE_M3U:
+                    return CONTENT_TYPE_M3U;
+                default:
+                    break;
             }
         }
 
-        return contentType;
+        return Locator.DEFAULT_CONTENT_TYPE;
     }
 
     /**