Merge commit '0540b1c1c53f9813f99233208c5ccccd87004f98'

Sibras · Sibras · commit 26d8c640918b · 2022-04-02T17:55:27.000+11:00
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2022-03-03: Version 1.3.1
+- Add support for Java 13 ... 16.
+- Improve JVM probing in Windows.
+- Fix playback issues with some discs when using recent libbdplus.
+- Fix loading dlopen'd libraries on OpenBSD.
+
 2021-04-05: Version 1.3.0
 - Add bd_event_name().
 - Add return value to bd_refcnt_inc().
diff --git a/Makefile.am b/Makefile.am
@@ -12,7 +12,7 @@ EXTRA_DIST = \
 	COPYING \
 	doc \
 	player_wrappers \
-	README.txt \
+	README.md \
 	src/libbluray/bdj/build.xml \
 	src/libbluray/bdj/java \
 	src/libbluray/bdj/java-build-support \
diff --git a/README.md b/README.md
@@ -0,0 +1,67 @@
+# Libbluray
+**Libbluray** is an open-source **lib**rary designed for **Blu-Ray** Discs playback for media players, like **VLC** or **MPlayer**.
+
+
+
+## Goals and features
+
+This research project is developed by an **international team** of developers from **Doom9**.
+
+The library integrates navigation, playlist parsing, menus and BD-J.
+
+Most commercial Blu-Ray are protected by **AACS** or **BD+** technologies and this library is not enough to playback those discs.
+
+People interested in AACS technologies should have a look at [libaacs](https://code.videolan.org/videolan/libaacs).
+
+People interested in BD+ technologies should have a look at [libbdplus](https://code.videolan.org/videolan/libbdplus).
+
+## Licence
+
+**Libbluray** is released under a Free Software license, LGPL, ensuring it will stay free.
+A copy of LGPL is available [here](https://code.videolan.org/videolan/libbluray/-/blob/master/COPYING)
+
+## CoC
+
+The [VideoLAN Code of Conduct](https://wiki.videolan.org/CoC) applies to this project.
+
+## Disclaimer
+
+This library is written for the purpose of playing Blu-ray movies. It is
+intended for software that want to support Blu-ray playback (such as VLC and
+MPlayer). We, the authors of this library, do not condone nor endorse piracy.
+
+This library is simply a tool for playback of Blu-ray movies. Like any tool, the
+use of this tool can also be abused. There are already numerous laws in
+different countries and juridictions all over the world that protect copyrighted
+material, such as Blu-ray movies. With that said, it would have been
+inappropriate for us to distribute this library with terms such as "you cannot
+use this library for piracy". Instead, we present to everyone this disclaimer.
+
+As a reminder, here is also the disclaimer found at the beginning of any movie
+in relation to copyrights.
+
+## ATTENTION
+
+International agreement and national laws protect copyrighted motion pictures,
+videotapes, and sound recordings.
+
+UNAUTHORIZED REPRODUCTION, EXHIBITION OR DISTRIBUTION OF COPYRIGHTED MOTION
+PICTURES CAN RESULT IN SEVERE CRIMINAL AND CIVIL PENALTIES UNDER THE LAWS OF
+YOUR COUNTRY.
+
+
+The International Criminal Police Organization - INTERPOL, has expressed its
+concern about motion picture and sound recording piracy to all of its member
+national police forces. (Resolution adopted at INTERPOL General Assembly,
+Stockholm, Sweden, September 8, 1977.)
+
+
+## Mailing list
+
+You can discuss about libbluray on the [libbluray-devel mailing list](https://mailman.videolan.org/listinfo/libbluray-devel).
+
+## Documentation and support
+
+For support or more informations, look [here](https://www.videolan.org/developers/libbluray.html)
+
+All documentation about libbluray is available [here](https://videolan.videolan.me/libbluray/)
diff --git a/README.txt b/README.txt
diff --git a/configure.ac b/configure.ac
@@ -1,7 +1,7 @@
 dnl library version number
 m4_define([bluray_major], 1)
 m4_define([bluray_minor], 3)
-m4_define([bluray_micro], 0)
+m4_define([bluray_micro], 1)
 m4_define([bluray_version],[bluray_major.bluray_minor.bluray_micro])
 
 dnl shared library version (.so version)
@@ -13,7 +13,7 @@ dnl
 dnl Library file name will be libbluray.so.(current-age).age.revision
 dnl
 m4_define([lt_current],  6)
-m4_define([lt_revision], 0)
+m4_define([lt_revision], 1)
 m4_define([lt_age],      4)
 
 dnl initilization
diff --git a/src/devtools/bdj_test.c b/src/devtools/bdj_test.c
@@ -91,6 +91,15 @@ int main(int argc, char** argv)
       return -1;
     }
 
+    /* Check for special titles */
+
+    if (!di->first_play_supported) {
+        printf("FirstPlay title not supported\n");
+    }
+    if (!di->top_menu_supported) {
+        printf("TopMenu title not supported\n");
+    }
+
     bd_get_titles(bd, TITLES_ALL, 0);
 
     if (!bd_start_bdj(bd, argv[2])) {
diff --git a/src/file/dl_posix.c b/src/file/dl_posix.c
@@ -85,11 +85,15 @@ void *dl_dlopen(const char *path, const char *version)
 #endif
 
     for (i = 0 ; search_paths[i] ; ++i) {
+#ifdef __OpenBSD__
+        name = str_printf("%s%s%s", search_paths[i], path, ext);
+#else
         if (version) {
             name = str_printf("%s%s%s.%s", search_paths[i], path, ext, version);
         } else {
             name = str_printf("%s%s%s", search_paths[i], path, ext);
         }
+#endif
 
         if (!name) {
             BD_DEBUG(DBG_FILE | DBG_CRIT, "out of memory\n");
diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c
@@ -138,6 +138,10 @@ static void *_load_jvm_win32(const char **p_java_home)
         wcscpy(buf_loc, L"SOFTWARE\\JavaSoft\\JRE\\");
         r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, buf_loc, 0, KEY_READ, &hkey);
     }
+    if (r != ERROR_SUCCESS) {
+        wcscpy(buf_loc, L"SOFTWARE\\JavaSoft\\JDK\\");
+        r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, buf_loc, 0, KEY_READ, &hkey);
+    }
 # endif
     if (r != ERROR_SUCCESS) {
         BD_DEBUG(DBG_BDJ | DBG_CRIT, "Error opening registry key SOFTWARE\\JavaSoft\\Java Runtime Environment\\\n");
@@ -417,11 +421,10 @@ static void *_load_jvm(const char **p_java_home, const char *app_java_home)
                                             "/usr/lib/jvm/default",
                                             "/usr/lib/jvm/",
                                             "/etc/java-config-2/current-system-vm",
-                                            "/usr/lib/jvm/java-7-openjdk",
-                                            "/usr/lib/jvm/java-7-openjdk-" JAVA_ARCH,
                                             "/usr/lib/jvm/java-8-openjdk",
                                             "/usr/lib/jvm/java-8-openjdk-" JAVA_ARCH,
-                                            "/usr/lib/jvm/java-6-openjdk",
+                                            "/usr/lib/jvm/java-11-openjdk",
+                                            "/usr/lib/jvm/java-11-openjdk-" JAVA_ARCH,
 #    endif
     };
     static const char * const jvm_dir[]  = {"jre/lib/" JAVA_ARCH "/server",
diff --git a/src/libbluray/bdj/java-j2se/sun/awt/PlatformGraphicsInfo.java b/src/libbluray/bdj/java-j2se/sun/awt/PlatformGraphicsInfo.java
@@ -0,0 +1,46 @@
+/*
+ * This file is part of libbluray
+ * Copyright (C) 2021  VideoLAN
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+package sun.awt;
+
+/* This class replaces java.awt.graphicsenv property in Java 13+ */
+
+import java.awt.GraphicsEnvironment;
+import java.awt.Toolkit;
+
+public class PlatformGraphicsInfo {
+
+    public static GraphicsEnvironment createGE() {
+        return new java.awt.BDGraphicsEnvironment();
+    }
+
+    public static Toolkit createToolkit() {
+        return new java.awt.BDToolkit();
+    }
+
+    public static boolean getDefaultHeadlessProperty() {
+        return false;
+    }
+
+    public static String getDefaultHeadlessMessage() {
+        org.videolan.Logger.getLogger(PlatformGraphicsInfo.class.getName())
+            .error("Headless graphics environment ?\n" + org.videolan.Logger.dumpStack());
+        return "Internal error: headless graphics environment ?";
+    }
+}
diff --git a/src/libbluray/bdj/java/java/awt/BDGraphicsEnvironment.java b/src/libbluray/bdj/java/java/awt/BDGraphicsEnvironment.java
@@ -24,7 +24,7 @@
 
 import org.videolan.Logger;
 
-class BDGraphicsEnvironment extends GraphicsEnvironment {
+public class BDGraphicsEnvironment extends GraphicsEnvironment {
     private BDGraphicsDevice graphicsDevice;
 
     public BDGraphicsEnvironment() {
diff --git a/src/libbluray/bdj/java/org/videolan/Logger.java b/src/libbluray/bdj/java/org/videolan/Logger.java
@@ -152,8 +152,11 @@ public static String dumpStack() {
     }
 
     public static String dumpStack(Throwable t) {
+        String sup = "";
+        if (t.getCause() != null)
+            sup += "\n    Caused by: " + t.getCause() + "\n" + dumpStack(t.getCause());
         StackTraceElement e[] = t.getStackTrace();
-        return printStackTrace(e, 0);
+        return printStackTrace(e, 0) + sup;
     }
 
     public void unimplemented(String func) {
diff --git a/src/libbluray/bdnav/meta_parse.c b/src/libbluray/bdnav/meta_parse.c
@@ -165,7 +165,7 @@ static void _findMetaXMLfiles(META_ROOT *meta, BD_DISC *disc)
     for (res = dir_read(dir, &ent); !res; res = dir_read(dir, &ent)) {
         if (ent.d_name[0] == '.')
             continue;
-        else if (strncasecmp(ent.d_name, "bdmt_", 5) == 0) {
+        else if (strncasecmp(ent.d_name, "bdmt_", 5) == 0 && strlen(ent.d_name) == 12) {
             META_DL *new_dl_entries = realloc(meta->dl_entries, ((meta->dl_count + 1)*sizeof(META_DL)));
             if (new_dl_entries) {
                 uint8_t i = meta->dl_count;
@@ -174,7 +174,7 @@ static void _findMetaXMLfiles(META_ROOT *meta, BD_DISC *disc)
                 memset(&meta->dl_entries[i], 0, sizeof(meta->dl_entries[i]));
 
                 meta->dl_entries[i].filename = str_dup(ent.d_name);
-                strncpy(meta->dl_entries[i].language_code, ent.d_name+5,3);
+                memcpy(meta->dl_entries[i].language_code, ent.d_name+5,3);
                 meta->dl_entries[i].language_code[3] = '\0';
                 str_tolower(meta->dl_entries[i].language_code);
             }
@@ -197,7 +197,7 @@ static void _findMetaXMLfiles(META_ROOT *meta, BD_DISC *disc)
                     memset(&meta->tn_entries[i], 0, sizeof(meta->tn_entries[i]));
 
                     meta->tn_entries[i].filename = str_dup(ent.d_name);
-                    strncpy(meta->tn_entries[i].language_code, ent.d_name + 5, 3);
+                    memcpy(meta->tn_entries[i].language_code, ent.d_name + 5, 3);
                     meta->tn_entries[i].playlist = atoi(ent.d_name + 9);
                     meta->tn_entries[i].language_code[3] = '\0';
                     str_tolower(meta->tn_entries[i].language_code);
diff --git a/src/libbluray/bluray.c b/src/libbluray/bluray.c
@@ -1138,12 +1138,13 @@ static void _fill_disc_info(BLURAY *bd, BD_ENC_INFO *enc_info)
         /* increase player profile and version when 3D or UHD disc is detected */
 
         if (index->indx_version >= ('0' << 24 | '3' << 16 | '0' << 8 | '0')) {
-            BD_DEBUG(DBG_CRIT | DBG_BLURAY, "WARNING: BluRay profile 6 BD-J menu support is experimental\n");
+            BD_DEBUG(DBG_BLURAY, "Detected 4K UltraHD (profile 6) disc\n");
             /* Switch to UHD profile */
             psr_init_UHD(bd->regs, 1);
         }
         if (((index->indx_version >> 16) & 0xff) == '2') {
             if (index->app_info.content_exist_flag) {
+                BD_DEBUG(DBG_BLURAY, "Detected Blu-Ray 3D (profile 5) disc\n");
                 /* Switch to 3D profile */
                 psr_init_3D(bd->regs, index->app_info.initial_output_mode_preference, 0);
             }
@@ -2425,6 +2426,11 @@ static int _add_known_playlist(BD_DISC *p, const char *mpls_id)
 
 static int _open_playlist(BLURAY *bd, const char *f_name, unsigned angle)
 {
+    if (!bd->title_list && bd->title_type == title_undef) {
+        BD_DEBUG(DBG_BLURAY | DBG_CRIT, "open_playlist(%s): bd_play() or bd_get_titles() not called\n", f_name);
+        disc_event(bd->disc, DISC_EVENT_START, bd->disc_info.num_titles);
+    }
+
     _close_playlist(bd);
 
     bd->title = nav_title_open(bd->disc, f_name, angle);
diff --git a/src/libbluray/decoders/graphics_controller.c b/src/libbluray/decoders/graphics_controller.c
@@ -2060,14 +2060,19 @@ int gc_run(GRAPHICS_CONTROLLER *gc, gc_ctrl_e ctrl, uint32_t param, GC_NAV_CMDS
         case GC_CTRL_MOUSE_MOVE:
             result = _mouse_move(gc, param >> 16, param & 0xffff, cmds);
             break;
-
+#ifndef __COVERITY__
+        /* no "default:" :
+         * this chunk is used to trigger a warning when a new enum value is added,
+         * but not handled here.
+         */
         case GC_CTRL_RESET:
         case GC_CTRL_PG_RESET:
         case GC_CTRL_PG_UPDATE:
         case GC_CTRL_PG_CHARCODE:
         case GC_CTRL_STYLE_SELECT:
             /* already handled */
             break;
+#endif
     }
 
     if (cmds) {
diff --git a/src/libbluray/disc/bdplus.c b/src/libbluray/disc/bdplus.c
@@ -281,6 +281,10 @@ const uint8_t *libbdplus_get_data(BD_BDPLUS *p, int type)
             if (libbdplus_is_mmbd(p)) {
                 return (const uint8_t *)"mmbd";
             }
+            if ((int32_t)_bdplus_get(p, "bdplus_is_cached") > 0) {
+                return (const uint8_t *)"mmbd;libbdplus";
+            }
+            break;
     }
 
     return NULL;
diff --git a/src/libbluray/disc/dec.c b/src/libbluray/disc/dec.c
@@ -369,6 +369,7 @@ void dec_start(BD_DEC *dec, uint32_t num_titles)
         }
     } else {
         if (dec->bdplus) {
+            libbdplus_start(dec->bdplus);
             libbdplus_event(dec->bdplus, 0xffffffff, num_titles, 0);
         }
     }
