[libbluray-devel] [Git][videolan/libbluray][master] 5 commits: bdj_test: report unsupportd FP/TM title

Petri Hintukainen (@hpi) gitlab at videolan.org
Thu Mar 3 17:04:14 UTC 2022



Petri Hintukainen pushed to branch master at VideoLAN / libbluray


Commits:
1568966f by hpi1 at 2022-03-03T18:54:52+02:00
bdj_test: report unsupportd FP/TM title

- - - - -
02475578 by hpi1 at 2022-03-03T18:54:52+02:00
Silence coverity

- - - - -
2553f12f by hpi1 at 2022-03-03T18:54:52+02:00
Silence warning from intentional string truncation

- - - - -
c96512cc by hpi1 at 2022-03-03T18:55:21+02:00
Update ChangeLog

- - - - -
0540b1c1 by hpi1 at 2022-03-03T18:58:53+02:00
Bump version (1.3.1)

- - - - -


5 changed files:

- ChangeLog
- configure.ac
- src/devtools/bdj_test.c
- src/libbluray/bdnav/meta_parse.c
- src/libbluray/decoders/graphics_controller.c


Changes:

=====================================
ChangeLog
=====================================
@@ -1,5 +1,8 @@
+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().


=====================================
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


=====================================
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])) {


=====================================
src/libbluray/bdnav/meta_parse.c
=====================================
@@ -161,7 +161,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;
@@ -170,7 +170,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);
             }
@@ -193,7 +193,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);


=====================================
src/libbluray/decoders/graphics_controller.c
=====================================
@@ -2060,7 +2060,11 @@ 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:
@@ -2068,6 +2072,7 @@ int gc_run(GRAPHICS_CONTROLLER *gc, gc_ctrl_e ctrl, uint32_t param, GC_NAV_CMDS
         case GC_CTRL_STYLE_SELECT:
             /* already handled */
             break;
+#endif
     }
 
     if (cmds) {



View it on GitLab: https://code.videolan.org/videolan/libbluray/-/compare/060d8f055f2ed1b4752340be5d16403bad5ccdc0...0540b1c1c53f9813f99233208c5ccccd87004f98

-- 
View it on GitLab: https://code.videolan.org/videolan/libbluray/-/compare/060d8f055f2ed1b4752340be5d16403bad5ccdc0...0540b1c1c53f9813f99233208c5ccccd87004f98
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance


More information about the libbluray-devel mailing list