[libbluray-devel] [Git][videolan/libbluray][master] 3 commits: Reduce log level (Java 9 warning -> info)

[Petri Hintukainen]

Petri Hintukainen pushed to branch master at VideoLAN / libbluray


Commits:
58796846 by hpi1 at 2020-08-15T23:35:48+03:00
Reduce log level (Java 9 warning -> info)

- - - - -
8c71ce2c by hpi1 at 2020-08-15T23:36:38+03:00
Remove old warning

- - - - -
92425ef3 by hpi1 at 2020-08-15T23:36:38+03:00
HDMV: try to recover after missing/broken playlist.

Fixes "Star Trek Beyond 4K".
At the beginning of playback the disc checks for UHD display capabilty
and selects first playlist based on the check result.
Only playlist for the error message (missing UHD capability) is present on
the disc.

- - - - -


3 changed files:

- src/libbluray/bdj/bdj.c
- src/libbluray/bluray.c
- src/libbluray/disc/dec.c


Changes:

=====================================
src/libbluray/bdj/bdj.c
=====================================
@@ -862,7 +862,7 @@ static int _create_jvm(void *jvm_lib, const char *java_home, const char *jar_fil
 #else
     java_9 = !!dl_dlsym(jvm_lib, "JVM_DefineModule");
     if (java_9) {
-        BD_DEBUG(DBG_CRIT | DBG_BDJ, "Detected Java 9 or later JVM - support is experimental !\n");
+        BD_DEBUG(DBG_BDJ, "Detected Java 9 or later JVM\n");
     }
 #endif
 


=====================================
src/libbluray/bluray.c
=====================================
@@ -147,6 +147,7 @@ struct bluray {
     /* HDMV */
     HDMV_VM        *hdmv_vm;
     uint8_t         hdmv_suspended;
+    uint8_t         hdmv_num_invalid_pl;
 
     /* BD-J */
     BDJAVA         *bdjava;
@@ -3427,7 +3428,23 @@ static void _process_hdmv_vm_event(BLURAY *bd, HDMV_EVENT *hev)
             break;
 
         case HDMV_EVENT_PLAY_PL:
-            bd_select_playlist(bd, hev->param);
+            if (!bd_select_playlist(bd, hev->param)) {
+                /* Missing playlist ?
+                 * Seen on some discs while checking UHD capability.
+                 * It seems only error message playlist is present, on success
+                 * non-existing playlist is selected ...
+                 */
+                bd->hdmv_num_invalid_pl++;
+                if (bd->hdmv_num_invalid_pl < 10) {
+                    hdmv_vm_resume(bd->hdmv_vm);
+                    bd->hdmv_suspended = !hdmv_vm_running(bd->hdmv_vm);
+                    BD_DEBUG(DBG_BLURAY | DBG_CRIT, "Ignoring non-existing playlist %05d.mpls in HDMV mode\n", hev->param);
+                    break;
+                }
+            } else {
+                bd->hdmv_num_invalid_pl = 0;
+            }
+
             /* initialize menus */
             _init_ig_stream(bd);
             _run_gc(bd, GC_CTRL_INIT_MENU, 0);


=====================================
src/libbluray/disc/dec.c
=====================================
@@ -242,7 +242,7 @@ static int _libbdplus_init(BD_DEC *dec, struct dec_dev *dev,
 
     if (i->bdplus_date == 0) {
         // libmmbd -> no menu support
-        BD_DEBUG(DBG_BLURAY | DBG_CRIT, "WARNING: using libmmbd for BD+. On-disc menus won't work with all discs.\n");
+        //BD_DEBUG(DBG_BLURAY | DBG_CRIT, "WARNING: using libmmbd for BD+. On-disc menus won't work with all discs.\n");
         //i->no_menu_support = 1;
     }
 



View it on GitLab: https://code.videolan.org/videolan/libbluray/-/compare/1ec56c7653e6ede56be94c126730f662580ef726...92425ef387168481ecb43d999a5db64fb8ff4180

-- 
View it on GitLab: https://code.videolan.org/videolan/libbluray/-/compare/1ec56c7653e6ede56be94c126730f662580ef726...92425ef387168481ecb43d999a5db64fb8ff4180
You're receiving this email because of your account on code.videolan.org.