[libbluray-devel] [Git][videolan/libbluray][master] 5 commits: bdparse.h: add missing defines

[Petri Hintukainen (@hpi)]

Petri Hintukainen pushed to branch master at VideoLAN / libbluray


Commits:
86c0bb7b by Petri Hintukainen at 2022-10-15T16:41:48+03:00
bdparse.h: add missing defines

- - - - -
5fcb081d by Petri Hintukainen at 2022-10-15T16:42:29+03:00
configure: drop unneeded AC_TYPE_SIGNAL

- - - - -
5dbe542b by Petri Hintukainen at 2022-10-15T16:42:52+03:00
configure: add missing brackets to AC_INIT

- - - - -
138af378 by Petri Hintukainen at 2022-10-15T16:43:36+03:00
Use define instead of magic number

- - - - -
ef8417e3 by Petri Hintukainen at 2022-10-15T16:44:08+03:00
Simplify

Font can't be null

- - - - -


4 changed files:

- configure.ac
- src/libbluray/bdj/java/java/awt/BDGraphicsBase.java
- src/libbluray/bdnav/bdparse.h
- src/libbluray/bluray.c


Changes:

=====================================
configure.ac
=====================================
@@ -17,7 +17,7 @@ m4_define([lt_revision], 2)
 m4_define([lt_age],      4)
 
 dnl initilization
-AC_INIT([libbluray], bluray_version, [http://www.videolan.org/developers/libbluray.html])
+AC_INIT([libbluray],[bluray_version],[http://www.videolan.org/developers/libbluray.html])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_HOST
@@ -138,9 +138,6 @@ AM_PROG_CC_C_O
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 AC_PROG_LIBTOOL
 
-dnl required types
-AC_TYPE_SIGNAL
-
 dnl required headers
 AC_CHECK_HEADERS([stdarg.h sys/types.h dirent.h errno.h libgen.h malloc.h])
 AC_CHECK_HEADERS([stdlib.h mntent.h inttypes.h strings.h])


=====================================
src/libbluray/bdj/java/java/awt/BDGraphicsBase.java
=====================================
@@ -220,11 +220,8 @@ abstract class BDGraphicsBase extends DVBGraphics implements ConstrainableGraphi
     }
 
     public FontMetrics getFontMetrics() {
-        if (font != null && fontMetrics == null) {
-            fontMetrics = BDFontMetrics.getFontMetrics(font);
-        }
         if (fontMetrics == null) {
-            logger.error("getFontMetrics() failed");
+            fontMetrics = BDFontMetrics.getFontMetrics(getFont());
         }
         return fontMetrics;
     }


=====================================
src/libbluray/bdnav/bdparse.h
=====================================
@@ -57,6 +57,9 @@
 #define BD_ASPECT_RATIO_4_3                 2
 #define BD_ASPECT_RATIO_16_9                3
 
+#define BD_COLOR_SPACE_BT_709               1
+#define BD_COLOR_SPACE_BT_2020              2
+
 #define BD_AUDIO_FORMAT_MONO                1
 #define BD_AUDIO_FORMAT_STEREO              3
 #define BD_AUDIO_FORMAT_MULTI_CHAN          6


=====================================
src/libbluray/bluray.c
=====================================
@@ -439,7 +439,7 @@ static int _is_interactive_title(BLURAY *bd)
 {
     if (bd->titles && bd->title_type != title_undef) {
         unsigned title = bd_psr_read(bd->regs, PSR_TITLE_NUMBER);
-        if (title == 0xffff && bd->disc_info.first_play->interactive) {
+        if (title == BLURAY_TITLE_FIRST_PLAY && bd->disc_info.first_play->interactive) {
             return 1;
         }
         if (title <= bd->disc_info.num_titles && bd->titles[title]) {
@@ -3357,7 +3357,7 @@ static int _play_title(BLURAY *bd, unsigned title)
     /* first play object ? */
     if (title == BLURAY_TITLE_FIRST_PLAY) {
 
-        bd_psr_write(bd->regs, PSR_TITLE_NUMBER, 0xffff); /* 5.2.3.3 */
+        bd_psr_write(bd->regs, PSR_TITLE_NUMBER, BLURAY_TITLE_FIRST_PLAY); /* 5.2.3.3 */
 
         if (!bd->disc_info.first_play_supported) {
             /* no first play title (5.2.3.3) */



View it on GitLab: https://code.videolan.org/videolan/libbluray/-/compare/5539addbbf8c26d756fc2cb76b3919f8b73be66a...ef8417e38e730b503eaeaa2c6e30e19db75b923c

-- 
View it on GitLab: https://code.videolan.org/videolan/libbluray/-/compare/5539addbbf8c26d756fc2cb76b3919f8b73be66a...ef8417e38e730b503eaeaa2c6e30e19db75b923c
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance