PageRenderTime 49ms CodeModel.GetById 9ms RepoModel.GetById 0ms app.codeStats 1ms

/packages/multimedia/libbluray/patches/libbluray-02-add-mvc-support.patch

http://github.com/OpenELEC/OpenELEC.tv
Patch | 6409 lines | 6292 code | 117 blank | 0 comment | 0 complexity | 55a24966b92c556ea67aecad7826064c MD5 | raw file
Possible License(s): CC0-1.0 
    

  1. diff --git a/Makefile.am b/Makefile.am
    2. 

  2. index 300deec..5c77a05 100644
    3. 

  3. --- a/Makefile.am
    4. 

  4. +++ b/Makefile.am
    5. 

  5. @@ -186,10 +186,12 @@ endif
    6. 

  6.  
    7. 

  7.  
    8. 

  8.  if USING_BDJAVA
    9. 

  9. +if USING_BDJAVA_BUILD_JAR
    10. 

  10.  jardir=$(datadir)/java/
    11. 

  11.  jar_DATA=$(top_builddir)/.libs/libbluray-$(BDJ_TYPE)-$(VERSION).jar
    12. 

  12.  
    13. 

  13.  $(top_builddir)/.libs/libbluray-$(BDJ_TYPE)-$(VERSION).jar: all-local
    14. 

  14. +endif
    15. 

  15.  
    16. 

  16.  libbluray_la_SOURCES += \
    17. 

  17.  	src/libbluray/bdj/bdj.h \
    18. 

  18. @@ -214,6 +216,7 @@ libbluray_la_SOURCES += \
    19. 

  19.  
    20. 

  20.  AM_CFLAGS += $(BDJAVA_CFLAGS)
    21. 

  21.  
    22. 

  22. +if USING_BDJAVA_BUILD_JAR
    23. 

  23.  all-local:
    24. 

  24.  	ant -f $(top_srcdir)/src/libbluray/bdj/build.xml \
    25. 

  25.  	    -Dbuild='$(abs_builddir)/src/libbluray/bdj/build' \
    26. 

  26. @@ -229,6 +232,7 @@ clean-local:
    27. 

  27.  	    -Dversion='$(BDJ_TYPE)-$(VERSION)' \
    28. 

  28.  	    clean
    29. 

  29.  endif
    30. 

  30. +endif
    31. 

  31.  
    32. 

  32.  pkgconfigdir = $(libdir)/pkgconfig
    33. 

  33.  pkgconfig_DATA = src/libbluray.pc
    34. 

  34. @@ -266,20 +270,20 @@ bd_info_LDADD = libbluray.la
    35. 

  35.  bdsplice_SOURCES = src/examples/bdsplice.c
    36. 

  36.  bdsplice_LDADD = libbluray.la
    37. 

  37.  
    38. 

  38. -bdj_test_SOURCES = src/examples/bdj_test.c
    39. 

  39. +bdj_test_SOURCES = src/devtools/bdj_test.c
    40. 

  40.  bdj_test_LDADD = libbluray.la
    41. 

  41.  
    42. 

  42. -bdjo_dump_SOURCES = src/examples/bdjo_dump.c
    43. 

  43. +bdjo_dump_SOURCES = src/devtools/bdjo_dump.c
    44. 

  44.  bdjo_dump_LDADD = libbluray.la
    45. 

  45.  
    46. 

  46.  clpi_dump_CFLAGS = $(AM_CFLAGS)
    47. 

  47.  clpi_dump_SOURCES = \
    48. 

  48. -	src/examples/clpi_dump.c \
    49. 

  49. -	src/examples/util.c \
    50. 

  50. -	src/examples/util.h
    51. 

  51. +	src/devtools/clpi_dump.c \
    52. 

  52. +	src/devtools/util.c \
    53. 

  53. +	src/devtools/util.h
    54. 

  54.  clpi_dump_LDADD = libbluray.la
    55. 

  55.  
    56. 

  56. -hdmv_test_SOURCES = src/examples/hdmv_test.c
    57. 

  57. +hdmv_test_SOURCES = src/devtools/hdmv_test.c
    58. 

  58.  hdmv_test_LDADD = libbluray.la
    59. 

  59.  
    60. 

  60.  index_dump_SOURCES = src/examples/index_dump.c
    61. 

  61. @@ -292,15 +296,15 @@ list_titles_SOURCES = src/examples/list_titles.c
    62. 

  62.  list_titles_LDADD = libbluray.la
    63. 

  63.  
    64. 

  64.  mobj_dump_CFLAGS = $(AM_CFLAGS)
    65. 

  65. -mobj_dump_SOURCES = src/examples/mobj_dump.c \
    66. 

  66. +mobj_dump_SOURCES = src/devtools/mobj_dump.c \
    67. 

  67.  	src/libbluray/hdmv/mobj_print.c
    68. 

  68.  mobj_dump_LDADD = libbluray.la
    69. 

  69.  
    70. 

  70.  mpls_dump_CFLAGS = $(AM_CFLAGS)
    71. 

  71.  mpls_dump_SOURCES = \
    72. 

  72. -	src/examples/mpls_dump.c \
    73. 

  73. -	src/examples/util.c \
    74. 

  74. -	src/examples/util.h
    75. 

  75. +	src/devtools/mpls_dump.c \
    76. 

  76. +	src/devtools/util.c \
    77. 

  77. +	src/devtools/util.h
    78. 

  78.  mpls_dump_LDADD = libbluray.la
    79. 

  79.  
    80. 

  80.  sound_dump_SOURCES = src/examples/sound_dump.c
    81. 

  81. diff --git a/config.h b/config.h
    82. 

  82. new file mode 100644
    83. 

  83. index 0000000..6764704
    84. 

  84. --- /dev/null
    85. 

  85. +++ b/config.h
    86. 

  86. @@ -0,0 +1,157 @@
    87. 

  87. +/* config.h.  Generated from config.h.in by configure.  */
    88. 

  88. +/* config.h.in.  Generated from configure.ac by autoheader.  */
    89. 

  89. +
    90. 

  90. +/* Define to 1 if libudfread is to be used for disc image access */
    91. 

  91. +/* #undef ENABLE_UDF */
    92. 

  92. +
    93. 

  93. +/* Define to 1 if using libbluray J2ME stack */
    94. 

  94. +/* #undef HAVE_BDJ_J2ME */
    95. 

  95. +
    96. 

  96. +/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
    97. 

  97. +   */
    98. 

  98. +/* #undef HAVE_DIRENT_H */
    99. 

  99. +
    100. 

  100. +/* Define to 1 if you have the <dlfcn.h> header file. */
    101. 

  101. +/* #undef HAVE_DLFCN_H */
    102. 

  102. +
    103. 

  103. +/* Define to 1 if you have the <errno.h> header file. */
    104. 

  104. +#define HAVE_ERRNO_H 1
    105. 

  105. +
    106. 

  106. +/* Define to 1 if you have the <fcntl.h> header file. */
    107. 

  107. +/* #undef HAVE_FCNTL_H */
    108. 

  108. +
    109. 

  109. +/* Define this if you have fontconfig library */
    110. 

  110. +/* #undef HAVE_FONTCONFIG */
    111. 

  111. +
    112. 

  112. +/* Define this if you have FreeType2 library */
    113. 

  113. +/* #undef HAVE_FT2 */
    114. 

  114. +
    115. 

  115. +/* Define to 1 if you have the <inttypes.h> header file. */
    116. 

  116. +#define HAVE_INTTYPES_H 1
    117. 

  117. +
    118. 

  118. +/* Define to 1 if you have the <jni.h> header file. */
    119. 

  119. +/* #undef HAVE_JNI_H */
    120. 

  120. +
    121. 

  121. +/* Define to 1 if you have the <libgen.h> header file. */
    122. 

  122. +#define HAVE_LIBGEN_H 1
    123. 

  123. +
    124. 

  124. +/* Define to 1 if libxml2 is to be used for metadata parsing */
    125. 

  125. +/* #undef HAVE_LIBXML2 */
    126. 

  126. +
    127. 

  127. +/* Define to 1 if you have the <linux/cdrom.h> header file. */
    128. 

  128. +/* #undef HAVE_LINUX_CDROM_H */
    129. 

  129. +
    130. 

  130. +/* Define to 1 if you have the <malloc.h> header file. */
    131. 

  131. +#define HAVE_MALLOC_H 1
    132. 

  132. +
    133. 

  133. +/* Define to 1 if you have the <memory.h> header file. */
    134. 

  134. +#define HAVE_MEMORY_H 1
    135. 

  135. +
    136. 

  136. +/* Define to 1 if you have the <mntent.h> header file. */
    137. 

  137. +/* #undef HAVE_MNTENT_H */
    138. 

  138. +
    139. 

  139. +/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
    140. 

  140. +/* #undef HAVE_NDIR_H */
    141. 

  141. +
    142. 

  142. +/* Define to 1 if you have the <pthread.h> header file. */
    143. 

  143. +/* #undef HAVE_PTHREAD_H */
    144. 

  144. +
    145. 

  145. +/* Define to 1 if you have the <stdarg.h> header file. */
    146. 

  146. +#define HAVE_STDARG_H 1
    147. 

  147. +
    148. 

  148. +/* Define to 1 if you have the <stdint.h> header file. */
    149. 

  149. +#define HAVE_STDINT_H 1
    150. 

  150. +
    151. 

  151. +/* Define to 1 if you have the <stdlib.h> header file. */
    152. 

  152. +#define HAVE_STDLIB_H 1
    153. 

  153. +
    154. 

  154. +/* Define to 1 if you have the <strings.h> header file. */
    155. 

  155. +/* #undef HAVE_STRINGS_H */
    156. 

  156. +
    157. 

  157. +/* Define to 1 if you have the <string.h> header file. */
    158. 

  158. +#define HAVE_STRING_H 1
    159. 

  159. +
    160. 

  160. +/* Define to 1 if `d_type' is a member of `struct dirent'. */
    161. 

  161. +/* #undef HAVE_STRUCT_DIRENT_D_TYPE */
    162. 

  162. +
    163. 

  163. +/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
    164. 

  164. +   */
    165. 

  165. +/* #undef HAVE_SYS_DIR_H */
    166. 

  166. +
    167. 

  167. +/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
    168. 

  168. +   */
    169. 

  169. +/* #undef HAVE_SYS_NDIR_H */
    170. 

  170. +
    171. 

  171. +/* Define to 1 if you have the <sys/stat.h> header file. */
    172. 

  172. +#define HAVE_SYS_STAT_H 1
    173. 

  173. +
    174. 

  174. +/* Define to 1 if you have the <sys/time.h> header file. */
    175. 

  175. +#define HAVE_SYS_TIME_H 1
    176. 

  176. +
    177. 

  177. +/* Define to 1 if you have the <sys/types.h> header file. */
    178. 

  178. +#define HAVE_SYS_TYPES_H 1
    179. 

  179. +
    180. 

  180. +/* Define to 1 if you have the <time.h> header file. */
    181. 

  181. +#define HAVE_TIME_H 1
    182. 

  182. +
    183. 

  183. +/* Define to 1 if you have the <unistd.h> header file. */
    184. 

  184. +/* #undef HAVE_UNISTD_H */
    185. 

  185. +
    186. 

  186. +/* "Defines the architecture of the java vm." */
    187. 

  187. +/* #undef JAVA_ARCH */
    188. 

  188. +
    189. 

  189. +/* "" */
    190. 

  190. +/* #undef JDK_HOME */
    191. 

  191. +
    192. 

  192. +/* Define to the sub-directory where libtool stores uninstalled libraries. */
    193. 

  193. +#define LT_OBJDIR ".libs/"
    194. 

  194. +
    195. 

  195. +/* Name of package */
    196. 

  196. +#define PACKAGE "libbluray"
    197. 

  197. +
    198. 

  198. +/* Define to the address where bug reports for this package should be sent. */
    199. 

  199. +#define PACKAGE_BUGREPORT "http://www.videolan.org/developers/libbluray.html"
    200. 

  200. +
    201. 

  201. +/* Define to the full name of this package. */
    202. 

  202. +#define PACKAGE_NAME "libbluray"
    203. 

  203. +
    204. 

  204. +/* Define to the full name and version of this package. */
    205. 

  205. +#define PACKAGE_STRING "libbluray 0.9.2"
    206. 

  206. +
    207. 

  207. +/* Define to the one symbol short name of this package. */
    208. 

  208. +#define PACKAGE_TARNAME "libbluray"
    209. 

  209. +
    210. 

  210. +/* Define to the home page for this package. */
    211. 

  211. +#define PACKAGE_URL ""
    212. 

  212. +
    213. 

  213. +/* Define to the version of this package. */
    214. 

  214. +#define PACKAGE_VERSION "0.9.2"
    215. 

  215. +
    216. 

  216. +/* Define as the return type of signal handlers (`int' or `void'). */
    217. 

  217. +#define RETSIGTYPE void
    218. 

  218. +
    219. 

  219. +/* Define to 1 if you have the ANSI C header files. */
    220. 

  220. +#define STDC_HEADERS 1
    221. 

  221. +
    222. 

  222. +/* "Define to 1 if using BD-Java" */
    223. 

  223. +/* #undef USING_BDJAVA */
    224. 

  224. +
    225. 

  225. +/* Version number of package */
    226. 

  226. +#define VERSION "0.9.2"
    227. 

  227. +
    228. 

  228. +/* Enable large inode numbers on Mac OS X 10.5.  */
    229. 

  229. +#ifndef _DARWIN_USE_64_BIT_INODE
    230. 

  230. +# define _DARWIN_USE_64_BIT_INODE 1
    231. 

  231. +#endif
    232. 

  232. +
    233. 

  233. +/* Number of bits in a file offset, on hosts where this is settable. */
    234. 

  234. +#define _FILE_OFFSET_BITS 64
    235. 

  235. +
    236. 

  236. +/* Define for large files, on AIX-style hosts. */
    237. 

  237. +/* #undef _LARGE_FILES */
    238. 

  238. +
    239. 

  239. +/* Define to '0x0501' for IE 5.01. */
    240. 

  240. +#define _WIN32_IE 0x0501
    241. 

  241. +
    242. 

  242. +/* Define to '0x0502' for Windows XP SP2 APIs. */
    243. 

  243. +#define _WIN32_WINNT 0x0502
    244. 

  244. diff --git a/configure.ac b/configure.ac
    245. 

  245. index e0da375..ed08c96 100644
    246. 

  246. --- a/configure.ac
    247. 

  247. +++ b/configure.ac
    248. 

  248. @@ -87,7 +87,15 @@ AC_ARG_ENABLE([bdjava],
    249. 

  249.    [use_bdjava=yes])
    250. 

  250.  
    251. 

  251.  AC_ARG_ENABLE([udf],
    252. 

  252. -  [AS_HELP_STRING([--enable-udf], [enable UDF support @<:@default=disabled@:>@])])
    253. 

  253. +  [AS_HELP_STRING([--disable-udf], [disable UDF support @<:@default=enabled@:>@])],
    254. 

  254. +  [enable_udf=$enableval],
    255. 

  255. +  [enable_udf=yes])
    256. 

  256. +
    257. 

  257. +AC_ARG_ENABLE([bdjava-jar],
    258. 

  258. +  [AS_HELP_STRING([--disable-bdjava-jar],
    259. 

  259. +  [disable building of BD-Java JAR file @<:@default=enabled@:>@])],
    260. 

  260. +  [use_bdjava_jar=$enableval],
    261. 

  261. +  [use_bdjava_jar=yes])
    262. 

  262.  
    263. 

  263.  AC_ARG_WITH([libxml2],
    264. 

  264.    [AS_HELP_STRING([--without-libxml2], [build without libxml2 support @<:@default=with@:>@])])
    265. 

  265. @@ -224,7 +232,7 @@ if [[ $use_bdjava = "yes" ]]; then
    266. 

  266.    ])
    267. 

  267.  
    268. 

  268.    AC_CHECK_PROG(HAVE_ANT, [ant], yes, no)
    269. 

  269. -  if test "x$HAVE_ANT" = "xno"; then
    270. 

  270. +  if test "x$use_bdjava_jar" = "xyes" && test "x$HAVE_ANT" = "xno"; then
    271. 

  271.        AC_MSG_ERROR([BD-J requires ANT, but ant was not found. Please install it.])
    272. 

  272.    fi
    273. 

  273.  
    274. 

  274. @@ -233,6 +241,7 @@ if [[ $use_bdjava = "yes" ]]; then
    275. 

  275.    AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""])
    276. 

  276.  fi
    277. 

  277.  AM_CONDITIONAL([USING_BDJAVA], [ test $use_bdjava = "yes" ])
    278. 

  278. +AM_CONDITIONAL([USING_BDJAVA_BUILD_JAR], [ test $use_bdjava_jar = "yes" ])
    279. 

  279.  
    280. 

  280.  dnl BD-J type
    281. 

  281.  if test "$BDJ_TYPE" = "j2me"; then
    282. 

  282. @@ -292,6 +301,7 @@ echo "  --------"
    283. 

  283.  echo "  BD-J support:                  $use_bdjava"
    284. 

  284.  if [[ $use_bdjava = "yes" ]]; then
    285. 

  285.  echo "  BD-J type:                     $BDJ_TYPE"
    286. 

  286. +echo "  build JAR:                     $use_bdjava_jar"
    287. 

  287.  if test x"$BDJ_BOOTCLASSPATH" != x""; then
    288. 

  288.  echo "  BD-J bootclasspath:            $BDJ_BOOTCLASSPATH"
    289. 

  289.  fi
    290. 

  290. diff --git a/includes/inttypes.h b/includes/inttypes.h
    291. 

  291. new file mode 100644
    292. 

  292. index 0000000..ead903f
    293. 

  293. --- /dev/null
    294. 

  294. +++ b/includes/inttypes.h
    295. 

  295. @@ -0,0 +1,305 @@
    296. 

  296. +// ISO C9x  compliant inttypes.h for Microsoft Visual Studio
    297. 

  297. +// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124
    298. 

  298. +//
    299. 

  299. +//  Copyright (c) 2006 Alexander Chemeris
    300. 

  300. +//
    301. 

  301. +// Redistribution and use in source and binary forms, with or without
    302. 

  302. +// modification, are permitted provided that the following conditions are met:
    303. 

  303. +//
    304. 

  304. +//   1. Redistributions of source code must retain the above copyright notice,
    305. 

  305. +//      this list of conditions and the following disclaimer.
    306. 

  306. +//
    307. 

  307. +//   2. Redistributions in binary form must reproduce the above copyright
    308. 

  308. +//      notice, this list of conditions and the following disclaimer in the
    309. 

  309. +//      documentation and/or other materials provided with the distribution.
    310. 

  310. +//
    311. 

  311. +//   3. The name of the author may be used to endorse or promote products
    312. 

  312. +//      derived from this software without specific prior written permission.
    313. 

  313. +//
    314. 

  314. +// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
    315. 

  315. +// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
    316. 

  316. +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
    317. 

  317. +// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
    318. 

  318. +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
    319. 

  319. +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
    320. 

  320. +// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
    321. 

  321. +// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
    322. 

  322. +// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
    323. 

  323. +// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    324. 

  324. +//
    325. 

  325. +///////////////////////////////////////////////////////////////////////////////
    326. 

  326. +
    327. 

  327. +#ifndef _MSC_VER // [
    328. 

  328. +#error "Use this header only with Microsoft Visual C++ compilers!"
    329. 

  329. +#endif // _MSC_VER ]
    330. 

  330. +
    331. 

  331. +#ifndef _MSC_INTTYPES_H_ // [
    332. 

  332. +#define _MSC_INTTYPES_H_
    333. 

  333. +
    334. 

  334. +#if _MSC_VER > 1000
    335. 

  335. +#pragma once
    336. 

  336. +#endif
    337. 

  337. +
    338. 

  338. +#include "stdint.h"
    339. 

  339. +
    340. 

  340. +// 7.8 Format conversion of integer types
    341. 

  341. +
    342. 

  342. +typedef struct {
    343. 

  343. +   intmax_t quot;
    344. 

  344. +   intmax_t rem;
    345. 

  345. +} imaxdiv_t;
    346. 

  346. +
    347. 

  347. +// 7.8.1 Macros for format specifiers
    348. 

  348. +
    349. 

  349. +#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS) // [   See footnote 185 at page 198
    350. 

  350. +
    351. 

  351. +// The fprintf macros for signed integers are:
    352. 

  352. +#define PRId8       "d"
    353. 

  353. +#define PRIi8       "i"
    354. 

  354. +#define PRIdLEAST8  "d"
    355. 

  355. +#define PRIiLEAST8  "i"
    356. 

  356. +#define PRIdFAST8   "d"
    357. 

  357. +#define PRIiFAST8   "i"
    358. 

  358. +
    359. 

  359. +#define PRId16       "hd"
    360. 

  360. +#define PRIi16       "hi"
    361. 

  361. +#define PRIdLEAST16  "hd"
    362. 

  362. +#define PRIiLEAST16  "hi"
    363. 

  363. +#define PRIdFAST16   "hd"
    364. 

  364. +#define PRIiFAST16   "hi"
    365. 

  365. +
    366. 

  366. +#define PRId32       "I32d"
    367. 

  367. +#define PRIi32       "I32i"
    368. 

  368. +#define PRIdLEAST32  "I32d"
    369. 

  369. +#define PRIiLEAST32  "I32i"
    370. 

  370. +#define PRIdFAST32   "I32d"
    371. 

  371. +#define PRIiFAST32   "I32i"
    372. 

  372. +
    373. 

  373. +#define PRId64       "I64d"
    374. 

  374. +#define PRIi64       "I64i"
    375. 

  375. +#define PRIdLEAST64  "I64d"
    376. 

  376. +#define PRIiLEAST64  "I64i"
    377. 

  377. +#define PRIdFAST64   "I64d"
    378. 

  378. +#define PRIiFAST64   "I64i"
    379. 

  379. +
    380. 

  380. +#define PRIdMAX     "I64d"
    381. 

  381. +#define PRIiMAX     "I64i"
    382. 

  382. +
    383. 

  383. +#define PRIdPTR     "Id"
    384. 

  384. +#define PRIiPTR     "Ii"
    385. 

  385. +
    386. 

  386. +// The fprintf macros for unsigned integers are:
    387. 

  387. +#define PRIo8       "o"
    388. 

  388. +#define PRIu8       "u"
    389. 

  389. +#define PRIx8       "x"
    390. 

  390. +#define PRIX8       "X"
    391. 

  391. +#define PRIoLEAST8  "o"
    392. 

  392. +#define PRIuLEAST8  "u"
    393. 

  393. +#define PRIxLEAST8  "x"
    394. 

  394. +#define PRIXLEAST8  "X"
    395. 

  395. +#define PRIoFAST8   "o"
    396. 

  396. +#define PRIuFAST8   "u"
    397. 

  397. +#define PRIxFAST8   "x"
    398. 

  398. +#define PRIXFAST8   "X"
    399. 

  399. +
    400. 

  400. +#define PRIo16       "ho"
    401. 

  401. +#define PRIu16       "hu"
    402. 

  402. +#define PRIx16       "hx"
    403. 

  403. +#define PRIX16       "hX"
    404. 

  404. +#define PRIoLEAST16  "ho"
    405. 

  405. +#define PRIuLEAST16  "hu"
    406. 

  406. +#define PRIxLEAST16  "hx"
    407. 

  407. +#define PRIXLEAST16  "hX"
    408. 

  408. +#define PRIoFAST16   "ho"
    409. 

  409. +#define PRIuFAST16   "hu"
    410. 

  410. +#define PRIxFAST16   "hx"
    411. 

  411. +#define PRIXFAST16   "hX"
    412. 

  412. +
    413. 

  413. +#define PRIo32       "I32o"
    414. 

  414. +#define PRIu32       "I32u"
    415. 

  415. +#define PRIx32       "I32x"
    416. 

  416. +#define PRIX32       "I32X"
    417. 

  417. +#define PRIoLEAST32  "I32o"
    418. 

  418. +#define PRIuLEAST32  "I32u"
    419. 

  419. +#define PRIxLEAST32  "I32x"
    420. 

  420. +#define PRIXLEAST32  "I32X"
    421. 

  421. +#define PRIoFAST32   "I32o"
    422. 

  422. +#define PRIuFAST32   "I32u"
    423. 

  423. +#define PRIxFAST32   "I32x"
    424. 

  424. +#define PRIXFAST32   "I32X"
    425. 

  425. +
    426. 

  426. +#define PRIo64       "I64o"
    427. 

  427. +#define PRIu64       "I64u"
    428. 

  428. +#define PRIx64       "I64x"
    429. 

  429. +#define PRIX64       "I64X"
    430. 

  430. +#define PRIoLEAST64  "I64o"
    431. 

  431. +#define PRIuLEAST64  "I64u"
    432. 

  432. +#define PRIxLEAST64  "I64x"
    433. 

  433. +#define PRIXLEAST64  "I64X"
    434. 

  434. +#define PRIoFAST64   "I64o"
    435. 

  435. +#define PRIuFAST64   "I64u"
    436. 

  436. +#define PRIxFAST64   "I64x"
    437. 

  437. +#define PRIXFAST64   "I64X"
    438. 

  438. +
    439. 

  439. +#define PRIoMAX     "I64o"
    440. 

  440. +#define PRIuMAX     "I64u"
    441. 

  441. +#define PRIxMAX     "I64x"
    442. 

  442. +#define PRIXMAX     "I64X"
    443. 

  443. +
    444. 

  444. +#define PRIoPTR     "Io"
    445. 

  445. +#define PRIuPTR     "Iu"
    446. 

  446. +#define PRIxPTR     "Ix"
    447. 

  447. +#define PRIXPTR     "IX"
    448. 

  448. +
    449. 

  449. +// The fscanf macros for signed integers are:
    450. 

  450. +#define SCNd8       "d"
    451. 

  451. +#define SCNi8       "i"
    452. 

  452. +#define SCNdLEAST8  "d"
    453. 

  453. +#define SCNiLEAST8  "i"
    454. 

  454. +#define SCNdFAST8   "d"
    455. 

  455. +#define SCNiFAST8   "i"
    456. 

  456. +
    457. 

  457. +#define SCNd16       "hd"
    458. 

  458. +#define SCNi16       "hi"
    459. 

  459. +#define SCNdLEAST16  "hd"
    460. 

  460. +#define SCNiLEAST16  "hi"
    461. 

  461. +#define SCNdFAST16   "hd"
    462. 

  462. +#define SCNiFAST16   "hi"
    463. 

  463. +
    464. 

  464. +#define SCNd32       "ld"
    465. 

  465. +#define SCNi32       "li"
    466. 

  466. +#define SCNdLEAST32  "ld"
    467. 

  467. +#define SCNiLEAST32  "li"
    468. 

  468. +#define SCNdFAST32   "ld"
    469. 

  469. +#define SCNiFAST32   "li"
    470. 

  470. +
    471. 

  471. +#define SCNd64       "I64d"
    472. 

  472. +#define SCNi64       "I64i"
    473. 

  473. +#define SCNdLEAST64  "I64d"
    474. 

  474. +#define SCNiLEAST64  "I64i"
    475. 

  475. +#define SCNdFAST64   "I64d"
    476. 

  476. +#define SCNiFAST64   "I64i"
    477. 

  477. +
    478. 

  478. +#define SCNdMAX     "I64d"
    479. 

  479. +#define SCNiMAX     "I64i"
    480. 

  480. +
    481. 

  481. +#ifdef _WIN64 // [
    482. 

  482. +#  define SCNdPTR     "I64d"
    483. 

  483. +#  define SCNiPTR     "I64i"
    484. 

  484. +#else  // _WIN64 ][
    485. 

  485. +#  define SCNdPTR     "ld"
    486. 

  486. +#  define SCNiPTR     "li"
    487. 

  487. +#endif  // _WIN64 ]
    488. 

  488. +
    489. 

  489. +// The fscanf macros for unsigned integers are:
    490. 

  490. +#define SCNo8       "o"
    491. 

  491. +#define SCNu8       "u"
    492. 

  492. +#define SCNx8       "x"
    493. 

  493. +#define SCNX8       "X"
    494. 

  494. +#define SCNoLEAST8  "o"
    495. 

  495. +#define SCNuLEAST8  "u"
    496. 

  496. +#define SCNxLEAST8  "x"
    497. 

  497. +#define SCNXLEAST8  "X"
    498. 

  498. +#define SCNoFAST8   "o"
    499. 

  499. +#define SCNuFAST8   "u"
    500. 

  500. +#define SCNxFAST8   "x"
    501. 

  501. +#define SCNXFAST8   "X"
    502. 

  502. +
    503. 

  503. +#define SCNo16       "ho"
    504. 

  504. +#define SCNu16       "hu"
    505. 

  505. +#define SCNx16       "hx"
    506. 

  506. +#define SCNX16       "hX"
    507. 

  507. +#define SCNoLEAST16  "ho"
    508. 

  508. +#define SCNuLEAST16  "hu"
    509. 

  509. +#define SCNxLEAST16  "hx"
    510. 

  510. +#define SCNXLEAST16  "hX"
    511. 

  511. +#define SCNoFAST16   "ho"
    512. 

  512. +#define SCNuFAST16   "hu"
    513. 

  513. +#define SCNxFAST16   "hx"
    514. 

  514. +#define SCNXFAST16   "hX"
    515. 

  515. +
    516. 

  516. +#define SCNo32       "lo"
    517. 

  517. +#define SCNu32       "lu"
    518. 

  518. +#define SCNx32       "lx"
    519. 

  519. +#define SCNX32       "lX"
    520. 

  520. +#define SCNoLEAST32  "lo"
    521. 

  521. +#define SCNuLEAST32  "lu"
    522. 

  522. +#define SCNxLEAST32  "lx"
    523. 

  523. +#define SCNXLEAST32  "lX"
    524. 

  524. +#define SCNoFAST32   "lo"
    525. 

  525. +#define SCNuFAST32   "lu"
    526. 

  526. +#define SCNxFAST32   "lx"
    527. 

  527. +#define SCNXFAST32   "lX"
    528. 

  528. +
    529. 

  529. +#define SCNo64       "I64o"
    530. 

  530. +#define SCNu64       "I64u"
    531. 

  531. +#define SCNx64       "I64x"
    532. 

  532. +#define SCNX64       "I64X"
    533. 

  533. +#define SCNoLEAST64  "I64o"
    534. 

  534. +#define SCNuLEAST64  "I64u"
    535. 

  535. +#define SCNxLEAST64  "I64x"
    536. 

  536. +#define SCNXLEAST64  "I64X"
    537. 

  537. +#define SCNoFAST64   "I64o"
    538. 

  538. +#define SCNuFAST64   "I64u"
    539. 

  539. +#define SCNxFAST64   "I64x"
    540. 

  540. +#define SCNXFAST64   "I64X"
    541. 

  541. +
    542. 

  542. +#define SCNoMAX     "I64o"
    543. 

  543. +#define SCNuMAX     "I64u"
    544. 

  544. +#define SCNxMAX     "I64x"
    545. 

  545. +#define SCNXMAX     "I64X"
    546. 

  546. +
    547. 

  547. +#ifdef _WIN64 // [
    548. 

  548. +#  define SCNoPTR     "I64o"
    549. 

  549. +#  define SCNuPTR     "I64u"
    550. 

  550. +#  define SCNxPTR     "I64x"
    551. 

  551. +#  define SCNXPTR     "I64X"
    552. 

  552. +#else  // _WIN64 ][
    553. 

  553. +#  define SCNoPTR     "lo"
    554. 

  554. +#  define SCNuPTR     "lu"
    555. 

  555. +#  define SCNxPTR     "lx"
    556. 

  556. +#  define SCNXPTR     "lX"
    557. 

  557. +#endif  // _WIN64 ]
    558. 

  558. +
    559. 

  559. +#endif // __STDC_FORMAT_MACROS ]
    560. 

  560. +
    561. 

  561. +// 7.8.2 Functions for greatest-width integer types
    562. 

  562. +
    563. 

  563. +// 7.8.2.1 The imaxabs function
    564. 

  564. +#define imaxabs _abs64
    565. 

  565. +
    566. 

  566. +// 7.8.2.2 The imaxdiv function
    567. 

  567. +
    568. 

  568. +// This is modified version of div() function from Microsoft's div.c found
    569. 

  569. +// in %MSVC.NET%\crt\src\div.c
    570. 

  570. +#ifdef STATIC_IMAXDIV // [
    571. 

  571. +static
    572. 

  572. +#else // STATIC_IMAXDIV ][
    573. 

  573. +_inline
    574. 

  574. +#endif // STATIC_IMAXDIV ]
    575. 

  575. +imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom)
    576. 

  576. +{
    577. 

  577. +   imaxdiv_t result;
    578. 

  578. +
    579. 

  579. +   result.quot = numer / denom;
    580. 

  580. +   result.rem = numer % denom;
    581. 

  581. +
    582. 

  582. +   if (numer < 0 && result.rem > 0) {
    583. 

  583. +      // did division wrong; must fix up
    584. 

  584. +      ++result.quot;
    585. 

  585. +      result.rem -= denom;
    586. 

  586. +   }
    587. 

  587. +
    588. 

  588. +   return result;
    589. 

  589. +}
    590. 

  590. +
    591. 

  591. +// 7.8.2.3 The strtoimax and strtoumax functions
    592. 

  592. +#define strtoimax _strtoi64
    593. 

  593. +#define strtoumax _strtoui64
    594. 

  594. +
    595. 

  595. +// 7.8.2.4 The wcstoimax and wcstoumax functions
    596. 

  596. +#define wcstoimax _wcstoi64
    597. 

  597. +#define wcstoumax _wcstoui64
    598. 

  598. +
    599. 

  599. +
    600. 

  600. +#endif // _MSC_INTTYPES_H_ ]
    601. 

  601. diff --git a/libbluray.def b/libbluray.def
    602. 

  602. new file mode 100644
    603. 

  603. index 0000000..d4c93cb
    604. 

  604. --- /dev/null
    605. 

  605. +++ b/libbluray.def
    606. 

  606. @@ -0,0 +1,63 @@
    607. 

  607. +; libbluray.def ; declares the exports
    608. 

  608. +
    609. 

  609. +LIBRARY         "libbluray.dll"
    610. 

  610. +
    611. 

  611. +EXPORTS
    612. 

  612. +                ; bluray.h
    613. 

  613. +                bd_get_version
    614. 

  614. +                bd_get_titles
    615. 

  615. +                bd_get_title_info
    616. 

  616. +                bd_get_playlist_info
    617. 

  617. +                bd_free_title_info
    618. 

  618. +                bd_open
    619. 

  619. +                bd_close
    620. 

  620. +                bd_seek
    621. 

  621. +                bd_seek_time
    622. 

  622. +                bd_find_seek_point
    623. 

  623. +                bd_read
    624. 

  624. +                bd_read_skip_still
    625. 

  625. +                bd_seek_chapter
    626. 

  626. +                bd_chapter_pos
    627. 

  627. +                bd_get_current_chapter
    628. 

  628. +                bd_seek_mark
    629. 

  629. +                bd_seek_playitem
    630. 

  630. +                bd_select_playlist
    631. 

  631. +                bd_select_title
    632. 

  632. +                bd_select_angle
    633. 

  633. +                bd_seamless_angle_change
    634. 

  634. +                bd_get_title_size
    635. 

  635. +                bd_get_current_title
    636. 

  636. +                bd_get_current_angle
    637. 

  637. +                bd_tell
    638. 

  638. +                bd_tell_time
    639. 

  639. +                bd_get_disc_info
    640. 

  640. +                bd_set_player_setting
    641. 

  641. +                bd_set_player_setting_str
    642. 

  642. +                bd_start_bdj
    643. 

  643. +                bd_stop_bdj
    644. 

  644. +                bd_get_event
    645. 

  645. +                bd_play
    646. 

  646. +                bd_read_ext
    647. 

  647. +                bd_play_title
    648. 

  648. +                bd_menu_call
    649. 

  649. +                bd_register_overlay_proc
    650. 

  650. +                bd_register_argb_overlay_proc
    651. 

  651. +                bd_set_scr
    652. 

  652. +                bd_user_input
    653. 

  653. +                bd_mouse_select
    654. 

  654. +                bd_get_sound_effect
    655. 

  655. +                bd_get_meta
    656. 

  656. +                bd_get_clpi
    657. 

  657. +                bd_read_clpi
    658. 

  658. +                bd_free_clpi
    659. 

  659. +                bd_read_mpls
    660. 

  660. +                bd_free_mpls
    661. 

  661. +                bd_read_mobj
    662. 

  662. +                bd_free_mobj
    663. 

  663. +                bd_get_clip_infos
    664. 

  664. +                bd_get_title_mpls
    665. 

  665. +
    666. 

  666. +                ; additional functions
    667. 

  667. +                bd_set_debug_handler
    668. 

  668. +                bd_set_debug_mask
    669. 

  669. +                bd_get_debug_mask
    670. 

  670. diff --git a/libbluray.vcxproj b/libbluray.vcxproj
    671. 

  671. new file mode 100644
    672. 

  672. index 0000000..c778955
    673. 

  673. --- /dev/null
    674. 

  674. +++ b/libbluray.vcxproj
    675. 

  675. @@ -0,0 +1,231 @@
    676. 

  676. +<?xml version="1.0" encoding="utf-8"?>
    677. 

  677. +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    678. 

  678. +  <ItemGroup Label="ProjectConfigurations">
    679. 

  679. +    <ProjectConfiguration Include="DebugRelease|Win32">
    680. 

  680. +      <Configuration>DebugRelease</Configuration>
    681. 

  681. +      <Platform>Win32</Platform>
    682. 

  682. +    </ProjectConfiguration>
    683. 

  683. +    <ProjectConfiguration Include="DebugRelease|x64">
    684. 

  684. +      <Configuration>DebugRelease</Configuration>
    685. 

  685. +      <Platform>x64</Platform>
    686. 

  686. +    </ProjectConfiguration>
    687. 

  687. +    <ProjectConfiguration Include="Debug|Win32">
    688. 

  688. +      <Configuration>Debug</Configuration>
    689. 

  689. +      <Platform>Win32</Platform>
    690. 

  690. +    </ProjectConfiguration>
    691. 

  691. +    <ProjectConfiguration Include="Debug|x64">
    692. 

  692. +      <Configuration>Debug</Configuration>
    693. 

  693. +      <Platform>x64</Platform>
    694. 

  694. +    </ProjectConfiguration>
    695. 

  695. +    <ProjectConfiguration Include="Release|Win32">
    696. 

  696. +      <Configuration>Release</Configuration>
    697. 

  697. +      <Platform>Win32</Platform>
    698. 

  698. +    </ProjectConfiguration>
    699. 

  699. +    <ProjectConfiguration Include="Release|x64">
    700. 

  700. +      <Configuration>Release</Configuration>
    701. 

  701. +      <Platform>x64</Platform>
    702. 

  702. +    </ProjectConfiguration>
    703. 

  703. +  </ItemGroup>
    704. 

  704. +  <ItemGroup>
    705. 

  705. +    <ClInclude Include="src\file\dirs.h" />
    706. 

  706. +    <ClInclude Include="src\file\dl.h" />
    707. 

  707. +    <ClInclude Include="src\file\file.h" />
    708. 

  708. +    <ClInclude Include="src\file\filesystem.h" />
    709. 

  709. +    <ClInclude Include="src\file\mount.h" />
    710. 

  710. +    <ClInclude Include="src\libbluray\bdnav\bdid_parse.h" />
    711. 

  711. +    <ClInclude Include="src\libbluray\bdnav\bdparse.h" />
    712. 

  712. +    <ClInclude Include="src\libbluray\bdnav\clpi_data.h" />
    713. 

  713. +    <ClInclude Include="src\libbluray\bdnav\clpi_parse.h" />
    714. 

  714. +    <ClInclude Include="src\libbluray\bdnav\extdata_parse.h" />
    715. 

  715. +    <ClInclude Include="src\libbluray\bdnav\index_parse.h" />
    716. 

  716. +    <ClInclude Include="src\libbluray\bdnav\meta_data.h" />
    717. 

  717. +    <ClInclude Include="src\libbluray\bdnav\meta_parse.h" />
    718. 

  718. +    <ClInclude Include="src\libbluray\bdnav\mpls_parse.h" />
    719. 

  719. +    <ClInclude Include="src\libbluray\bdnav\navigation.h" />
    720. 

  720. +    <ClInclude Include="src\libbluray\bdnav\sound_parse.h" />
    721. 

  721. +    <ClInclude Include="src\libbluray\bdnav\uo_mask_table.h" />
    722. 

  722. +    <ClInclude Include="src\libbluray\bluray-version.h" />
    723. 

  723. +    <ClInclude Include="src\libbluray\bluray.h" />
    724. 

  724. +    <ClInclude Include="src\libbluray\bluray_internal.h" />
    725. 

  725. +    <ClInclude Include="src\libbluray\decoders\graphics_controller.h" />
    726. 

  726. +    <ClInclude Include="src\libbluray\decoders\graphics_processor.h" />
    727. 

  727. +    <ClInclude Include="src\libbluray\decoders\ig.h" />
    728. 

  728. +    <ClInclude Include="src\libbluray\decoders\ig_decode.h" />
    729. 

  729. +    <ClInclude Include="src\libbluray\decoders\m2ts_demux.h" />
    730. 

  730. +    <ClInclude Include="src\libbluray\decoders\m2ts_filter.h" />
    731. 

  731. +    <ClInclude Include="src\libbluray\decoders\overlay.h" />
    732. 

  732. +    <ClInclude Include="src\libbluray\decoders\pes_buffer.h" />
    733. 

  733. +    <ClInclude Include="src\libbluray\decoders\pg.h" />
    734. 

  734. +    <ClInclude Include="src\libbluray\decoders\pg_decode.h" />
    735. 

  735. +    <ClInclude Include="src\libbluray\decoders\rle.h" />
    736. 

  736. +    <ClInclude Include="src\libbluray\decoders\textst.h" />
    737. 

  737. +    <ClInclude Include="src\libbluray\decoders\textst_decode.h" />
    738. 

  738. +    <ClInclude Include="src\libbluray\decoders\textst_render.h" />
    739. 

  739. +    <ClInclude Include="src\libbluray\disc\aacs.h" />
    740. 

  740. +    <ClInclude Include="src\libbluray\disc\bdplus.h" />
    741. 

  741. +    <ClInclude Include="src\libbluray\disc\dec.h" />
    742. 

  742. +    <ClInclude Include="src\libbluray\disc\disc.h" />
    743. 

  743. +    <ClInclude Include="src\libbluray\disc\enc_info.h" />
    744. 

  744. +    <ClInclude Include="src\libbluray\hdmv\hdmv_insn.h" />
    745. 

  745. +    <ClInclude Include="src\libbluray\hdmv\hdmv_vm.h" />
    746. 

  746. +    <ClInclude Include="src\libbluray\hdmv\mobj_parse.h" />
    747. 

  747. +    <ClInclude Include="src\libbluray\keys.h" />
    748. 

  748. +    <ClInclude Include="src\libbluray\register.h" />
    749. 

  749. +    <ClInclude Include="src\util\array.h" />
    750. 

  750. +    <ClInclude Include="src\util\attributes.h" />
    751. 

  751. +    <ClInclude Include="src\util\bits.h" />
    752. 

  752. +    <ClInclude Include="src\util\logging.h" />
    753. 

  753. +    <ClInclude Include="src\util\log_control.h" />
    754. 

  754. +    <ClInclude Include="src\util\macro.h" />
    755. 

  755. +    <ClInclude Include="src\util\mutex.h" />
    756. 

  756. +    <ClInclude Include="src\util\refcnt.h" />
    757. 

  757. +    <ClInclude Include="src\util\strutl.h" />
    758. 

  758. +    <ClInclude Include="src\util\time.h" />
    759. 

  759. +  </ItemGroup>
    760. 

  760. +  <ItemGroup>
    761. 

  761. +    <ClCompile Include="src\file\dirs_win32.c" />
    762. 

  762. +    <ClCompile Include="src\file\dir_win32.c" />
    763. 

  763. +    <ClCompile Include="src\file\dl_win32.c" />
    764. 

  764. +    <ClCompile Include="src\file\file.c" />
    765. 

  765. +    <ClCompile Include="src\file\filesystem.c" />
    766. 

  766. +    <ClCompile Include="src\file\file_win32.c" />
    767. 

  767. +    <ClCompile Include="src\file\mount.c" />
    768. 

  768. +    <ClCompile Include="src\libbluray\bdnav\bdid_parse.c" />
    769. 

  769. +    <ClCompile Include="src\libbluray\bdnav\clpi_parse.c" />
    770. 

  770. +    <ClCompile Include="src\libbluray\bdnav\extdata_parse.c" />
    771. 

  771. +    <ClCompile Include="src\libbluray\bdnav\index_parse.c" />
    772. 

  772. +    <ClCompile Include="src\libbluray\bdnav\meta_parse.c" />
    773. 

  773. +    <ClCompile Include="src\libbluray\bdnav\mpls_parse.c" />
    774. 

  774. +    <ClCompile Include="src\libbluray\bdnav\navigation.c" />
    775. 

  775. +    <ClCompile Include="src\libbluray\bdnav\sound_parse.c" />
    776. 

  776. +    <ClCompile Include="src\libbluray\bluray.c" />
    777. 

  777. +    <ClCompile Include="src\libbluray\decoders\graphics_controller.c" />
    778. 

  778. +    <ClCompile Include="src\libbluray\decoders\graphics_processor.c" />
    779. 

  779. +    <ClCompile Include="src\libbluray\decoders\ig_decode.c" />
    780. 

  780. +    <ClCompile Include="src\libbluray\decoders\m2ts_demux.c" />
    781. 

  781. +    <ClCompile Include="src\libbluray\decoders\m2ts_filter.c" />
    782. 

  782. +    <ClCompile Include="src\libbluray\decoders\pes_buffer.c" />
    783. 

  783. +    <ClCompile Include="src\libbluray\decoders\pg_decode.c" />
    784. 

  784. +    <ClCompile Include="src\libbluray\decoders\rle.c" />
    785. 

  785. +    <ClCompile Include="src\libbluray\decoders\textst_decode.c" />
    786. 

  786. +    <ClCompile Include="src\libbluray\decoders\textst_render.c" />
    787. 

  787. +    <ClCompile Include="src\libbluray\disc\aacs.c" />
    788. 

  788. +    <ClCompile Include="src\libbluray\disc\bdplus.c" />
    789. 

  789. +    <ClCompile Include="src\libbluray\disc\dec.c" />
    790. 

  790. +    <ClCompile Include="src\libbluray\disc\disc.c" />
    791. 

  791. +    <ClCompile Include="src\libbluray\hdmv\hdmv_vm.c" />
    792. 

  792. +    <ClCompile Include="src\libbluray\hdmv\mobj_parse.c" />
    793. 

  793. +    <ClCompile Include="src\libbluray\hdmv\mobj_print.c" />
    794. 

  794. +    <ClCompile Include="src\libbluray\register.c" />
    795. 

  795. +    <ClCompile Include="src\util\array.c" />
    796. 

  796. +    <ClCompile Include="src\util\bits.c" />
    797. 

  797. +    <ClCompile Include="src\util\logging.c" />
    798. 

  798. +    <ClCompile Include="src\util\mutex.c" />
    799. 

  799. +    <ClCompile Include="src\util\refcnt.c" />
    800. 

  800. +    <ClCompile Include="src\util\strutl.c" />
    801. 

  801. +    <ClCompile Include="src\util\time.c" />
    802. 

  802. +  </ItemGroup>
    803. 

  803. +  <ItemGroup>
    804. 

  804. +    <None Include="libbluray.def" />
    805. 

  805. +  </ItemGroup>
    806. 

  806. +  <PropertyGroup Label="Globals">
    807. 

  807. +    <ProjectGuid>{E1DA1B95-71F1-4C21-A271-121176925062}</ProjectGuid>
    808. 

  808. +    <Keyword>Win32Proj</Keyword>
    809. 

  809. +    <RootNamespace>libbluray</RootNamespace>
    810. 

  810. +  </PropertyGroup>
    811. 

  811. +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
    812. 

  812. +  <PropertyGroup Label="Configuration" Condition="'$(VisualStudioVersion)' == '11.0'">
    813. 

  813. +    <PlatformToolset>v110_xp</PlatformToolset>
    814. 

  814. +  </PropertyGroup>
    815. 

  815. +  <PropertyGroup Label="Configuration" Condition="'$(VisualStudioVersion)' == '12.0'">
    816. 

  816. +    <PlatformToolset>v120_xp</PlatformToolset>
    817. 

  817. +  </PropertyGroup>
    818. 

  818. +  <PropertyGroup Label="Configuration" Condition="'$(VisualStudioVersion)' == '14.0'">
    819. 

  819. +    <PlatformToolset>v140_xp</PlatformToolset>
    820. 

  820. +  </PropertyGroup>
    821. 

  821. +  <PropertyGroup Condition="'$(Configuration)'=='Debug' Or '$(Configuration)'=='DebugRelease'" Label="Configuration">
    822. 

  822. +    <ConfigurationType>DynamicLibrary</ConfigurationType>
    823. 

  823. +    <UseDebugLibraries>true</UseDebugLibraries>
    824. 

  824. +    <CharacterSet>Unicode</CharacterSet>
    825. 

  825. +  </PropertyGroup>
    826. 

  826. +  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
    827. 

  827. +    <ConfigurationType>DynamicLibrary</ConfigurationType>
    828. 

  828. +    <UseDebugLibraries>false</UseDebugLibraries>
    829. 

  829. +    <WholeProgramOptimization>true</WholeProgramOptimization>
    830. 

  830. +    <CharacterSet>Unicode</CharacterSet>
    831. 

  831. +  </PropertyGroup>
    832. 

  832. +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
    833. 

  833. +  <ImportGroup Label="ExtensionSettings">
    834. 

  834. +  </ImportGroup>
    835. 

  835. +  <ImportGroup Label="PropertySheets">
    836. 

  836. +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
    837. 

  837. +  </ImportGroup>
    838. 

  838. +  <PropertyGroup Label="UserMacros" />
    839. 

  839. +  <PropertyGroup Condition="'$(Configuration)'=='Debug' Or '$(Configuration)'=='DebugRelease'">
    840. 

  840. +    <LinkIncremental>true</LinkIncremental>
    841. 

  841. +    <OutDir>$(SolutionDir)bin_$(PlatformName)d\</OutDir>
    842. 

  842. +    <IntDir>$(SolutionDir)bin_$(PlatformName)d\$(ProjectName)\</IntDir>
    843. 

  843. +  </PropertyGroup>
    844. 

  844. +  <PropertyGroup Condition="'$(Configuration)'=='Release'">
    845. 

  845. +    <LinkIncremental>false</LinkIncremental>
    846. 

  846. +    <OutDir>$(SolutionDir)bin_$(PlatformName)\$(ProjectName)\</OutDir>
    847. 

  847. +    <IntDir>$(SolutionDir)bin_$(PlatformName)\$(ProjectName)\</IntDir>
    848. 

  848. +  </PropertyGroup>
    849. 

  849. +  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug' Or '$(Configuration)'=='DebugRelease'">
    850. 

  850. +    <ClCompile>
    851. 

  851. +      <PrecompiledHeader>
    852. 

  852. +      </PrecompiledHeader>
    853. 

  853. +      <WarningLevel>Level3</WarningLevel>
    854. 

  854. +      <Optimization>Disabled</Optimization>
    855. 

  855. +      <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBBLURAY_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    856. 

  856. +      <PreprocessorDefinitions Condition="'$(VisualStudioVersion)' == '12.0'">__STDC_FORMAT_MACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    857. 

  857. +      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)includes;$(ProjectDir)src;$(ProjectDir)src\libbluray;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    858. 

  858. +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    859. 

  859. +      <CompileAs Condition="'$(VisualStudioVersion)' == '12.0'">CompileAsCpp</CompileAs>
    860. 

  860. +    </ClCompile>
    861. 

  861. +    <Link>
    862. 

  862. +      <SubSystem>Windows</SubSystem>
    863. 

  863. +      <GenerateDebugInformation>true</GenerateDebugInformation>
    864. 

  864. +      <ModuleDefinitionFile>libbluray.def</ModuleDefinitionFile>
    865. 

  865. +    </Link>
    866. 

  866. +    <PostBuildEvent>
    867. 

  867. +      <Command>xcopy /I /Y "$(OutDir)$(TargetName).lib" "$(OutDir)lib\"</Command>
    868. 

  868. +      <Message>Copy .lib into library path</Message>
    869. 

  869. +    </PostBuildEvent>
    870. 

  870. +  </ItemDefinitionGroup>
    871. 

  871. +  <ItemDefinitionGroup Condition="'$(Configuration)'=='DebugRelease'">
    872. 

  872. +    <ClCompile>
    873. 

  873. +      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    874. 

  874. +    </ClCompile>
    875. 

  875. +  </ItemDefinitionGroup>
    876. 

  876. +  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
    877. 

  877. +    <ClCompile>
    878. 

  878. +      <WarningLevel>Level3</WarningLevel>
    879. 

  879. +      <Optimization>MaxSpeed</Optimization>
    880. 

  880. +      <FunctionLevelLinking>true</FunctionLevelLinking>
    881. 

  881. +      <IntrinsicFunctions>true</IntrinsicFunctions>
    882. 

  882. +      <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBBLURAY_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    883. 

  883. +      <PreprocessorDefinitions Condition="'$(VisualStudioVersion)' == '12.0'">__STDC_FORMAT_MACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    884. 

  884. +      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)includes;$(ProjectDir)src;$(ProjectDir)src\libbluray;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    885. 

  885. +      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    886. 

  886. +      <EnableEnhancedInstructionSet Condition="'$(Platform)'=='Win32'">StreamingSIMDExtensions</EnableEnhancedInstructionSet>
    887. 

  887. +      <CompileAs Condition="'$(VisualStudioVersion)' == '12.0'">CompileAsCpp</CompileAs>
    888. 

  888. +    </ClCompile>
    889. 

  889. +    <Link>
    890. 

  890. +      <SubSystem>Windows</SubSystem>
    891. 

  891. +      <GenerateDebugInformation>true</GenerateDebugInformation>
    892. 

  892. +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    893. 

  893. +      <OptimizeReferences>true</OptimizeReferences>
    894. 

  894. +      <ModuleDefinitionFile>libbluray.def</ModuleDefinitionFile>
    895. 

  895. +      <SetChecksum>true</SetChecksum>
    896. 

  896. +    </Link>
    897. 

  897. +    <PostBuildEvent>
    898. 

  898. +      <Command>xcopy /I /Y "$(TargetDir)$(TargetName)$(TargetExt)" "$(OutDir)..\"
    899. 

  899. +xcopy /I /Y "$(TargetDir)$(TargetName).lib" "$(OutDir)..\lib\"</Command>
    900. 

  900. +      <Message>Copy .dll/.lib into library path</Message>
    901. 

  901. +    </PostBuildEvent>
    902. 

  902. +  </ItemDefinitionGroup>
    903. 

  903. +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    904. 

  904. +  <ImportGroup Label="ExtensionTargets">
    905. 

  905. +  </ImportGroup>
    906. 

  906. +</Project>
    907. 

  907. \ No newline at end of file
    908. 

  908. diff --git a/libbluray.vcxproj.filters b/libbluray.vcxproj.filters
    909. 

  909. new file mode 100644
    910. 

  910. index 0000000..57ff16c
    911. 

  911. --- /dev/null
    912. 

  912. +++ b/libbluray.vcxproj.filters
    913. 

  913. @@ -0,0 +1,353 @@
    914. 

  914. +<?xml version="1.0" encoding="utf-8"?>
    915. 

  915. +<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    916. 

  916. +  <ItemGroup>
    917. 

  917. +    <Filter Include="Source Files">
    918. 

  918. +      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
    919. 

  919. +      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
    920. 

  920. +    </Filter>
    921. 

  921. +    <Filter Include="Header Files">
    922. 

  922. +      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
    923. 

  923. +      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
    924. 

  924. +    </Filter>
    925. 

  925. +    <Filter Include="Resource Files">
    926. 

  926. +      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
    927. 

  927. +      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
    928. 

  928. +    </Filter>
    929. 

  929. +    <Filter Include="Source Files\util">
    930. 

  930. +      <UniqueIdentifier>{1ab0e905-7c04-4090-b385-6363dd1c961c}</UniqueIdentifier>
    931. 

  931. +    </Filter>
    932. 

  932. +    <Filter Include="Header Files\util">
    933. 

  933. +      <UniqueIdentifier>{b8fa3348-a089-461f-9ef5-3d9df997b8e5}</UniqueIdentifier>
    934. 

  934. +    </Filter>
    935. 

  935. +    <Filter Include="Header Files\file">
    936. 

  936. +      <UniqueIdentifier>{125333e9-0b5e-45f9-a444-f0aaaf547d9b}</UniqueIdentifier>
    937. 

  937. +    </Filter>
    938. 

  938. +    <Filter Include="Source Files\file">
    939. 

  939. +      <UniqueIdentifier>{a743058f-f07a-4d0f-bab6-02dc57defda9}</UniqueIdentifier>
    940. 

  940. +    </Filter>
    941. 

  941. +    <Filter Include="Source Files\libbluray">
    942. 

  942. +      <UniqueIdentifier>{7dacc7c4-ef59-452b-9e5b-392c9df07c98}</UniqueIdentifier>
    943. 

  943. +    </Filter>
    944. 

  944. +    <Filter Include="Header Files\libbluray">
    945. 

  945. +      <UniqueIdentifier>{c7895c81-c186-4d5e-a8ff-645c6d55a731}</UniqueIdentifier>
    946. 

  946. +    </Filter>
    947. 

  947. +    <Filter Include="Header Files\libbluray\bdnav">
    948. 

  948. +      <UniqueIdentifier>{c8619466-211b-4c85-9d30-d1b1a822d32e}</UniqueIdentifier>
    949. 

  949. +    </Filter>
    950. 

  950. +    <Filter Include="Source Files\libbluray\bdnav">
    951. 

  951. +      <UniqueIdentifier>{8afb6919-994f-4d1f-9638-ce4a06d0b473}</UniqueIdentifier>
    952. 

  952. +    </Filter>
    953. 

  953. +    <Filter Include="Source Files\libbluray\decoders">
    954. 

  954. +      <UniqueIdentifier>{0e9086a7-eebf-4b8e-a4fe-b1724d148877}</UniqueIdentifier>
    955. 

  955. +    </Filter>
    956. 

  956. +    <Filter Include="Header Files\libbluray\decoders">
    957. 

  957. +      <UniqueIdentifier>{fc5e776b-0f32-493a-b823-240288288502}</UniqueIdentifier>
    958. 

  958. +    </Filter>
    959. 

  959. +    <Filter Include="Header Files\libbluray\hdmv">
    960. 

  960. +      <UniqueIdentifier>{96d2d786-cd45-4856-937d-9e6f85ced241}</UniqueIdentifier>
    961. 

  961. +    </Filter>
    962. 

  962. +    <Filter Include="Source Files\libbluray\hdmv">
    963. 

  963. +      <UniqueIdentifier>{9f4ea4ae-217a-4d97-a5f3-e561ce1e49cd}</UniqueIdentifier>
    964. 

  964. +    </Filter>
    965. 

  965. +    <Filter Include="Source Files\libbluray\disc">
    966. 

  966. +      <UniqueIdentifier>{09e1b1b8-3aa3-4918-b157-3dfc0554ccbb}</UniqueIdentifier>
    967. 

  967. +    </Filter>
    968. 

  968. +    <Filter Include="Header Files\libbluray\disc">
    969. 

  969. +      <UniqueIdentifier>{1e02e503-752e-4765-9dfb-8cc67a7b79f8}</UniqueIdentifier>
    970. 

  970. +    </Filter>
    971. 

  971. +  </ItemGroup>
    972. 

  972. +  <ItemGroup>
    973. 

  973. +    <ClInclude Include="src\util\attributes.h">
    974. 

  974. +      <Filter>Header Files\util</Filter>
    975. 

  975. +    </ClInclude>
    976. 

  976. +    <ClInclude Include="src\util\strutl.h">
    977. 

  977. +      <Filter>Header Files\util</Filter>
    978. 

  978. +    </ClInclude>
    979. 

  979. +    <ClInclude Include="src\util\bits.h">
    980. 

  980. +      <Filter>Header Files\util</Filter>
    981. 

  981. +    </ClInclude>
    982. 

  982. +    <ClInclude Include="src\util\log_control.h">
    983. 

  983. +      <Filter>Header Files\util</Filter>
    984. 

  984. +    </ClInclude>
    985. 

  985. +    <ClInclude Include="src\util\logging.h">
    986. 

  986. +      <Filter>Header Files\util</Filter>
    987. 

  987. +    </ClInclude>
    988. 

  988. +    <ClInclude Include="src\util\macro.h">
    989. 

  989. +      <Filter>Header Files\util</Filter>
    990. 

  990. +    </ClInclude>
    991. 

  991. +    <ClInclude Include="src\util\mutex.h">
    992. 

  992. +      <Filter>Header Files\util</Filter>
    993. 

  993. +    </ClInclude>
    994. 

  994. +    <ClInclude Include="src\file\dl.h">
    995. 

  995. +      <Filter>Header Files\file</Filter>
    996. 

  996. +    </ClInclude>
    997. 

  997. +    <ClInclude Include="src\file\filesystem.h">
    998. 

  998. +      <Filter>Header Files\file</Filter>
    999. 

  999. +    </ClInclude>
    1000. 

  1000. +    <ClInclude Include="src\file\file.h">
    1001. 

  1001. +      <Filter>Header Files\file</Filter>
    1002. 

  1002. +    </ClInclude>
    1003. 

  1003. +    <ClInclude Include="src\libbluray\bluray.h">
    1004. 

  1004. +      <Filter>Header Files\libbluray</Filter>
    1005. 

  1005. +    </ClInclude>
    1006. 

  1006. +    <ClInclude Include="src\libbluray\register.h">
    1007. 

  1007. +      <Filter>Header Files\libbluray</Filter>
    1008. 

  1008. +    </ClInclude>
    1009. 

  1009. +    <ClInclude Include="src\libbluray\keys.h">
    1010. 

  1010. +      <Filter>Header Files\libbluray</Filter>
    1011. 

  1011. +    </ClInclude>
    1012. 

  1012. +    <ClInclude Include="src\libbluray\bdnav\bdparse.h">
    1013. 

  1013. +      <Filter>Header Files\libbluray\bdnav</Filter>
    1014. 

  1014. +    </ClInclude>
    1015. 

  1015. +    <ClInclude Include="src\libbluray\bdnav\uo_mask_table.h">
    1016. 

  1016. +      <Filter>Header Files\libbluray\bdnav</Filter>
    1017. 

  1017. +    </ClInclude>
    1018. 

  1018. +    <ClInclude Include="src\libbluray\bdnav\clpi_parse.h">
    1019. 

  1019. +      <Filter>Header Files\libbluray\bdnav</Filter>
    1020. 

  1020. +    </ClInclude>
    1021. 

  1021. +    <ClInclude Include="src\libbluray\bdnav\index_parse.h">
    1022. 

  1022. +      <Filter>Header Files\libbluray\bdnav</Filter>
    1023. 

  1023. +    </ClInclude>
    1024. 

  1024. +    <ClInclude Include="src\libbluray\bdnav\meta_data.h">
    1025. 

  1025. +      <Filter>Header Files\libbluray\bdnav</Filter>
    1026. 

  1026. +    </ClInclude>
    1027. 

  1027. +    <ClInclude Include="src\libbluray\bdnav\meta_parse.h">
    1028. 

  1028. +      <Filter>Header Files\libbluray\bdnav</Filter>
    1029. 

  1029. +    </ClInclude>
    1030. 

  1030. +    <ClInclude Include="src\libbluray\bdnav\mpls_parse.h">
    1031. 

  1031. +      <Filter>Header Files\libbluray\bdnav</Filter>
    1032. 

  1032. +    </ClInclude>
    1033. 

  1033. +    <ClInclude Include="src\libbluray\bdnav\navigation.h">
    1034. 

  1034. +      <Filter>Header Files\libbluray\bdnav</Filter>
    1035. 

  1035. +    </ClInclude>
    1036. 

  1036. +    <ClInclude Include="src\libbluray\bdnav\sound_parse.h">
    1037. 

  1037. +      <Filter>Header Files\libbluray\bdnav</Filter>
    1038. 

  1038. +    </ClInclude>
    1039. 

  1039. +    <ClInclude Include="src\libbluray\decoders\graphics_controller.h">
    1040. 

  1040. +      <Filter>Header Files\libbluray\decoders</Filter>
    1041. 

  1041. +    </ClInclude>
    1042. 

  1042. +    <ClInclude Include="src\libbluray\decoders\pg_decode.h">
    1043. 

  1043. +      <Filter>Header Files\libbluray\decoders</Filter>
    1044. 

  1044. +    </ClInclude>
    1045. 

  1045. +    <ClInclude Include="src\libbluray\decoders\graphics_processor.h">
    1046. 

  1046. +      <Filter>Header Files\libbluray\decoders</Filter>
    1047. 

  1047. +    </ClInclude>
    1048. 

  1048. +    <ClInclude Include="src\libbluray\decoders\ig.h">
    1049. 

  1049. +      <Filter>Header Files\libbluray\decoders</Filter>
    1050. 

  1050. +    </ClInclude>
    1051. 

  1051. +    <ClInclude Include="src\libbluray\decoders\ig_decode.h">
    1052. 

  1052. +      <Filter>Header Files\libbluray\decoders</Filter>
    1053. 

  1053. +    </ClInclude>
    1054. 

  1054. +    <ClInclude Include="src\libbluray\decoders\m2ts_demux.h">
    1055. 

  1055. +      <Filter>Header Files\libbluray\decoders</Filter>
    1056. 

  1056. +    </ClInclude>
    1057. 

  1057. +    <ClInclude Include="src\libbluray\decoders\overlay.h">
    1058. 

  1058. +      <Filter>Header Files\libbluray\decoders</Filter>
    1059. 

  1059. +    </ClInclude>
    1060. 

  1060. +    <ClInclude Include="src\libbluray\decoders\pes_buffer.h">
    1061. 

  1061. +      <Filter>Header Files\libbluray\decoders</Filter>
    1062. 

  1062. +    </ClInclude>
    1063. 

  1063. +    <ClInclude Include="src\libbluray\decoders\pg.h">
    1064. 

  1064. +      <Filter>Header Files\libbluray\decoders</Filter>
    1065. 

  1065. +    </ClInclude>
    1066. 

  1066. +    <ClInclude Include="src\libbluray\hdmv\hdmv_insn.h">
    1067. 

  1067. +      <Filter>Header Files\libbluray\hdmv</Filter>
    1068. 

  1068. +    </ClInclude>
    1069. 

  1069. +    <ClInclude Include="src\libbluray\hdmv\mobj_parse.h">
    1070. 

  1070. +      <Filter>Header Files\libbluray\hdmv</Filter>
    1071. 

  1071. +    </ClInclude>
    1072. 

  1072. +    <ClInclude Include="src\libbluray\hdmv\hdmv_vm.h">
    1073. 

  1073. +      <Filter>Header Files\libbluray\hdmv</Filter>
    1074. 

  1074. +    </ClInclude>
    1075. 

  1075. +    <ClInclude Include="src\libbluray\bdnav\bdid_parse.h">
    1076. 

  1076. +      <Filter>Header Files\libbluray\bdnav</Filter>
    1077. 

  1077. +    </ClInclude>
    1078. 

  1078. +    <ClInclude Include="src\libbluray\bdnav\clpi_data.h">
    1079. 

  1079. +      <Filter>Header Files\libbluray\bdnav</Filter>
    1080. 

  1080. +    </ClInclude>
    1081. 

  1081. +    <ClInclude Include="src\libbluray\bdnav\extdata_parse.h">
    1082. 

  1082. +      <Filter>Header Files\libbluray\bdnav</Filter>
    1083. 

  1083. +    </ClInclude>
    1084. 

  1084. +    <ClInclude Include="src\libbluray\decoders\textst.h">
    1085. 

  1085. +      <Filter>Header Files\libbluray\decoders</Filter>
    1086. 

  1086. +    </ClInclude>
    1087. 

  1087. +    <ClInclude Include="src\libbluray\decoders\textst_render.h">
    1088. 

  1088. +      <Filter>Header Files\libbluray\decoders</Filter>
    1089. 

  1089. +    </ClInclude>
    1090. 

  1090. +    <ClInclude Include="src\libbluray\decoders\textst_decode.h">
    1091. 

  1091. +      <Filter>Header Files\libbluray\decoders</Filter>
    1092. 

  1092. +    </ClInclude>
    1093. 

  1093. +    <ClInclude Include="src\libbluray\decoders\rle.h">
    1094. 

  1094. +      <Filter>Header Files\libbluray\decoders</Filter>
    1095. 

  1095. +    </ClInclude>
    1096. 

  1096. +    <ClInclude Include="src\util\refcnt.h">
    1097. 

  1097. +      <Filter>Header Files\util</Filter>
    1098. 

  1098. +    </ClInclude>
    1099. 

  1099. +    <ClInclude Include="src\util\time.h">
    1100. 

  1100. +      <Filter>Header Files\util</Filter>
    1101. 

  1101. +    </ClInclude>
    1102. 

  1102. +    <ClInclude Include="src\libbluray\bluray_internal.h">
    1103. 

  1103. +      <Filter>Header Files\libbluray</Filter>
    1104. 

  1104. +    </ClInclude>
    1105. 

  1105. +    <ClInclude Include="src\libbluray\decoders\m2ts_filter.h">
    1106. 

  1106. +      <Filter>Header Files\libbluray\decoders</Filter>
    1107. 

  1107. +    </ClInclude>
    1108. 

  1108. +    <ClInclude Include="src\file\dirs.h">
    1109. 

  1109. +      <Filter>Header Files\file</Filter>
    1110. 

  1110. +    </ClInclude>
    1111. 

  1111. +    <ClInclude Include="src\libbluray\bluray-version.h">
    1112. 

  1112. +      <Filter>Header Files\libbluray</Filter>
    1113. 

  1113. +    </ClInclude>
    1114. 

  1114. +    <ClInclude Include="src\util\array.h">
    1115. 

  1115. +      <Filter>Header Files\util</Filter>
    1116. 

  1116. +    </ClInclude>
    1117. 

  1117. +    <ClInclude Include="src\libbluray\disc\aacs.h">
    1118. 

  1118. +      <Filter>Header Files\libbluray\disc</Filter>
    1119. 

  1119. +    </ClInclude>
    1120. 

  1120. +    <ClInclude Include="src\libbluray\disc\bdplus.h">
    1121. 

  1121. +      <Filter>Header Files\libbluray\disc</Filter>
    1122. 

  1122. +    </ClInclude>
    1123. 

  1123. +    <ClInclude Include="src\libbluray\disc\dec.h">
    1124. 

  1124. +      <Filter>Header Files\libbluray\disc</Filter>
    1125. 

  1125. +    </ClInclude>
    1126. 

  1126. +    <ClInclude Include="src\libbluray\disc\disc.h">
    1127. 

  1127. +      <Filter>Header Files\libbluray\disc</Filter>
    1128. 

  1128. +    </ClInclude>
    1129. 

  1129. +    <ClInclude Include="src\libbluray\disc\enc_info.h">
    1130. 

  1130. +      <Filter>Header Files\libbluray\disc</Filter>
    1131. 

  1131. +    </ClInclude>
    1132. 

  1132. +    <ClInclude Include="src\file\mount.h">
    1133. 

  1133. +      <Filter>Header Files\file</Filter>
    1134. 

  1134. +    </ClInclude>
    1135. 

  1135. +  </ItemGroup>
    1136. 

  1136. +  <ItemGroup>
    1137. 

  1137. +    <ClCompile Include="src\util\logging.c">
    1138. 

  1138. +      <Filter>Source Files\util</Filter>
    1139. 

  1139. +    </ClCompile>
    1140. 

  1140. +    <ClCompile Include="src\util\strutl.c">
    1141. 

  1141. +      <Filter>Source Files\util</Filter>
    1142. 

  1142. +    </ClCompile>
    1143. 

  1143. +    <ClCompile Include="src\file\filesystem.c">
    1144. 

  1144. +      <Filter>Source Files\file</Filter>
    1145. 

  1145. +    </ClCompile>
    1146. 

  1146. +    <ClCompile Include="src\libbluray\bluray.c">
    1147. 

  1147. +      <Filter>Source Files\libbluray</Filter>
    1148. 

  1148. +    </ClCompile>
    1149. 

  1149. +    <ClCompile Include="src\libbluray\register.c">
    1150. 

  1150. +      <Filter>Source Files\libbluray</Filter>
    1151. 

  1151. +    </ClCompile>
    1152. 

  1152. +    <ClCompile Include="src\libbluray\bdnav\clpi_parse.c">
    1153. 

  1153. +      <Filter>Source Files\libbluray\bdnav</Filter>
    1154. 

  1154. +    </ClCompile>
    1155. 

  1155. +    <ClCompile Include="src\libbluray\bdnav\sound_parse.c">
    1156. 

  1156. +      <Filter>Source Files\libbluray\bdnav</Filter>
    1157. 

  1157. +    </ClCompile>
    1158. 

  1158. +    <ClCompile Include="src\libbluray\bdnav\index_parse.c">
    1159. 

  1159. +      <Filter>Source Files\libbluray\bdnav</Filter>
    1160. 

  1160. +    </ClCompile>
    1161. 

  1161. +    <ClCompile Include="src\libbluray\bdnav\meta_parse.c">
    1162. 

  1162. +      <Filter>Source Files\libbluray\bdnav</Filter>
    1163. 

  1163. +    </ClCompile>
    1164. 

  1164. +    <ClCompile Include="src\libbluray\bdnav\mpls_parse.c">
    1165. 

  1165. +      <Filter>Source Files\libbluray\bdnav</Filter>
    1166. 

  1166. +    </ClCompile>
    1167. 

  1167. +    <ClCompile Include="src\libbluray\bdnav\navigation.c">
    1168. 

  1168. +      <Filter>Source Files\libbluray\bdnav</Filter>
    1169. 

  1169. +    </ClCompile>
    1170. 

  1170. +    <ClCompile Include="src\libbluray\decoders\graphics_controller.c">
    1171. 

  1171. +      <Filter>Source Files\libbluray\decoders</Filter>
    1172. 

  1172. +    </ClCompile>
    1173. 

  1173. +    <ClCompile Include="src\libbluray\decoders\pg_decode.c">
    1174. 

  1174. +      <Filter>Source Files\libbluray\decoders</Filter>
    1175. 

  1175. +    </ClCompile>
    1176. 

  1176. +    <ClCompile Include="src\libbluray\decoders\graphics_processor.c">
    1177. 

  1177. +      <Filter>Source Files\libbluray\decoders</Filter>
    1178. 

  1178. +    </ClCompile>
    1179. 

  1179. +    <ClCompile Include="src\libbluray\decoders\ig_decode.c">
    1180. 

  1180. +      <Filter>Source Files\libbluray\decoders</Filter>
    1181. 

  1181. +    </ClCompile>
    1182. 

  1182. +    <ClCompile Include="src\libbluray\decoders\m2ts_demux.c">
    1183. 

  1183. +      <Filter>Source Files\libbluray\decoders</Filter>
    1184. 

  1184. +    </ClCompile>
    1185. 

  1185. +    <ClCompile Include="src\libbluray\decoders\pes_buffer.c">
    1186. 

  1186. +      <Filter>Source Files\libbluray\decoders</Filter>
    1187. 

  1187. +    </ClCompile>
    1188. 

  1188. +    <ClCompile Include="src\libbluray\hdmv\hdmv_vm.c">
    1189. 

  1189. +      <Filter>Source Files\libbluray\hdmv</Filter>
    1190. 

  1190. +    </ClCompile>
    1191. 

  1191. +    <ClCompile Include="src\libbluray\hdmv\mobj_print.c">
    1192. 

  1192. +      <Filter>Source Files\libbluray\hdmv</Filter>
    1193. 

  1193. +    </ClCompile>
    1194. 

  1194. +    <ClCompile Include="src\libbluray\hdmv\mobj_parse.c">
    1195. 

  1195. +      <Filter>Source Files\libbluray\hdmv</Filter>
    1196. 

  1196. +    </ClCompile>
    1197. 

  1197. +    <ClCompile Include="src\libbluray\bdnav\bdid_parse.c">
    1198. 

  1198. +      <Filter>Source Files\libbluray\bdnav</Filter>
    1199. 

  1199. +    </ClCompile>
    1200. 

  1200. +    <ClCompile Include="src\libbluray\bdnav\extdata_parse.c">
    1201. 

  1201. +      <Filter>Source Files\libbluray\bdnav</Filter>
    1202. 

  1202. +    </ClCompile>
    1203. 

  1203. +    <ClCompile Include="src\util\bits.c">
    1204. 

  1204. +      <Filter>Source Files\util</Filter>
    1205. 

  1205. +    </ClCompile>
    1206. 

  1206. +    <ClCompile Include="src\file\dir_win32.c">
    1207. 

  1207. +      <Filter>Source Files\file</Filter>
    1208. 

  1208. +    </ClCompile>
    1209. 

  1209. +    <ClCompile Include="src\file\dirs_win32.c">
    1210. 

  1210. +      <Filter>Source Files\file</Filter>
    1211. 

  1211. +    </ClCompile>
    1212. 

  1212. +    <ClCompile Include="src\file\dl_win32.c">
    1213. 

  1213. +      <Filter>Source Files\file</Filter>
    1214. 

  1214. +    </ClCompile>
    1215. 

  1215. +    <ClCompile Include="src\libbluray\decoders\textst_decode.c">
    1216. 

  1216. +      <Filter>Source Files\libbluray\decoders</Filter>
    1217. 

  1217. +    </ClCompile>
    1218. 

  1218. +    <ClCompile Include="src\libbluray\decoders\textst_render.c">
    1219. 

  1219. +      <Filter>Source Files\libbluray\decoders</Filter>
    1220. 

  1220. +    </ClCompile>
    1221. 

  1221. +    <ClCompile Include="src\util\refcnt.c">
    1222. 

  1222. +      <Filter>Source Files\util</Filter>
    1223. 

  1223. +    </ClCompile>
    1224. 

  1224. +    <ClCompile Include="src\libbluray\decoders\m2ts_filter.c">
    1225. 

  1225. +      <Filter>Source Files\libbluray\decoders</Filter>
    1226. 

  1226. +    </ClCompile>
    1227. 

  1227. +    <ClCompile Include="src\libbluray\decoders\rle.c">
    1228. 

  1228. +      <Filter>Source Files\libbluray\decoders</Filter>
    1229. 

  1229. +    </ClCompile>
    1230. 

  1230. +    <ClCompile Include="src\file\file_win32.c">
    1231. 

  1231. +      <Filter>Source Files\file</Filter>
    1232. 

  1232. +    </ClCompile>
    1233. 

  1233. +    <ClCompile Include="src\file\file.c">
    1234. 

  1234. +      <Filter>Source Files\file</Filter>
    1235. 

  1235. +    </ClCompile>
    1236. 

  1236. +    <ClCompile Include="src\util\array.c">
    1237. 

  1237. +      <Filter>Source Files\util</Filter>
    1238. 

  1238. +    </ClCompile>
    1239. 

  1239. +    <ClCompile Include="src\util\mutex.c">
    1240. 

  1240. +      <Filter>Source Files\util</Filter>
    1241. 

  1241. +    </ClCompile>
    1242. 

  1242. +    <ClCompile Include="src\libbluray\disc\aacs.c">
    1243. 

  1243. +      <Filter>Source Files\libbluray\disc</Filter>
    1244. 

  1244. +    </ClCompile>
    1245. 

  1245. +    <ClCompile Include="src\libbluray\disc\bdplus.c">
    1246. 

  1246. +      <Filter>Source Files\libbluray\disc</Filter>
    1247. 

  1247. +    </ClCompile>
    1248. 

  1248. +    <ClCompile Include="src\libbluray\disc\dec.c">
    1249. 

  1249. +      <Filter>Source Files\libbluray\disc</Filter>
    1250. 

  1250. +    </ClCompile>
    1251. 

  1251. +    <ClCompile Include="src\libbluray\disc\disc.c">
    1252. 

  1252. +      <Filter>Source Files\libbluray\disc</Filter>
    1253. 

  1253. +    </ClCompile>
    1254. 

  1254. +    <ClCompile Include="src\util\time.c">
    1255. 

  1255. +      <Filter>Source Files\util</Filter>
    1256. 

  1256. +    </ClCompile>
    1257. 

  1257. +    <ClCompile Include="src\file\mount.c">
    1258. 

  1258. +      <Filter>Source Files\file</Filter>
    1259. 

  1259. +    </ClCompile>
    1260. 

  1260. +  </ItemGroup>
    1261. 

  1261. +  <ItemGroup>
    1262. 

  1262. +    <None Include="libbluray.def">
    1263. 

  1263. +      <Filter>Source Files</Filter>
    1264. 

  1264. +    </None>
    1265. 

  1265. +  </ItemGroup>
    1266. 

  1266. +</Project>
    1267. 

  1267. \ No newline at end of file
    1268. 

  1268. diff --git a/src/devtools/bdj_test.c b/src/devtools/bdj_test.c
    1269. 

  1269. new file mode 100644
    1270. 

  1270. index 0000000..d9ebd16
    1271. 

  1271. --- /dev/null
    1272. 

  1272. +++ b/src/devtools/bdj_test.c
    1273. 

  1273. @@ -0,0 +1,67 @@
    1274. 

  1274. +/*
    1275. 

  1275. + * This file is part of libbluray
    1276. 

  1276. + * Copyright (C) 2010  William Hahne
    1277. 

  1277. + *
    1278. 

  1278. + * This program is free software; you can redistribute it and/or
    1279. 

  1279. + * modify it under the terms of the GNU General Public License
    1280. 

  1280. + * as published by the Free Software Foundation; either version 2
    1281. 

  1281. + * of the License, or (at your option) any later version.
    1282. 

  1282. + *
    1283. 

  1283. + * This program is distributed in the hope that it will be useful,
    1284. 

  1284. + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    1285. 

  1285. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    1286. 

  1286. + * GNU General Public License for more details.
    1287. 

  1287. + *
    1288. 

  1288. + * You should have received a copy of the GNU General Public License
    1289. 

  1289. + * along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1290. 

  1290. + *
    1291. 

  1291. + * In addition, as a special exception, the copyright holders of libbluray
    1292. 

  1292. + * gives permission to link the code of its release of libbluray with the
    1293. 

  1293. + * OpenSSL project's "OpenSSL" library (or with modified versions of it
    1294. 

  1294. + * that use the same license as the "OpenSSL" library), and distribute
    1295. 

  1295. + * the linked executables.  You must obey the GNU General Public License
    1296. 

  1296. + * in all respects for all of the code used other than "OpenSSL".  If you
    1297. 

  1297. + * modify this file, you may extend this exception to your version of the
    1298. 

  1298. + * file, but you are not obligated to do so.  If you do not wish to do
    1299. 

  1299. + * so, delete this exception statement from your version.
    1300. 

  1300. + */
    1301. 

  1301. +
    1302. 

  1302. +#include <stdio.h>
    1303. 

  1303. +#include <stdlib.h>
    1304. 

  1304. +#include <unistd.h>
    1305. 

  1305. +
    1306. 

  1306. +#include "libbluray/bluray.h"
    1307. 

  1307. +
    1308. 

  1308. +#if defined(_WIN32)
    1309. 

  1309. +#include <windows.h>
    1310. 

  1310. +#define sleep(x) Sleep(x)
    1311. 

  1311. +#endif
    1312. 

  1312. +
    1313. 

  1313. +static void _usage(void) {
    1314. 

  1314. +    printf("Usage: [path to disc] [starting object]\n");
    1315. 

  1315. +}
    1316. 

  1316. +
    1317. 

  1317. +int main(int argc, char** argv)
    1318. 

  1318. +{
    1319. 

  1319. +    if (argc < 3) {
    1320. 

  1320. +        _usage();
    1321. 

  1321. +        return 0;
    1322. 

  1322. +    }
    1323. 

  1323. +
    1324. 

  1324. +    printf("%s %s\n", argv[1], argv[2]);
    1325. 

  1325. +
    1326. 

  1326. +    BLURAY* bd = bd_open(argv[1], NULL);
    1327. 

  1327. +
    1328. 

  1328. +    bd_get_titles(bd, TITLES_ALL, 0);
    1329. 

  1329. +
    1330. 

  1330. +    if (!bd_start_bdj(bd, argv[2])) {
    1331. 

  1331. +        printf("Failed to start BD-J application.\n");
    1332. 

  1332. +    } else {
    1333. 

  1333. +        while (1) { sleep(20); }
    1334. 

  1334. +        bd_stop_bdj(bd);
    1335. 

  1335. +    }
    1336. 

  1336. +
    1337. 

  1337. +    bd_close(bd);
    1338. 

  1338. +
    1339. 

  1339. +    return 0;
    1340. 

  1340. +}
    1341. 

  1341. diff --git a/src/devtools/bdjo_dump.c b/src/devtools/bdjo_dump.c
    1342. 

  1342. new file mode 100644
    1343. 

  1343. index 0000000..c9c8141
    1344. 

  1344. --- /dev/null
    1345. 

  1345. +++ b/src/devtools/bdjo_dump.c
    1346. 

  1346. @@ -0,0 +1,206 @@
    1347. 

  1347. +/*
    1348. 

  1348. + * This file is part of libbluray
    1349. 

  1349. + * Copyright (C) 2014  Petri Hintukainen <phintuka@users.sourceforge.net>
    1350. 

  1350. + *
    1351. 

  1351. + * This library is free software; you can redistribute it and/or
    1352. 

  1352. + * modify it under the terms of the GNU Lesser General Public
    1353. 

  1353. + * License as published by the Free Software Foundation; either
    1354. 

  1354. + * version 2.1 of the License, or (at your option) any later version.
    1355. 

  1355. + *
    1356. 

  1356. + * This library is distributed in the hope that it will be useful,
    1357. 

  1357. + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    1358. 

  1358. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    1359. 

  1359. + * Lesser General Public License for more details.
    1360. 

  1360. + *
    1361. 

  1361. + * You should have received a copy of the GNU Lesser General Public
    1362. 

  1362. + * License along with this library. If not, see
    1363. 

  1363. + * <http://www.gnu.org/licenses/>.
    1364. 

  1364. + */
    1365. 

  1365. +
    1366. 

  1366. +#include "libbluray/bluray.h"
    1367. 

  1367. +#include "libbluray/bdj/bdjo_data.h"
    1368. 

  1368. +
    1369. 

  1369. +#include <stdio.h>
    1370. 

  1370. +#include <string.h>
    1371. 

  1371. +
    1372. 

  1372. +static const char *_yes_no(int i)
    1373. 

  1373. +{
    1374. 

  1374. +    return i > 0 ? "yes" : i < 0 ? "unknown" : "no";
    1375. 

  1375. +}
    1376. 

  1376. +
    1377. 

  1377. +static const char *_binding_str(int i)
    1378. 

  1378. +{
    1379. 

  1379. +    switch (i) {
    1380. 

  1380. +        case 0:  return "unbound";
    1381. 

  1381. +        case 1:  return "disc bound";
    1382. 

  1382. +        case 3:  return "title bound";
    1383. 

  1383. +        default: return "???";
    1384. 

  1384. +    }
    1385. 

  1385. +}
    1386. 

  1386. +
    1387. 

  1387. +static const char *_visibility_str(int i)
    1388. 

  1388. +{
    1389. 

  1389. +    switch (i) {
    1390. 

  1390. +        case 0:  return "none";
    1391. 

  1391. +        case 1:  return "applications";
    1392. 

  1392. +        case 2:  return "user";
    1393. 

  1393. +        default: return "???";
    1394. 

  1394. +    }
    1395. 

  1395. +}
    1396. 

  1396. +
    1397. 

  1397. +static void _terminal_info_print(const BDJO_TERMINAL_INFO *p)
    1398. 

  1398. +{
    1399. 

  1399. +    printf("Terminal Info:\n");
    1400. 

  1400. +    printf("    Default AWT font    : %s\n", p->default_font);
    1401. 

  1401. +    printf("    initial HaVi config : %d\n", p->initial_havi_config_id);
    1402. 

  1402. +    printf("    Menu call mask      : %d\n", p->menu_call_mask);
    1403. 

  1403. +    printf("    Title search mask   : %d\n", p->menu_call_mask);
    1404. 

  1404. +}
    1405. 

  1405. +
    1406. 

  1406. +static void _app_cache_item_print(const BDJO_APP_CACHE_ITEM *p)
    1407. 

  1407. +{
    1408. 

  1408. +    printf("    %3.3s: %s%s\n",
    1409. 

  1409. +           p->lang_code, p->ref_to_name,
    1410. 

  1410. +           p->type == 1 ? ".jar" : p->type == 2 ? "/" : " (unknown type)");
    1411. 

  1411. +}
    1412. 

  1412. +
    1413. 

  1413. +static void _app_cache_info_print(const BDJO_APP_CACHE_INFO *p)
    1414. 

  1414. +{
    1415. 

  1415. +    unsigned ii;
    1416. 

  1416. +
    1417. 

  1417. +    printf("Application cache info:\n");
    1418. 

  1418. +    for (ii = 0; ii < p->num_item; ii++) {
    1419. 

  1419. +        _app_cache_item_print(&p->item[ii]);
    1420. 

  1420. +    }
    1421. 

  1421. +}
    1422. 

  1422. +
    1423. 

  1423. +static void _accessible_playlists_print(const BDJO_ACCESSIBLE_PLAYLISTS *p)
    1424. 

  1424. +{
    1425. 

  1425. +    unsigned ii;
    1426. 

  1426. +
    1427. 

  1427. +    printf("Accessible playlists:\n");
    1428. 

  1428. +    printf("    Access to all       : %s\n", _yes_no(p->access_to_all_flag));
    1429. 

  1429. +    printf("    Autostart first     : %s\n", _yes_no(p->autostart_first_playlist_flag));
    1430. 

  1430. +
    1431. 

  1431. +    if (p->num_pl) {
    1432. 

  1432. +        printf("    Playlists           : %d\n", p->num_pl);
    1433. 

  1433. +        for (ii = 0; ii < p->num_pl; ii++) {
    1434. 

  1434. +            printf("        %s.mpls\n", p->pl[ii].name);
    1435. 

  1435. +        }
    1436. 

  1436. +    }
    1437. 

  1437. +}
    1438. 

  1438. +
    1439. 

  1439. +static void _app_profile_print(BDJO_APP_PROFILE *p)
    1440. 

  1440. +{
    1441. 

  1441. +    printf("        Profile %d Version %d.%d.%d\n",
    1442. 

  1442. +           p->profile_number, p->major_version, p->minor_version, p->micro_version);
    1443. 

  1443. +}
    1444. 

  1444. +
    1445. 

  1445. +static void _app_print(const BDJO_APP *p)
    1446. 

  1446. +{
    1447. 

  1447. +    unsigned ii;
    1448. 

  1448. +
    1449. 

  1449. +    printf("    Control code:       : %d (%s)\n", p->control_code,
    1450. 

  1450. +           p->control_code == 1 ? "autostart" : p->control_code == 2 ? "present" : "???");
    1451. 

  1451. +    printf("    Type                : %d (%s)\n", p->type,
    1452. 

  1452. +           p->type == 1 ? "BD-J App" : "???");
    1453. 

  1453. +    printf("    Organization ID     : %08X\n", p->org_id);
    1454. 

  1454. +    printf("    Application ID      : %04X\n", p->app_id);
    1455. 

  1455. +    printf("    Priority            : %d\n", p->priority);
    1456. 

  1456. +    printf("    Binding             : %d (%s)\n", p->binding, _binding_str(p->binding));
    1457. 

  1457. +    printf("    Visibility          : %d (%s)\n", p->visibility, _visibility_str(p->visibility));
    1458. 

  1458. +
    1459. 

  1459. +    if (p->num_profile) {
    1460. 

  1460. +        printf("    Profiles:\n");
    1461. 

  1461. +        for (ii = 0; ii < p->num_profile; ii++) {
    1462. 

  1462. +            _app_profile_print(&p->profile[ii]);
    1463. 

  1463. +        }
    1464. 

  1464. +    }
    1465. 

  1465. +
    1466. 

  1466. +    if (p->num_name) {
    1467. 

  1467. +        printf("    Names:\n");
    1468. 

  1468. +        for (ii = 0; ii < p->num_name; ii++) {
    1469. 

  1469. +            printf("        %s: %s\n", p->name[ii].lang, p->name[ii].name);
    1470. 

  1470. +        }
    1471. 

  1471. +    }
    1472. 

  1472. +
    1473. 

  1473. +    printf("    Base directory      : %s\n", p->base_dir);
    1474. 

  1474. +    printf("    Icon locator        : %s\n", p->icon_locator);
    1475. 

  1475. +    printf("    Icon flags          : 0x%04x\n", p->icon_flags);
    1476. 

  1476. +    printf("    Classpath extension : %s\n", p->classpath_extension);
    1477. 

  1477. +    printf("    Initial class       : %s\n", p->initial_class);
    1478. 

  1478. +    printf("    Parameters          : ");
    1479. 

  1479. +    for (ii = 0; ii < p->num_param; ii++) {
    1480. 

  1480. +        printf("%s ", p->param[ii].param);
    1481. 

  1481. +    }
    1482. 

  1482. +    printf("\n");
    1483. 

  1483. +}
    1484. 

  1484. +
    1485. 

  1485. +static void _app_management_table_print(const BDJO_APP_MANAGEMENT_TABLE *p)
    1486. 

  1486. +{
    1487. 

  1487. +    unsigned ii;
    1488. 

  1488. +
    1489. 

  1489. +    for (ii = 0; ii < p->num_app; ii++) {
    1490. 

  1490. +        printf("Application %u:\n", ii);
    1491. 

  1491. +        _app_print(&p->app[ii]);
    1492. 

  1492. +    }
    1493. 

  1493. +}
    1494. 

  1494. +
    1495. 

  1495. +static void _key_interest_table_print(const BDJO_KEY_INTEREST_TABLE *p)
    1496. 

  1496. +{
    1497. 

  1497. +    unsigned int v;
    1498. 

  1498. +    memcpy(&v, p, sizeof(unsigned int));
    1499. 

  1499. +    if (v) {
    1500. 

  1500. +        printf("Key interest table:\n");
    1501. 

  1501. +        printf("    %s%s%s%s%s%s%s%s%s%s%s\n",
    1502. 

  1502. +               p->vk_play              ? "VK_PLAY " : "",
    1503. 

  1503. +               p->vk_stop              ? "VK_STOP " : "",
    1504. 

  1504. +               p->vk_ffw               ? "VK_FFW " : "",
    1505. 

  1505. +               p->vk_rew               ? "VK_REW " : "",
    1506. 

  1506. +               p->vk_track_next        ? "VK_TRACK_NEXT " : "",
    1507. 

  1507. +               p->vk_track_prev        ? "VK_TRACK_PREV " : "",
    1508. 

  1508. +               p->vk_pause             ? "VK_PAUSE " : "",
    1509. 

  1509. +               p->vk_still_off         ? "VK_STILL_OFF " : "",
    1510. 

  1510. +               p->vk_sec_audio_ena_dis ? "VK_SEC_AUDIO " : "",
    1511. 

  1511. +               p->vk_sec_video_ena_dis ? "VK_SEC_VIDEO " : "",
    1512. 

  1512. +               p->pg_textst_ena_dis    ? "VK_PG_TEXTST " : "");
    1513. 

  1513. +    }
    1514. 

  1514. +}
    1515. 

  1515. +
    1516. 

  1516. +static void _file_access_info_print(const BDJO_FILE_ACCESS_INFO *p)
    1517. 

  1517. +{
    1518. 

  1518. +    printf("File access info:\n    %s\n",  p->path);
    1519. 

  1519. +}
    1520. 

  1520. +
    1521. 

  1521. +static void _bdjo_print(const BDJO *p)
    1522. 

  1522. +{
    1523. 

  1523. +    _terminal_info_print(&p->terminal_info);
    1524. 

  1524. +    _app_cache_info_print(&p->app_cache_info);
    1525. 

  1525. +    _accessible_playlists_print(&p->accessible_playlists);
    1526. 

  1526. +    _app_management_table_print(&p->app_table);
    1527. 

  1527. +    _key_interest_table_print(&p->key_interest_table);
    1528. 

  1528. +    _file_access_info_print(&p->file_access_info);
    1529. 

  1529. +}
    1530. 

  1530. +
    1531. 

  1531. +int main(int argc, const char *argv[])
    1532. 

  1532. +{
    1533. 

  1533. +    if (argc < 2) {
    1534. 

  1534. +        fprintf(stderr, "usage: %s <bdjo_file>\n", argv[0]);
    1535. 

  1535. +        return 1;
    1536. 

  1536. +    }
    1537. 

  1537. +
    1538. 

  1538. +    int cnt;
    1539. 

  1539. +    for (cnt = 1; cnt < argc; cnt++) {
    1540. 

  1540. +
    1541. 

  1541. +        printf("%s\n", argv[cnt]);
    1542. 

  1542. +
    1543. 

  1543. +        BDJO *bdjo = bd_read_bdjo(argv[cnt]);
    1544. 

  1544. +        if (bdjo) {
    1545. 

  1545. +            _bdjo_print(bdjo);
    1546. 

  1546. +            bd_free_bdjo(bdjo);
    1547. 

  1547. +        }
    1548. 

  1548. +        printf("\n");
    1549. 

  1549. +    }
    1550. 

  1550. +
    1551. 

  1551. +    return 0;
    1552. 

  1552. +}
    1553. 

  1553. diff --git a/src/devtools/clpi_dump.c b/src/devtools/clpi_dump.c
    1554. 

  1554. new file mode 100644
    1555. 

  1555. index 0000000..bd64783
    1556. 

  1556. --- /dev/null
    1557. 

  1557. +++ b/src/devtools/clpi_dump.c
    1558. 

  1558. @@ -0,0 +1,487 @@
    1559. 

  1559. +/*
    1560. 

  1560. + * This file is part of libbluray
    1561. 

  1561. + * Copyright (C) 2009-2010  John Stebbins
    1562. 

  1562. + * Copyright (C) 2012-2013  Petri Hintukainen <phintuka@users.sourceforge.net>
    1563. 

  1563. + *
    1564. 

  1564. + * This library is free software; you can redistribute it and/or
    1565. 

  1565. + * modify it under the terms of the GNU Lesser General Public
    1566. 

  1566. + * License as published by the Free Software Foundation; either
    1567. 

  1567. + * version 2.1 of the License, or (at your option) any later version.
    1568. 

  1568. + *
    1569. 

  1569. + * This library is distributed in the hope that it will be useful,
    1570. 

  1570. + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    1571. 

  1571. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    1572. 

  1572. + * Lesser General Public License for more details.
    1573. 

  1573. + *
    1574. 

  1574. + * You should have received a copy of the GNU Lesser General Public
    1575. 

  1575. + * License along with this library. If not, see
    1576. 

  1576. + * <http://www.gnu.org/licenses/>.
    1577. 

  1577. + */
    1578. 

  1578. +
    1579. 

  1579. +#include <stdio.h>
    1580. 

  1580. +#include <stdlib.h>
    1581. 

  1581. +#include <unistd.h>
    1582. 

  1582. +#include <inttypes.h>
    1583. 

  1583. +
    1584. 

  1584. +#include "libbluray/bdnav/clpi_data.h"
    1585. 

  1585. +#include "libbluray/bluray.h"
    1586. 

  1586. +
    1587. 

  1587. +#include "util.h"
    1588. 

  1588. +
    1589. 

  1589. +static int verbose;
    1590. 

  1590. +
    1591. 

  1591. +typedef struct {
    1592. 

  1592. +    int value;
    1593. 

  1593. +    const char *str;
    1594. 

  1594. +} VALUE_MAP;
    1595. 

  1595. +
    1596. 

  1596. +static inline const char*
    1597. 

  1597. +_lookup_str(const VALUE_MAP *map, int val)
    1598. 

  1598. +{
    1599. 

  1599. +    int ii;
    1600. 

  1600. +
    1601. 

  1601. +    for (ii = 0; map[ii].str; ii++) {
    1602. 

  1602. +        if (val == map[ii].value) {
    1603. 

  1603. +            return map[ii].str;
    1604. 

  1604. +        }
    1605. 

  1605. +    }
    1606. 

  1606. +    return "?";
    1607. 

  1607. +}
    1608. 

  1608. +
    1609. 

  1609. +const VALUE_MAP codec_map[] = {
    1610. 

  1610. +    {0x01, "MPEG-1 Video"},
    1611. 

  1611. +    {0x02, "MPEG-2 Video"},
    1612. 

  1612. +    {0x03, "MPEG-1 Audio"},
    1613. 

  1613. +    {0x04, "MPEG-2 Audio"},
    1614. 

  1614. +    {0x80, "LPCM"},
    1615. 

  1615. +    {0x81, "AC-3"},
    1616. 

  1616. +    {0x82, "DTS"},
    1617. 

  1617. +    {0x83, "TrueHD"},
    1618. 

  1618. +    {0x84, "AC-3 Plus"},
    1619. 

  1619. +    {0x85, "DTS-HD"},
    1620. 

  1620. +    {0x86, "DTS-HD Master"},
    1621. 

  1621. +    {0xa1, "AC-3 Plus for secondary audio"},
    1622. 

  1622. +    {0xa2, "DTS-HD for secondary audio"},
    1623. 

  1623. +    {0xea, "VC-1"},
    1624. 

  1624. +    {0x1b, "H.264"},
    1625. 

  1625. +    {0x20, "H.264 MVC dep."},
    1626. 

  1626. +    {0x90, "Presentation Graphics"},
    1627. 

  1627. +    {0x91, "Presentation Graphics"},
    1628. 

  1628. +    {0x92, "Interactive Graphics"},
    1629. 

  1629. +    {0, NULL}
    1630. 

  1630. +};
    1631. 

  1631. +
    1632. 

  1632. +const VALUE_MAP video_format_map[] = {
    1633. 

  1633. +    {0, "Reserved"},
    1634. 

  1634. +    {1, "480i"},
    1635. 

  1635. +    {2, "576i"},
    1636. 

  1636. +    {3, "480p"},
    1637. 

  1637. +    {4, "1080i"},
    1638. 

  1638. +    {5, "720p"},
    1639. 

  1639. +    {6, "1080p"},
    1640. 

  1640. +    {7, "576p"},
    1641. 

  1641. +    {0, NULL}
    1642. 

  1642. +};
    1643. 

  1643. +
    1644. 

  1644. +const VALUE_MAP video_rate_map[] = {
    1645. 

  1645. +    {0, "Reserved1"},
    1646. 

  1646. +    {1, "23.976"},
    1647. 

  1647. +    {2, "24"},
    1648. 

  1648. +    {3, "25"},
    1649. 

  1649. +    {4, "29.97"},
    1650. 

  1650. +    {5, "Reserved2"},
    1651. 

  1651. +    {6, "50"},
    1652. 

  1652. +    {7, "59.94"},
    1653. 

  1653. +    {0, NULL}
    1654. 

  1654. +};
    1655. 

  1655. +
    1656. 

  1656. +const VALUE_MAP video_aspect_map[] = {
    1657. 

  1657. +    {0, "Reserved1"},
    1658. 

  1658. +    {1, "Reserved2"},
    1659. 

  1659. +    {2, "4:3"},
    1660. 

  1660. +    {3, "16:9"},
    1661. 

  1661. +    {0, NULL}
    1662. 

  1662. +};
    1663. 

  1663. +
    1664. 

  1664. +const VALUE_MAP audio_format_map[] = {
    1665. 

  1665. +    {0, "Reserved1"},
    1666. 

  1666. +    {1, "Mono"},
    1667. 

  1667. +    {2, "Reserved2"},
    1668. 

  1668. +    {3, "Stereo"},
    1669. 

  1669. +    {4, "Reserved3"},
    1670. 

  1670. +    {5, "Reserved4"},
    1671. 

  1671. +    {6, "Multi Channel"},
    1672. 

  1672. +    {12, "Combo"},
    1673. 

  1673. +    {0, NULL}
    1674. 

  1674. +};
    1675. 

  1675. +
    1676. 

  1676. +const VALUE_MAP audio_rate_map[] = {
    1677. 

  1677. +    {0, "Reserved1"},
    1678. 

  1678. +    {1, "48 Khz"},
    1679. 

  1679. +    {2, "Reserved2"},
    1680. 

  1680. +    {3, "Reserved3"},
    1681. 

  1681. +    {4, "96 Khz"},
    1682. 

  1682. +    {5, "192 Khz"},
    1683. 

  1683. +    {12, "48/192 Khz"},
    1684. 

  1684. +    {14, "48/96 Khz"},
    1685. 

  1685. +    {0, NULL}
    1686. 

  1686. +};
    1687. 

  1687. +
    1688. 

  1688. +const VALUE_MAP application_type_map[] = {
    1689. 

  1689. +    {1, "Main TS for a main-path of Movie"},
    1690. 

  1690. +    {2, "Main TS for a main-path of Time based slide show"},
    1691. 

  1691. +    {3, "Main TS for a main-path of Browsable slide show"},
    1692. 

  1692. +    {4, "Sub TS for a sub-path of Browsable slide show"},
    1693. 

  1693. +    {5, "Sub TS for a sub-path of Interactive Graphics menu"},
    1694. 

  1694. +    {6, "Sub TS for a sub-path of Text subtitle"},
    1695. 

  1695. +    {7, "Sub TS for a sub-path of one or more elementary streams path"},
    1696. 

  1696. +    {0, NULL},
    1697. 

  1697. +};
    1698. 

  1698. +
    1699. 

  1699. +static void
    1700. 

  1700. +_show_stream(CLPI_PROG_STREAM *ss, int level)
    1701. 

  1701. +{
    1702. 

  1702. +    indent_printf(level, "Codec (%04x): %s", ss->coding_type,
    1703. 

  1703. +                    _lookup_str(codec_map, ss->coding_type));
    1704. 

  1704. +    indent_printf(level, "PID: %04x", ss->pid);
    1705. 

  1705. +    switch (ss->coding_type) {
    1706. 

  1706. +        case 0x01:
    1707. 

  1707. +        case 0x02:
    1708. 

  1708. +        case 0xea:
    1709. 

  1709. +        case 0x1b:
    1710. 

  1710. +        case 0x20:
    1711. 

  1711. +            indent_printf(level, "Format %02x: %s", ss->format,
    1712. 

  1712. +                        _lookup_str(video_format_map, ss->format));
    1713. 

  1713. +            indent_printf(level, "Rate %02x: %s", ss->rate,
    1714. 

  1714. +                        _lookup_str(video_rate_map, ss->rate));
    1715. 

  1715. +            indent_printf(level, "Aspect %02x: %s", ss->aspect,
    1716. 

  1716. +                        _lookup_str(video_aspect_map, ss->aspect));
    1717. 

  1717. +            indent_printf(level, "oc_flag %02x", ss->oc_flag);
    1718. 

  1718. +            break;
    1719. 

  1719. +
    1720. 

  1720. +        case 0x03:
    1721. 

  1721. +        case 0x04:
    1722. 

  1722. +        case 0x80:
    1723. 

  1723. +        case 0x81:
    1724. 

  1724. +        case 0x82:
    1725. 

  1725. +        case 0x83:
    1726. 

  1726. +        case 0x84:
    1727. 

  1727. +        case 0x85:
    1728. 

  1728. +        case 0x86:
    1729. 

  1729. +        case 0xa1:
    1730. 

  1730. +        case 0xa2:
    1731. 

  1731. +            indent_printf(level, "Format %02x: %s", ss->format,
    1732. 

  1732. +                        _lookup_str(audio_format_map, ss->format));
    1733. 

  1733. +            indent_printf(level, "Rate %02x: %s", ss->rate,
    1734. 

  1734. +                        _lookup_str(audio_rate_map, ss->rate));
    1735. 

  1735. +            indent_printf(level, "Language: %s", ss->lang);
    1736. 

  1736. +            break;
    1737. 

  1737. +
    1738. 

  1738. +        case 0x90:
    1739. 

  1739. +        case 0x91:
    1740. 

  1740. +        case 0xa0:
    1741. 

  1741. +            indent_printf(level, "Language: %s", ss->lang);
    1742. 

  1742. +            break;
    1743. 

  1743. +
    1744. 

  1744. +        case 0x92:
    1745. 

  1745. +            indent_printf(level, "Char Code: %02x", ss->char_code);
    1746. 

  1746. +            indent_printf(level, "Language: %s", ss->lang);
    1747. 

  1747. +            break;
    1748. 

  1748. +
    1749. 

  1749. +        default:
    1750. 

  1750. +            fprintf(stderr, "unrecognized coding type %02x\n", ss->coding_type);
    1751. 

  1751. +            break;
    1752. 

  1752. +    };
    1753. 

  1753. +}
    1754. 

  1754. +
    1755. 

  1755. +static void
    1756. 

  1756. +_show_clip_info(CLPI_CL *cl, int level)
    1757. 

  1757. +{
    1758. 

  1758. +    CLPI_CLIP_INFO *ci = &cl->clip;
    1759. 

  1759. +    int ii;
    1760. 

  1760. +
    1761. 

  1761. +    indent_printf(level, "Clip Info");
    1762. 

  1762. +    indent_printf(level+1, "Clip Stream Type: %02x", ci->clip_stream_type);
    1763. 

  1763. +    indent_printf(level+1, "Clip Application Type (%02x): %s",
    1764. 

  1764. +                  ci->application_type, _lookup_str(application_type_map, ci->application_type));
    1765. 

  1765. +    indent_printf(level+1, "is_ATC_delta: %s", ci->is_atc_delta ? "True" : "False");
    1766. 

  1766. +    indent_printf(level+1, "ATC delta count: %d", ci->atc_delta_count);
    1767. 

  1767. +    indent_printf(level+1, "TS Recording Rate: %u", ci->ts_recording_rate);
    1768. 

  1768. +    indent_printf(level+1, "Number Source Packets: %u", ci->num_source_packets);
    1769. 

  1769. +    // Show ts type info
    1770. 

  1770. +    indent_printf(level+1, "TS Type Info");
    1771. 

  1771. +    indent_printf(level+2, "Validity Flags %02x", ci->ts_type_info.validity);
    1772. 

  1772. +    indent_printf(level+2, "Format Id %s", ci->ts_type_info.format_id);
    1773. 

  1773. +    // Show cc5 thing
    1774. 

  1774. +    for (ii = 0; ii < ci->atc_delta_count; ii++) {
    1775. 

  1775. +        indent_printf(level+1, "ATC delta[ %d ]", ii);
    1776. 

  1776. +        indent_printf(level+2, "Delta %08x", ci->atc_delta[ii].delta);
    1777. 

  1777. +        indent_printf(level+2, "File Id %s", ci->atc_delta[ii].file_id);
    1778. 

  1778. +        indent_printf(level+2, "File Code %s", ci->atc_delta[ii].file_code);
    1779. 

  1779. +    }
    1780. 

  1780. +    // show fonts
    1781. 

  1781. +    if (cl->font_info.font_count) {
    1782. 

  1782. +        indent_printf(level+1, "Font files");
    1783. 

  1783. +        for (ii = 0; ii < cl->font_info.font_count; ii++) {
    1784. 

  1784. +            indent_printf(level+2, "Font file %d: %s.otf", ii+1, cl->font_info.font[ii].file_id);
    1785. 

  1785. +        }
    1786. 

  1786. +    }
    1787. 

  1787. +
    1788. 

  1788. +    printf("\n");
    1789. 

  1789. +}
    1790. 

  1790. +
    1791. 

  1791. +static void
    1792. 

  1792. +_show_seq_info(CLPI_SEQ_INFO *si, int level)
    1793. 

  1793. +{
    1794. 

  1794. +    CLPI_ATC_SEQ *atc;
    1795. 

  1795. +    CLPI_STC_SEQ *stc;
    1796. 

  1796. +    int ii, jj;
    1797. 

  1797. +
    1798. 

  1798. +    indent_printf(level, "Sequence Info");
    1799. 

  1799. +    indent_printf(level+1, "Number ATC Sequences: %d", si->num_atc_seq);
    1800. 

  1800. +    for (ii = 0; ii < si->num_atc_seq; ii++) {
    1801. 

  1801. +        atc = &si->atc_seq[ii];
    1802. 

  1802. +        indent_printf(level+1, "ATC Sequence %d", ii);
    1803. 

  1803. +        indent_printf(level+2, "SPN ATC Start: %u", atc->spn_atc_start);
    1804. 

  1804. +        indent_printf(level+2, "Offset STC Id: %d", atc->offset_stc_id);
    1805. 

  1805. +        indent_printf(level+2, "Number STC Sequences: %d", atc->num_stc_seq);
    1806. 

  1806. +        for (jj = 0; jj < atc->num_stc_seq; jj++) {
    1807. 

  1807. +            stc = &atc->stc_seq[jj];
    1808. 

  1808. +            indent_printf(level+2, "ATC Sequence %d", jj);
    1809. 

  1809. +            indent_printf(level+3, "SPN STC Start: %u", stc->spn_stc_start);
    1810. 

  1810. +            indent_printf(level+3, "PCR PID: %04x", stc->pcr_pid);
    1811. 

  1811. +            indent_printf(level+3, "Presentation Start: %u", 
    1812. 

  1812. +                            stc->presentation_start_time);
    1813. 

  1813. +            indent_printf(level+3, "Presentation End: %u", 
    1814. 

  1814. +                            stc->presentation_end_time);
    1815. 

  1815. +        }
    1816. 

  1816. +    }
    1817. 

  1817. +}
    1818. 

  1818. +
    1819. 

  1819. +static void
    1820. 

  1820. +_show_prog_info(CLPI_PROG_INFO *pi, int level)
    1821. 

  1821. +{
    1822. 

  1822. +    CLPI_PROG *prog;
    1823. 

  1823. +    int ii, jj;
    1824. 

  1824. +
    1825. 

  1825. +    indent_printf(level, "Program Info");
    1826. 

  1826. +    indent_printf(level+1, "Number Programs: %d", pi->num_prog);
    1827. 

  1827. +    for (ii = 0; ii < pi->num_prog; ii++) {
    1828. 

  1828. +        prog = &pi->progs[ii];
    1829. 

  1829. +        indent_printf(level+1, "Program %d", ii);
    1830. 

  1830. +        indent_printf(level+2, "SPN Program Sequence Start: %d", 
    1831. 

  1831. +                        prog->spn_program_sequence_start);
    1832. 

  1832. +        indent_printf(level+2, "Program Map PID: %d", prog->program_map_pid);
    1833. 

  1833. +        indent_printf(level+2, "Number Streams: %d", prog->num_streams);
    1834. 

  1834. +        indent_printf(level+2, "Number Groups: %d", prog->num_groups);
    1835. 

  1835. +        for (jj = 0; jj < prog->num_streams; jj++) {
    1836. 

  1836. +            indent_printf(level+2, "Stream %d", jj);
    1837. 

  1837. +            _show_stream(&prog->streams[jj], level+3);
    1838. 

  1838. +        }
    1839. 

  1839. +    }
    1840. 

  1840. +}
    1841. 

  1841. +
    1842. 

  1842. +static void
    1843. 

  1843. +_show_extent_start(CLPI_EXTENT_START *es, int level)
    1844. 

  1844. +{
    1845. 

  1845. +    unsigned int ii;
    1846. 

  1846. +
    1847. 

  1847. +    indent_printf(level, "Extension data: Extent Start Point");
    1848. 

  1848. +
    1849. 

  1849. +    if (!es->num_point) {
    1850. 

  1850. +        indent_printf(level+1, "(no data)");
    1851. 

  1851. +
    1852. 

  1852. +    } else {
    1853. 

  1853. +        indent_printf(level+1, "Number of Start Points: %d", es->num_point);
    1854. 

  1854. +
    1855. 

  1855. +        if (verbose) {
    1856. 

  1856. +            for (ii = 0; ii < es->num_point; ii++) {
    1857. 

  1857. +                indent_printf(level+1, "Extent %5d: SPN 0x%08X", ii, es->point[ii]);
    1858. 

  1858. +            }
    1859. 

  1859. +        }
    1860. 

  1860. +    }
    1861. 

  1861. +}
    1862. 

  1862. +
    1863. 

  1863. +static void
    1864. 

  1864. +_show_cpi_info(CLPI_CPI *cpi, int level)
    1865. 

  1865. +{
    1866. 

  1866. +    CLPI_EP_MAP_ENTRY *entry;
    1867. 

  1867. +    CLPI_EP_COARSE *coarse;
    1868. 

  1868. +    CLPI_EP_FINE *fine;
    1869. 

  1869. +    int ii, jj, kk;
    1870. 

  1870. +
    1871. 

  1871. +    indent_printf(level, "CPI");
    1872. 

  1872. +    indent_printf(level+1, "Number Stream PID: %d", cpi->num_stream_pid);
    1873. 

  1873. +    for (ii = 0; ii < cpi->num_stream_pid; ii++) {
    1874. 

  1874. +        entry = &cpi->entry[ii];
    1875. 

  1875. +        indent_printf(level+1, "Stream: %d", ii);
    1876. 

  1876. +        indent_printf(level+2, "PID: %04x", entry->pid);
    1877. 

  1877. +        indent_printf(level+2, "EP Stream Type: %d", entry->ep_stream_type);
    1878. 

  1878. +        indent_printf(level+2, "Number EP Coarse: %d", entry->num_ep_coarse);
    1879. 

  1879. +        indent_printf(level+2, "Number EP Fine: %d", entry->num_ep_fine);
    1880. 

  1880. +        indent_printf(level+2, "EP Map Start: %d", 
    1881. 

  1881. +                        entry->ep_map_stream_start_addr);
    1882. 

  1882. +        for (jj = 0; jj < entry->num_ep_coarse; jj++) {
    1883. 

  1883. +            coarse = &entry->coarse[jj];
    1884. 

  1884. +            indent_printf(level+2, "Coarse: %d", jj);
    1885. 

  1885. +            indent_printf(level+3, "Ref EP Fine: %d", coarse->ref_ep_fine_id);
    1886. 

  1886. +            indent_printf(level+3, "PTS EP: %d", coarse->pts_ep);
    1887. 

  1887. +            indent_printf(level+3, "SPN EP: %d", coarse->spn_ep);
    1888. 

  1888. +        }
    1889. 

  1889. +        for (jj = 0; jj < entry->num_ep_fine; jj++) {
    1890. 

  1890. +            fine = &entry->fine[jj];
    1891. 

  1891. +            indent_printf(level+2, "Fine: %d", jj);
    1892. 

  1892. +            indent_printf(level+3, "Angle Change Point: %s", 
    1893. 

  1893. +                fine->is_angle_change_point ? "True":"False");
    1894. 

  1894. +            indent_printf(level+3, "I End Offset: %d", 
    1895. 

  1895. +                fine->i_end_position_offset);
    1896. 

  1896. +            indent_printf(level+3, "PTS EP: %d", fine->pts_ep);
    1897. 

  1897. +            indent_printf(level+3, "SPN EP: %d", fine->spn_ep);
    1898. 

  1898. +        }
    1899. 

  1899. +        if (verbose) {
    1900. 

  1900. +            uint64_t pts;
    1901. 

  1901. +            uint32_t spn;
    1902. 

  1902. +
    1903. 

  1903. +            indent_printf(level+2, "PTS - SPN Map");
    1904. 

  1904. +            for (jj = 0; jj < entry->num_ep_coarse; jj++) {
    1905. 

  1905. +                int start, end;
    1906. 

  1906. +
    1907. 

  1907. +                indent_printf(level+3, "Coarse: %d", jj);
    1908. 

  1908. +                coarse = &entry->coarse[jj];
    1909. 

  1909. +                start = coarse->ref_ep_fine_id;
    1910. 

  1910. +                if (jj < entry->num_ep_coarse - 1) {
    1911. 

  1911. +                    end = entry->coarse[jj+1].ref_ep_fine_id;
    1912. 

  1912. +                } else {
    1913. 

  1913. +                    end = entry->num_ep_fine;
    1914. 

  1914. +                }
    1915. 

  1915. +                for (kk = start; kk < end; kk++) {
    1916. 

  1916. +                    fine = &entry->fine[kk];
    1917. 

  1917. +                    pts = ((uint64_t) (coarse->pts_ep & ~0x01) << 19) +
    1918. 

  1918. +                            ((uint64_t)fine->pts_ep << 9);
    1919. 

  1919. +                    spn = (coarse->spn_ep & ~0x1FFFF) + fine->spn_ep;
    1920. 

  1920. +                    indent_printf(level+4, "PTS %8"PRIu64"/%8"PRIu64" -- SPN %u",
    1921. 

  1921. +                        pts, pts >> 1, spn);
    1922. 

  1922. +                }
    1923. 

  1923. +            }
    1924. 

  1924. +        }
    1925. 

  1925. +    }
    1926. 

  1926. +}
    1927. 

  1927. +
    1928. 

  1928. +
    1929. 

  1929. +static void
    1930. 

  1930. +_usage(char *cmd)
    1931. 

  1931. +{
    1932. 

  1932. +    fprintf(stderr, 
    1933. 

  1933. +"Usage: %s -vcspi <clpi file> [<clpi file> ...]\n"
    1934. 

  1934. +"With no options, produces no output (not very useful)\n"
    1935. 

  1935. +"Options:\n"
    1936. 

  1936. +"    v - Verbose output.\n"
    1937. 

  1937. +"    c - Shows the Clip Info structure\n"
    1938. 

  1938. +"    s - Shows the Sequence Info structure\n"
    1939. 

  1939. +"    p - Shows the Program Info structure\n"
    1940. 

  1940. +"    i - Shows the CPI. PTS to SPN map\n"
    1941. 

  1941. +"    e - Shows Extent Start Table\n"
    1942. 

  1942. +, cmd);
    1943. 

  1943. +
    1944. 

  1944. +    exit(EXIT_FAILURE);
    1945. 

  1945. +}
    1946. 

  1946. +
    1947. 

  1947. +#define OPTS "vcspie"
    1948. 

  1948. +
    1949. 

  1949. +int
    1950. 

  1950. +main(int argc, char *argv[])
    1951. 

  1951. +{
    1952. 

  1952. +    CLPI_CL *cl;
    1953. 

  1953. +    int opt;
    1954. 

  1954. +    int opt_clip_info = 0, opt_seq_info = 0, opt_prog_info = 0;
    1955. 

  1955. +    int opt_cpi_info = 0, opt_extent_start = 0;
    1956. 

  1956. +    int ii;
    1957. 

  1957. +
    1958. 

  1958. +    do {
    1959. 

  1959. +        opt = getopt(argc, argv, OPTS);
    1960. 

  1960. +        switch (opt) {
    1961. 

  1961. +            case -1: break;
    1962. 

  1962. +
    1963. 

  1963. +            case 'v':
    1964. 

  1964. +                verbose = 1;
    1965. 

  1965. +                break;
    1966. 

  1966. +
    1967. 

  1967. +            case 's':
    1968. 

  1968. +                opt_seq_info = 1;
    1969. 

  1969. +                break;
    1970. 

  1970. +
    1971. 

  1971. +            case 'i':
    1972. 

  1972. +                opt_cpi_info = 1;
    1973. 

  1973. +                break;
    1974. 

  1974. +
    1975. 

  1975. +            case 'c':
    1976. 

  1976. +                opt_clip_info = 1;
    1977. 

  1977. +                break;
    1978. 

  1978. +
    1979. 

  1979. +            case 'p':
    1980. 

  1980. +                opt_prog_info = 1;
    1981. 

  1981. +                break;
    1982. 

  1982. +
    1983. 

  1983. +            case 'e':
    1984. 

  1984. +                opt_extent_start = 1;
    1985. 

  1985. +                break;
    1986. 

  1986. +
    1987. 

  1987. +            default:
    1988. 

  1988. +                _usage(argv[0]);
    1989. 

  1989. +                break;
    1990. 

  1990. +        }
    1991. 

  1991. +    } while (opt != -1);
    1992. 

  1992. +
    1993. 

  1993. +    if (optind >= argc) {
    1994. 

  1994. +        _usage(argv[0]);
    1995. 

  1995. +    }
    1996. 

  1996. +
    1997. 

  1997. +    for (ii = optind; ii < argc; ii++) {
    1998. 

  1998. +        cl = bd_read_clpi(argv[ii]);
    1999. 

  1999. +        if (cl == NULL) {
    2000. 

  2000. +            fprintf(stderr, "Parsing %s failed\n", argv[ii]);
    2001. 

  2001. +            continue;
    2002. 

  2002. +        }
    2003. 

  2003. +        if (opt_clip_info) {
    2004. 

  2004. +            // Show clip info
    2005. 

  2005. +            _show_clip_info(cl, 1);
    2006. 

  2006. +        }
    2007. 

  2007. +        if (opt_seq_info) {
    2008. 

  2008. +            // Show sequence info
    2009. 

  2009. +            _show_seq_info(&cl->sequence, 1);
    2010. 

  2010. +        }
    2011. 

  2011. +        if (opt_prog_info) {
    2012. 

  2012. +            // Show program info
    2013. 

  2013. +            _show_prog_info(&cl->program, 1);
    2014. 

  2014. +        }
    2015. 

  2015. +        if (opt_cpi_info) {
    2016. 

  2016. +            // Show cpi
    2017. 

  2017. +            _show_cpi_info(&cl->cpi, 1);
    2018. 

  2018. +        }
    2019. 

  2019. +
    2020. 

  2020. +        if (opt_prog_info) {
    2021. 

  2021. +            if (cl->program_ss.num_prog) {
    2022. 

  2022. +                printf("\n");
    2023. 

  2023. +                indent_printf(1, "Extension: Program Info SS");
    2024. 

  2024. +                _show_prog_info(&cl->program_ss, 1);
    2025. 

  2025. +            }
    2026. 

  2026. +        }
    2027. 

  2027. +        if (opt_cpi_info) {
    2028. 

  2028. +            if (cl->program_ss.num_prog) {
    2029. 

  2029. +                printf("\n");
    2030. 

  2030. +                indent_printf(1, "Extension: CPI SS");
    2031. 

  2031. +                _show_cpi_info(&cl->cpi_ss, 1);
    2032. 

  2032. +            }
    2033. 

  2033. +        }
    2034. 

  2034. +        if (opt_extent_start) {
    2035. 

  2035. +            // Show extent start point
    2036. 

  2036. +            if (cl->extent_start.num_point > 0) {
    2037. 

  2037. +                _show_extent_start(&cl->extent_start, 1);
    2038. 

  2038. +            }
    2039. 

  2039. +        }
    2040. 

  2040. +
    2041. 

  2041. +        bd_free_clpi(cl);
    2042. 

  2042. +    }
    2043. 

  2043. +    return 0;
    2044. 

  2044. +}
    2045. 

  2045. +
    2046. 

  2046. diff --git a/src/devtools/hdmv_test.c b/src/devtools/hdmv_test.c
    2047. 

  2047. new file mode 100644
    2048. 

  2048. index 0000000..585ed70
    2049. 

  2049. --- /dev/null
    2050. 

  2050. +++ b/src/devtools/hdmv_test.c
    2051. 

  2051. @@ -0,0 +1,257 @@
    2052. 

  2052. +/*
    2053. 

  2053. + * This file is part of libbluray
    2054. 

  2054. + * Copyright (C) 2010  hpi1
    2055. 

  2055. + *
    2056. 

  2056. + * This library is free software; you can redistribute it and/or
    2057. 

  2057. + * modify it under the terms of the GNU Lesser General Public
    2058. 

  2058. + * License as published by the Free Software Foundation; either
    2059. 

  2059. + * version 2.1 of the License, or (at your option) any later version.
    2060. 

  2060. + *
    2061. 

  2061. + * This library is distributed in the hope that it will be useful,
    2062. 

  2062. + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    2063. 

  2063. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    2064. 

  2064. + * Lesser General Public License for more details.
    2065. 

  2065. + *
    2066. 

  2066. + * You should have received a copy of the GNU Lesser General Public
    2067. 

  2067. + * License along with this library. If not, see
    2068. 

  2068. + * <http://www.gnu.org/licenses/>.
    2069. 

  2069. + */
    2070. 

  2070. +
    2071. 

  2071. +#include <stdio.h>
    2072. 

  2072. +#include <stdlib.h>
    2073. 

  2073. +#include <string.h>
    2074. 

  2074. +#include <inttypes.h>
    2075. 

  2075. +
    2076. 

  2076. +#include "util/log_control.h"
    2077. 

  2077. +#include "libbluray/bluray.h"
    2078. 

  2078. +
    2079. 

  2079. +static void _print_event(BD_EVENT *ev)
    2080. 

  2080. +{
    2081. 

  2081. +    switch (ev->event) {
    2082. 

  2082. +        case BD_EVENT_NONE:
    2083. 

  2083. +            break;
    2084. 

  2084. +        case BD_EVENT_ERROR:
    2085. 

  2085. +            printf("EVENT_ERROR:\t%d\n", ev->param);
    2086. 

  2086. +            break;
    2087. 

  2087. +        case BD_EVENT_READ_ERROR:
    2088. 

  2088. +            printf("EVENT_READ_ERROR:\t%d\n", ev->param);
    2089. 

  2089. +            break;
    2090. 

  2090. +        case BD_EVENT_ENCRYPTED:
    2091. 

  2091. +            printf("EVENT_ENCRYPTED:\t%d\n", ev->param);
    2092. 

  2092. +            break;
    2093. 

  2093. +
    2094. 

  2094. +        /* current playback position */
    2095. 

  2095. +
    2096. 

  2096. +        case BD_EVENT_ANGLE:
    2097. 

  2097. +            printf("EVENT_ANGLE:\t%d\n", ev->param);
    2098. 

  2098. +            break;
    2099. 

  2099. +        case BD_EVENT_TITLE:
    2100. 

  2100. +            printf("EVENT_TITLE:\t%d\n", ev->param);
    2101. 

  2101. +            break;
    2102. 

  2102. +        case BD_EVENT_PLAYLIST:
    2103. 

  2103. +            printf("EVENT_PLAYLIST:\t%d\n", ev->param);
    2104. 

  2104. +            break;
    2105. 

  2105. +        case BD_EVENT_PLAYITEM:
    2106. 

  2106. +            printf("EVENT_PLAYITEM:\t%d\n", ev->param);
    2107. 

  2107. +            break;
    2108. 

  2108. +        case BD_EVENT_CHAPTER:
    2109. 

  2109. +            printf("EVENT_CHAPTER:\t%d\n", ev->param);
    2110. 

  2110. +            break;
    2111. 

  2111. +
    2112. 

  2112. +        /* */
    2113. 

  2113. +
    2114. 

  2114. +        case BD_EVENT_STILL:
    2115. 

  2115. +            printf("EVENT_STILL:\t%d\n", ev->param);
    2116. 

  2116. +            break;
    2117. 

  2117. +
    2118. 

  2118. +        case BD_EVENT_SEEK:
    2119. 

  2119. +            printf("EVENT_SEEK:\t%d\n", ev->param);
    2120. 

  2120. +            break;
    2121. 

  2121. +
    2122. 

  2122. +        case BD_EVENT_STILL_TIME:
    2123. 

  2123. +            if (ev->param) {
    2124. 

  2124. +                printf("EVENT_STILL_TIME:\t%d\n", ev->param);
    2125. 

  2125. +            } else {
    2126. 

  2126. +                printf("EVENT_STILL_TIME:\tinfinite\n");
    2127. 

  2127. +            }
    2128. 

  2128. +            break;
    2129. 

  2129. +
    2130. 

  2130. +        /* stream selection */
    2131. 

  2131. +
    2132. 

  2132. +        case BD_EVENT_AUDIO_STREAM:
    2133. 

  2133. +            printf("EVENT_AUDIO_STREAM:\t%d\n", ev->param);
    2134. 

  2134. +            break;
    2135. 

  2135. +        case BD_EVENT_IG_STREAM:
    2136. 

  2136. +            printf("EVENT_IG_STREAM:\t%d\n", ev->param);
    2137. 

  2137. +            break;
    2138. 

  2138. +        case BD_EVENT_PG_TEXTST_STREAM:
    2139. 

  2139. +            printf("EVENT_PG_TEXTST_STREAM:\t%d\n", ev->param);
    2140. 

  2140. +            break;
    2141. 

  2141. +        case BD_EVENT_SECONDARY_AUDIO_STREAM:
    2142. 

  2142. +            printf("EVENT_SECONDARY_AUDIO_STREAM:\t%d\n", ev->param);
    2143. 

  2143. +            break;
    2144. 

  2144. +        case BD_EVENT_SECONDARY_VIDEO_STREAM:
    2145. 

  2145. +            printf("EVENT_SECONDARY_VIDEO_STREAM:\t%d\n", ev->param);
    2146. 

  2146. +            break;
    2147. 

  2147. +
    2148. 

  2148. +        case BD_EVENT_PG_TEXTST:
    2149. 

  2149. +            printf("EVENT_PG_TEXTST:\t%s\n", ev->param ? "enable" : "disable");
    2150. 

  2150. +            break;
    2151. 

  2151. +        case BD_EVENT_SECONDARY_AUDIO:
    2152. 

  2152. +            printf("EVENT_SECONDARY_AUDIO:\t%s\n", ev->param ? "enable" : "disable");
    2153. 

  2153. +            break;
    2154. 

  2154. +        case BD_EVENT_SECONDARY_VIDEO:
    2155. 

  2155. +            printf("EVENT_SECONDARY_VIDEO:\t%s\n", ev->param ? "enable" : "disable");
    2156. 

  2156. +            break;
    2157. 

  2157. +        case BD_EVENT_SECONDARY_VIDEO_SIZE:
    2158. 

  2158. +            printf("EVENT_SECONDARY_VIDEO_SIZE:\t%s\n", ev->param==0 ? "PIP" : "fullscreen");
    2159. 

  2159. +            break;
    2160. 

  2160. +
    2161. 

  2161. +        default:
    2162. 

  2162. +            printf("UNKNOWN EVENT %d:\t%d\n", ev->event, ev->param);
    2163. 

  2163. +            break;
    2164. 

  2164. +      }
    2165. 

  2165. +
    2166. 

  2166. +      fflush(stdout);
    2167. 

  2167. +}
    2168. 

  2168. +
    2169. 

  2169. +static void _read_to_eof(BLURAY *bd)
    2170. 

  2170. +{
    2171. 

  2171. +    BD_EVENT ev;
    2172. 

  2172. +    int      bytes;
    2173. 

  2173. +    uint64_t total = 0;
    2174. 

  2174. +    uint8_t  buf[6144];
    2175. 

  2175. +
    2176. 

  2176. +    bd_seek(bd, bd_get_title_size(bd) - 6144);
    2177. 

  2177. +
    2178. 

  2178. +    do {
    2179. 

  2179. +        bytes = bd_read_ext(bd, buf, 6144, &ev);
    2180. 

  2180. +        total += bytes < 0 ? 0 : bytes;
    2181. 

  2181. +        _print_event(&ev);
    2182. 

  2182. +    } while (bytes > 0);
    2183. 

  2183. +
    2184. 

  2184. +    printf("_read_to_eof(): read %"PRIu64" bytes\n", total);
    2185. 

  2185. +}
    2186. 

  2186. +
    2187. 

  2187. +static void _print_events(BLURAY *bd)
    2188. 

  2188. +{
    2189. 

  2189. +    BD_EVENT ev;
    2190. 

  2190. +
    2191. 

  2191. +    do {
    2192. 

  2192. +        bd_read_ext(bd, NULL, 0, &ev);
    2193. 

  2193. +        _print_event(&ev);
    2194. 

  2194. +    } while (ev.event != BD_EVENT_NONE && ev.event != BD_EVENT_ERROR);
    2195. 

  2195. +}
    2196. 

  2196. +
    2197. 

  2197. +static void _play_pl(BLURAY *bd)
    2198. 

  2198. +{
    2199. 

  2199. +    printf("Playing playlist\n");
    2200. 

  2200. +
    2201. 

  2201. +    fflush(stdout);
    2202. 

  2202. +    _read_to_eof(bd);
    2203. 

  2203. +
    2204. 

  2204. +    printf("Playing playlist done\n\n");
    2205. 

  2205. +
    2206. 

  2206. +    _print_events(bd);
    2207. 

  2207. +
    2208. 

  2208. +    printf("\n");
    2209. 

  2209. +}
    2210. 

  2210. +
    2211. 

  2211. +int main(int argc, char *argv[])
    2212. 

  2212. +{
    2213. 

  2213. +    int title = -1;
    2214. 

  2214. +    int verbose = 0;
    2215. 

  2215. +    int args = 0;
    2216. 

  2216. +
    2217. 

  2217. +    /*
    2218. 

  2218. +     * parse arguments
    2219. 

  2219. +     */
    2220. 

  2220. +
    2221. 

  2221. +    if (argc < 2) {
    2222. 

  2222. +        printf("\nUsage:\n   %s [-v] [-t <title>] <media_path> [<keyfile_path>]\n\n", argv[0]);
    2223. 

  2223. +        return -1;
    2224. 

  2224. +    }
    2225. 

  2225. +
    2226. 

  2226. +    if (!strcmp(argv[1+args], "-v")) {
    2227. 

  2227. +        verbose = 1;
    2228. 

  2228. +        args++;
    2229. 

  2229. +    }
    2230. 

  2230. +
    2231. 

  2231. +    if (!strcmp(argv[1+args], "-t")) {
    2232. 

  2232. +        args++;
    2233. 

  2233. +        title = atoi(argv[1+args]);
    2234. 

  2234. +        args++;
    2235. 

  2235. +        printf("Requested title %d\n", title);
    2236. 

  2236. +    }
    2237. 

  2237. +
    2238. 

  2238. +    if (verbose) {
    2239. 

  2239. +        printf("Enabling verbose debug\n");
    2240. 

  2240. +        bd_set_debug_mask(bd_get_debug_mask() | DBG_HDMV | DBG_BLURAY);
    2241. 

  2241. +    }
    2242. 

  2242. +
    2243. 

  2243. +    printf("\n");
    2244. 

  2244. +
    2245. 

  2245. +    /*
    2246. 

  2246. +     * open and setup
    2247. 

  2247. +     */
    2248. 

  2248. +
    2249. 

  2249. +    BLURAY  *bd = bd_open(argv[1+args], argv[2+args]);
    2250. 

  2250. +
    2251. 

  2251. +    if (!bd) {
    2252. 

  2252. +        printf("bd_open(\'%s\') failed\n", argv[1]);
    2253. 

  2253. +        return -1;
    2254. 

  2254. +    }
    2255. 

  2255. +
    2256. 

  2256. +    bd_set_player_setting    (bd, BLURAY_PLAYER_SETTING_PARENTAL,     99);
    2257. 

  2257. +    bd_set_player_setting_str(bd, BLURAY_PLAYER_SETTING_AUDIO_LANG,   "eng");
    2258. 

  2258. +    bd_set_player_setting_str(bd, BLURAY_PLAYER_SETTING_PG_LANG,      "eng");
    2259. 

  2259. +    bd_set_player_setting_str(bd, BLURAY_PLAYER_SETTING_MENU_LANG,    "eng");
    2260. 

  2260. +    bd_set_player_setting_str(bd, BLURAY_PLAYER_SETTING_COUNTRY_CODE, NULL);
    2261. 

  2261. +
    2262. 

  2262. +    /*
    2263. 

  2263. +     * play
    2264. 

  2264. +     */
    2265. 

  2265. +
    2266. 

  2266. +    printf("Running first play movie object\n");
    2267. 

  2267. +
    2268. 

  2268. +    fflush(stdout);
    2269. 

  2269. +    bd_play(bd);
    2270. 

  2270. +
    2271. 

  2271. +    _print_events(bd);
    2272. 

  2272. +
    2273. 

  2273. +    printf("\n");
    2274. 

  2274. +
    2275. 

  2275. +    /*
    2276. 

  2276. +     * play title
    2277. 

  2277. +     */
    2278. 

  2278. +
    2279. 

  2279. +    if (title >= 0) {
    2280. 

  2280. +        printf("Playing title %d\n", title);
    2281. 

  2281. +
    2282. 

  2282. +        fflush(stdout);
    2283. 

  2283. +        bd_play_title(bd, title);
    2284. 

  2284. +
    2285. 

  2285. +        _print_events(bd);
    2286. 

  2286. +
    2287. 

  2287. +        printf("\n");
    2288. 

  2288. +    }
    2289. 

  2289. +
    2290. 

  2290. +    /*
    2291. 

  2291. +     * play playlist
    2292. 

  2292. +     */
    2293. 

  2293. +
    2294. 

  2294. +    _play_pl(bd);
    2295. 

  2295. +
    2296. 

  2296. +    _play_pl(bd);
    2297. 

  2297. +
    2298. 

  2298. +    _play_pl(bd);
    2299. 

  2299. +
    2300. 

  2300. +    /*
    2301. 

  2301. +     * clean up
    2302. 

  2302. +     */
    2303. 

  2303. +
    2304. 

  2304. +    bd_close(bd);
    2305. 

  2305. +
    2306. 

  2306. +    return 0;
    2307. 

  2307. +}
    2308. 

  2308. +
    2309. 

  2309. diff --git a/src/devtools/mobj_dump.c b/src/devtools/mobj_dump.c
    2310. 

  2310. new file mode 100644
    2311. 

  2311. index 0000000..3eaf9f4
    2312. 

  2312. --- /dev/null
    2313. 

  2313. +++ b/src/devtools/mobj_dump.c
    2314. 

  2314. @@ -0,0 +1,83 @@
    2315. 

  2315. +/*
    2316. 

  2316. + * This file is part of libbluray
    2317. 

  2317. + * Copyright (C) 2010  hpi1
    2318. 

  2318. + *
    2319. 

  2319. + * This library is free software; you can redistribute it and/or
    2320. 

  2320. + * modify it under the terms of the GNU Lesser General Public
    2321. 

  2321. + * License as published by the Free Software Foundation; either
    2322. 

  2322. + * version 2.1 of the License, or (at your option) any later version.
    2323. 

  2323. + *
    2324. 

  2324. + * This library is distributed in the hope that it will be useful,
    2325. 

  2325. + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    2326. 

  2326. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    2327. 

  2327. + * Lesser General Public License for more details.
    2328. 

  2328. + *
    2329. 

  2329. + * You should have received a copy of the GNU Lesser General Public
    2330. 

  2330. + * License along with this library. If not, see
    2331. 

  2331. + * <http://www.gnu.org/licenses/>.
    2332. 

  2332. + */
    2333. 

  2333. +
    2334. 

  2334. +#include "libbluray/bluray.h"
    2335. 

  2335. +
    2336. 

  2336. +#include "libbluray/hdmv/mobj_data.h"
    2337. 

  2337. +#include "libbluray/hdmv/mobj_print.h"
    2338. 

  2338. +
    2339. 

  2339. +#include <stdio.h>
    2340. 

  2340. +#include <string.h>
    2341. 

  2341. +
    2342. 

  2342. +static void _mobj_print(MOBJ_OBJECTS *objects, int disasm)
    2343. 

  2343. +{
    2344. 

  2344. +    int o, c;
    2345. 

  2345. +
    2346. 

  2346. +    printf("Number of objects: %d\n", objects->num_objects);
    2347. 

  2347. +
    2348. 

  2348. +    for (o = 0; o < objects->num_objects; o++) {
    2349. 

  2349. +
    2350. 

  2350. +        printf("Object %d:\n"
    2351. 

  2351. +               "  number of commands:    %d\n"
    2352. 

  2352. +               "  resume intention flag: %d\n"
    2353. 

  2353. +               "  menu call mask:        %d\n"
    2354. 

  2354. +               "  title search mask:     %d\n",
    2355. 

  2355. +               o, objects->objects[o].num_cmds,
    2356. 

  2356. +               objects->objects[o].resume_intention_flag,
    2357. 

  2357. +               objects->objects[o].menu_call_mask,
    2358. 

  2358. +               objects->objects[o].title_search_mask);
    2359. 

  2359. +
    2360. 

  2360. +            if (disasm) {
    2361. 

  2361. +                printf("  program:\n");
    2362. 

  2362. +                for (c = 0; c < objects->objects[o].num_cmds; c++) {
    2363. 

  2363. +                    char buf[256];
    2364. 

  2364. +                    mobj_sprint_cmd(buf, &objects->objects[o].cmds[c]);
    2365. 

  2365. +                    printf("    %04d: %s\n", c, buf);
    2366. 

  2366. +                }
    2367. 

  2367. +            }
    2368. 

  2368. +    }
    2369. 

  2369. +}
    2370. 

  2370. +
    2371. 

  2371. +int main(int argc, const char *argv[])
    2372. 

  2372. +{
    2373. 

  2373. +    int           disasm = 0;
    2374. 

  2374. +    MOBJ_OBJECTS *mobj = NULL;
    2375. 

  2375. +
    2376. 

  2376. +    if (argc < 2) {
    2377. 

  2377. +        fprintf(stderr,
    2378. 

  2378. +                "usage: %s [-d] <file>\n"
    2379. 

  2379. +                "Options:\n"
    2380. 

  2380. +                "    d         disassemble object code\n",
    2381. 

  2381. +                argv[0]);
    2382. 

  2382. +        return 1;
    2383. 

  2383. +    }
    2384. 

  2384. +    if (argc > 2) {
    2385. 

  2385. +        disasm = !strcmp(argv[1], "-d");
    2386. 

  2386. +    }
    2387. 

  2387. +
    2388. 

  2388. +    mobj = bd_read_mobj(argv[argc-1]);
    2389. 

  2389. +
    2390. 

  2390. +    if (mobj) {
    2391. 

  2391. +        _mobj_print(mobj, disasm);
    2392. 

  2392. +
    2393. 

  2393. +        bd_free_mobj(mobj);
    2394. 

  2394. +    }
    2395. 

  2395. +
    2396. 

  2396. +    return 0;
    2397. 

  2397. +}
    2398. 

  2398. diff --git a/src/devtools/mpls_dump.c b/src/devtools/mpls_dump.c
    2399. 

  2399. new file mode 100644
    2400. 

  2400. index 0000000..405b6a1
    2401. 

  2401. --- /dev/null
    2402. 

  2402. +++ b/src/devtools/mpls_dump.c
    2403. 

  2403. @@ -0,0 +1,799 @@
    2404. 

  2404. +/*
    2405. 

  2405. + * This file is part of libbluray
    2406. 

  2406. + * Copyright (C) 2009-2010  John Stebbins
    2407. 

  2407. + *
    2408. 

  2408. + * This library is free software; you can redistribute it and/or
    2409. 

  2409. + * modify it under the terms of the GNU Lesser General Public
    2410. 

  2410. + * License as published by the Free Software Foundation; either
    2411. 

  2411. + * version 2.1 of the License, or (at your option) any later version.
    2412. 

  2412. + *
    2413. 

  2413. + * This library is distributed in the hope that it will be useful,
    2414. 

  2414. + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    2415. 

  2415. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    2416. 

  2416. + * Lesser General Public License for more details.
    2417. 

  2417. + *
    2418. 

  2418. + * You should have received a copy of the GNU Lesser General Public
    2419. 

  2419. + * License along with this library. If not, see
    2420. 

  2420. + * <http://www.gnu.org/licenses/>.
    2421. 

  2421. + */
    2422. 

  2422. +
    2423. 

  2423. +#include <sys/stat.h>
    2424. 

  2424. +#include <dirent.h>
    2425. 

  2425. +#include <stdio.h>
    2426. 

  2426. +#include <stdlib.h>
    2427. 

  2427. +#include <unistd.h>
    2428. 

  2428. +#include <string.h>
    2429. 

  2429. +#include <libgen.h>
    2430. 

  2430. +
    2431. 

  2431. +#include "libbluray/bdnav/mpls_parse.h"
    2432. 

  2432. +#include "libbluray/bluray.h"
    2433. 

  2433. +
    2434. 

  2434. +#include "util.h"
    2435. 

  2435. +
    2436. 

  2436. +#ifdef _WIN32
    2437. 

  2437. +# define DIR_SEP "\\"
    2438. 

  2438. +# define PLAYLIST_DIR "\\BDMV\\PLAYLIST"
    2439. 

  2439. +#else
    2440. 

  2440. +# define DIR_SEP "/"
    2441. 

  2441. +# define PLAYLIST_DIR "/BDMV/PLAYLIST"
    2442. 

  2442. +#endif
    2443. 

  2443. +
    2444. 

  2444. +
    2445. 

  2445. +static int verbose;
    2446. 

  2446. +
    2447. 

  2447. +typedef struct {
    2448. 

  2448. +    int value;
    2449. 

  2449. +    const char *str;
    2450. 

  2450. +} VALUE_MAP;
    2451. 

  2451. +
    2452. 

  2452. +const VALUE_MAP codec_map[] = {
    2453. 

  2453. +    {0x01, "MPEG-1 Video"},
    2454. 

  2454. +    {0x02, "MPEG-2 Video"},
    2455. 

  2455. +    {0x03, "MPEG-1 Audio"},
    2456. 

  2456. +    {0x04, "MPEG-2 Audio"},
    2457. 

  2457. +    {0x80, "LPCM"},
    2458. 

  2458. +    {0x81, "AC-3"},
    2459. 

  2459. +    {0x82, "DTS"},
    2460. 

  2460. +    {0x83, "TrueHD"},
    2461. 

  2461. +    {0x84, "AC-3 Plus"},
    2462. 

  2462. +    {0x85, "DTS-HD"},
    2463. 

  2463. +    {0x86, "DTS-HD Master"},
    2464. 

  2464. +    {0xa1, "AC-3 Plus for secondary audio"},
    2465. 

  2465. +    {0xa2, "DTS-HD for secondary audio"},
    2466. 

  2466. +    {0xea, "VC-1"},
    2467. 

  2467. +    {0x1b, "H.264"},
    2468. 

  2468. +    {0x90, "Presentation Graphics"},
    2469. 

  2469. +    {0x91, "Interactive Graphics"},
    2470. 

  2470. +    {0x92, "Text Subtitle"},
    2471. 

  2471. +    {0, NULL}
    2472. 

  2472. +};
    2473. 

  2473. +
    2474. 

  2474. +const VALUE_MAP video_format_map[] = {
    2475. 

  2475. +    {0, "Reserved"},
    2476. 

  2476. +    {1, "480i"},
    2477. 

  2477. +    {2, "576i"},
    2478. 

  2478. +    {3, "480p"},
    2479. 

  2479. +    {4, "1080i"},
    2480. 

  2480. +    {5, "720p"},
    2481. 

  2481. +    {6, "1080p"},
    2482. 

  2482. +    {7, "576p"},
    2483. 

  2483. +    {0, NULL}
    2484. 

  2484. +};
    2485. 

  2485. +
    2486. 

  2486. +const VALUE_MAP video_rate_map[] = {
    2487. 

  2487. +    {0, "Reserved1"},
    2488. 

  2488. +    {1, "23.976"},
    2489. 

  2489. +    {2, "24"},
    2490. 

  2490. +    {3, "25"},
    2491. 

  2491. +    {4, "29.97"},
    2492. 

  2492. +    {5, "Reserved2"},
    2493. 

  2493. +    {6, "50"},
    2494. 

  2494. +    {7, "59.94"},
    2495. 

  2495. +    {0, NULL}
    2496. 

  2496. +};
    2497. 

  2497. +
    2498. 

  2498. +const VALUE_MAP audio_format_map[] = {
    2499. 

  2499. +    {0, "Reserved1"},
    2500. 

  2500. +    {1, "Mono"},
    2501. 

  2501. +    {2, "Reserved2"},
    2502. 

  2502. +    {3, "Stereo"},
    2503. 

  2503. +    {4, "Reserved3"},
    2504. 

  2504. +    {5, "Reserved4"},
    2505. 

  2505. +    {6, "Multi Channel"},
    2506. 

  2506. +    {12, "Combo"},
    2507. 

  2507. +    {0, NULL}
    2508. 

  2508. +};
    2509. 

  2509. +
    2510. 

  2510. +const VALUE_MAP audio_rate_map[] = {
    2511. 

  2511. +    {0, "Reserved1"},
    2512. 

  2512. +    {1, "48 Khz"},
    2513. 

  2513. +    {2, "Reserved2"},
    2514. 

  2514. +    {3, "Reserved3"},
    2515. 

  2515. +    {4, "96 Khz"},
    2516. 

  2516. +    {5, "192 Khz"},
    2517. 

  2517. +    {12, "48/192 Khz"},
    2518. 

  2518. +    {14, "48/96 Khz"},
    2519. 

  2519. +    {0, NULL}
    2520. 

  2520. +};
    2521. 

  2521. +
    2522. 

  2522. +const VALUE_MAP subpath_type_map[] = {
    2523. 

  2523. +  {2, "Primary audio of the Browsable slideshow"},
    2524. 

  2524. +  {3, "Interactive Graphics presentation menu"},
    2525. 

  2525. +  {4, "Text Subtitle"},
    2526. 

  2526. +  {5, "Out-of-mux Synchronous elementary streams"},
    2527. 

  2527. +  {6, "Out-of-mux Asynchronous Picture-in-Picture presentation"},
    2528. 

  2528. +  {7, "In-mux Synchronous Picture-in-Picture presentation"},
    2529. 

  2529. +  {8, "SS Video"},
    2530. 

  2530. +  {0,NULL}
    2531. 

  2531. +};
    2532. 

  2532. +
    2533. 

  2533. +const VALUE_MAP playback_type_map[] = {
    2534. 

  2534. +  {1, "Sequential"},
    2535. 

  2535. +  {2, "Random"},
    2536. 

  2536. +  {3, "Shuffle"},
    2537. 

  2537. +  {0, NULL}
    2538. 

  2538. +};
    2539. 

  2539. +
    2540. 

  2540. +const VALUE_MAP connection_type_map[] = {
    2541. 

  2541. +  {1, "Non-seamless"},
    2542. 

  2542. +  {5, "Seamless"},
    2543. 

  2543. +  {6, "Seamless"},
    2544. 

  2544. +  {0, NULL}
    2545. 

  2545. +};
    2546. 

  2546. +
    2547. 

  2547. +static const char*
    2548. 

  2548. +_lookup_str(const VALUE_MAP *map, int val)
    2549. 

  2549. +{
    2550. 

  2550. +    int ii;
    2551. 

  2551. +
    2552. 

  2552. +    for (ii = 0; map[ii].str; ii++) {
    2553. 

  2553. +        if (val == map[ii].value) {
    2554. 

  2554. +            return map[ii].str;
    2555. 

  2555. +        }
    2556. 

  2556. +    }
    2557. 

  2557. +    return "?";
    2558. 

  2558. +}
    2559. 

  2559. +
    2560. 

  2560. +static char *
    2561. 

  2561. +_mk_path(const char *base, const char *sub)
    2562. 

  2562. +{
    2563. 

  2563. +    size_t n1 = strlen(base);
    2564. 

  2564. +    size_t n2 = strlen(sub);
    2565. 

  2565. +    char *result = (char*)malloc(n1 + n2 + strlen(DIR_SEP) + 1);
    2566. 

  2566. +    strcpy(result, base);
    2567. 

  2567. +    strcat(result, DIR_SEP);
    2568. 

  2568. +    strcat(result, sub);
    2569. 

  2569. +
    2570. 

  2570. +    return result;
    2571. 

  2571. +}
    2572. 

  2572. +
    2573. 

  2573. +static void
    2574. 

  2574. +_show_stream(MPLS_STREAM *ss, int level)
    2575. 

  2575. +{
    2576. 

  2576. +    indent_printf(level, "Codec (%04x): %s", ss->coding_type,
    2577. 

  2577. +                    _lookup_str(codec_map, ss->coding_type));
    2578. 

  2578. +    switch (ss->stream_type) {
    2579. 

  2579. +        case 1:
    2580. 

  2580. +            indent_printf(level, "PID: %04x", ss->pid);
    2581. 

  2581. +            break;
    2582. 

  2582. +
    2583. 

  2583. +        case 2:
    2584. 

  2584. +        case 4:
    2585. 

  2585. +            indent_printf(level, "SubPath Id: %02x", ss->subpath_id);
    2586. 

  2586. +            indent_printf(level, "SubClip Id: %02x", ss->subclip_id);
    2587. 

  2587. +            indent_printf(level, "PID: %04x", ss->pid);
    2588. 

  2588. +            break;
    2589. 

  2589. +
    2590. 

  2590. +        case 3:
    2591. 

  2591. +            indent_printf(level, "SubPath Id: %02x", ss->subpath_id);
    2592. 

  2592. +            indent_printf(level, "PID: %04x", ss->pid);
    2593. 

  2593. +            break;
    2594. 

  2594. +
    2595. 

  2595. +        default:
    2596. 

  2596. +            fprintf(stderr, "unrecognized stream type %02x\n", ss->stream_type);
    2597. 

  2597. +            break;
    2598. 

  2598. +    };
    2599. 

  2599. +
    2600. 

  2600. +    switch (ss->coding_type) {
    2601. 

  2601. +        case 0x01:
    2602. 

  2602. +        case 0x02:
    2603. 

  2603. +        case 0xea:
    2604. 

  2604. +        case 0x1b:
    2605. 

  2605. +            indent_printf(level, "Format %02x: %s", ss->format,
    2606. 

  2606. +                        _lookup_str(video_format_map, ss->format));
    2607. 

  2607. +            indent_printf(level, "Rate %02x: %s", ss->rate,
    2608. 

  2608. +                        _lookup_str(video_rate_map, ss->rate));
    2609. 

  2609. +            break;
    2610. 

  2610. +
    2611. 

  2611. +        case 0x03:
    2612. 

  2612. +        case 0x04:
    2613. 

  2613. +        case 0x80:
    2614. 

  2614. +        case 0x81:
    2615. 

  2615. +        case 0x82:
    2616. 

  2616. +        case 0x83:
    2617. 

  2617. +        case 0x84:
    2618. 

  2618. +        case 0x85:
    2619. 

  2619. +        case 0x86:
    2620. 

  2620. +        case 0xa1:
    2621. 

  2621. +        case 0xa2:
    2622. 

  2622. +            indent_printf(level, "Format %02x: %s", ss->format,
    2623. 

  2623. +                        _lookup_str(audio_format_map, ss->format));
    2624. 

  2624. +            indent_printf(level, "Rate %02x: %s", ss->rate,
    2625. 

  2625. +                        _lookup_str(audio_rate_map, ss->rate));
    2626. 

  2626. +            indent_printf(level, "Language: %s", ss->lang);
    2627. 

  2627. +            break;
    2628. 

  2628. +
    2629. 

  2629. +        case 0x90:
    2630. 

  2630. +        case 0x91:
    2631. 

  2631. +            indent_printf(level, "Language: %s", ss->lang);
    2632. 

  2632. +            break;
    2633. 

  2633. +
    2634. 

  2634. +        case 0x92:
    2635. 

  2635. +            indent_printf(level, "Char Code: %02x", ss->char_code);
    2636. 

  2636. +            indent_printf(level, "Language: %s", ss->lang);
    2637. 

  2637. +            break;
    2638. 

  2638. +
    2639. 

  2639. +        default:
    2640. 

  2640. +            fprintf(stderr, "unrecognized coding type %02x\n", ss->coding_type);
    2641. 

  2641. +            break;
    2642. 

  2642. +    };
    2643. 

  2643. +}
    2644. 

  2644. +
    2645. 

  2645. +static void
    2646. 

  2646. +_show_details(MPLS_PL *pl, int level)
    2647. 

  2647. +{
    2648. 

  2648. +    int ii, jj, kk;
    2649. 

  2649. +
    2650. 

  2650. +    for (ii = 0; ii < pl->list_count; ii++) {
    2651. 

  2651. +        MPLS_PI *pi;
    2652. 

  2652. +
    2653. 

  2653. +        pi = &pl->play_item[ii];
    2654. 

  2654. +        indent_printf(level, "Clip Id %s", pi->clip[0].clip_id);
    2655. 

  2655. +        indent_printf(level+1, "Stc Id: %02x", pi->clip[0].stc_id);
    2656. 

  2656. +        indent_printf(level+1, "Connection Condition: %s (%02x)",
    2657. 

  2657. +                      _lookup_str(connection_type_map, pi->connection_condition),
    2658. 

  2658. +                      pi->connection_condition);
    2659. 

  2659. +        indent_printf(level+1, "In-Time: %d", pi->in_time);
    2660. 

  2660. +        indent_printf(level+1, "Out-Time: %d", pi->out_time);
    2661. 

  2661. +        if (pi->still_mode == 1) {
    2662. 

  2662. +            indent_printf(level+1, "Still time: %ds\n", pi->still_time);
    2663. 

  2663. +        }
    2664. 

  2664. +        if (pi->still_mode == 2) {
    2665. 

  2665. +            indent_printf(level+1, "Still time: infinite\n");
    2666. 

  2666. +        }
    2667. 

  2667. +        if (pi->angle_count > 1) {
    2668. 

  2668. +            for (jj = 1; jj < pi->angle_count; jj++) {
    2669. 

  2669. +                indent_printf(level+1, "Angle %d:", jj);
    2670. 

  2670. +                indent_printf(level+2, "Clip Id %s", pi->clip[jj].clip_id);
    2671. 

  2671. +                indent_printf(level+2, "Stc Id: %02x", pi->clip[jj].stc_id);
    2672. 

  2672. +            }
    2673. 

  2673. +        }
    2674. 

  2674. +        for (jj = 0; jj < pi->stn.num_video; jj++) {
    2675. 

  2675. +            indent_printf(level+1, "Video Stream %d:", jj);
    2676. 

  2676. +            _show_stream(&pi->stn.video[jj], level + 2);
    2677. 

  2677. +        }
    2678. 

  2678. +        for (jj = 0; jj < pi->stn.num_audio; jj++) {
    2679. 

  2679. +            indent_printf(level+1, "Audio Stream %d:", jj);
    2680. 

  2680. +            _show_stream(&pi->stn.audio[jj], level + 2);
    2681. 

  2681. +        }
    2682. 

  2682. +        for (jj = 0; jj < pi->stn.num_ig; jj++) {
    2683. 

  2683. +            indent_printf(level+1, "Interactive Graphics Stream %d:", jj);
    2684. 

  2684. +            _show_stream(&pi->stn.ig[jj], level + 2);
    2685. 

  2685. +        }
    2686. 

  2686. +        for (jj = 0; jj < (pi->stn.num_pg + pi->stn.num_pip_pg); jj++) {
    2687. 

  2687. +            if (jj < pi->stn.num_pg) {
    2688. 

  2688. +               indent_printf(level+1, "Presentation Graphics Stream %d:", jj);
    2689. 

  2689. +            } else {
    2690. 

  2690. +                indent_printf(level+1, "PIP Presentation Graphics Stream %d:", jj);
    2691. 

  2691. +            }
    2692. 

  2692. +            _show_stream(&pi->stn.pg[jj], level + 2);
    2693. 

  2693. +        }
    2694. 

  2694. +        for (jj = 0; jj < pi->stn.num_secondary_video; jj++) {
    2695. 

  2695. +            indent_printf(level+1, "Secondary Video Stream %d:", jj);
    2696. 

  2696. +            _show_stream(&pi->stn.secondary_video[jj], level + 2);
    2697. 

  2697. +            for (kk = 0; kk < pi->stn.secondary_video[jj].sv_num_secondary_audio_ref; kk++) {
    2698. 

  2698. +                indent_printf(level+2, "Secondary Audio Ref %d: %d", kk,pi->stn.secondary_video[jj].sv_secondary_audio_ref[kk]);
    2699. 

  2699. +            }
    2700. 

  2700. +            for (kk = 0; kk < pi->stn.secondary_video[jj].sv_num_pip_pg_ref; kk++) {
    2701. 

  2701. +                indent_printf(level+2, "PIP Presentation Graphic Ref %d: %d", kk,pi->stn.secondary_video[jj].sv_pip_pg_ref[kk]);
    2702. 

  2702. +            }
    2703. 

  2703. +        }
    2704. 

  2704. +        for (jj = 0; jj < pi->stn.num_secondary_audio; jj++) {
    2705. 

  2705. +            indent_printf(level+1, "Secondary Audio Stream %d:", jj);
    2706. 

  2706. +            _show_stream(&pi->stn.secondary_audio[jj], level + 2);
    2707. 

  2707. +            for (kk = 0; kk < pi->stn.secondary_audio[jj].sa_num_primary_audio_ref; kk++) {
    2708. 

  2708. +                indent_printf(level+2, "Primary Audio Ref %d: %d", kk,pi->stn.secondary_audio[jj].sa_primary_audio_ref[kk]);
    2709. 

  2709. +            }
    2710. 

  2710. +        }
    2711. 

  2711. +        printf("\n");
    2712. 

  2712. +    }
    2713. 

  2713. +}
    2714. 

  2714. +
    2715. 

  2715. +static void
    2716. 

  2716. +_show_ai(MPLS_PL *pl, int level)
    2717. 

  2717. +{
    2718. 

  2718. +    indent_printf(level, "Playback type: %s (%d)",
    2719. 

  2719. +                  _lookup_str(playback_type_map, pl->app_info.playback_type),
    2720. 

  2720. +                  pl->app_info.playback_type);
    2721. 

  2721. +    if (pl->app_info.playback_type == 2 || pl->app_info.playback_type == 3) {
    2722. 

  2722. +        indent_printf(level+1, "Playback count: %d", pl->app_info.playback_count);
    2723. 

  2723. +    }
    2724. 

  2724. +}
    2725. 

  2725. +
    2726. 

  2726. +static void
    2727. 

  2727. +_show_marks(MPLS_PL *pl, int level)
    2728. 

  2728. +{
    2729. 

  2729. +    int ii;
    2730. 

  2730. +
    2731. 

  2731. +    indent_printf(level, "PlayMark Count %d", pl->mark_count);
    2732. 

  2732. +    for (ii = 0; ii < pl->mark_count; ii++) {
    2733. 

  2733. +        MPLS_PI *pi;
    2734. 

  2734. +        MPLS_PLM *plm;
    2735. 

  2735. +        int min;
    2736. 

  2736. +        double sec;
    2737. 

  2737. +
    2738. 

  2738. +        plm = &pl->play_mark[ii];
    2739. 

  2739. +        indent_printf(level, "PlayMark %d", ii);
    2740. 

  2740. +        indent_printf(level+1, "Type: %02x", plm->mark_type);
    2741. 

  2741. +        if (plm->play_item_ref < pl->list_count) {
    2742. 

  2742. +            pi = &pl->play_item[plm->play_item_ref];
    2743. 

  2743. +            indent_printf(level+1, "PlayItem: %s", pi->clip[0].clip_id);
    2744. 

  2744. +        } else {
    2745. 

  2745. +            indent_printf(level+1, "PlayItem: Invalid reference");
    2746. 

  2746. +        }
    2747. 

  2747. +        indent_printf(level+1, "Time (ticks): %u", plm->time);
    2748. 

  2748. +        min = plm->duration / (45000*60);
    2749. 

  2749. +        sec = (double)(plm->duration - min * 45000 * 60) / 45000;
    2750. 

  2750. +        indent_printf(level+1, "Duration (mm:ss.ms, ticks): %d:%.2f, %u",
    2751. 

  2751. +                      min, sec, plm->duration);
    2752. 

  2752. +        printf("\n");
    2753. 

  2753. +    }
    2754. 

  2754. +}
    2755. 

  2755. +
    2756. 

  2756. +static void
    2757. 

  2757. +_show_clip_list(MPLS_PL *pl, int level)
    2758. 

  2758. +{
    2759. 

  2759. +    int ii, jj;
    2760. 

  2760. +
    2761. 

  2761. +    for (ii = 0; ii < pl->list_count; ii++) {
    2762. 

  2762. +        MPLS_PI *pi;
    2763. 

  2763. +
    2764. 

  2764. +        pi = &pl->play_item[ii];
    2765. 

  2765. +        if (verbose) {
    2766. 

  2766. +            uint32_t duration;
    2767. 

  2767. +
    2768. 

  2768. +            duration = pi->out_time - pi->in_time;
    2769. 

  2769. +            indent_printf(level, "%s.m2ts -- Duration: %3d:%02d", 
    2770. 

  2770. +                        pi->clip[0].clip_id,
    2771. 

  2771. +                        duration / (45000 * 60), (duration / 45000) % 60);
    2772. 

  2772. +        } else {
    2773. 

  2773. +            indent_printf(level, "%s.m2ts", pi->clip[0].clip_id);
    2774. 

  2774. +        }
    2775. 

  2775. +        if (pi->angle_count > 1) {
    2776. 

  2776. +            for (jj = 1; jj < pi->angle_count; jj++) {
    2777. 

  2777. +                indent_printf(level+1, "Angle %d: %s.m2ts", jj+1, pi->clip[jj].clip_id);
    2778. 

  2778. +            }
    2779. 

  2779. +        }
    2780. 

  2780. +    }
    2781. 

  2781. +    printf("\n");
    2782. 

  2782. +}
    2783. 

  2783. +
    2784. 

  2784. +static void
    2785. 

  2785. +_show_sub_path(MPLS_SUB *sub, int level)
    2786. 

  2786. +{
    2787. 

  2787. +    int ii;
    2788. 

  2788. +
    2789. 

  2789. +    indent_printf(level+1, "Type: %d (%s)", sub->type, _lookup_str(subpath_type_map, sub->type));
    2790. 

  2790. +    indent_printf(level+1, "Repeat: %d", sub->is_repeat);
    2791. 

  2791. +    indent_printf(level+1, "Sub playitem count: %d", sub->sub_playitem_count);
    2792. 

  2792. +
    2793. 

  2793. +    for (ii = 0; ii < sub->sub_playitem_count; ii++) {
    2794. 

  2794. +        MPLS_SUB_PI *pi;
    2795. 

  2795. +
    2796. 

  2796. +        pi = &sub->sub_play_item[ii];
    2797. 

  2797. +
    2798. 

  2798. +        if (verbose) {
    2799. 

  2799. +            indent_printf(level+1, "Sub playitem %d", ii);
    2800. 

  2800. +            indent_printf(level+2, "Clip Id %s", pi->clip[0].clip_id);
    2801. 

  2801. +            indent_printf(level+2, "Multi clip: %d", pi->is_multi_clip);
    2802. 

  2802. +            indent_printf(level+2, "Clip count: %d", pi->clip_count);
    2803. 

  2803. +            indent_printf(level+2, "Connection Condition: %s (%02x)",
    2804. 

  2804. +                          _lookup_str(connection_type_map, pi->connection_condition),
    2805. 

  2805. +                          pi->connection_condition);
    2806. 

  2806. +            indent_printf(level+2, "In-Time: %d", pi->in_time);
    2807. 

  2807. +            indent_printf(level+2, "Out-Time: %d", pi->out_time);
    2808. 

  2808. +            indent_printf(level+2, "Sync playitem Id: %d", pi->sync_play_item_id);
    2809. 

  2809. +            indent_printf(level+2, "Sync PTS: %d", pi->sync_pts);
    2810. 

  2810. +        } else {
    2811. 

  2811. +            indent_printf(level+1, "%s.m2ts", pi->clip[0].clip_id);
    2812. 

  2812. +        }
    2813. 

  2813. +    }
    2814. 

  2814. +}
    2815. 

  2815. +
    2816. 

  2816. +static void
    2817. 

  2817. +_show_pip_metadata_block(MPLS_PIP_METADATA *block, int level)
    2818. 

  2818. +{
    2819. 

  2819. +    int ii;
    2820. 

  2820. +
    2821. 

  2821. +    indent_printf(level, "Clip ref: %d", block->clip_ref);
    2822. 

  2822. +    indent_printf(level, "Secondary video ref: %d", block->secondary_video_ref);
    2823. 

  2823. +    indent_printf(level, "Timeline type: %d", block->timeline_type);
    2824. 

  2824. +    indent_printf(level, "Luma key flag: %d", block->luma_key_flag);
    2825. 

  2825. +    if (block->luma_key_flag) {
    2826. 

  2826. +        indent_printf(level, "Upper limit luma key: %d", block->upper_limit_luma_key);
    2827. 

  2827. +    }
    2828. 

  2828. +    indent_printf(level, "Trick play flag: %d", block->trick_play_flag);
    2829. 

  2829. +
    2830. 

  2830. +    for (ii = 0; ii < block->data_count; ii++) {
    2831. 

  2831. +        indent_printf(level, "data block %d:", ii);
    2832. 

  2832. +        indent_printf(level+1, "Timestamp: %d", block->data[ii].time);
    2833. 

  2833. +        indent_printf(level+1, "Horizontal position %d", block->data[ii].xpos);
    2834. 

  2834. +        indent_printf(level+1, "Vertical position: %d", block->data[ii].ypos);
    2835. 

  2835. +        indent_printf(level+1, "Scaling factor: %d", block->data[ii].scale_factor);
    2836. 

  2836. +    }
    2837. 

  2837. +}
    2838. 

  2838. +
    2839. 

  2839. +static void
    2840. 

  2840. +_show_pip_metadata(MPLS_PL *pl, int level)
    2841. 

  2841. +{
    2842. 

  2842. +    int ii;
    2843. 

  2843. +
    2844. 

  2844. +    for (ii = 0; ii < pl->ext_pip_data_count; ii++) {
    2845. 

  2845. +        MPLS_PIP_METADATA *data;
    2846. 

  2846. +
    2847. 

  2847. +        data = &pl->ext_pip_data[ii];
    2848. 

  2848. +
    2849. 

  2849. +        indent_printf(level, "PiP metadata block %d:", ii);
    2850. 

  2850. +        _show_pip_metadata_block(data, level+1);
    2851. 

  2851. +    }
    2852. 

  2852. +}
    2853. 

  2853. +
    2854. 

  2854. +static void
    2855. 

  2855. +_show_sub_paths(MPLS_PL *pl, int level)
    2856. 

  2856. +{
    2857. 

  2857. +    int ss;
    2858. 

  2858. +
    2859. 

  2859. +    for (ss = 0; ss < pl->sub_count; ss++) {
    2860. 

  2860. +        MPLS_SUB *sub;
    2861. 

  2861. +
    2862. 

  2862. +        sub = &pl->sub_path[ss];
    2863. 

  2863. +
    2864. 

  2864. +        indent_printf(level, "Sub Path %d:", ss);
    2865. 

  2865. +        _show_sub_path(sub, level+1);
    2866. 

  2866. +    }
    2867. 

  2867. +}
    2868. 

  2868. +
    2869. 

  2869. +static void
    2870. 

  2870. +_show_sub_paths_ss(MPLS_PL *pl, int level)
    2871. 

  2871. +{
    2872. 

  2872. +    int ss;
    2873. 

  2873. +
    2874. 

  2874. +    for (ss = 0; ss < pl->ext_sub_count; ss++) {
    2875. 

  2875. +        MPLS_SUB *sub;
    2876. 

  2876. +
    2877. 

  2877. +        sub = &pl->ext_sub_path[ss];
    2878. 

  2878. +
    2879. 

  2879. +        indent_printf(level, "Extension Sub Path %d:", ss);
    2880. 

  2880. +        _show_sub_path(sub, level+1);
    2881. 

  2881. +    }
    2882. 

  2882. +}
    2883. 

  2883. +
    2884. 

  2884. +static uint32_t
    2885. 

  2885. +_pl_duration(MPLS_PL *pl)
    2886. 

  2886. +{
    2887. 

  2887. +    int ii;
    2888. 

  2888. +    uint32_t duration = 0;
    2889. 

  2889. +    MPLS_PI *pi;
    2890. 

  2890. +
    2891. 

  2891. +    for (ii = 0; ii < pl->list_count; ii++) {
    2892. 

  2892. +        pi = &pl->play_item[ii];
    2893. 

  2893. +        duration += pi->out_time - pi->in_time;
    2894. 

  2894. +    }
    2895. 

  2895. +    return duration;
    2896. 

  2896. +}
    2897. 

  2897. +
    2898. 

  2898. +static int
    2899. 

  2899. +_filter_dup(MPLS_PL *pl_list[], int count, MPLS_PL *pl)
    2900. 

  2900. +{
    2901. 

  2901. +    int ii, jj;
    2902. 

  2902. +
    2903. 

  2903. +    for (ii = 0; ii < count; ii++) {
    2904. 

  2904. +        if (pl->list_count != pl_list[ii]->list_count ||
    2905. 

  2905. +            _pl_duration(pl) != _pl_duration(pl_list[ii])) {
    2906. 

  2906. +            continue;
    2907. 

  2907. +        }
    2908. 

  2908. +        for (jj = 0; jj < pl->list_count; jj++) {
    2909. 

  2909. +            MPLS_PI *pi1, *pi2;
    2910. 

  2910. +
    2911. 

  2911. +            pi1 = &pl->play_item[jj];
    2912. 

  2912. +            pi2 = &pl_list[ii]->play_item[jj];
    2913. 

  2913. +
    2914. 

  2914. +            if (memcmp(pi1->clip[0].clip_id, pi2->clip[0].clip_id, 5) != 0 ||
    2915. 

  2915. +                pi1->in_time != pi2->in_time ||
    2916. 

  2916. +                pi1->out_time != pi2->out_time) {
    2917. 

  2917. +                break;
    2918. 

  2918. +            }
    2919. 

  2919. +        }
    2920. 

  2920. +        if (jj != pl->list_count) {
    2921. 

  2921. +            continue;
    2922. 

  2922. +        }
    2923. 

  2923. +        return 0;
    2924. 

  2924. +    }
    2925. 

  2925. +    return 1;
    2926. 

  2926. +}
    2927. 

  2927. +
    2928. 

  2928. +static int
    2929. 

  2929. +_find_repeats(MPLS_PL *pl, const char *m2ts)
    2930. 

  2930. +{
    2931. 

  2931. +    int ii, count = 0;
    2932. 

  2932. +
    2933. 

  2933. +    for (ii = 0; ii < pl->list_count; ii++) {
    2934. 

  2934. +        MPLS_PI *pi;
    2935. 

  2935. +
    2936. 

  2936. +        pi = &pl->play_item[ii];
    2937. 

  2937. +        // Ignore titles with repeated segments
    2938. 

  2938. +        if (strcmp(pi->clip[0].clip_id, m2ts) == 0) {
    2939. 

  2939. +            count++;
    2940. 

  2940. +        }
    2941. 

  2941. +    }
    2942. 

  2942. +    return count;
    2943. 

  2943. +}
    2944. 

  2944. +
    2945. 

  2945. +static int
    2946. 

  2946. +_filter_short(MPLS_PL *pl, unsigned int seconds)
    2947. 

  2947. +{
    2948. 

  2948. +    // Ignore short playlists
    2949. 

  2949. +    if (_pl_duration(pl) / 45000 <= seconds) {
    2950. 

  2950. +        return 0;
    2951. 

  2951. +    }
    2952. 

  2952. +    return 1;
    2953. 

  2953. +}
    2954. 

  2954. +
    2955. 

  2955. +static int
    2956. 

  2956. +_filter_repeats(MPLS_PL *pl, int repeats)
    2957. 

  2957. +{
    2958. 

  2958. +    int ii;
    2959. 

  2959. +
    2960. 

  2960. +    for (ii = 0; ii < pl->list_count; ii++) {
    2961. 

  2961. +        MPLS_PI *pi;
    2962. 

  2962. +
    2963. 

  2963. +        pi = &pl->play_item[ii];
    2964. 

  2964. +        // Ignore titles with repeated segments
    2965. 

  2965. +        if (_find_repeats(pl, pi->clip[0].clip_id) > repeats) {
    2966. 

  2966. +            return 0;
    2967. 

  2967. +        }
    2968. 

  2968. +    }
    2969. 

  2969. +    return 1;
    2970. 

  2970. +}
    2971. 

  2971. +
    2972. 

  2972. +static int clip_list = 0, playlist_info = 0, chapter_marks = 0, sub_paths = 0, pip_metadata = 0;
    2973. 

  2973. +static int repeats = 0, seconds = 0, dups = 0;
    2974. 

  2974. +
    2975. 

  2975. +static MPLS_PL*
    2976. 

  2976. +_process_file(char *name, MPLS_PL *pl_list[], int pl_count)
    2977. 

  2977. +{
    2978. 

  2978. +    MPLS_PL *pl;
    2979. 

  2979. +
    2980. 

  2980. +    pl = bd_read_mpls(name);
    2981. 

  2981. +    if (pl == NULL) {
    2982. 

  2982. +        fprintf(stderr, "Parse failed: %s\n", name);
    2983. 

  2983. +        return NULL;
    2984. 

  2984. +    }
    2985. 

  2985. +    if (seconds) {
    2986. 

  2986. +        if (!_filter_short(pl, seconds)) {
    2987. 

  2987. +            bd_free_mpls(pl);
    2988. 

  2988. +            return NULL;
    2989. 

  2989. +        }
    2990. 

  2990. +    }
    2991. 

  2991. +    if (repeats) {
    2992. 

  2992. +        if (!_filter_repeats(pl, repeats)) {
    2993. 

  2993. +            bd_free_mpls(pl);
    2994. 

  2994. +            return NULL;
    2995. 

  2995. +        }
    2996. 

  2996. +    }
    2997. 

  2997. +    if (dups) {
    2998. 

  2998. +        if (!_filter_dup(pl_list, pl_count, pl)) {
    2999. 

  2999. +            bd_free_mpls(pl);
    3000. 

  3000. +            return NULL;
    3001. 

  3001. +        }
    3002. 

  3002. +    }
    3003. 

  3003. +    if (verbose) {
    3004. 

  3004. +        indent_printf(0, 
    3005. 

  3005. +                    "%s -- Num Clips: %3d , Duration: minutes %4u:%02u",
    3006. 

  3006. +                    basename(name),
    3007. 

  3007. +                    pl->list_count,
    3008. 

  3008. +                    _pl_duration(pl) / (45000 * 60),
    3009. 

  3009. +                    (_pl_duration(pl) / 45000) % 60);
    3010. 

  3010. +        _show_ai(pl, 1);
    3011. 

  3011. +    } else {
    3012. 

  3012. +        indent_printf(0, "%s -- Duration: minutes %4u:%02u",
    3013. 

  3013. +                    basename(name),
    3014. 

  3014. +                    _pl_duration(pl) / (45000 * 60),
    3015. 

  3015. +                    (_pl_duration(pl) / 45000) % 60);
    3016. 

  3016. +    }
    3017. 

  3017. +    if (playlist_info) {
    3018. 

  3018. +        _show_details(pl, 1);
    3019. 

  3019. +    }
    3020. 

  3020. +    if (chapter_marks) {
    3021. 

  3021. +        _show_marks(pl, 1);
    3022. 

  3022. +    }
    3023. 

  3023. +    if (pip_metadata) {
    3024. 

  3024. +        _show_pip_metadata(pl, 1);
    3025. 

  3025. +    }
    3026. 

  3026. +    if (clip_list) {
    3027. 

  3027. +        _show_clip_list(pl, 1);
    3028. 

  3028. +    }
    3029. 

  3029. +    if (sub_paths) {
    3030. 

  3030. +        _show_sub_paths(pl, 1);
    3031. 

  3031. +        _show_sub_paths_ss(pl, 1);
    3032. 

  3032. +    }
    3033. 

  3033. +    return pl;
    3034. 

  3034. +}
    3035. 

  3035. +
    3036. 

  3036. +static void
    3037. 

  3037. +_usage(char *cmd)
    3038. 

  3038. +{
    3039. 

  3039. +    fprintf(stderr, 
    3040. 

  3040. +"Usage: %s -vli <mpls file> [<mpls file> ...]\n"
    3041. 

  3041. +"With no options, produces a list of the playlist(s) with durations\n"
    3042. 

  3042. +"Options:\n"
    3043. 

  3043. +"    v             - Verbose output.\n"
    3044. 

  3044. +"    l             - Produces a list of the m2ts clips\n"
    3045. 

  3045. +"    i             - Dumps detailed information about each clip\n"
    3046. 

  3046. +"    c             - Show chapter marks\n"
    3047. 

  3047. +"    p             - Show sub paths\n"
    3048. 

  3048. +"    P             - Show picture-in-picture metadata\n"
    3049. 

  3049. +"    r <N>         - Filter out titles that have >N repeating clips\n"
    3050. 

  3050. +"    d             - Filter out duplicate titles\n"
    3051. 

  3051. +"    s <seconds>   - Filter out short titles\n"
    3052. 

  3052. +"    f             - Filter combination -r2 -d -s900\n"
    3053. 

  3053. +, cmd);
    3054. 

  3054. +
    3055. 

  3055. +    exit(EXIT_FAILURE);
    3056. 

  3056. +}
    3057. 

  3057. +
    3058. 

  3058. +#define OPTS "vlicpPfr:ds:"
    3059. 

  3059. +
    3060. 

  3060. +static int
    3061. 

  3061. +_qsort_str_cmp(const void *a, const void *b)
    3062. 

  3062. +{
    3063. 

  3063. +    const char *stra = *(char * const *)a;
    3064. 

  3064. +    const char *strb = *(char * const *)b;
    3065. 

  3065. +
    3066. 

  3066. +    return strcmp(stra, strb);
    3067. 

  3067. +}
    3068. 

  3068. +
    3069. 

  3069. +int
    3070. 

  3070. +main(int argc, char *argv[])
    3071. 

  3071. +{
    3072. 

  3072. +    MPLS_PL *pl;
    3073. 

  3073. +    int opt;
    3074. 

  3074. +    int ii, pl_ii;
    3075. 

  3075. +    MPLS_PL *pl_list[1000];
    3076. 

  3076. +    struct stat st;
    3077. 

  3077. +    char *path = NULL;
    3078. 

  3078. +    DIR *dir = NULL;
    3079. 

  3079. +
    3080. 

  3080. +    do {
    3081. 

  3081. +        opt = getopt(argc, argv, OPTS);
    3082. 

  3082. +        switch (opt) {
    3083. 

  3083. +            case -1: 
    3084. 

  3084. +                break;
    3085. 

  3085. +
    3086. 

  3086. +            case 'v':
    3087. 

  3087. +                verbose = 1;
    3088. 

  3088. +                break;
    3089. 

  3089. +
    3090. 

  3090. +            case 'l':
    3091. 

  3091. +                clip_list = 1;
    3092. 

  3092. +                break;
    3093. 

  3093. +
    3094. 

  3094. +            case 'i':
    3095. 

  3095. +                playlist_info = 1;
    3096. 

  3096. +                break;
    3097. 

  3097. +
    3098. 

  3098. +            case 'c':
    3099. 

  3099. +                chapter_marks = 1;
    3100. 

  3100. +                break;
    3101. 

  3101. +
    3102. 

  3102. +            case 'p':
    3103. 

  3103. +                sub_paths = 1;
    3104. 

  3104. +                break;
    3105. 

  3105. +
    3106. 

  3106. +            case 'P':
    3107. 

  3107. +                pip_metadata = 1;
    3108. 

  3108. +                break;
    3109. 

  3109. +
    3110. 

  3110. +            case 'd':
    3111. 

  3111. +                dups = 1;
    3112. 

  3112. +                break;
    3113. 

  3113. +
    3114. 

  3114. +            case 'r':
    3115. 

  3115. +                repeats = atoi(optarg);
    3116. 

  3116. +                break;
    3117. 

  3117. +
    3118. 

  3118. +            case 'f':
    3119. 

  3119. +                repeats = 2;
    3120. 

  3120. +                dups = 1;
    3121. 

  3121. +                seconds = 900;
    3122. 

  3122. +                break;
    3123. 

  3123. +
    3124. 

  3124. +            case 's':
    3125. 

  3125. +                seconds = atoi(optarg);
    3126. 

  3126. +                break;
    3127. 

  3127. +
    3128. 

  3128. +            default:
    3129. 

  3129. +                _usage(argv[0]);
    3130. 

  3130. +                break;
    3131. 

  3131. +        }
    3132. 

  3132. +    } while (opt != -1);
    3133. 

  3133. +
    3134. 

  3134. +    if (optind >= argc) {
    3135. 

  3135. +        _usage(argv[0]);
    3136. 

  3136. +    }
    3137. 

  3137. +
    3138. 

  3138. +    for (pl_ii = 0, ii = optind; pl_ii < 1000 && ii < argc; ii++) {
    3139. 

  3139. +
    3140. 

  3140. +        if (stat(argv[ii], &st)) {
    3141. 

  3141. +            continue;
    3142. 

  3142. +        }
    3143. 

  3143. +        dir = NULL;
    3144. 

  3144. +        if (S_ISDIR(st.st_mode)) {
    3145. 

  3145. +
    3146. 

  3146. +            printf("Directory: %s:\n", argv[ii]);
    3147. 

  3147. +            path = _mk_path(argv[ii], PLAYLIST_DIR);
    3148. 

  3148. +            if (path == NULL) {
    3149. 

  3149. +                fprintf(stderr, "Failed to find playlist path: %s\n", argv[ii]);
    3150. 

  3150. +                continue;
    3151. 

  3151. +            }
    3152. 

  3152. +            dir = opendir(path);
    3153. 

  3153. +            if (dir == NULL) {
    3154. 

  3154. +                fprintf(stderr, "Failed to open dir: %s\n", path);
    3155. 

  3155. +                free(path);
    3156. 

  3156. +                continue;
    3157. 

  3157. +            }
    3158. 

  3158. +        }
    3159. 

  3159. +        if (dir != NULL) {
    3160. 

  3160. +            char **dirlist = (char**)calloc(10001, sizeof(char*));
    3161. 

  3161. +            struct dirent *ent;
    3162. 

  3162. +            int jj = 0;
    3163. 

  3163. +            for (ent = readdir(dir); ent != NULL; ent = readdir(dir)) {
    3164. 

  3164. +                dirlist[jj++] = strcpy((char*)malloc(strlen(ent->d_name)), ent->d_name);
    3165. 

  3165. +            }
    3166. 

  3166. +            qsort(dirlist, jj, sizeof(char*), _qsort_str_cmp);
    3167. 

  3167. +            for (jj = 0; dirlist[jj] != NULL; jj++) {
    3168. 

  3168. +                char *name = NULL;
    3169. 

  3169. +                name = _mk_path(path, dirlist[jj]);
    3170. 

  3170. +                free(dirlist[jj]);
    3171. 

  3171. +                if (stat(name, &st)) {
    3172. 

  3172. +                    free(name);
    3173. 

  3173. +                    continue;
    3174. 

  3174. +                }
    3175. 

  3175. +                if (!S_ISREG(st.st_mode)) {
    3176. 

  3176. +                    free(name);
    3177. 

  3177. +                    continue;
    3178. 

  3178. +                }
    3179. 

  3179. +                pl = _process_file(name, pl_list, pl_ii);
    3180. 

  3180. +                free(name);
    3181. 

  3181. +                if (pl != NULL) {
    3182. 

  3182. +                    pl_list[pl_ii++] = pl;
    3183. 

  3183. +                }
    3184. 

  3184. +            }
    3185. 

  3185. +            free(dirlist);
    3186. 

  3186. +            free(path);
    3187. 

  3187. +            closedir(dir);
    3188. 

  3188. +            dir = NULL;
    3189. 

  3189. +        } else {
    3190. 

  3190. +            pl = _process_file(argv[ii], pl_list, pl_ii);
    3191. 

  3191. +            if (pl != NULL) {
    3192. 

  3192. +                pl_list[pl_ii++] = pl;
    3193. 

  3193. +            }
    3194. 

  3194. +        }
    3195. 

  3195. +    }
    3196. 

  3196. +    // Cleanup
    3197. 

  3197. +    for (ii = 0; ii < pl_ii; ii++) {
    3198. 

  3198. +        bd_free_mpls(pl_list[ii]);
    3199. 

  3199. +    }
    3200. 

  3200. +    return 0;
    3201. 

  3201. +}
    3202. 

  3202. +
    3203. 

  3203. diff --git a/src/devtools/util.c b/src/devtools/util.c
    3204. 

  3204. new file mode 100644
    3205. 

  3205. index 0000000..aaa4c46
    3206. 

  3206. --- /dev/null
    3207. 

  3207. +++ b/src/devtools/util.c
    3208. 

  3208. @@ -0,0 +1,40 @@
    3209. 

  3209. +/*
    3210. 

  3210. + * This file is part of libbluray
    3211. 

  3211. + * Copyright (C) 2009-2010  John Stebbins
    3212. 

  3212. + *
    3213. 

  3213. + * This library is free software; you can redistribute it and/or
    3214. 

  3214. + * modify it under the terms of the GNU Lesser General Public
    3215. 

  3215. + * License as published by the Free Software Foundation; either
    3216. 

  3216. + * version 2.1 of the License, or (at your option) any later version.
    3217. 

  3217. + *
    3218. 

  3218. + * This library is distributed in the hope that it will be useful,
    3219. 

  3219. + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    3220. 

  3220. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    3221. 

  3221. + * Lesser General Public License for more details.
    3222. 

  3222. + *
    3223. 

  3223. + * You should have received a copy of the GNU Lesser General Public
    3224. 

  3224. + * License along with this library. If not, see
    3225. 

  3225. + * <http://www.gnu.org/licenses/>.
    3226. 

  3226. + */
    3227. 

  3227. +
    3228. 

  3228. +#include <stdio.h>
    3229. 

  3229. +#include <stdarg.h>
    3230. 

  3230. +
    3231. 

  3231. +#include "util.h"
    3232. 

  3232. +
    3233. 

  3233. +void
    3234. 

  3234. +indent_printf(int level, const char *fmt, ...)
    3235. 

  3235. +{
    3236. 

  3236. +    va_list ap;
    3237. 

  3237. +    int ii;
    3238. 

  3238. +
    3239. 

  3239. +    for (ii = 0; ii < level; ii++)
    3240. 

  3240. +    {
    3241. 

  3241. +        printf("    ");
    3242. 

  3242. +    }
    3243. 

  3243. +    va_start(ap, fmt);
    3244. 

  3244. +    vprintf(fmt, ap);
    3245. 

  3245. +    va_end(ap);
    3246. 

  3246. +    printf("\n");
    3247. 

  3247. +}
    3248. 

  3248. +
    3249. 

  3249. diff --git a/src/devtools/util.h b/src/devtools/util.h
    3250. 

  3250. new file mode 100644
    3251. 

  3251. index 0000000..144f8ec
    3252. 

  3252. --- /dev/null
    3253. 

  3253. +++ b/src/devtools/util.h
    3254. 

  3254. @@ -0,0 +1,43 @@
    3255. 

  3255. +/*
    3256. 

  3256. + * This file is part of libbluray
    3257. 

  3257. + * Copyright (C) 2009-2010  John Stebbins
    3258. 

  3258. + *
    3259. 

  3259. + * This library is free software; you can redistribute it and/or
    3260. 

  3260. + * modify it under the terms of the GNU Lesser General Public
    3261. 

  3261. + * License as published by the Free Software Foundation; either
    3262. 

  3262. + * version 2.1 of the License, or (at your option) any later version.
    3263. 

  3263. + *
    3264. 

  3264. + * This library is distributed in the hope that it will be useful,
    3265. 

  3265. + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    3266. 

  3266. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    3267. 

  3267. + * Lesser General Public License for more details.
    3268. 

  3268. + *
    3269. 

  3269. + * You should have received a copy of the GNU Lesser General Public
    3270. 

  3270. + * License along with this library. If not, see
    3271. 

  3271. + * <http://www.gnu.org/licenses/>.
    3272. 

  3272. + */
    3273. 

  3273. +
    3274. 

  3274. +#include <stdint.h>
    3275. 

  3275. +
    3276. 

  3276. +#include "util/attributes.h"
    3277. 

  3277. +
    3278. 

  3278. +#if defined( __MINGW32__ )
    3279. 

  3279. +#   undef  lseek
    3280. 

  3280. +#   define lseek  _lseeki64
    3281. 

  3281. +#   undef  fseeko
    3282. 

  3282. +#   define fseeko fseeko64
    3283. 

  3283. +#   undef  ftello
    3284. 

  3284. +#   define ftello ftello64
    3285. 

  3285. +#   define flockfile(...)
    3286. 

  3286. +#   define funlockfile(...)
    3287. 

  3287. +#   define getc_unlocked getc
    3288. 

  3288. +#   undef  off_t
    3289. 

  3289. +#   define off_t off64_t
    3290. 

  3290. +#   undef  stat
    3291. 

  3291. +#   define stat  _stati64
    3292. 

  3292. +#   define fstat _fstati64
    3293. 

  3293. +#   define wstat _wstati64
    3294. 

  3294. +#endif
    3295. 

  3295. +
    3296. 

  3296. +void indent_printf(int level, const char *fmt, ...) BD_ATTR_FORMAT_PRINTF(2,3);
    3297. 

  3297. +
    3298. 

  3298. diff --git a/src/examples/bdj_test.c b/src/examples/bdj_test.c
    3299. 

  3299. deleted file mode 100644
    3300. 

  3300. index d9ebd16..0000000
    3301. 

  3301. --- a/src/examples/bdj_test.c
    3302. 

  3302. +++ /dev/null
    3303. 

  3303. @@ -1,67 +0,0 @@
    3304. 

  3304. -/*
    3305. 

  3305. - * This file is part of libbluray
    3306. 

  3306. - * Copyright (C) 2010  William Hahne
    3307. 

  3307. - *
    3308. 

  3308. - * This program is free software; you can redistribute it and/or
    3309. 

  3309. - * modify it under the terms of the GNU General Public License
    3310. 

  3310. - * as published by the Free Software Foundation; either version 2
    3311. 

  3311. - * of the License, or (at your option) any later version.
    3312. 

  3312. - *
    3313. 

  3313. - * This program is distributed in the hope that it will be useful,
    3314. 

  3314. - * but WITHOUT ANY WARRANTY; without even the implied warranty of
    3315. 

  3315. - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    3316. 

  3316. - * GNU General Public License for more details.
    3317. 

  3317. - *
    3318. 

  3318. - * You should have received a copy of the GNU General Public License
    3319. 

  3319. - * along with this program.  If not, see <http://www.gnu.org/licenses/>.
    3320. 

  3320. - *
    3321. 

  3321. - * In addition, as a special exception, the copyright holders of libbluray
    3322. 

  3322. - * gives permission to link the code of its release of libbluray with the
    3323. 

  3323. - * OpenSSL project's "OpenSSL" library (or with modified versions of it
    3324. 

  3324. - * that use the same license as the "OpenSSL" library), and distribute
    3325. 

  3325. - * the linked executables.  You must obey the GNU General Public License
    3326. 

  3326. - * in all respects for all of the code used other than "OpenSSL".  If you
    3327. 

  3327. - * modify this file, you may extend this exception to your version of the
    3328. 

  3328. - * file, but you are not obligated to do so.  If you do not wish to do
    3329. 

  3329. - * so, delete this exception statement from your version.
    3330. 

  3330. - */
    3331. 

  3331. -
    3332. 

  3332. -#include <stdio.h>
    3333. 

  3333. -#include <stdlib.h>
    3334. 

  3334. -#include <unistd.h>
    3335. 

  3335. -
    3336. 

  3336. -#include "libbluray/bluray.h"
    3337. 

  3337. -
    3338. 

  3338. -#if defined(_WIN32)
    3339. 

  3339. -#include <windows.h>
    3340. 

  3340. -#define sleep(x) Sleep(x)
    3341. 

  3341. -#endif
    3342. 

  3342. -
    3343. 

  3343. -static void _usage(void) {
    3344. 

  3344. -    printf("Usage: [path to disc] [starting object]\n");
    3345. 

  3345. -}
    3346. 

  3346. -
    3347. 

  3347. -int main(int argc, char** argv)
    3348. 

  3348. -{
    3349. 

  3349. -    if (argc < 3) {
    3350. 

  3350. -        _usage();
    3351. 

  3351. -        return 0;
    3352. 

  3352. -    }
    3353. 

  3353. -
    3354. 

  3354. -    printf("%s %s\n", argv[1], argv[2]);
    3355. 

  3355. -
    3356. 

  3356. -    BLURAY* bd = bd_open(argv[1], NULL);
    3357. 

  3357. -
    3358. 

  3358. -    bd_get_titles(bd, TITLES_ALL, 0);
    3359. 

  3359. -
    3360. 

  3360. -    if (!bd_start_bdj(bd, argv[2])) {
    3361. 

  3361. -        printf("Failed to start BD-J application.\n");
    3362. 

  3362. -    } else {
    3363. 

  3363. -        while (1) { sleep(20); }
    3364. 

  3364. -        bd_stop_bdj(bd);
    3365. 

  3365. -    }
    3366. 

  3366. -
    3367. 

  3367. -    bd_close(bd);
    3368. 

  3368. -
    3369. 

  3369. -    return 0;
    3370. 

  3370. -}
    3371. 

  3371. diff --git a/src/examples/bdjo_dump.c b/src/examples/bdjo_dump.c
    3372. 

  3372. deleted file mode 100644
    3373. 

  3373. index bcbd2af..0000000
    3374. 

  3374. --- a/src/examples/bdjo_dump.c
    3375. 

  3375. +++ /dev/null
    3376. 

  3376. @@ -1,206 +0,0 @@
    3377. 

  3377. -/*
    3378. 

  3378. - * This file is part of libbluray
    3379. 

  3379. - * Copyright (C) 2014  Petri Hintukainen <phintuka@users.sourceforge.net>
    3380. 

  3380. - *
    3381. 

  3381. - * This library is free software; you can redistribute it and/or
    3382. 

  3382. - * modify it under the terms of the GNU Lesser General Public
    3383. 

  3383. - * License as published by the Free Software Foundation; either
    3384. 

  3384. - * version 2.1 of the License, or (at your option) any later version.
    3385. 

  3385. - *
    3386. 

  3386. - * This library is distributed in the hope that it will be useful,
    3387. 

  3387. - * but WITHOUT ANY WARRANTY; without even the implied warranty of
    3388. 

  3388. - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    3389. 

  3389. - * Lesser General Public License for more details.
    3390. 

  3390. - *
    3391. 

  3391. - * You should have received a copy of the GNU Lesser General Public
    3392. 

  3392. - * License along with this library. If not, see
    3393. 

  3393. - * <http://www.gnu.org/licenses/>.
    3394. 

  3394. - */
    3395. 

  3395. -
    3396. 

  3396. -#include "libbluray/bluray.h"
    3397. 

  3397. -#include "libbluray/bdj/bdjo_data.h"
    3398. 

  3398. -
    3399. 

  3399. -#include <stdio.h>
    3400. 

  3400. -#include <string.h>
    3401. 

  3401. -
    3402. 

  3402. -static const char *_yes_no(int i)
    3403. 

  3403. -{
    3404. 

  3404. -    return i > 0 ? "yes" : i < 0 ? "unknown" : "no";
    3405. 

  3405. -}
    3406. 

  3406. -
    3407. 

  3407. -static const char *_binding_str(int i)
    3408. 

  3408. -{
    3409. 

  3409. -    switch (i) {
    3410. 

  3410. -        case 0:  return "unbound";
    3411. 

  3411. -        case 1:  return "disc bound";
    3412. 

  3412. -        case 3:  return "title bound";
    3413. 

  3413. -        default: return "???";
    3414. 

  3414. -    }
    3415. 

  3415. -}
    3416. 

  3416. -
    3417. 

  3417. -static const char *_visibility_str(int i)
    3418. 

  3418. -{
    3419. 

  3419. -    switch (i) {
    3420. 

  3420. -        case 0:  return "none";
    3421. 

  3421. -        case 1:  return "applications";
    3422. 

  3422. -        case 2:  return "user";
    3423. 

  3423. -        default: return "???";
    3424. 

  3424. -    }
    3425. 

  3425. -}
    3426. 

  3426. -
    3427. 

  3427. -static void _terminal_info_print(const BDJO_TERMINAL_INFO *p)
    3428. 

  3428. -{
    3429. 

  3429. -    printf("Terminal Info:\n");
    3430. 

  3430. -    printf("    Default AWT font    : %s\n", p->default_font);
    3431. 

  3431. -    printf("    initial HaVi config : %d\n", p->initial_havi_config_id);
    3432. 

  3432. -    printf("    Menu call mask      : %d\n", p->menu_call_mask);
    3433. 

  3433. -    printf("    Title search mask   : %d\n", p->menu_call_mask);
    3434. 

  3434. -}
    3435. 

  3435. -
    3436. 

  3436. -static void _app_cache_item_print(const BDJO_APP_CACHE_ITEM *p)
    3437. 

  3437. -{
    3438. 

  3438. -    printf("    %3.3s: %s%s\n",
    3439. 

  3439. -           p->lang_code, p->ref_to_name,
    3440. 

  3440. -           p->type == 1 ? ".jar" : p->type == 2 ? "/" : " (unknown type)");
    3441. 

  3441. -}
    3442. 

  3442. -
    3443. 

  3443. -static void _app_cache_info_print(const BDJO_APP_CACHE_INFO *p)
    3444. 

  3444. -{
    3445. 

  3445. -    unsigned ii;
    3446. 

  3446. -
    3447. 

  3447. -    printf("Application cache info:\n");
    3448. 

  3448. -    for (ii = 0; ii < p->num_item; ii++) {
    3449. 

  3449. -        _app_cache_item_print(&p->item[ii]);
    3450. 

  3450. -    }
    3451. 

  3451. -}
    3452. 

  3452. -
    3453. 

  3453. -static void _accessible_playlists_print(const BDJO_ACCESSIBLE_PLAYLISTS *p)
    3454. 

  3454. -{
    3455. 

  3455. -    unsigned ii;
    3456. 

  3456. -
    3457. 

  3457. -    printf("Accessible playlists:\n");
    3458. 

  3458. -    printf("    Access to all       : %s\n", _yes_no(p->access_to_all_flag));
    3459. 

  3459. -    printf("    Autostart first     : %s\n", _yes_no(p->autostart_first_playlist_flag));
    3460. 

  3460. -
    3461. 

  3461. -    if (p->num_pl) {
    3462. 

  3462. -        printf("    Playlists           : %d\n", p->num_pl);
    3463. 

  3463. -        for (ii = 0; ii < p->num_pl; ii++) {
    3464. 

  3464. -            printf("        %s.mpls\n", p->pl[ii].name);
    3465. 

  3465. -        }
    3466. 

  3466. -    }
    3467. 

  3467. -}
    3468. 

  3468. -
    3469. 

  3469. -static void _app_profile_print(BDJO_APP_PROFILE *p)
    3470. 

  3470. -{
    3471. 

  3471. -    printf("        Profile %d Version %d.%d.%d\n",
    3472. 

  3472. -           p->profile_number, p->major_version, p->minor_version, p->micro_version);
    3473. 

  3473. -}
    3474. 

  3474. -
    3475. 

  3475. -static void _app_print(const BDJO_APP *p)
    3476. 

  3476. -{
    3477. 

  3477. -    unsigned ii;
    3478. 

  3478. -
    3479. 

  3479. -    printf("    Control code:       : %d (%s)\n", p->control_code,
    3480. 

  3480. -           p->control_code == 1 ? "autostart" : p->control_code == 2 ? "present" : "???");
    3481. 

  3481. -    printf("    Type                : %d (%s)\n", p->type,
    3482. 

  3482. -           p->type == 1 ? "BD-J App" : "???");
    3483. 

  3483. -    printf("    Organization ID     : %08X\n", p->org_id);
    3484. 

  3484. -    printf("    Application ID      : %04X\n", p->app_id);
    3485. 

  3485. -    printf("    Priority            : %d\n", p->priority);
    3486. 

  3486. -    printf("    Binding             : %d (%s)\n", p->binding, _binding_str(p->binding));
    3487. 

  3487. -    printf("    Visibility          : %d (%s)\n", p->visibility, _visibility_str(p->visibility));
    3488. 

  3488. -
    3489. 

  3489. -    if (p->num_profile) {
    3490. 

  3490. -        printf("    Profiles:\n");
    3491. 

  3491. -        for (ii = 0; ii < p->num_profile; ii++) {
    3492. 

  3492. -            _app_profile_print(&p->profile[ii]);
    3493. 

  3493. -        }
    3494. 

  3494. -    }
    3495. 

  3495. -
    3496. 

  3496. -    if (p->num_name) {
    3497. 

  3497. -        printf("    Names:\n");
    3498. 

  3498. -        for (ii = 0; ii < p->num_name; ii++) {
    3499. 

  3499. -            printf("        %s: %s\n", p->name[ii].lang, p->name[ii].name);
    3500. 

  3500. -        }
    3501. 

  3501. -    }
    3502. 

  3502. -
    3503. 

  3503. -    printf("    Base directory      : %s\n", p->base_dir);
    3504. 

  3504. -    printf("    Icon locator        : %s\n", p->icon_locator);
    3505. 

  3505. -    printf("    Icon flags          : 0x%04x\n", p->icon_flags);
    3506. 

  3506. -    printf("    Classpath extension : %s\n", p->classpath_extension);
    3507. 

  3507. -    printf("    Initial class       : %s\n", p->initial_class);
    3508. 

  3508. -    printf("    Parameters          : ");
    3509. 

  3509. -    for (ii = 0; ii < p->num_param; ii++) {
    3510. 

  3510. -        printf("%s ", p->param[ii].param);
    3511. 

  3511. -    }
    3512. 

  3512. -    printf("\n");
    3513. 

  3513. -}
    3514. 

  3514. -
    3515. 

  3515. -static void _app_management_table_print(const BDJO_APP_MANAGEMENT_TABLE *p)
    3516. 

  3516. -{
    3517. 

  3517. -    unsigned ii;
    3518. 

  3518. -
    3519. 

  3519. -    for (ii = 0; ii < p->num_app; ii++) {
    3520. 

  3520. -        printf("Application %d:\n", ii);
    3521. 

  3521. -        _app_print(&p->app[ii]);
    3522. 

  3522. -    }
    3523. 

  3523. -}
    3524. 

  3524. -
    3525. 

  3525. -static void _key_interest_table_print(const BDJO_KEY_INTEREST_TABLE *p)
    3526. 

  3526. -{
    3527. 

  3527. -    unsigned int v;
    3528. 

  3528. -    memcpy(&v, p, sizeof(unsigned int));
    3529. 

  3529. -    if (v) {
    3530. 

  3530. -        printf("Key interest table:\n");
    3531. 

  3531. -        printf("    %s%s%s%s%s%s%s%s%s%s%s\n",
    3532. 

  3532. -               p->vk_play              ? "VK_PLAY " : "",
    3533. 

  3533. -               p->vk_stop              ? "VK_STOP " : "",
    3534. 

  3534. -               p->vk_ffw               ? "VK_FFW " : "",
    3535. 

  3535. -               p->vk_rew               ? "VK_REW " : "",
    3536. 

  3536. -               p->vk_track_next        ? "VK_TRACK_NEXT " : "",
    3537. 

  3537. -               p->vk_track_prev        ? "VK_TRACK_PREV " : "",
    3538. 

  3538. -               p->vk_pause             ? "VK_PAUSE " : "",
    3539. 

  3539. -               p->vk_still_off         ? "VK_STILL_OFF " : "",
    3540. 

  3540. -               p->vk_sec_audio_ena_dis ? "VK_SEC_AUDIO " : "",
    3541. 

  3541. -               p->vk_sec_video_ena_dis ? "VK_SEC_VIDEO " : "",
    3542. 

  3542. -               p->pg_textst_ena_dis    ? "VK_PG_TEXTST " : "");
    3543. 

  3543. -    }
    3544. 

  3544. -}
    3545. 

  3545. -
    3546. 

  3546. -static void _file_access_info_print(const BDJO_FILE_ACCESS_INFO *p)
    3547. 

  3547. -{
    3548. 

  3548. -    printf("File access info:\n    %s\n",  p->path);
    3549. 

  3549. -}
    3550. 

  3550. -
    3551. 

  3551. -static void _bdjo_print(const BDJO *p)
    3552. 

  3552. -{
    3553. 

  3553. -    _terminal_info_print(&p->terminal_info);
    3554. 

  3554. -    _app_cache_info_print(&p->app_cache_info);
    3555. 

  3555. -    _accessible_playlists_print(&p->accessible_playlists);
    3556. 

  3556. -    _app_management_table_print(&p->app_table);
    3557. 

  3557. -    _key_interest_table_print(&p->key_interest_table);
    3558. 

  3558. -    _file_access_info_print(&p->file_access_info);
    3559. 

  3559. -}
    3560. 

  3560. -
    3561. 

  3561. -int main(int argc, const char *argv[])
    3562. 

  3562. -{
    3563. 

  3563. -    if (argc < 2) {
    3564. 

  3564. -        fprintf(stderr, "usage: %s <bdjo_file>\n", argv[0]);
    3565. 

  3565. -        return 1;
    3566. 

  3566. -    }
    3567. 

  3567. -
    3568. 

  3568. -    int cnt;
    3569. 

  3569. -    for (cnt = 1; cnt < argc; cnt++) {
    3570. 

  3570. -
    3571. 

  3571. -        printf("%s\n", argv[cnt]);
    3572. 

  3572. -
    3573. 

  3573. -        BDJO *bdjo = bd_read_bdjo(argv[cnt]);
    3574. 

  3574. -        if (bdjo) {
    3575. 

  3575. -            _bdjo_print(bdjo);
    3576. 

  3576. -            bd_free_bdjo(bdjo);
    3577. 

  3577. -        }
    3578. 

  3578. -        printf("\n");
    3579. 

  3579. -    }
    3580. 

  3580. -
    3581. 

  3581. -    return 0;
    3582. 

  3582. -}
    3583. 

  3583. diff --git a/src/examples/clpi_dump.c b/src/examples/clpi_dump.c
    3584. 

  3584. deleted file mode 100644
    3585. 

  3585. index bd64783..0000000
    3586. 

  3586. --- a/src/examples/clpi_dump.c
    3587. 

  3587. +++ /dev/null
    3588. 

  3588. @@ -1,487 +0,0 @@
    3589. 

  3589. -/*
    3590. 

  3590. - * This file is part of libbluray
    3591. 

  3591. - * Copyright (C) 2009-2010  John Stebbins
    3592. 

  3592. - * Copyright (C) 2012-2013  Petri Hintukainen <phintuka@users.sourceforge.net>
    3593. 

  3593. - *
    3594. 

  3594. - * This library is free software; you can redistribute it and/or
    3595. 

  3595. - * modify it under the terms of the GNU Lesser General Public
    3596. 

  3596. - * License as published by the Free Software Foundation; either
    3597. 

  3597. - * version 2.1 of the License, or (at your option) any later version.
    3598. 

  3598. - *
    3599. 

  3599. - * This library is distributed in the hope that it will be useful,
    3600. 

  3600. - * but WITHOUT ANY WARRANTY; without even the implied warranty of
    3601. 

  3601. - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    3602. 

  3602. - * Lesser General Public License for more details.
    3603. 

  3603. - *
    3604. 

  3604. - * You should have received a copy of the GNU Lesser General Public
    3605. 

  3605. - * License along with this library. If not, see
    3606. 

  3606. - * <http://www.gnu.org/licenses/>.
    3607. 

  3607. - */
    3608. 

  3608. -
    3609. 

  3609. -#include <stdio.h>
    3610. 

  3610. -#include <stdlib.h>
    3611. 

  3611. -#include <unistd.h>
    3612. 

  3612. -#include <inttypes.h>
    3613. 

  3613. -
    3614. 

  3614. -#include "libbluray/bdnav/clpi_data.h"
    3615. 

  3615. -#include "libbluray/bluray.h"
    3616. 

  3616. -
    3617. 

  3617. -#include "util.h"
    3618. 

  3618. -
    3619. 

  3619. -static int verbose;
    3620. 

  3620. -
    3621. 

  3621. -typedef struct {
    3622. 

  3622. -    int value;
    3623. 

  3623. -    const char *str;
    3624. 

  3624. -} VALUE_MAP;
    3625. 

  3625. -
    3626. 

  3626. -static inline const char*
    3627. 

  3627. -_lookup_str(const VALUE_MAP *map, int val)
    3628. 

  3628. -{
    3629. 

  3629. -    int ii;
    3630. 

  3630. -
    3631. 

  3631. -    for (ii = 0; map[ii].str; ii++) {
    3632. 

  3632. -        if (val == map[ii].value) {
    3633. 

  3633. -            return map[ii].str;
    3634. 

  3634. -        }
    3635. 

  3635. -    }
    3636. 

  3636. -    return "?";
    3637. 

  3637. -}
    3638. 

  3638. -
    3639. 

  3639. -const VALUE_MAP codec_map[] = {
    3640. 

  3640. -    {0x01, "MPEG-1 Video"},
    3641. 

  3641. -    {0x02, "MPEG-2 Video"},
    3642. 

  3642. -    {0x03, "MPEG-1 Audio"},
    3643. 

  3643. -    {0x04, "MPEG-2 Audio"},
    3644. 

  3644. -    {0x80, "LPCM"},
    3645. 

  3645. -    {0x81, "AC-3"},
    3646. 

  3646. -    {0x82, "DTS"},
    3647. 

  3647. -    {0x83, "TrueHD"},
    3648. 

  3648. -    {0x84, "AC-3 Plus"},
    3649. 

  3649. -    {0x85, "DTS-HD"},
    3650. 

  3650. -    {0x86, "DTS-HD Master"},
    3651. 

  3651. -    {0xa1, "AC-3 Plus for secondary audio"},
    3652. 

  3652. -    {0xa2, "DTS-HD for secondary audio"},
    3653. 

  3653. -    {0xea, "VC-1"},
    3654. 

  3654. -    {0x1b, "H.264"},
    3655. 

  3655. -    {0x20, "H.264 MVC dep."},
    3656. 

  3656. -    {0x90, "Presentation Graphics"},
    3657. 

  3657. -    {0x91, "Presentation Graphics"},
    3658. 

  3658. -    {0x92, "Interactive Graphics"},
    3659. 

  3659. -    {0, NULL}
    3660. 

  3660. -};
    3661. 

  3661. -
    3662. 

  3662. -const VALUE_MAP video_format_map[] = {
    3663. 

  3663. -    {0, "Reserved"},
    3664. 

  3664. -    {1, "480i"},
    3665. 

  3665. -    {2, "576i"},
    3666. 

  3666. -    {3, "480p"},
    3667. 

  3667. -    {4, "1080i"},
    3668. 

  3668. -    {5, "720p"},
    3669. 

  3669. -    {6, "1080p"},
    3670. 

  3670. -    {7, "576p"},
    3671. 

  3671. -    {0, NULL}
    3672. 

  3672. -};
    3673. 

  3673. -
    3674. 

  3674. -const VALUE_MAP video_rate_map[] = {
    3675. 

  3675. -    {0, "Reserved1"},
    3676. 

  3676. -    {1, "23.976"},
    3677. 

  3677. -    {2, "24"},
    3678. 

  3678. -    {3, "25"},
    3679. 

  3679. -    {4, "29.97"},
    3680. 

  3680. -    {5, "Reserved2"},
    3681. 

  3681. -    {6, "50"},
    3682. 

  3682. -    {7, "59.94"},
    3683. 

  3683. -    {0, NULL}
    3684. 

  3684. -};
    3685. 

  3685. -
    3686. 

  3686. -const VALUE_MAP video_aspect_map[] = {
    3687. 

  3687. -    {0, "Reserved1"},
    3688. 

  3688. -    {1, "Reserved2"},
    3689. 

  3689. -    {2, "4:3"},
    3690. 

  3690. -    {3, "16:9"},
    3691. 

  3691. -    {0, NULL}
    3692. 

  3692. -};
    3693. 

  3693. -
    3694. 

  3694. -const VALUE_MAP audio_format_map[] = {
    3695. 

  3695. -    {0, "Reserved1"},
    3696. 

  3696. -    {1, "Mono"},
    3697. 

  3697. -    {2, "Reserved2"},
    3698. 

  3698. -    {3, "Stereo"},
    3699. 

  3699. -    {4, "Reserved3"},
    3700. 

  3700. -    {5, "Reserved4"},
    3701. 

  3701. -    {6, "Multi Channel"},
    3702. 

  3702. -    {12, "Combo"},
    3703. 

  3703. -    {0, NULL}
    3704. 

  3704. -};
    3705. 

  3705. -
    3706. 

  3706. -const VALUE_MAP audio_rate_map[] = {
    3707. 

  3707. -    {0, "Reserved1"},
    3708. 

  3708. -    {1, "48 Khz"},
    3709. 

  3709. -    {2, "Reserved2"},
    3710. 

  3710. -    {3, "Reserved3"},
    3711. 

  3711. -    {4, "96 Khz"},
    3712. 

  3712. -    {5, "192 Khz"},
    3713. 

  3713. -    {12, "48/192 Khz"},
    3714. 

  3714. -    {14, "48/96 Khz"},
    3715. 

  3715. -    {0, NULL}
    3716. 

  3716. -};
    3717. 

  3717. -
    3718. 

  3718. -const VALUE_MAP application_type_map[] = {
    3719. 

  3719. -    {1, "Main TS for a main-path of Movie"},
    3720. 

  3720. -    {2, "Main TS for a main-path of Time based slide show"},
    3721. 

  3721. -    {3, "Main TS for a main-path of Browsable slide show"},
    3722. 

  3722. -    {4, "Sub TS for a sub-path of Browsable slide show"},
    3723. 

  3723. -    {5, "Sub TS for a sub-path of Interactive Graphics menu"},
    3724. 

  3724. -    {6, "Sub TS for a sub-path of Text subtitle"},
    3725. 

  3725. -    {7, "Sub TS for a sub-path of one or more elementary streams path"},
    3726. 

  3726. -    {0, NULL},
    3727. 

  3727. -};
    3728. 

  3728. -
    3729. 

  3729. -static void
    3730. 

  3730. -_show_stream(CLPI_PROG_STREAM *ss, int level)
    3731. 

  3731. -{
    3732. 

  3732. -    indent_printf(level, "Codec (%04x): %s", ss->coding_type,
    3733. 

  3733. -                    _lookup_str(codec_map, ss->coding_type));
    3734. 

  3734. -    indent_printf(level, "PID: %04x", ss->pid);
    3735. 

  3735. -    switch (ss->coding_type) {
    3736. 

  3736. -        case 0x01:
    3737. 

  3737. -        case 0x02:
    3738. 

  3738. -        case 0xea:
    3739. 

  3739. -        case 0x1b:
    3740. 

  3740. -        case 0x20:
    3741. 

  3741. -            indent_printf(level, "Format %02x: %s", ss->format,
    3742. 

  3742. -                        _lookup_str(video_format_map, ss->format));
    3743. 

  3743. -            indent_printf(level, "Rate %02x: %s", ss->rate,
    3744. 

  3744. -                        _lookup_str(video_rate_map, ss->rate));
    3745. 

  3745. -            indent_printf(level, "Aspect %02x: %s", ss->aspect,
    3746. 

  3746. -                        _lookup_str(video_aspect_map, ss->aspect));
    3747. 

  3747. -            indent_printf(level, "oc_flag %02x", ss->oc_flag);
    3748. 

  3748. -            break;
    3749. 

  3749. -
    3750. 

  3750. -        case 0x03:
    3751. 

  3751. -        case 0x04:
    3752. 

  3752. -        case 0x80:
    3753. 

  3753. -        case 0x81:
    3754. 

  3754. -        case 0x82:
    3755. 

  3755. -        case 0x83:
    3756. 

  3756. -        case 0x84:
    3757. 

  3757. -        case 0x85:
    3758. 

  3758. -        case 0x86:
    3759. 

  3759. -        case 0xa1:
    3760. 

  3760. -        case 0xa2:
    3761. 

  3761. -            indent_printf(level, "Format %02x: %s", ss->format,
    3762. 

  3762. -                        _lookup_str(audio_format_map, ss->format));
    3763. 

  3763. -            indent_printf(level, "Rate %02x: %s", ss->rate,
    3764. 

  3764. -                        _lookup_str(audio_rate_map, ss->rate));
    3765. 

  3765. -            indent_printf(level, "Language: %s", ss->lang);
    3766. 

  3766. -            break;
    3767. 

  3767. -
    3768. 

  3768. -        case 0x90:
    3769. 

  3769. -        case 0x91:
    3770. 

  3770. -        case 0xa0:
    3771. 

  3771. -            indent_printf(level, "Language: %s", ss->lang);
    3772. 

  3772. -            break;
    3773. 

  3773. -
    3774. 

  3774. -        case 0x92:
    3775. 

  3775. -            indent_printf(level, "Char Code: %02x", ss->char_code);
    3776. 

  3776. -            indent_printf(level, "Language: %s", ss->lang);
    3777. 

  3777. -            break;
    3778. 

  3778. -
    3779. 

  3779. -        default:
    3780. 

  3780. -            fprintf(stderr, "unrecognized coding type %02x\n", ss->coding_type);
    3781. 

  3781. -            break;
    3782. 

  3782. -    };
    3783. 

  3783. -}
    3784. 

  3784. -
    3785. 

  3785. -static void
    3786. 

  3786. -_show_clip_info(CLPI_CL *cl, int level)
    3787. 

  3787. -{
    3788. 

  3788. -    CLPI_CLIP_INFO *ci = &cl->clip;
    3789. 

  3789. -    int ii;
    3790. 

  3790. -
    3791. 

  3791. -    indent_printf(level, "Clip Info");
    3792. 

  3792. -    indent_printf(level+1, "Clip Stream Type: %02x", ci->clip_stream_type);
    3793. 

  3793. -    indent_printf(level+1, "Clip Application Type (%02x): %s",
    3794. 

  3794. -                  ci->application_type, _lookup_str(application_type_map, ci->application_type));
    3795. 

  3795. -    indent_printf(level+1, "is_ATC_delta: %s", ci->is_atc_delta ? "True" : "False");
    3796. 

  3796. -    indent_printf(level+1, "ATC delta count: %d", ci->atc_delta_count);
    3797. 

  3797. -    indent_printf(level+1, "TS Recording Rate: %u", ci->ts_recording_rate);
    3798. 

  3798. -    indent_printf(level+1, "Number Source Packets: %u", ci->num_source_packets);
    3799. 

  3799. -    // Show ts type info
    3800. 

  3800. -    indent_printf(level+1, "TS Type Info");
    3801. 

  3801. -    indent_printf(level+2, "Validity Flags %02x", ci->ts_type_info.validity);
    3802. 

  3802. -    indent_printf(level+2, "Format Id %s", ci->ts_type_info.format_id);
    3803. 

  3803. -    // Show cc5 thing
    3804. 

  3804. -    for (ii = 0; ii < ci->atc_delta_count; ii++) {
    3805. 

  3805. -        indent_printf(level+1, "ATC delta[ %d ]", ii);
    3806. 

  3806. -        indent_printf(level+2, "Delta %08x", ci->atc_delta[ii].delta);
    3807. 

  3807. -        indent_printf(level+2, "File Id %s", ci->atc_delta[ii].file_id);
    3808. 

  3808. -        indent_printf(level+2, "File Code %s", ci->atc_delta[ii].file_code);
    3809. 

  3809. -    }
    3810. 

  3810. -    // show fonts
    3811. 

  3811. -    if (cl->font_info.font_count) {
    3812. 

  3812. -        indent_printf(level+1, "Font files");
    3813. 

  3813. -        for (ii = 0; ii < cl->font_info.font_count; ii++) {
    3814. 

  3814. -            indent_printf(level+2, "Font file %d: %s.otf", ii+1, cl->font_info.font[ii].file_id);
    3815. 

  3815. -        }
    3816. 

  3816. -    }
    3817. 

  3817. -
    3818. 

  3818. -    printf("\n");
    3819. 

  3819. -}
    3820. 

  3820. -
    3821. 

  3821. -static void
    3822. 

  3822. -_show_seq_info(CLPI_SEQ_INFO *si, int level)
    3823. 

  3823. -{
    3824. 

  3824. -    CLPI_ATC_SEQ *atc;
    3825. 

  3825. -    CLPI_STC_SEQ *stc;
    3826. 

  3826. -    int ii, jj;
    3827. 

  3827. -
    3828. 

  3828. -    indent_printf(level, "Sequence Info");
    3829. 

  3829. -    indent_printf(level+1, "Number ATC Sequences: %d", si->num_atc_seq);
    3830. 

  3830. -    for (ii = 0; ii < si->num_atc_seq; ii++) {
    3831. 

  3831. -        atc = &si->atc_seq[ii];
    3832. 

  3832. -        indent_printf(level+1, "ATC Sequence %d", ii);
    3833. 

  3833. -        indent_printf(level+2, "SPN ATC Start: %u", atc->spn_atc_start);
    3834. 

  3834. -        indent_printf(level+2, "Offset STC Id: %d", atc->offset_stc_id);
    3835. 

  3835. -        indent_printf(level+2, "Number STC Sequences: %d", atc->num_stc_seq);
    3836. 

  3836. -        for (jj = 0; jj < atc->num_stc_seq; jj++) {
    3837. 

  3837. -            stc = &atc->stc_seq[jj];
    3838. 

  3838. -            indent_printf(level+2, "ATC Sequence %d", jj);
    3839. 

  3839. -            indent_printf(level+3, "SPN STC Start: %u", stc->spn_stc_start);
    3840. 

  3840. -            indent_printf(level+3, "PCR PID: %04x", stc->pcr_pid);
    3841. 

  3841. -            indent_printf(level+3, "Presentation Start: %u", 
    3842. 

  3842. -                            stc->presentation_start_time);
    3843. 

  3843. -            indent_printf(level+3, "Presentation End: %u", 
    3844. 

  3844. -                            stc->presentation_end_time);
    3845. 

  3845. -        }
    3846. 

  3846. -    }
    3847. 

  3847. -}
    3848. 

  3848. -
    3849. 

  3849. -static void
    3850. 

  3850. -_show_prog_info(CLPI_PROG_INFO *pi, int level)
    3851. 

  3851. -{
    3852. 

  3852. -    CLPI_PROG *prog;
    3853. 

  3853. -    int ii, jj;
    3854. 

  3854. -
    3855. 

  3855. -    indent_printf(level, "Program Info");
    3856. 

  3856. -    indent_printf(level+1, "Number Programs: %d", pi->num_prog);
    3857. 

  3857. -    for (ii = 0; ii < pi->num_prog; ii++) {
    3858. 

  3858. -        prog = &pi->progs[ii];
    3859. 

  3859. -        indent_printf(level+1, "Program %d", ii);
    3860. 

  3860. -        indent_printf(level+2, "SPN Program Sequence Start: %d", 
    3861. 

  3861. -                        prog->spn_program_sequence_start);
    3862. 

  3862. -        indent_printf(level+2, "Program Map PID: %d", prog->program_map_pid);
    3863. 

  3863. -        indent_printf(level+2, "Number Streams: %d", prog->num_streams);
    3864. 

  3864. -        indent_printf(level+2, "Number Groups: %d", prog->num_groups);
    3865. 

  3865. -        for (jj = 0; jj < prog->num_streams; jj++) {
    3866. 

  3866. -            indent_printf(level+2, "Stream %d", jj);
    3867. 

  3867. -            _show_stream(&prog->streams[jj], level+3);
    3868. 

  3868. -        }
    3869. 

  3869. -    }
    3870. 

  3870. -}
    3871. 

  3871. -
    3872. 

  3872. -static void
    3873. 

  3873. -_show_extent_start(CLPI_EXTENT_START *es, int level)
    3874. 

  3874. -{
    3875. 

  3875. -    unsigned int ii;
    3876. 

  3876. -
    3877. 

  3877. -    indent_printf(level, "Extension data: Extent Start Point");
    3878. 

  3878. -
    3879. 

  3879. -    if (!es->num_point) {
    3880. 

  3880. -        indent_printf(level+1, "(no data)");
    3881. 

  3881. -
    3882. 

  3882. -    } else {
    3883. 

  3883. -        indent_printf(level+1, "Number of Start Points: %d", es->num_point);
    3884. 

  3884. -
    3885. 

  3885. -        if (verbose) {
    3886. 

  3886. -            for (ii = 0; ii < es->num_point; ii++) {
    3887. 

  3887. -                indent_printf(level+1, "Extent %5d: SPN 0x%08X", ii, es->point[ii]);
    3888. 

  3888. -            }
    3889. 

  3889. -        }
    3890. 

  3890. -    }
    3891. 

  3891. -}
    3892. 

  3892. -
    3893. 

  3893. -static void
    3894. 

  3894. -_show_cpi_info(CLPI_CPI *cpi, int level)
    3895. 

  3895. -{
    3896. 

  3896. -    CLPI_EP_MAP_ENTRY *entry;
    3897. 

  3897. -    CLPI_EP_COARSE *coarse;
    3898. 

  3898. -    CLPI_EP_FINE *fine;
    3899. 

  3899. -    int ii, jj, kk;
    3900. 

  3900. -
    3901. 

  3901. -    indent_printf(level, "CPI");
    3902. 

  3902. -    indent_printf(level+1, "Number Stream PID: %d", cpi->num_stream_pid);
    3903. 

  3903. -    for (ii = 0; ii < cpi->num_stream_pid; ii++) {
    3904. 

  3904. -        entry = &cpi->entry[ii];
    3905. 

  3905. -        indent_printf(level+1, "Stream: %d", ii);
    3906. 

  3906. -        indent_printf(level+2, "PID: %04x", entry->pid);
    3907. 

  3907. -        indent_printf(level+2, "EP Stream Type: %d", entry->ep_stream_type);
    3908. 

  3908. -        indent_printf(level+2, "Number EP Coarse: %d", entry->num_ep_coarse);
    3909. 

  3909. -        indent_printf(level+2, "Number EP Fine: %d", entry->num_ep_fine);
    3910. 

  3910. -        indent_printf(level+2, "EP Map Start: %d", 
    3911. 

  3911. -                        entry->ep_map_stream_start_addr);
    3912. 

  3912. -        for (jj = 0; jj < entry->num_ep_coarse; jj++) {
    3913. 

  3913. -            coarse = &entry->coarse[jj];
    3914. 

  3914. -            indent_printf(level+2, "Coarse: %d", jj);
    3915. 

  3915. -            indent_printf(level+3, "Ref EP Fine: %d", coarse->ref_ep_fine_id);
    3916. 

  3916. -            indent_printf(level+3, "PTS EP: %d", coarse->pts_ep);
    3917. 

  3917. -            indent_printf(level+3, "SPN EP: %d", coarse->spn_ep);
    3918. 

  3918. -        }
    3919. 

  3919. -        for (jj = 0; jj < entry->num_ep_fine; jj++) {
    3920. 

  3920. -            fine = &entry->fine[jj];
    3921. 

  3921. -            indent_printf(level+2, "Fine: %d", jj);
    3922. 

  3922. -            indent_printf(level+3, "Angle Change Point: %s", 
    3923. 

  3923. -                fine->is_angle_change_point ? "True":"False");
    3924. 

  3924. -            indent_printf(level+3, "I End Offset: %d", 
    3925. 

  3925. -                fine->i_end_position_offset);
    3926. 

  3926. -            indent_printf(level+3, "PTS EP: %d", fine->pts_ep);
    3927. 

  3927. -            indent_printf(level+3, "SPN EP: %d", fine->spn_ep);
    3928. 

  3928. -        }
    3929. 

  3929. -        if (verbose) {
    3930. 

  3930. -            uint64_t pts;
    3931. 

  3931. -            uint32_t spn;
    3932. 

  3932. -
    3933. 

  3933. -            indent_printf(level+2, "PTS - SPN Map");
    3934. 

  3934. -            for (jj = 0; jj < entry->num_ep_coarse; jj++) {
    3935. 

  3935. -                int start, end;
    3936. 

  3936. -
    3937. 

  3937. -                indent_printf(level+3, "Coarse: %d", jj);
    3938. 

  3938. -                coarse = &entry->coarse[jj];
    3939. 

  3939. -                start = coarse->ref_ep_fine_id;
    3940. 

  3940. -                if (jj < entry->num_ep_coarse - 1) {
    3941. 

  3941. -                    end = entry->coarse[jj+1].ref_ep_fine_id;
    3942. 

  3942. -                } else {
    3943. 

  3943. -                    end = entry->num_ep_fine;
    3944. 

  3944. -                }
    3945. 

  3945. -                for (kk = start; kk < end; kk++) {
    3946. 

  3946. -                    fine = &entry->fine[kk];
    3947. 

  3947. -                    pts = ((uint64_t) (coarse->pts_ep & ~0x01) << 19) +
    3948. 

  3948. -                            ((uint64_t)fine->pts_ep << 9);
    3949. 

  3949. -                    spn = (coarse->spn_ep & ~0x1FFFF) + fine->spn_ep;
    3950. 

  3950. -                    indent_printf(level+4, "PTS %8"PRIu64"/%8"PRIu64" -- SPN %u",
    3951. 

  3951. -                        pts, pts >> 1, spn);
    3952. 

  3952. -                }
    3953. 

  3953. -            }
    3954. 

  3954. -        }
    3955. 

  3955. -    }
    3956. 

  3956. -}
    3957. 

  3957. -
    3958. 

  3958. -
    3959. 

  3959. -static void
    3960. 

  3960. -_usage(char *cmd)
    3961. 

  3961. -{
    3962. 

  3962. -    fprintf(stderr, 
    3963. 

  3963. -"Usage: %s -vcspi <clpi file> [<clpi file> ...]\n"
    3964. 

  3964. -"With no options, produces no output (not very useful)\n"
    3965. 

  3965. -"Options:\n"
    3966. 

  3966. -"    v - Verbose output.\n"
    3967. 

  3967. -"    c - Shows the Clip Info structure\n"
    3968. 

  3968. -"    s - Shows the Sequence Info structure\n"
    3969. 

  3969. -"    p - Shows the Program Info structure\n"
    3970. 

  3970. -"    i - Shows the CPI. PTS to SPN map\n"
    3971. 

  3971. -"    e - Shows Extent Start Table\n"
    3972. 

  3972. -, cmd);
    3973. 

  3973. -
    3974. 

  3974. -    exit(EXIT_FAILURE);
    3975. 

  3975. -}
    3976. 

  3976. -
    3977. 

  3977. -#define OPTS "vcspie"
    3978. 

  3978. -
    3979. 

  3979. -int
    3980. 

  3980. -main(int argc, char *argv[])
    3981. 

  3981. -{
    3982. 

  3982. -    CLPI_CL *cl;
    3983. 

  3983. -    int opt;
    3984. 

  3984. -    int opt_clip_info = 0, opt_seq_info = 0, opt_prog_info = 0;
    3985. 

  3985. -    int opt_cpi_info = 0, opt_extent_start = 0;
    3986. 

  3986. -    int ii;
    3987. 

  3987. -
    3988. 

  3988. -    do {
    3989. 

  3989. -        opt = getopt(argc, argv, OPTS);
    3990. 

  3990. -        switch (opt) {
    3991. 

  3991. -            case -1: break;
    3992. 

  3992. -
    3993. 

  3993. -            case 'v':
    3994. 

  3994. -                verbose = 1;
    3995. 

  3995. -                break;
    3996. 

  3996. -
    3997. 

  3997. -            case 's':
    3998. 

  3998. -                opt_seq_info = 1;
    3999. 

  3999. -                break;
    4000. 

  4000. -
    4001. 

  4001. -            case 'i':
    4002. 

  4002. -                opt_cpi_info = 1;
    4003. 

  4003. -                break;
    4004. 

  4004. -
    4005. 

  4005. -            case 'c':
    4006. 

  4006. -                opt_clip_info = 1;
    4007. 

  4007. -                break;
    4008. 

  4008. -
    4009. 

  4009. -            case 'p':
    4010. 

  4010. -                opt_prog_info = 1;
    4011. 

  4011. -                break;
    4012. 

  4012. -
    4013. 

  4013. -            case 'e':
    4014. 

  4014. -                opt_extent_start = 1;
    4015. 

  4015. -                break;
    4016. 

  4016. -
    4017. 

  4017. -            default:
    4018. 

  4018. -                _usage(argv[0]);
    4019. 

  4019. -                break;
    4020. 

  4020. -        }
    4021. 

  4021. -    } while (opt != -1);
    4022. 

  4022. -
    4023. 

  4023. -    if (optind >= argc) {
    4024. 

  4024. -        _usage(argv[0]);
    4025. 

  4025. -    }
    4026. 

  4026. -
    4027. 

  4027. -    for (ii = optind; ii < argc; ii++) {
    4028. 

  4028. -        cl = bd_read_clpi(argv[ii]);
    4029. 

  4029. -        if (cl == NULL) {
    4030. 

  4030. -            fprintf(stderr, "Parsing %s failed\n", argv[ii]);
    4031. 

  4031. -            continue;
    4032. 

  4032. -        }
    4033. 

  4033. -        if (opt_clip_info) {
    4034. 

  4034. -            // Show clip info
    4035. 

  4035. -            _show_clip_info(cl, 1);
    4036. 

  4036. -        }
    4037. 

  4037. -        if (opt_seq_info) {
    4038. 

  4038. -            // Show sequence info
    4039. 

  4039. -            _show_seq_info(&cl->sequence, 1);
    4040. 

  4040. -        }
    4041. 

  4041. -        if (opt_prog_info) {
    4042. 

  4042. -            // Show program info
    4043. 

  4043. -            _show_prog_info(&cl->program, 1);
    4044. 

  4044. -        }
    4045. 

  4045. -        if (opt_cpi_info) {
    4046. 

  4046. -            // Show cpi
    4047. 

  4047. -            _show_cpi_info(&cl->cpi, 1);
    4048. 

  4048. -        }
    4049. 

  4049. -
    4050. 

  4050. -        if (opt_prog_info) {
    4051. 

  4051. -            if (cl->program_ss.num_prog) {
    4052. 

  4052. -                printf("\n");
    4053. 

  4053. -                indent_printf(1, "Extension: Program Info SS");
    4054. 

  4054. -                _show_prog_info(&cl->program_ss, 1);
    4055. 

  4055. -            }
    4056. 

  4056. -        }
    4057. 

  4057. -        if (opt_cpi_info) {
    4058. 

  4058. -            if (cl->program_ss.num_prog) {
    4059. 

  4059. -                printf("\n");
    4060. 

  4060. -                indent_printf(1, "Extension: CPI SS");
    4061. 

  4061. -                _show_cpi_info(&cl->cpi_ss, 1);
    4062. 

  4062. -            }
    4063. 

  4063. -        }
    4064. 

  4064. -        if (opt_extent_start) {
    4065. 

  4065. -            // Show extent start point
    4066. 

  4066. -            if (cl->extent_start.num_point > 0) {
    4067. 

  4067. -                _show_extent_start(&cl->extent_start, 1);
    4068. 

  4068. -            }
    4069. 

  4069. -        }
    4070. 

  4070. -
    4071. 

  4071. -        bd_free_clpi(cl);
    4072. 

  4072. -    }
    4073. 

  4073. -    return 0;
    4074. 

  4074. -}
    4075. 

  4075. -
    4076. 

  4076. diff --git a/src/examples/hdmv_test.c b/src/examples/hdmv_test.c
    4077. 

  4077. deleted file mode 100644
    4078. 

  4078. index 585ed70..0000000
    4079. 

  4079. --- a/src/examples/hdmv_test.c
    4080. 

  4080. +++ /dev/null
    4081. 

  4081. @@ -1,257 +0,0 @@
    4082. 

  4082. -/*
    4083. 

  4083. - * This file is part of libbluray
    4084. 

  4084. - * Copyright (C) 2010  hpi1
    4085. 

  4085. - *
    4086. 

  4086. - * This library is free software; you can redistribute it and/or
    4087. 

  4087. - * modify it under the terms of the GNU Lesser General Public
    4088. 

  4088. - * License as published by the Free Software Foundation; either
    4089. 

  4089. - * version 2.1 of the License, or (at your option) any later version.
    4090. 

  4090. - *
    4091. 

  4091. - * This library is distributed in the hope that it will be useful,
    4092. 

  4092. - * but WITHOUT ANY WARRANTY; without even the implied warranty of
    4093. 

  4093. - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    4094. 

  4094. - * Lesser General Public License for more details.
    4095. 

  4095. - *
    4096. 

  4096. - * You should have received a copy of the GNU Lesser General Public
    4097. 

  4097. - * License along with this library. If not, see
    4098. 

  4098. - * <http://www.gnu.org/licenses/>.
    4099. 

  4099. - */
    4100. 

  4100. -
    4101. 

  4101. -#include <stdio.h>
    4102. 

  4102. -#include <stdlib.h>
    4103. 

  4103. -#include <string.h>
    4104. 

  4104. -#include <inttypes.h>
    4105. 

  4105. -
    4106. 

  4106. -#include "util/log_control.h"
    4107. 

  4107. -#include "libbluray/bluray.h"
    4108. 

  4108. -
    4109. 

  4109. -static void _print_event(BD_EVENT *ev)
    4110. 

  4110. -{
    4111. 

  4111. -    switch (ev->event) {
    4112. 

  4112. -        case BD_EVENT_NONE:
    4113. 

  4113. -            break;
    4114. 

  4114. -        case BD_EVENT_ERROR:
    4115. 

  4115. -            printf("EVENT_ERROR:\t%d\n", ev->param);
    4116. 

  4116. -            break;
    4117. 

  4117. -        case BD_EVENT_READ_ERROR:
    4118. 

  4118. -            printf("EVENT_READ_ERROR:\t%d\n", ev->param);
    4119. 

  4119. -            break;
    4120. 

  4120. -        case BD_EVENT_ENCRYPTED:
    4121. 

  4121. -            printf("EVENT_ENCRYPTED:\t%d\n", ev->param);
    4122. 

  4122. -            break;
    4123. 

  4123. -
    4124. 

  4124. -        /* current playback position */
    4125. 

  4125. -
    4126. 

  4126. -        case BD_EVENT_ANGLE:
    4127. 

  4127. -            printf("EVENT_ANGLE:\t%d\n", ev->param);
    4128. 

  4128. -            break;
    4129. 

  4129. -        case BD_EVENT_TITLE:
    4130. 

  4130. -            printf("EVENT_TITLE:\t%d\n", ev->param);
    4131. 

  4131. -            break;
    4132. 

  4132. -        case BD_EVENT_PLAYLIST:
    4133. 

  4133. -            printf("EVENT_PLAYLIST:\t%d\n", ev->param);
    4134. 

  4134. -            break;
    4135. 

  4135. -        case BD_EVENT_PLAYITEM:
    4136. 

  4136. -            printf("EVENT_PLAYITEM:\t%d\n", ev->param);
    4137. 

  4137. -            break;
    4138. 

  4138. -        case BD_EVENT_CHAPTER:
    4139. 

  4139. -            printf("EVENT_CHAPTER:\t%d\n", ev->param);
    4140. 

  4140. -            break;
    4141. 

  4141. -
    4142. 

  4142. -        /* */
    4143. 

  4143. -
    4144. 

  4144. -        case BD_EVENT_STILL:
    4145. 

  4145. -            printf("EVENT_STILL:\t%d\n", ev->param);
    4146. 

  4146. -            break;
    4147. 

  4147. -
    4148. 

  4148. -        case BD_EVENT_SEEK:
    4149. 

  4149. -            printf("EVENT_SEEK:\t%d\n", ev->param);
    4150. 

  4150. -            break;
    4151. 

  4151. -
    4152. 

  4152. -        case BD_EVENT_STILL_TIME:
    4153. 

  4153. -            if (ev->param) {
    4154. 

  4154. -                printf("EVENT_STILL_TIME:\t%d\n", ev->param);
    4155. 

  4155. -            } else {
    4156. 

  4156. -                printf("EVENT_STILL_TIME:\tinfinite\n");
    4157. 

  4157. -            }
    4158. 

  4158. -            break;
    4159. 

  4159. -
    4160. 

  4160. -        /* stream selection */
    4161. 

  4161. -
    4162. 

  4162. -        case BD_EVENT_AUDIO_STREAM:
    4163. 

  4163. -            printf("EVENT_AUDIO_STREAM:\t%d\n", ev->param);
    4164. 

  4164. -            break;
    4165. 

  4165. -        case BD_EVENT_IG_STREAM:
    4166. 

  4166. -            printf("EVENT_IG_STREAM:\t%d\n", ev->param);
    4167. 

  4167. -            break;
    4168. 

  4168. -        case BD_EVENT_PG_TEXTST_STREAM:
    4169. 

  4169. -            printf("EVENT_PG_TEXTST_STREAM:\t%d\n", ev->param);
    4170. 

  4170. -            break;
    4171. 

  4171. -        case BD_EVENT_SECONDARY_AUDIO_STREAM:
    4172. 

  4172. -            printf("EVENT_SECONDARY_AUDIO_STREAM:\t%d\n", ev->param);
    4173. 

  4173. -            break;
    4174. 

  4174. -        case BD_EVENT_SECONDARY_VIDEO_STREAM:
    4175. 

  4175. -            printf("EVENT_SECONDARY_VIDEO_STREAM:\t%d\n", ev->param);
    4176. 

  4176. -            break;
    4177. 

  4177. -
    4178. 

  4178. -        case BD_EVENT_PG_TEXTST:
    4179. 

  4179. -            printf("EVENT_PG_TEXTST:\t%s\n", ev->param ? "enable" : "disable");
    4180. 

  4180. -            break;
    4181. 

  4181. -        case BD_EVENT_SECONDARY_AUDIO:
    4182. 

  4182. -            printf("EVENT_SECONDARY_AUDIO:\t%s\n", ev->param ? "enable" : "disable");
    4183. 

  4183. -            break;
    4184. 

  4184. -        case BD_EVENT_SECONDARY_VIDEO:
    4185. 

  4185. -            printf("EVENT_SECONDARY_VIDEO:\t%s\n", ev->param ? "enable" : "disable");
    4186. 

  4186. -            break;
    4187. 

  4187. -        case BD_EVENT_SECONDARY_VIDEO_SIZE:
    4188. 

  4188. -            printf("EVENT_SECONDARY_VIDEO_SIZE:\t%s\n", ev->param==0 ? "PIP" : "fullscreen");
    4189. 

  4189. -            break;
    4190. 

  4190. -
    4191. 

  4191. -        default:
    4192. 

  4192. -            printf("UNKNOWN EVENT %d:\t%d\n", ev->event, ev->param);
    4193. 

  4193. -            break;
    4194. 

  4194. -      }
    4195. 

  4195. -
    4196. 

  4196. -      fflush(stdout);
    4197. 

  4197. -}
    4198. 

  4198. -
    4199. 

  4199. -static void _read_to_eof(BLURAY *bd)
    4200. 

  4200. -{
    4201. 

  4201. -    BD_EVENT ev;
    4202. 

  4202. -    int      bytes;
    4203. 

  4203. -    uint64_t total = 0;
    4204. 

  4204. -    uint8_t  buf[6144];
    4205. 

  4205. -
    4206. 

  4206. -    bd_seek(bd, bd_get_title_size(bd) - 6144);
    4207. 

  4207. -
    4208. 

  4208. -    do {
    4209. 

  4209. -        bytes = bd_read_ext(bd, buf, 6144, &ev);
    4210. 

  4210. -        total += bytes < 0 ? 0 : bytes;
    4211. 

  4211. -        _print_event(&ev);
    4212. 

  4212. -    } while (bytes > 0);
    4213. 

  4213. -
    4214. 

  4214. -    printf("_read_to_eof(): read %"PRIu64" bytes\n", total);
    4215. 

  4215. -}
    4216. 

  4216. -
    4217. 

  4217. -static void _print_events(BLURAY *bd)
    4218. 

  4218. -{
    4219. 

  4219. -    BD_EVENT ev;
    4220. 

  4220. -
    4221. 

  4221. -    do {
    4222. 

  4222. -        bd_read_ext(bd, NULL, 0, &ev);
    4223. 

  4223. -        _print_event(&ev);
    4224. 

  4224. -    } while (ev.event != BD_EVENT_NONE && ev.event != BD_EVENT_ERROR);
    4225. 

  4225. -}
    4226. 

  4226. -
    4227. 

  4227. -static void _play_pl(BLURAY *bd)
    4228. 

  4228. -{
    4229. 

  4229. -    printf("Playing playlist\n");
    4230. 

  4230. -
    4231. 

  4231. -    fflush(stdout);
    4232. 

  4232. -    _read_to_eof(bd);
    4233. 

  4233. -
    4234. 

  4234. -    printf("Playing playlist done\n\n");
    4235. 

  4235. -
    4236. 

  4236. -    _print_events(bd);
    4237. 

  4237. -
    4238. 

  4238. -    printf("\n");
    4239. 

  4239. -}
    4240. 

  4240. -
    4241. 

  4241. -int main(int argc, char *argv[])
    4242. 

  4242. -{
    4243. 

  4243. -    int title = -1;
    4244. 

  4244. -    int verbose = 0;
    4245. 

  4245. -    int args = 0;
    4246. 

  4246. -
    4247. 

  4247. -    /*
    4248. 

  4248. -     * parse arguments
    4249. 

  4249. -     */
    4250. 

  4250. -
    4251. 

  4251. -    if (argc < 2) {
    4252. 

  4252. -        printf("\nUsage:\n   %s [-v] [-t <title>] <media_path> [<keyfile_path>]\n\n", argv[0]);
    4253. 

  4253. -        return -1;
    4254. 

  4254. -    }
    4255. 

  4255. -
    4256. 

  4256. -    if (!strcmp(argv[1+args], "-v")) {
    4257. 

  4257. -        verbose = 1;
    4258. 

  4258. -        args++;
    4259. 

  4259. -    }
    4260. 

  4260. -
    4261. 

  4261. -    if (!strcmp(argv[1+args], "-t")) {
    4262. 

  4262. -        args++;
    4263. 

  4263. -        title = atoi(argv[1+args]);
    4264. 

  4264. -        args++;
    4265. 

  4265. -        printf("Requested title %d\n", title);
    4266. 

  4266. -    }
    4267. 

  4267. -
    4268. 

  4268. -    if (verbose) {
    4269. 

  4269. -        printf("Enabling verbose debug\n");
    4270. 

  4270. -        bd_set_debug_mask(bd_get_debug_mask() | DBG_HDMV | DBG_BLURAY);
    4271. 

  4271. -    }
    4272. 

  4272. -
    4273. 

  4273. -    printf("\n");
    4274. 

  4274. -
    4275. 

  4275. -    /*
    4276. 

  4276. -     * open and setup
    4277. 

  4277. -     */
    4278. 

  4278. -
    4279. 

  4279. -    BLURAY  *bd = bd_open(argv[1+args], argv[2+args]);
    4280. 

  4280. -
    4281. 

  4281. -    if (!bd) {
    4282. 

  4282. -        printf("bd_open(\'%s\') failed\n", argv[1]);
    4283. 

  4283. -        return -1;
    4284. 

  4284. -    }
    4285. 

  4285. -
    4286. 

  4286. -    bd_set_player_setting    (bd, BLURAY_PLAYER_SETTING_PARENTAL,     99);
    4287. 

  4287. -    bd_set_player_setting_str(bd, BLURAY_PLAYER_SETTING_AUDIO_LANG,   "eng");
    4288. 

  4288. -    bd_set_player_setting_str(bd, BLURAY_PLAYER_SETTING_PG_LANG,      "eng");
    4289. 

  4289. -    bd_set_player_setting_str(bd, BLURAY_PLAYER_SETTING_MENU_LANG,    "eng");
    4290. 

  4290. -    bd_set_player_setting_str(bd, BLURAY_PLAYER_SETTING_COUNTRY_CODE, NULL);
    4291. 

  4291. -
    4292. 

  4292. -    /*
    4293. 

  4293. -     * play
    4294. 

  4294. -     */
    4295. 

  4295. -
    4296. 

  4296. -    printf("Running first play movie object\n");
    4297. 

  4297. -
    4298. 

  4298. -    fflush(stdout);
    4299. 

  4299. -    bd_play(bd);
    4300. 

  4300. -
    4301. 

  4301. -    _print_events(bd);
    4302. 

  4302. -
    4303. 

  4303. -    printf("\n");
    4304. 

  4304. -
    4305. 

  4305. -    /*
    4306. 

  4306. -     * play title
    4307. 

  4307. -     */
    4308. 

  4308. -
    4309. 

  4309. -    if (title >= 0) {
    4310. 

  4310. -        printf("Playing title %d\n", title);
    4311. 

  4311. -
    4312. 

  4312. -        fflush(stdout);
    4313. 

  4313. -        bd_play_title(bd, title);
    4314. 

  4314. -
    4315. 

  4315. -        _print_events(bd);
    4316. 

  4316. -
    4317. 

  4317. -        printf("\n");
    4318. 

  4318. -    }
    4319. 

  4319. -
    4320. 

  4320. -    /*
    4321. 

  4321. -     * play playlist
    4322. 

  4322. -     */
    4323. 

  4323. -
    4324. 

  4324. -    _play_pl(bd);
    4325. 

  4325. -
    4326. 

  4326. -    _play_pl(bd);
    4327. 

  4327. -
    4328. 

  4328. -    _play_pl(bd);
    4329. 

  4329. -
    4330. 

  4330. -    /*
    4331. 

  4331. -     * clean up
    4332. 

  4332. -     */
    4333. 

  4333. -
    4334. 

  4334. -    bd_close(bd);
    4335. 

  4335. -
    4336. 

  4336. -    return 0;
    4337. 

  4337. -}
    4338. 

  4338. -
    4339. 

  4339. diff --git a/src/examples/list_titles.c b/src/examples/list_titles.c
    4340. 

  4340. index 2e0cae8..768f078 100644
    4341. 

  4341. --- a/src/examples/list_titles.c
    4342. 

  4342. +++ b/src/examples/list_titles.c
    4343. 

  4343. @@ -78,7 +78,10 @@ int main(int argc, char *argv[])
    4344. 

  4344.          _usage(argv[0]);
    4345. 

  4345.      }
    4346. 

  4346.      bd = bd_open(bd_dir, NULL);
    4347. 

  4347. -
    4348. 

  4348. +    if (!bd) {
    4349. 

  4349. +        fprintf(stderr, "bd_open(%s) failed\n", bd_dir);
    4350. 

  4350. +        exit(EXIT_FAILURE);
    4351. 

  4351. +    }
    4352. 

  4352.      count = bd_get_titles(bd, flags, seconds);
    4353. 

  4353.      main_title = bd_get_main_title(bd);
    4354. 

  4354.      if (main_title >= 0) {
    4355. 

  4355. @@ -89,7 +92,7 @@ int main(int argc, char *argv[])
    4356. 

  4356.          BLURAY_TITLE_INFO* ti;
    4357. 

  4357.          ti = bd_get_title_info(bd, ii, 0);
    4358. 

  4358.          printf(
    4359. 

  4359. -       "index: %d duration: %02"PRIu64":%02"PRIu64":%02"PRIu64" chapters: %3d angles: %2u clips: %3u (playlist: %05d.mpls) "
    4360. 

  4360. +       "index: %3d duration: %02"PRIu64":%02"PRIu64":%02"PRIu64" chapters: %3d angles: %2u clips: %3u (playlist: %05d.mpls) "
    4361. 

  4361.         "V:%d A:%-2d PG:%-2d IG:%-2d SV:%d SA:%d\n",
    4362. 

  4362.                ii + 1,
    4363. 

  4363.                (ti->duration / 90000) / (3600),
    4364. 

  4364. diff --git a/src/examples/mobj_dump.c b/src/examples/mobj_dump.c
    4365. 

  4365. deleted file mode 100644
    4366. 

  4366. index 3eaf9f4..0000000
    4367. 

  4367. --- a/src/examples/mobj_dump.c
    4368. 

  4368. +++ /dev/null
    4369. 

  4369. @@ -1,83 +0,0 @@
    4370. 

  4370. -/*
    4371. 

  4371. - * This file is part of libbluray
    4372. 

  4372. - * Copyright (C) 2010  hpi1
    4373. 

  4373. - *
    4374. 

  4374. - * This library is free software; you can redistribute it and/or
    4375. 

  4375. - * modify it under the terms of the GNU Lesser General Public
    4376. 

  4376. - * License as published by the Free Software Foundation; either
    4377. 

  4377. - * version 2.1 of the License, or (at your option) any later version.
    4378. 

  4378. - *
    4379. 

  4379. - * This library is distributed in the hope that it will be useful,
    4380. 

  4380. - * but WITHOUT ANY WARRANTY; without even the implied warranty of
    4381. 

  4381. - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    4382. 

  4382. - * Lesser General Public License for more details.
    4383. 

  4383. - *
    4384. 

  4384. - * You should have received a copy of the GNU Lesser General Public
    4385. 

  4385. - * License along with this library. If not, see
    4386. 

  4386. - * <http://www.gnu.org/licenses/>.
    4387. 

  4387. - */
    4388. 

  4388. -
    4389. 

  4389. -#include "libbluray/bluray.h"
    4390. 

  4390. -
    4391. 

  4391. -#include "libbluray/hdmv/mobj_data.h"
    4392. 

  4392. -#include "libbluray/hdmv/mobj_print.h"
    4393. 

  4393. -
    4394. 

  4394. -#include <stdio.h>
    4395. 

  4395. -#include <string.h>
    4396. 

  4396. -
    4397. 

  4397. -static void _mobj_print(MOBJ_OBJECTS *objects, int disasm)
    4398. 

  4398. -{
    4399. 

  4399. -    int o, c;
    4400. 

  4400. -
    4401. 

  4401. -    printf("Number of objects: %d\n", objects->num_objects);
    4402. 

  4402. -
    4403. 

  4403. -    for (o = 0; o < objects->num_objects; o++) {
    4404. 

  4404. -
    4405. 

  4405. -        printf("Object %d:\n"
    4406. 

  4406. -               "  number of commands:    %d\n"
    4407. 

  4407. -               "  resume intention flag: %d\n"
    4408. 

  4408. -               "  menu call mask:        %d\n"
    4409. 

  4409. -               "  title search mask:     %d\n",
    4410. 

  4410. -               o, objects->objects[o].num_cmds,
    4411. 

  4411. -               objects->objects[o].resume_intention_flag,
    4412. 

  4412. -               objects->objects[o].menu_call_mask,
    4413. 

  4413. -               objects->objects[o].title_search_mask);
    4414. 

  4414. -
    4415. 

  4415. -            if (disasm) {
    4416. 

  4416. -                printf("  program:\n");
    4417. 

  4417. -                for (c = 0; c < objects->objects[o].num_cmds; c++) {
    4418. 

  4418. -                    char buf[256];
    4419. 

  4419. -                    mobj_sprint_cmd(buf, &objects->objects[o].cmds[c]);
    4420. 

  4420. -                    printf("    %04d: %s\n", c, buf);
    4421. 

  4421. -                }
    4422. 

  4422. -            }
    4423. 

  4423. -    }
    4424. 

  4424. -}
    4425. 

  4425. -
    4426. 

  4426. -int main(int argc, const char *argv[])
    4427. 

  4427. -{
    4428. 

  4428. -    int           disasm = 0;
    4429. 

  4429. -    MOBJ_OBJECTS *mobj = NULL;
    4430. 

  4430. -
    4431. 

  4431. -    if (argc < 2) {
    4432. 

  4432. -        fprintf(stderr,
    4433. 

  4433. -                "usage: %s [-d] <file>\n"
    4434. 

  4434. -                "Options:\n"
    4435. 

  4435. -                "    d         disassemble object code\n",
    4436. 

  4436. -                argv[0]);
    4437. 

  4437. -        return 1;
    4438. 

  4438. -    }
    4439. 

  4439. -    if (argc > 2) {
    4440. 

  4440. -        disasm = !strcmp(argv[1], "-d");
    4441. 

  4441. -    }
    4442. 

  4442. -
    4443. 

  4443. -    mobj = bd_read_mobj(argv[argc-1]);
    4444. 

  4444. -
    4445. 

  4445. -    if (mobj) {
    4446. 

  4446. -        _mobj_print(mobj, disasm);
    4447. 

  4447. -
    4448. 

  4448. -        bd_free_mobj(mobj);
    4449. 

  4449. -    }
    4450. 

  4450. -
    4451. 

  4451. -    return 0;
    4452. 

  4452. -}
    4453. 

  4453. diff --git a/src/examples/mpls_dump.c b/src/examples/mpls_dump.c
    4454. 

  4454. deleted file mode 100644
    4455. 

  4455. index 619b6b2..0000000
    4456. 

  4456. --- a/src/examples/mpls_dump.c
    4457. 

  4457. +++ /dev/null
    4458. 

  4458. @@ -1,797 +0,0 @@
    4459. 

  4459. -/*
    4460. 

  4460. - * This file is part of libbluray
    4461. 

  4461. - * Copyright (C) 2009-2010  John Stebbins
    4462. 

  4462. - *
    4463. 

  4463. - * This library is free software; you can redistribute it and/or
    4464. 

  4464. - * modify it under the terms of the GNU Lesser General Public
    4465. 

  4465. - * License as published by the Free Software Foundation; either
    4466. 

  4466. - * version 2.1 of the License, or (at your option) any later version.
    4467. 

  4467. - *
    4468. 

  4468. - * This library is distributed in the hope that it will be useful,
    4469. 

  4469. - * but WITHOUT ANY WARRANTY; without even the implied warranty of
    4470. 

  4470. - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    4471. 

  4471. - * Lesser General Public License for more details.
    4472. 

  4472. - *
    4473. 

  4473. - * You should have received a copy of the GNU Lesser General Public
    4474. 

  4474. - * License along with this library. If not, see
    4475. 

  4475. - * <http://www.gnu.org/licenses/>.
    4476. 

  4476. - */
    4477. 

  4477. -
    4478. 

  4478. -#include <sys/stat.h>
    4479. 

  4479. -#include <dirent.h>
    4480. 

  4480. -#include <stdio.h>
    4481. 

  4481. -#include <stdlib.h>
    4482. 

  4482. -#include <unistd.h>
    4483. 

  4483. -#include <string.h>
    4484. 

  4484. -#include <libgen.h>
    4485. 

  4485. -
    4486. 

  4486. -#include "libbluray/bdnav/mpls_parse.h"
    4487. 

  4487. -#include "libbluray/bluray.h"
    4488. 

  4488. -
    4489. 

  4489. -#include "util.h"
    4490. 

  4490. -
    4491. 

  4491. -#ifdef _WIN32
    4492. 

  4492. -# define DIR_SEP "\\"
    4493. 

  4493. -# define PLAYLIST_DIR "\\BDMV\\PLAYLIST"
    4494. 

  4494. -#else
    4495. 

  4495. -# define DIR_SEP "/"
    4496. 

  4496. -# define PLAYLIST_DIR "/BDMV/PLAYLIST"
    4497. 

  4497. -#endif
    4498. 

  4498. -
    4499. 

  4499. -
    4500. 

  4500. -static int verbose;
    4501. 

  4501. -
    4502. 

  4502. -typedef struct {
    4503. 

  4503. -    int value;
    4504. 

  4504. -    const char *str;
    4505. 

  4505. -} VALUE_MAP;
    4506. 

  4506. -
    4507. 

  4507. -const VALUE_MAP codec_map[] = {
    4508. 

  4508. -    {0x01, "MPEG-1 Video"},
    4509. 

  4509. -    {0x02, "MPEG-2 Video"},
    4510. 

  4510. -    {0x03, "MPEG-1 Audio"},
    4511. 

  4511. -    {0x04, "MPEG-2 Audio"},
    4512. 

  4512. -    {0x80, "LPCM"},
    4513. 

  4513. -    {0x81, "AC-3"},
    4514. 

  4514. -    {0x82, "DTS"},
    4515. 

  4515. -    {0x83, "TrueHD"},
    4516. 

  4516. -    {0x84, "AC-3 Plus"},
    4517. 

  4517. -    {0x85, "DTS-HD"},
    4518. 

  4518. -    {0x86, "DTS-HD Master"},
    4519. 

  4519. -    {0xa1, "AC-3 Plus for secondary audio"},
    4520. 

  4520. -    {0xa2, "DTS-HD for secondary audio"},
    4521. 

  4521. -    {0xea, "VC-1"},
    4522. 

  4522. -    {0x1b, "H.264"},
    4523. 

  4523. -    {0x90, "Presentation Graphics"},
    4524. 

  4524. -    {0x91, "Interactive Graphics"},
    4525. 

  4525. -    {0x92, "Text Subtitle"},
    4526. 

  4526. -    {0, NULL}
    4527. 

  4527. -};
    4528. 

  4528. -
    4529. 

  4529. -const VALUE_MAP video_format_map[] = {
    4530. 

  4530. -    {0, "Reserved"},
    4531. 

  4531. -    {1, "480i"},
    4532. 

  4532. -    {2, "576i"},
    4533. 

  4533. -    {3, "480p"},
    4534. 

  4534. -    {4, "1080i"},
    4535. 

  4535. -    {5, "720p"},
    4536. 

  4536. -    {6, "1080p"},
    4537. 

  4537. -    {7, "576p"},
    4538. 

  4538. -    {0, NULL}
    4539. 

  4539. -};
    4540. 

  4540. -
    4541. 

  4541. -const VALUE_MAP video_rate_map[] = {
    4542. 

  4542. -    {0, "Reserved1"},
    4543. 

  4543. -    {1, "23.976"},
    4544. 

  4544. -    {2, "24"},
    4545. 

  4545. -    {3, "25"},
    4546. 

  4546. -    {4, "29.97"},
    4547. 

  4547. -    {5, "Reserved2"},
    4548. 

  4548. -    {6, "50"},
    4549. 

  4549. -    {7, "59.94"},
    4550. 

  4550. -    {0, NULL}
    4551. 

  4551. -};
    4552. 

  4552. -
    4553. 

  4553. -const VALUE_MAP audio_format_map[] = {
    4554. 

  4554. -    {0, "Reserved1"},
    4555. 

  4555. -    {1, "Mono"},
    4556. 

  4556. -    {2, "Reserved2"},
    4557. 

  4557. -    {3, "Stereo"},
    4558. 

  4558. -    {4, "Reserved3"},
    4559. 

  4559. -    {5, "Reserved4"},
    4560. 

  4560. -    {6, "Multi Channel"},
    4561. 

  4561. -    {12, "Combo"},
    4562. 

  4562. -    {0, NULL}
    4563. 

  4563. -};
    4564. 

  4564. -
    4565. 

  4565. -const VALUE_MAP audio_rate_map[] = {
    4566. 

  4566. -    {0, "Reserved1"},
    4567. 

  4567. -    {1, "48 Khz"},
    4568. 

  4568. -    {2, "Reserved2"},
    4569. 

  4569. -    {3, "Reserved3"},
    4570. 

  4570. -    {4, "96 Khz"},
    4571. 

  4571. -    {5, "192 Khz"},
    4572. 

  4572. -    {12, "48/192 Khz"},
    4573. 

  4573. -    {14, "48/96 Khz"},
    4574. 

  4574. -    {0, NULL}
    4575. 

  4575. -};
    4576. 

  4576. -
    4577. 

  4577. -const VALUE_MAP subpath_type_map[] = {
    4578. 

  4578. -  {2, "Primary audio of the Browsable slideshow"},
    4579. 

  4579. -  {3, "Interactive Graphics presentation menu"},
    4580. 

  4580. -  {4, "Text Subtitle"},
    4581. 

  4581. -  {5, "Out-of-mux Synchronous elementary streams"},
    4582. 

  4582. -  {6, "Out-of-mux Asynchronous Picture-in-Picture presentation"},
    4583. 

  4583. -  {7, "In-mux Synchronous Picture-in-Picture presentation"},
    4584. 

  4584. -  {8, "SS Video"},
    4585. 

  4585. -  {0,NULL}
    4586. 

  4586. -};
    4587. 

  4587. -
    4588. 

  4588. -const VALUE_MAP playback_type_map[] = {
    4589. 

  4589. -  {1, "Sequential"},
    4590. 

  4590. -  {2, "Random"},
    4591. 

  4591. -  {3, "Shuffle"},
    4592. 

  4592. -  {0, NULL}
    4593. 

  4593. -};
    4594. 

  4594. -
    4595. 

  4595. -const VALUE_MAP connection_type_map[] = {
    4596. 

  4596. -  {1, "Non-seamless"},
    4597. 

  4597. -  {5, "Seamless"},
    4598. 

  4598. -  {6, "Seamless"},
    4599. 

  4599. -  {0, NULL}
    4600. 

  4600. -};
    4601. 

  4601. -
    4602. 

  4602. -static const char*
    4603. 

  4603. -_lookup_str(const VALUE_MAP *map, int val)
    4604. 

  4604. -{
    4605. 

  4605. -    int ii;
    4606. 

  4606. -
    4607. 

  4607. -    for (ii = 0; map[ii].str; ii++) {
    4608. 

  4608. -        if (val == map[ii].value) {
    4609. 

  4609. -            return map[ii].str;
    4610. 

  4610. -        }
    4611. 

  4611. -    }
    4612. 

  4612. -    return "?";
    4613. 

  4613. -}
    4614. 

  4614. -
    4615. 

  4615. -static char *
    4616. 

  4616. -_mk_path(const char *base, const char *sub)
    4617. 

  4617. -{
    4618. 

  4618. -    size_t n1 = strlen(base);
    4619. 

  4619. -    size_t n2 = strlen(sub);
    4620. 

  4620. -    char *result = (char*)malloc(n1 + n2 + strlen(DIR_SEP) + 1);
    4621. 

  4621. -    strcpy(result, base);
    4622. 

  4622. -    strcat(result, DIR_SEP);
    4623. 

  4623. -    strcat(result, sub);
    4624. 

  4624. -
    4625. 

  4625. -    return result;
    4626. 

  4626. -}
    4627. 

  4627. -
    4628. 

  4628. -static void
    4629. 

  4629. -_show_stream(MPLS_STREAM *ss, int level)
    4630. 

  4630. -{
    4631. 

  4631. -    indent_printf(level, "Codec (%04x): %s", ss->coding_type,
    4632. 

  4632. -                    _lookup_str(codec_map, ss->coding_type));
    4633. 

  4633. -    switch (ss->stream_type) {
    4634. 

  4634. -        case 1:
    4635. 

  4635. -            indent_printf(level, "PID: %04x", ss->pid);
    4636. 

  4636. -            break;
    4637. 

  4637. -
    4638. 

  4638. -        case 2:
    4639. 

  4639. -        case 4:
    4640. 

  4640. -            indent_printf(level, "SubPath Id: %02x", ss->subpath_id);
    4641. 

  4641. -            indent_printf(level, "SubClip Id: %02x", ss->subclip_id);
    4642. 

  4642. -            indent_printf(level, "PID: %04x", ss->pid);
    4643. 

  4643. -            break;
    4644. 

  4644. -
    4645. 

  4645. -        case 3:
    4646. 

  4646. -            indent_printf(level, "SubPath Id: %02x", ss->subpath_id);
    4647. 

  4647. -            indent_printf(level, "PID: %04x", ss->pid);
    4648. 

  4648. -            break;
    4649. 

  4649. -
    4650. 

  4650. -        default:
    4651. 

  4651. -            fprintf(stderr, "unrecognized stream type %02x\n", ss->stream_type);
    4652. 

  4652. -            break;
    4653. 

  4653. -    };
    4654. 

  4654. -
    4655. 

  4655. -    switch (ss->coding_type) {
    4656. 

  4656. -        case 0x01:
    4657. 

  4657. -        case 0x02:
    4658. 

  4658. -        case 0xea:
    4659. 

  4659. -        case 0x1b:
    4660. 

  4660. -            indent_printf(level, "Format %02x: %s", ss->format,
    4661. 

  4661. -                        _lookup_str(video_format_map, ss->format));
    4662. 

  4662. -            indent_printf(level, "Rate %02x: %s", ss->rate,
    4663. 

  4663. -                        _lookup_str(video_rate_map, ss->rate));
    4664. 

  4664. -            break;
    4665. 

  4665. -
    4666. 

  4666. -        case 0x03:
    4667. 

  4667. -        case 0x04:
    4668. 

  4668. -        case 0x80:
    4669. 

  4669. -        case 0x81:
    4670. 

  4670. -        case 0x82:
    4671. 

  4671. -        case 0x83:
    4672. 

  4672. -        case 0x84:
    4673. 

  4673. -        case 0x85:
    4674. 

  4674. -        case 0x86:
    4675. 

  4675. -        case 0xa1:
    4676. 

  4676. -        case 0xa2:
    4677. 

  4677. -            indent_printf(level, "Format %02x: %s", ss->format,
    4678. 

  4678. -                        _lookup_str(audio_format_map, ss->format));
    4679. 

  4679. -            indent_printf(level, "Rate %02x: %s", ss->rate,
    4680. 

  4680. -                        _lookup_str(audio_rate_map, ss->rate));
    4681. 

  4681. -            indent_printf(level, "Language: %s", ss->lang);
    4682. 

  4682. -            break;
    4683. 

  4683. -
    4684. 

  4684. -        case 0x90:
    4685. 

  4685. -        case 0x91:
    4686. 

  4686. -            indent_printf(level, "Language: %s", ss->lang);
    4687. 

  4687. -            break;
    4688. 

  4688. -
    4689. 

  4689. -        case 0x92:
    4690. 

  4690. -            indent_printf(level, "Char Code: %02x", ss->char_code);
    4691. 

  4691. -            indent_printf(level, "Language: %s", ss->lang);
    4692. 

  4692. -            break;
    4693. 

  4693. -
    4694. 

  4694. -        default:
    4695. 

  4695. -            fprintf(stderr, "unrecognized coding type %02x\n", ss->coding_type);
    4696. 

  4696. -            break;
    4697. 

  4697. -    };
    4698. 

  4698. -}
    4699. 

  4699. -
    4700. 

  4700. -static void
    4701. 

  4701. -_show_details(MPLS_PL *pl, int level)
    4702. 

  4702. -{
    4703. 

  4703. -    int ii, jj, kk;
    4704. 

  4704. -
    4705. 

  4705. -    for (ii = 0; ii < pl->list_count; ii++) {
    4706. 

  4706. -        MPLS_PI *pi;
    4707. 

  4707. -
    4708. 

  4708. -        pi = &pl->play_item[ii];
    4709. 

  4709. -        indent_printf(level, "Clip Id %s", pi->clip[0].clip_id);
    4710. 

  4710. -        indent_printf(level+1, "Stc Id: %02x", pi->clip[0].stc_id);
    4711. 

  4711. -        indent_printf(level+1, "Connection Condition: %s (%02x)",
    4712. 

  4712. -                      _lookup_str(connection_type_map, pi->connection_condition),
    4713. 

  4713. -                      pi->connection_condition);
    4714. 

  4714. -        indent_printf(level+1, "In-Time: %d", pi->in_time);
    4715. 

  4715. -        indent_printf(level+1, "Out-Time: %d", pi->out_time);
    4716. 

  4716. -        if (pi->still_mode == 1) {
    4717. 

  4717. -            indent_printf(level+1, "Still time: %ds\n", pi->still_time);
    4718. 

  4718. -        }
    4719. 

  4719. -        if (pi->still_mode == 2) {
    4720. 

  4720. -            indent_printf(level+1, "Still time: infinite\n");
    4721. 

  4721. -        }
    4722. 

  4722. -        if (pi->angle_count > 1) {
    4723. 

  4723. -            for (jj = 1; jj < pi->angle_count; jj++) {
    4724. 

  4724. -                indent_printf(level+1, "Angle %d:", jj);
    4725. 

  4725. -                indent_printf(level+2, "Clip Id %s", pi->clip[jj].clip_id);
    4726. 

  4726. -                indent_printf(level+2, "Stc Id: %02x", pi->clip[jj].stc_id);
    4727. 

  4727. -            }
    4728. 

  4728. -        }
    4729. 

  4729. -        for (jj = 0; jj < pi->stn.num_video; jj++) {
    4730. 

  4730. -            indent_printf(level+1, "Video Stream %d:", jj);
    4731. 

  4731. -            _show_stream(&pi->stn.video[jj], level + 2);
    4732. 

  4732. -        }
    4733. 

  4733. -        for (jj = 0; jj < pi->stn.num_audio; jj++) {
    4734. 

  4734. -            indent_printf(level+1, "Audio Stream %d:", jj);
    4735. 

  4735. -            _show_stream(&pi->stn.audio[jj], level + 2);
    4736. 

  4736. -        }
    4737. 

  4737. -        for (jj = 0; jj < pi->stn.num_ig; jj++) {
    4738. 

  4738. -            indent_printf(level+1, "Interactive Graphics Stream %d:", jj);
    4739. 

  4739. -            _show_stream(&pi->stn.ig[jj], level + 2);
    4740. 

  4740. -        }
    4741. 

  4741. -        for (jj = 0; jj < (pi->stn.num_pg + pi->stn.num_pip_pg); jj++) {
    4742. 

  4742. -            if (jj < pi->stn.num_pg) {
    4743. 

  4743. -               indent_printf(level+1, "Presentation Graphics Stream %d:", jj);
    4744. 

  4744. -            } else {
    4745. 

  4745. -                indent_printf(level+1, "PIP Presentation Graphics Stream %d:", jj);
    4746. 

  4746. -            }
    4747. 

  4747. -            _show_stream(&pi->stn.pg[jj], level + 2);
    4748. 

  4748. -        }
    4749. 

  4749. -        for (jj = 0; jj < pi->stn.num_secondary_video; jj++) {
    4750. 

  4750. -            indent_printf(level+1, "Secondary Video Stream %d:", jj);
    4751. 

  4751. -            _show_stream(&pi->stn.secondary_video[jj], level + 2);
    4752. 

  4752. -            for (kk = 0; kk < pi->stn.secondary_video[jj].sv_num_secondary_audio_ref; kk++) {
    4753. 

  4753. -                indent_printf(level+2, "Secondary Audio Ref %d: %d", kk,pi->stn.secondary_video[jj].sv_secondary_audio_ref[kk]);
    4754. 

  4754. -            }
    4755. 

  4755. -            for (kk = 0; kk < pi->stn.secondary_video[jj].sv_num_pip_pg_ref; kk++) {
    4756. 

  4756. -                indent_printf(level+2, "PIP Presentation Graphic Ref %d: %d", kk,pi->stn.secondary_video[jj].sv_pip_pg_ref[kk]);
    4757. 

  4757. -            }
    4758. 

  4758. -        }
    4759. 

  4759. -        for (jj = 0; jj < pi->stn.num_secondary_audio; jj++) {
    4760. 

  4760. -            indent_printf(level+1, "Secondary Audio Stream %d:", jj);
    4761. 

  4761. -            _show_stream(&pi->stn.secondary_audio[jj], level + 2);
    4762. 

  4762. -            for (kk = 0; kk < pi->stn.secondary_audio[jj].sa_num_primary_audio_ref; kk++) {
    4763. 

  4763. -                indent_printf(level+2, "Primary Audio Ref %d: %d", kk,pi->stn.secondary_audio[jj].sa_primary_audio_ref[kk]);
    4764. 

  4764. -            }
    4765. 

  4765. -        }
    4766. 

  4766. -        printf("\n");
    4767. 

  4767. -    }
    4768. 

  4768. -}
    4769. 

  4769. -
    4770. 

  4770. -static void
    4771. 

  4771. -_show_ai(MPLS_PL *pl, int level)
    4772. 

  4772. -{
    4773. 

  4773. -    indent_printf(level, "Playback type: %s (%d)",
    4774. 

  4774. -                  _lookup_str(playback_type_map, pl->app_info.playback_type),
    4775. 

  4775. -                  pl->app_info.playback_type);
    4776. 

  4776. -    if (pl->app_info.playback_type == 2 || pl->app_info.playback_type == 3) {
    4777. 

  4777. -        indent_printf(level+1, "Playback count: %d", pl->app_info.playback_count);
    4778. 

  4778. -    }
    4779. 

  4779. -}
    4780. 

  4780. -
    4781. 

  4781. -static void
    4782. 

  4782. -_show_marks(MPLS_PL *pl, int level)
    4783. 

  4783. -{
    4784. 

  4784. -    int ii;
    4785. 

  4785. -
    4786. 

  4786. -    indent_printf(level, "PlayMark Count %d", pl->mark_count);
    4787. 

  4787. -    for (ii = 0; ii < pl->mark_count; ii++) {
    4788. 

  4788. -        MPLS_PI *pi;
    4789. 

  4789. -        MPLS_PLM *plm;
    4790. 

  4790. -        int min;
    4791. 

  4791. -        double sec;
    4792. 

  4792. -
    4793. 

  4793. -        plm = &pl->play_mark[ii];
    4794. 

  4794. -        indent_printf(level, "PlayMark %d", ii);
    4795. 

  4795. -        indent_printf(level+1, "Type: %02x", plm->mark_type);
    4796. 

  4796. -        if (plm->play_item_ref < pl->list_count) {
    4797. 

  4797. -            pi = &pl->play_item[plm->play_item_ref];
    4798. 

  4798. -            indent_printf(level+1, "PlayItem: %s", pi->clip[0].clip_id);
    4799. 

  4799. -        } else {
    4800. 

  4800. -            indent_printf(level+1, "PlayItem: Invalid reference");
    4801. 

  4801. -        }
    4802. 

  4802. -        indent_printf(level+1, "Time (ticks): %u", plm->time);
    4803. 

  4803. -        min = plm->duration / (45000*60);
    4804. 

  4804. -        sec = (double)(plm->duration - min * 45000 * 60) / 45000;
    4805. 

  4805. -        indent_printf(level+1, "Duration (mm:ss.ms, ticks): %d:%.2f, %u",
    4806. 

  4806. -                      min, sec, plm->duration);
    4807. 

  4807. -        printf("\n");
    4808. 

  4808. -    }
    4809. 

  4809. -}
    4810. 

  4810. -
    4811. 

  4811. -static void
    4812. 

  4812. -_show_clip_list(MPLS_PL *pl, int level)
    4813. 

  4813. -{
    4814. 

  4814. -    int ii, jj;
    4815. 

  4815. -
    4816. 

  4816. -    for (ii = 0; ii < pl->list_count; ii++) {
    4817. 

  4817. -        MPLS_PI *pi;
    4818. 

  4818. -
    4819. 

  4819. -        pi = &pl->play_item[ii];
    4820. 

  4820. -        if (verbose) {
    4821. 

  4821. -            uint32_t duration;
    4822. 

  4822. -
    4823. 

  4823. -            duration = pi->out_time - pi->in_time;
    4824. 

  4824. -            indent_printf(level, "%s.m2ts -- Duration: %3d:%02d", 
    4825. 

  4825. -                        pi->clip[0].clip_id,
    4826. 

  4826. -                        duration / (45000 * 60), (duration / 45000) % 60);
    4827. 

  4827. -        } else {
    4828. 

  4828. -            indent_printf(level, "%s.m2ts", pi->clip[0].clip_id);
    4829. 

  4829. -        }
    4830. 

  4830. -        if (pi->angle_count > 1) {
    4831. 

  4831. -            for (jj = 1; jj < pi->angle_count; jj++) {
    4832. 

  4832. -                indent_printf(level+1, "Angle %d: %s.m2ts", jj+1, pi->clip[jj].clip_id);
    4833. 

  4833. -            }
    4834. 

  4834. -        }
    4835. 

  4835. -    }
    4836. 

  4836. -    printf("\n");
    4837. 

  4837. -}
    4838. 

  4838. -
    4839. 

  4839. -static void
    4840. 

  4840. -_show_sub_path(MPLS_SUB *sub, int level)
    4841. 

  4841. -{
    4842. 

  4842. -    int ii;
    4843. 

  4843. -
    4844. 

  4844. -    indent_printf(level+1, "Type: %d (%s)", sub->type, _lookup_str(subpath_type_map, sub->type));
    4845. 

  4845. -    indent_printf(level+1, "Repeat: %d", sub->is_repeat);
    4846. 

  4846. -    indent_printf(level+1, "Sub playitem count: %d", sub->sub_playitem_count);
    4847. 

  4847. -
    4848. 

  4848. -    for (ii = 0; ii < sub->sub_playitem_count; ii++) {
    4849. 

  4849. -        MPLS_SUB_PI *pi;
    4850. 

  4850. -
    4851. 

  4851. -        pi = &sub->sub_play_item[ii];
    4852. 

  4852. -
    4853. 

  4853. -        if (verbose) {
    4854. 

  4854. -            indent_printf(level+1, "Sub playitem %d", ii);
    4855. 

  4855. -            indent_printf(level+2, "Clip Id %s", pi->clip[0].clip_id);
    4856. 

  4856. -            indent_printf(level+2, "Multi clip: %d", pi->is_multi_clip);
    4857. 

  4857. -            indent_printf(level+2, "Clip count: %d", pi->clip_count);
    4858. 

  4858. -            indent_printf(level+2, "Connection Condition: %s (%02x)",
    4859. 

  4859. -                          _lookup_str(connection_type_map, pi->connection_condition),
    4860. 

  4860. -                          pi->connection_condition);
    4861. 

  4861. -            indent_printf(level+2, "In-Time: %d", pi->in_time);
    4862. 

  4862. -            indent_printf(level+2, "Out-Time: %d", pi->out_time);
    4863. 

  4863. -            indent_printf(level+2, "Sync playitem Id: %d", pi->sync_play_item_id);
    4864. 

  4864. -            indent_printf(level+2, "Sync PTS: %d", pi->sync_pts);
    4865. 

  4865. -        } else {
    4866. 

  4866. -            indent_printf(level+1, "%s.m2ts", pi->clip[0].clip_id);
    4867. 

  4867. -        }
    4868. 

  4868. -    }
    4869. 

  4869. -}
    4870. 

  4870. -
    4871. 

  4871. -static void
    4872. 

  4872. -_show_pip_metadata_block(MPLS_PIP_METADATA *block, int level)
    4873. 

  4873. -{
    4874. 

  4874. -    int ii;
    4875. 

  4875. -
    4876. 

  4876. -    indent_printf(level, "Clip ref: %d", block->clip_ref);
    4877. 

  4877. -    indent_printf(level, "Secondary video ref: %d", block->secondary_video_ref);
    4878. 

  4878. -    indent_printf(level, "Timeline type: %d", block->timeline_type);
    4879. 

  4879. -    indent_printf(level, "Luma key flag: %d", block->luma_key_flag);
    4880. 

  4880. -    if (block->luma_key_flag) {
    4881. 

  4881. -        indent_printf(level, "Upper limit luma key: %d", block->upper_limit_luma_key);
    4882. 

  4882. -    }
    4883. 

  4883. -    indent_printf(level, "Trick play flag: %d", block->trick_play_flag);
    4884. 

  4884. -
    4885. 

  4885. -    for (ii = 0; ii < block->data_count; ii++) {
    4886. 

  4886. -        indent_printf(level, "data block %d:", ii);
    4887. 

  4887. -        indent_printf(level+1, "Timestamp: %d", block->data[ii].time);
    4888. 

  4888. -        indent_printf(level+1, "Horizontal position %d", block->data[ii].xpos);
    4889. 

  4889. -        indent_printf(level+1, "Vertical position: %d", block->data[ii].ypos);
    4890. 

  4890. -        indent_printf(level+1, "Scaling factor: %d", block->data[ii].scale_factor);
    4891. 

  4891. -    }
    4892. 

  4892. -}
    4893. 

  4893. -
    4894. 

  4894. -static void
    4895. 

  4895. -_show_pip_metadata(MPLS_PL *pl, int level)
    4896. 

  4896. -{
    4897. 

  4897. -    int ii;
    4898. 

  4898. -
    4899. 

  4899. -    for (ii = 0; ii < pl->ext_pip_data_count; ii++) {
    4900. 

  4900. -        MPLS_PIP_METADATA *data;
    4901. 

  4901. -
    4902. 

  4902. -        data = &pl->ext_pip_data[ii];
    4903. 

  4903. -
    4904. 

  4904. -        indent_printf(level, "PiP metadata block %d:", ii);
    4905. 

  4905. -        _show_pip_metadata_block(data, level+1);
    4906. 

  4906. -    }
    4907. 

  4907. -}
    4908. 

  4908. -
    4909. 

  4909. -static void
    4910. 

  4910. -_show_sub_paths(MPLS_PL *pl, int level)
    4911. 

  4911. -{
    4912. 

  4912. -    int ss;
    4913. 

  4913. -
    4914. 

  4914. -    for (ss = 0; ss < pl->sub_count; ss++) {
    4915. 

  4915. -        MPLS_SUB *sub;
    4916. 

  4916. -
    4917. 

  4917. -        sub = &pl->sub_path[ss];
    4918. 

  4918. -
    4919. 

  4919. -        indent_printf(level, "Sub Path %d:", ss);
    4920. 

  4920. -        _show_sub_path(sub, level+1);
    4921. 

  4921. -    }
    4922. 

  4922. -}
    4923. 

  4923. -
    4924. 

  4924. -static void
    4925. 

  4925. -_show_sub_paths_ss(MPLS_PL *pl, int level)
    4926. 

  4926. -{
    4927. 

  4927. -    int ss;
    4928. 

  4928. -
    4929. 

  4929. -    for (ss = 0; ss < pl->ext_sub_count; ss++) {
    4930. 

  4930. -        MPLS_SUB *sub;
    4931. 

  4931. -
    4932. 

  4932. -        sub = &pl->ext_sub_path[ss];
    4933. 

  4933. -
    4934. 

  4934. -        indent_printf(level, "Extension Sub Path %d:", ss);
    4935. 

  4935. -        _show_sub_path(sub, level+1);
    4936. 

  4936. -    }
    4937. 

  4937. -}
    4938. 

  4938. -
    4939. 

  4939. -static uint32_t
    4940. 

  4940. -_pl_duration(MPLS_PL *pl)
    4941. 

  4941. -{
    4942. 

  4942. -    int ii;
    4943. 

  4943. -    uint32_t duration = 0;
    4944. 

  4944. -    MPLS_PI *pi;
    4945. 

  4945. -
    4946. 

  4946. -    for (ii = 0; ii < pl->list_count; ii++) {
    4947. 

  4947. -        pi = &pl->play_item[ii];
    4948. 

  4948. -        duration += pi->out_time - pi->in_time;
    4949. 

  4949. -    }
    4950. 

  4950. -    return duration;
    4951. 

  4951. -}
    4952. 

  4952. -
    4953. 

  4953. -static int
    4954. 

  4954. -_filter_dup(MPLS_PL *pl_list[], int count, MPLS_PL *pl)
    4955. 

  4955. -{
    4956. 

  4956. -    int ii, jj;
    4957. 

  4957. -
    4958. 

  4958. -    for (ii = 0; ii < count; ii++) {
    4959. 

  4959. -        if (pl->list_count != pl_list[ii]->list_count ||
    4960. 

  4960. -            _pl_duration(pl) != _pl_duration(pl_list[ii])) {
    4961. 

  4961. -            continue;
    4962. 

  4962. -        }
    4963. 

  4963. -        for (jj = 0; jj < pl->list_count; jj++) {
    4964. 

  4964. -            MPLS_PI *pi1, *pi2;
    4965. 

  4965. -
    4966. 

  4966. -            pi1 = &pl->play_item[jj];
    4967. 

  4967. -            pi2 = &pl_list[ii]->play_item[jj];
    4968. 

  4968. -
    4969. 

  4969. -            if (memcmp(pi1->clip[0].clip_id, pi2->clip[0].clip_id, 5) != 0 ||
    4970. 

  4970. -                pi1->in_time != pi2->in_time ||
    4971. 

  4971. -                pi1->out_time != pi2->out_time) {
    4972. 

  4972. -                break;
    4973. 

  4973. -            }
    4974. 

  4974. -        }
    4975. 

  4975. -        if (jj != pl->list_count) {
    4976. 

  4976. -            continue;
    4977. 

  4977. -        }
    4978. 

  4978. -        return 0;
    4979. 

  4979. -    }
    4980. 

  4980. -    return 1;
    4981. 

  4981. -}
    4982. 

  4982. -
    4983. 

  4983. -static int
    4984. 

  4984. -_find_repeats(MPLS_PL *pl, const char *m2ts)
    4985. 

  4985. -{
    4986. 

  4986. -    int ii, count = 0;
    4987. 

  4987. -
    4988. 

  4988. -    for (ii = 0; ii < pl->list_count; ii++) {
    4989. 

  4989. -        MPLS_PI *pi;
    4990. 

  4990. -
    4991. 

  4991. -        pi = &pl->play_item[ii];
    4992. 

  4992. -        // Ignore titles with repeated segments
    4993. 

  4993. -        if (strcmp(pi->clip[0].clip_id, m2ts) == 0) {
    4994. 

  4994. -            count++;
    4995. 

  4995. -        }
    4996. 

  4996. -    }
    4997. 

  4997. -    return count;
    4998. 

  4998. -}
    4999. 

  4999. -
    5000. 

  5000. -static int
    5001. 

  5001. -_filter_short(MPLS_PL *pl, unsigned int seconds)
    5002. 

  5002. -{
    5003. 

  5003. -    // Ignore short playlists
    5004. 

  5004. -    if (_pl_duration(pl) / 45000 <= seconds) {
    5005. 

  5005. -        return 0;
    5006. 

  5006. -    }
    5007. 

  5007. -    return 1;
    5008. 

  5008. -}
    5009. 

  5009. -
    5010. 

  5010. -static int
    5011. 

  5011. -_filter_repeats(MPLS_PL *pl, int repeats)
    5012. 

  5012. -{
    5013. 

  5013. -    int ii;
    5014. 

  5014. -
    5015. 

  5015. -    for (ii = 0; ii < pl->list_count; ii++) {
    5016. 

  5016. -        MPLS_PI *pi;
    5017. 

  5017. -
    5018. 

  5018. -        pi = &pl->play_item[ii];
    5019. 

  5019. -        // Ignore titles with repeated segments
    5020. 

  5020. -        if (_find_repeats(pl, pi->clip[0].clip_id) > repeats) {
    5021. 

  5021. -            return 0;
    5022. 

  5022. -        }
    5023. 

  5023. -    }
    5024. 

  5024. -    return 1;
    5025. 

  5025. -}
    5026. 

  5026. -
    5027. 

  5027. -static int clip_list = 0, playlist_info = 0, chapter_marks = 0, sub_paths = 0, pip_metadata = 0;
    5028. 

  5028. -static int repeats = 0, seconds = 0, dups = 0;
    5029. 

  5029. -
    5030. 

  5030. -static MPLS_PL*
    5031. 

  5031. -_process_file(char *name, MPLS_PL *pl_list[], int pl_count)
    5032. 

  5032. -{
    5033. 

  5033. -    MPLS_PL *pl;
    5034. 

  5034. -
    5035. 

  5035. -    pl = bd_read_mpls(name);
    5036. 

  5036. -    if (pl == NULL) {
    5037. 

  5037. -        fprintf(stderr, "Parse failed: %s\n", name);
    5038. 

  5038. -        return NULL;
    5039. 

  5039. -    }
    5040. 

  5040. -    if (seconds) {
    5041. 

  5041. -        if (!_filter_short(pl, seconds)) {
    5042. 

  5042. -            bd_free_mpls(pl);
    5043. 

  5043. -            return NULL;
    5044. 

  5044. -        }
    5045. 

  5045. -    }
    5046. 

  5046. -    if (repeats) {
    5047. 

  5047. -        if (!_filter_repeats(pl, repeats)) {
    5048. 

  5048. -            bd_free_mpls(pl);
    5049. 

  5049. -            return NULL;
    5050. 

  5050. -        }
    5051. 

  5051. -    }
    5052. 

  5052. -    if (dups) {
    5053. 

  5053. -        if (!_filter_dup(pl_list, pl_count, pl)) {
    5054. 

  5054. -            bd_free_mpls(pl);
    5055. 

  5055. -            return NULL;
    5056. 

  5056. -        }
    5057. 

  5057. -    }
    5058. 

  5058. -    if (verbose) {
    5059. 

  5059. -        indent_printf(0, 
    5060. 

  5060. -                    "%s -- Num Clips: %3d , Duration: minutes %4u:%02u",
    5061. 

  5061. -                    basename(name),
    5062. 

  5062. -                    pl->list_count,
    5063. 

  5063. -                    _pl_duration(pl) / (45000 * 60),
    5064. 

  5064. -                    (_pl_duration(pl) / 45000) % 60);
    5065. 

  5065. -        _show_ai(pl, 1);
    5066. 

  5066. -    } else {
    5067. 

  5067. -        indent_printf(0, "%s -- Duration: minutes %4u:%02u",
    5068. 

  5068. -                    basename(name),
    5069. 

  5069. -                    _pl_duration(pl) / (45000 * 60),
    5070. 

  5070. -                    (_pl_duration(pl) / 45000) % 60);
    5071. 

  5071. -    }
    5072. 

  5072. -    if (playlist_info) {
    5073. 

  5073. -        _show_details(pl, 1);
    5074. 

  5074. -    }
    5075. 

  5075. -    if (chapter_marks) {
    5076. 

  5076. -        _show_marks(pl, 1);
    5077. 

  5077. -    }
    5078. 

  5078. -    if (pip_metadata) {
    5079. 

  5079. -        _show_pip_metadata(pl, 1);
    5080. 

  5080. -    }
    5081. 

  5081. -    if (clip_list) {
    5082. 

  5082. -        _show_clip_list(pl, 1);
    5083. 

  5083. -    }
    5084. 

  5084. -    if (sub_paths) {
    5085. 

  5085. -        _show_sub_paths(pl, 1);
    5086. 

  5086. -        _show_sub_paths_ss(pl, 1);
    5087. 

  5087. -    }
    5088. 

  5088. -    return pl;
    5089. 

  5089. -}
    5090. 

  5090. -
    5091. 

  5091. -static void
    5092. 

  5092. -_usage(char *cmd)
    5093. 

  5093. -{
    5094. 

  5094. -    fprintf(stderr, 
    5095. 

  5095. -"Usage: %s -vli <mpls file> [<mpls file> ...]\n"
    5096. 

  5096. -"With no options, produces a list of the playlist(s) with durations\n"
    5097. 

  5097. -"Options:\n"
    5098. 

  5098. -"    v             - Verbose output.\n"
    5099. 

  5099. -"    l             - Produces a list of the m2ts clips\n"
    5100. 

  5100. -"    i             - Dumps detailed information about each clip\n"
    5101. 

  5101. -"    c             - Show chapter marks\n"
    5102. 

  5102. -"    p             - Show sub paths\n"
    5103. 

  5103. -"    P             - Show picture-in-picture metadata\n"
    5104. 

  5104. -"    r <N>         - Filter out titles that have >N repeating clips\n"
    5105. 

  5105. -"    d             - Filter out duplicate titles\n"
    5106. 

  5106. -"    s <seconds>   - Filter out short titles\n"
    5107. 

  5107. -"    f             - Filter combination -r2 -d -s900\n"
    5108. 

  5108. -, cmd);
    5109. 

  5109. -
    5110. 

  5110. -    exit(EXIT_FAILURE);
    5111. 

  5111. -}
    5112. 

  5112. -
    5113. 

  5113. -#define OPTS "vlicpPfr:ds:"
    5114. 

  5114. -
    5115. 

  5115. -static int
    5116. 

  5116. -_qsort_str_cmp(const void *a, const void *b)
    5117. 

  5117. -{
    5118. 

  5118. -    const char *stra = *(char * const *)a;
    5119. 

  5119. -    const char *strb = *(char * const *)b;
    5120. 

  5120. -
    5121. 

  5121. -    return strcmp(stra, strb);
    5122. 

  5122. -}
    5123. 

  5123. -
    5124. 

  5124. -int
    5125. 

  5125. -main(int argc, char *argv[])
    5126. 

  5126. -{
    5127. 

  5127. -    MPLS_PL *pl;
    5128. 

  5128. -    int opt;
    5129. 

  5129. -    int ii, pl_ii;
    5130. 

  5130. -    MPLS_PL *pl_list[1000];
    5131. 

  5131. -    struct stat st;
    5132. 

  5132. -    char *path = NULL;
    5133. 

  5133. -    DIR *dir = NULL;
    5134. 

  5134. -
    5135. 

  5135. -    do {
    5136. 

  5136. -        opt = getopt(argc, argv, OPTS);
    5137. 

  5137. -        switch (opt) {
    5138. 

  5138. -            case -1: 
    5139. 

  5139. -                break;
    5140. 

  5140. -
    5141. 

  5141. -            case 'v':
    5142. 

  5142. -                verbose = 1;
    5143. 

  5143. -                break;
    5144. 

  5144. -
    5145. 

  5145. -            case 'l':
    5146. 

  5146. -                clip_list = 1;
    5147. 

  5147. -                break;
    5148. 

  5148. -
    5149. 

  5149. -            case 'i':
    5150. 

  5150. -                playlist_info = 1;
    5151. 

  5151. -                break;
    5152. 

  5152. -
    5153. 

  5153. -            case 'c':
    5154. 

  5154. -                chapter_marks = 1;
    5155. 

  5155. -                break;
    5156. 

  5156. -
    5157. 

  5157. -            case 'p':
    5158. 

  5158. -                sub_paths = 1;
    5159. 

  5159. -                break;
    5160. 

  5160. -
    5161. 

  5161. -            case 'P':
    5162. 

  5162. -                pip_metadata = 1;
    5163. 

  5163. -                break;
    5164. 

  5164. -
    5165. 

  5165. -            case 'd':
    5166. 

  5166. -                dups = 1;
    5167. 

  5167. -                break;
    5168. 

  5168. -
    5169. 

  5169. -            case 'r':
    5170. 

  5170. -                repeats = atoi(optarg);
    5171. 

  5171. -                break;
    5172. 

  5172. -
    5173. 

  5173. -            case 'f':
    5174. 

  5174. -                repeats = 2;
    5175. 

  5175. -                dups = 1;
    5176. 

  5176. -                seconds = 900;
    5177. 

  5177. -                break;
    5178. 

  5178. -
    5179. 

  5179. -            case 's':
    5180. 

  5180. -                seconds = atoi(optarg);
    5181. 

  5181. -                break;
    5182. 

  5182. -
    5183. 

  5183. -            default:
    5184. 

  5184. -                _usage(argv[0]);
    5185. 

  5185. -                break;
    5186. 

  5186. -        }
    5187. 

  5187. -    } while (opt != -1);
    5188. 

  5188. -
    5189. 

  5189. -    if (optind >= argc) {
    5190. 

  5190. -        _usage(argv[0]);
    5191. 

  5191. -    }
    5192. 

  5192. -
    5193. 

  5193. -    for (pl_ii = 0, ii = optind; pl_ii < 1000 && ii < argc; ii++) {
    5194. 

  5194. -
    5195. 

  5195. -        if (stat(argv[ii], &st)) {
    5196. 

  5196. -            continue;
    5197. 

  5197. -        }
    5198. 

  5198. -        dir = NULL;
    5199. 

  5199. -        if (S_ISDIR(st.st_mode)) {
    5200. 

  5200. -
    5201. 

  5201. -            printf("Directory: %s:\n", argv[ii]);
    5202. 

  5202. -            path = _mk_path(argv[ii], PLAYLIST_DIR);
    5203. 

  5203. -            if (path == NULL) {
    5204. 

  5204. -                fprintf(stderr, "Failed to find playlist path: %s\n", argv[ii]);
    5205. 

  5205. -                continue;
    5206. 

  5206. -            }
    5207. 

  5207. -            dir = opendir(path);
    5208. 

  5208. -            if (dir == NULL) {
    5209. 

  5209. -                fprintf(stderr, "Failed to open dir: %s\n", path);
    5210. 

  5210. -                free(path);
    5211. 

  5211. -                continue;
    5212. 

  5212. -            }
    5213. 

  5213. -        }
    5214. 

  5214. -        if (dir != NULL) {
    5215. 

  5215. -            char **dirlist = (char**)calloc(10001, sizeof(char*));
    5216. 

  5216. -            struct dirent *ent;
    5217. 

  5217. -            int jj = 0;
    5218. 

  5218. -            for (ent = readdir(dir); ent != NULL; ent = readdir(dir)) {
    5219. 

  5219. -                dirlist[jj++] = strcpy((char*)malloc(strlen(ent->d_name)), ent->d_name);
    5220. 

  5220. -            }
    5221. 

  5221. -            qsort(dirlist, jj, sizeof(char*), _qsort_str_cmp);
    5222. 

  5222. -            for (jj = 0; dirlist[jj] != NULL; jj++) {
    5223. 

  5223. -                char *name = NULL;
    5224. 

  5224. -                name = _mk_path(path, dirlist[jj]);
    5225. 

  5225. -                free(dirlist[jj]);
    5226. 

  5226. -                if (stat(name, &st)) {
    5227. 

  5227. -                    free(name);
    5228. 

  5228. -                    continue;
    5229. 

  5229. -                }
    5230. 

  5230. -                if (!S_ISREG(st.st_mode)) {
    5231. 

  5231. -                    free(name);
    5232. 

  5232. -                    continue;
    5233. 

  5233. -                }
    5234. 

  5234. -                pl = _process_file(name, pl_list, pl_ii);
    5235. 

  5235. -                free(name);
    5236. 

  5236. -                if (pl != NULL) {
    5237. 

  5237. -                    pl_list[pl_ii++] = pl;
    5238. 

  5238. -                }
    5239. 

  5239. -            }
    5240. 

  5240. -            free(dirlist);
    5241. 

  5241. -            free(path);
    5242. 

  5242. -        } else {
    5243. 

  5243. -            pl = _process_file(argv[ii], pl_list, pl_ii);
    5244. 

  5244. -            if (pl != NULL) {
    5245. 

  5245. -                pl_list[pl_ii++] = pl;
    5246. 

  5246. -            }
    5247. 

  5247. -        }
    5248. 

  5248. -    }
    5249. 

  5249. -    // Cleanup
    5250. 

  5250. -    for (ii = 0; ii < pl_ii; ii++) {
    5251. 

  5251. -        bd_free_mpls(pl_list[ii]);
    5252. 

  5252. -    }
    5253. 

  5253. -    return 0;
    5254. 

  5254. -}
    5255. 

  5255. -
    5256. 

  5256. diff --git a/src/examples/util.c b/src/examples/util.c
    5257. 

  5257. deleted file mode 100644
    5258. 

  5258. index aaa4c46..0000000
    5259. 

  5259. --- a/src/examples/util.c
    5260. 

  5260. +++ /dev/null
    5261. 

  5261. @@ -1,40 +0,0 @@
    5262. 

  5262. -/*
    5263. 

  5263. - * This file is part of libbluray
    5264. 

  5264. - * Copyright (C) 2009-2010  John Stebbins
    5265. 

  5265. - *
    5266. 

  5266. - * This library is free software; you can redistribute it and/or
    5267. 

  5267. - * modify it under the terms of the GNU Lesser General Public
    5268. 

  5268. - * License as published by the Free Software Foundation; either
    5269. 

  5269. - * version 2.1 of the License, or (at your option) any later version.
    5270. 

  5270. - *
    5271. 

  5271. - * This library is distributed in the hope that it will be useful,
    5272. 

  5272. - * but WITHOUT ANY WARRANTY; without even the implied warranty of
    5273. 

  5273. - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    5274. 

  5274. - * Lesser General Public License for more details.
    5275. 

  5275. - *
    5276. 

  5276. - * You should have received a copy of the GNU Lesser General Public
    5277. 

  5277. - * License along with this library. If not, see
    5278. 

  5278. - * <http://www.gnu.org/licenses/>.
    5279. 

  5279. - */
    5280. 

  5280. -
    5281. 

  5281. -#include <stdio.h>
    5282. 

  5282. -#include <stdarg.h>
    5283. 

  5283. -
    5284. 

  5284. -#include "util.h"
    5285. 

  5285. -
    5286. 

  5286. -void
    5287. 

  5287. -indent_printf(int level, const char *fmt, ...)
    5288. 

  5288. -{
    5289. 

  5289. -    va_list ap;
    5290. 

  5290. -    int ii;
    5291. 

  5291. -
    5292. 

  5292. -    for (ii = 0; ii < level; ii++)
    5293. 

  5293. -    {
    5294. 

  5294. -        printf("    ");
    5295. 

  5295. -    }
    5296. 

  5296. -    va_start(ap, fmt);
    5297. 

  5297. -    vprintf(fmt, ap);
    5298. 

  5298. -    va_end(ap);
    5299. 

  5299. -    printf("\n");
    5300. 

  5300. -}
    5301. 

  5301. -
    5302. 

  5302. diff --git a/src/examples/util.h b/src/examples/util.h
    5303. 

  5303. deleted file mode 100644
    5304. 

  5304. index 144f8ec..0000000
    5305. 

  5305. --- a/src/examples/util.h
    5306. 

  5306. +++ /dev/null
    5307. 

  5307. @@ -1,43 +0,0 @@
    5308. 

  5308. -/*
    5309. 

  5309. - * This file is part of libbluray
    5310. 

  5310. - * Copyright (C) 2009-2010  John Stebbins
    5311. 

  5311. - *
    5312. 

  5312. - * This library is free software; you can redistribute it and/or
    5313. 

  5313. - * modify it under the terms of the GNU Lesser General Public
    5314. 

  5314. - * License as published by the Free Software Foundation; either
    5315. 

  5315. - * version 2.1 of the License, or (at your option) any later version.
    5316. 

  5316. - *
    5317. 

  5317. - * This library is distributed in the hope that it will be useful,
    5318. 

  5318. - * but WITHOUT ANY WARRANTY; without even the implied warranty of
    5319. 

  5319. - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    5320. 

  5320. - * Lesser General Public License for more details.
    5321. 

  5321. - *
    5322. 

  5322. - * You should have received a copy of the GNU Lesser General Public
    5323. 

  5323. - * License along with this library. If not, see
    5324. 

  5324. - * <http://www.gnu.org/licenses/>.
    5325. 

  5325. - */
    5326. 

  5326. -
    5327. 

  5327. -#include <stdint.h>
    5328. 

  5328. -
    5329. 

  5329. -#include "util/attributes.h"
    5330. 

  5330. -
    5331. 

  5331. -#if defined( __MINGW32__ )
    5332. 

  5332. -#   undef  lseek
    5333. 

  5333. -#   define lseek  _lseeki64
    5334. 

  5334. -#   undef  fseeko
    5335. 

  5335. -#   define fseeko fseeko64
    5336. 

  5336. -#   undef  ftello
    5337. 

  5337. -#   define ftello ftello64
    5338. 

  5338. -#   define flockfile(...)
    5339. 

  5339. -#   define funlockfile(...)
    5340. 

  5340. -#   define getc_unlocked getc
    5341. 

  5341. -#   undef  off_t
    5342. 

  5342. -#   define off_t off64_t
    5343. 

  5343. -#   undef  stat
    5344. 

  5344. -#   define stat  _stati64
    5345. 

  5345. -#   define fstat _fstati64
    5346. 

  5346. -#   define wstat _wstati64
    5347. 

  5347. -#endif
    5348. 

  5348. -
    5349. 

  5349. -void indent_printf(int level, const char *fmt, ...) BD_ATTR_FORMAT_PRINTF(2,3);
    5350. 

  5350. -
    5351. 

  5351. diff --git a/src/file/dir_win32.c b/src/file/dir_win32.c
    5352. 

  5352. index 2690658..f42114d 100644
    5353. 

  5353. --- a/src/file/dir_win32.c
    5354. 

  5354. +++ b/src/file/dir_win32.c
    5355. 

  5355. @@ -86,8 +86,8 @@ static BD_DIR_H *_dir_open_win32(const char* dirname)
    5356. 

  5356.  
    5357. 

  5357.      dir->internal = priv;
    5358. 

  5358.  
    5359. 

  5359. -    wchar_t wfilespec[MAX_PATH];
    5360. 

  5360. -    if (MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, filespec, -1, wfilespec, MAX_PATH))
    5361. 

  5361. +    wchar_t wfilespec[4096 + 1] = {0};
    5362. 

  5362. +    if (MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, filespec, -1, wfilespec, 4096))
    5363. 

  5363.          priv->handle = _wfindfirst(wfilespec, &priv->info);
    5364. 

  5364.      else
    5365. 

  5365.          priv->handle = -1;
    5366. 

  5366. diff --git a/src/file/dirs_win32.c b/src/file/dirs_win32.c
    5367. 

  5367. index e165fea..3d07251 100644
    5368. 

  5368. --- a/src/file/dirs_win32.c
    5369. 

  5369. +++ b/src/file/dirs_win32.c
    5370. 

  5370. @@ -36,7 +36,7 @@
    5371. 

  5371.  
    5372. 

  5372.  char *win32_get_font_dir(const char *font_file)
    5373. 

  5373.  {
    5374. 

  5374. -    wchar_t wdir[MAX_PATH];
    5375. 

  5375. +    wchar_t wdir[MAX_PATH+1] = {0};
    5376. 

  5376.      if (S_OK != SHGetFolderPathW(NULL, CSIDL_FONTS, NULL, SHGFP_TYPE_CURRENT, wdir)) {
    5377. 

  5377.          int lenght = GetWindowsDirectoryW(wdir, MAX_PATH);
    5378. 

  5378.          if (lenght == 0 || lenght > (MAX_PATH - 8)) {
    5379. 

  5379. @@ -67,7 +67,7 @@ char *file_get_config_home(void)
    5380. 

  5380.  
    5381. 

  5381.  char *file_get_data_home(void)
    5382. 

  5382.  {
    5383. 

  5383. -    wchar_t wdir[MAX_PATH];
    5384. 

  5384. +    wchar_t wdir[MAX_PATH+1] = {0};
    5385. 

  5385.  
    5386. 

  5386.      /* Get the "Application Data" folder for the user */
    5387. 

  5387.      if (S_OK == SHGetFolderPathW(NULL, CSIDL_APPDATA | CSIDL_FLAG_CREATE,
    5388. 

  5388. @@ -92,7 +92,7 @@ char *file_get_cache_home(void)
    5389. 

  5389.  const char *file_get_config_system(const char *dir)
    5390. 

  5390.  {
    5391. 

  5391.      static char *appdir = NULL;
    5392. 

  5392. -    wchar_t wdir[MAX_PATH];
    5393. 

  5393. +    wchar_t wdir[MAX_PATH+1] = {0};
    5394. 

  5394.  
    5395. 

  5395.      if (!dir) {
    5396. 

  5396.          // first call
    5397. 

  5397. diff --git a/src/file/dl_win32.c b/src/file/dl_win32.c
    5398. 

  5398. index e4492e1..7f6ae73 100644
    5399. 

  5399. --- a/src/file/dl_win32.c
    5400. 

  5400. +++ b/src/file/dl_win32.c
    5401. 

  5401. @@ -57,7 +57,7 @@ void *dl_dlopen(const char *path, const char *version)
    5402. 

  5402.  {
    5403. 

  5403.      (void)version;
    5404. 

  5404.  
    5405. 

  5405. -    wchar_t wname[MAX_PATH];
    5406. 

  5406. +    wchar_t wname[MAX_PATH+1] = {0};
    5407. 

  5407.      char *name;
    5408. 

  5408.      void *result;
    5409. 

  5409.  
    5410. 

  5410. @@ -109,7 +109,7 @@ const char *dl_get_path(void)
    5411. 

  5411.      if (!initialized) {
    5412. 

  5412.          initialized = 1;
    5413. 

  5413.  
    5414. 

  5414. -        static char path[MAX_PATH];
    5415. 

  5415. +        static char path[MAX_PATH + 1];
    5416. 

  5416.          HMODULE hModule;
    5417. 

  5417.          wchar_t wpath[MAX_PATH];
    5418. 

  5418.  
    5419. 

  5419. diff --git a/src/file/file_win32.c b/src/file/file_win32.c
    5420. 

  5420. index 5eb52d7..c0f48e4 100644
    5421. 

  5421. --- a/src/file/file_win32.c
    5422. 

  5422. +++ b/src/file/file_win32.c
    5423. 

  5423. @@ -97,9 +97,9 @@ static BD_FILE_H *_file_open(const char* filename, const char *mode)
    5424. 

  5424.  {
    5425. 

  5425.      BD_FILE_H *file;
    5426. 

  5426.      FILE *fp;
    5427. 

  5427. -    wchar_t wfilename[MAX_PATH], wmode[8];
    5428. 

  5428. +    wchar_t wfilename[4096 + 1] = {0}, wmode[8] = {0};
    5429. 

  5429.  
    5430. 

  5430. -    if (!MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, filename, -1, wfilename, MAX_PATH) ||
    5431. 

  5431. +    if (!MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, filename, -1, wfilename, 4096) ||
    5432. 

  5432.          !MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, mode, -1, wmode, 8)) {
    5433. 

  5433.  
    5434. 

  5434.          BD_DEBUG(DBG_FILE, "Error opening file %s\n", filename);
    5435. 

  5435. @@ -112,6 +112,9 @@ static BD_FILE_H *_file_open(const char* filename, const char *mode)
    5436. 

  5436.          return NULL;
    5437. 

  5437.      }
    5438. 

  5438.  
    5439. 

  5439. +    // Set file buffer
    5440. 

  5440. +    setvbuf(fp, NULL, _IOFBF, 6144 * 10);
    5441. 

  5441. +
    5442. 

  5442.      file = calloc(1, sizeof(BD_FILE_H));
    5443. 

  5443.      if (!file) {
    5444. 

  5444.          BD_DEBUG(DBG_FILE | DBG_CRIT, "Error opening file %s (out of memory)\n", filename);
    5445. 

  5445. diff --git a/src/libbluray/bdj/java-j2se/java/awt/BDGraphics.java b/src/libbluray/bdj/java-j2se/java/awt/BDGraphics.java
    5446. 

  5446. index 54c24e5..77ce66e 100644
    5447. 

  5447. --- a/src/libbluray/bdj/java-j2se/java/awt/BDGraphics.java
    5448. 

  5448. +++ b/src/libbluray/bdj/java-j2se/java/awt/BDGraphics.java
    5449. 

  5449. @@ -53,6 +53,7 @@ class BDGraphics extends BDGraphicsBase {
    5450. 

  5450.  
    5451. 

  5451.      public java.awt.font.FontRenderContext getFontRenderContext()
    5452. 

  5452.      {
    5453. 

  5453. +        logger.unimplemented("getFontRenderContext");
    5454. 

  5454.          return null;
    5455. 

  5455.      }
    5456. 

  5456.      public void setPaint(Paint p) {
    5457. 

  5457. diff --git a/src/libbluray/bdj/java/java/awt/BDToolkitBase.java b/src/libbluray/bdj/java/java/awt/BDToolkitBase.java
    5458. 

  5458. index dc61bef..0f5e3e0 100644
    5459. 

  5459. --- a/src/libbluray/bdj/java/java/awt/BDToolkitBase.java
    5460. 

  5460. +++ b/src/libbluray/bdj/java/java/awt/BDToolkitBase.java
    5461. 

  5461. @@ -124,6 +124,10 @@ abstract class BDToolkitBase extends Toolkit {
    5462. 

  5462.      }
    5463. 

  5463.  
    5464. 

  5464.      public Image getImage(String filename) {
    5465. 

  5465. +        if (BDJXletContext.getCurrentContext() == null) {
    5466. 

  5466. +            logger.error("getImage(): no context " + Logger.dumpStack());
    5467. 

  5467. +        }
    5468. 

  5468. +
    5469. 

  5469.          if (cachedImages.containsKey(filename))
    5470. 

  5470.              return (Image)cachedImages.get(filename);
    5471. 

  5471.          Image newImage = createImage(filename);
    5472. 

  5472. @@ -133,6 +137,10 @@ abstract class BDToolkitBase extends Toolkit {
    5473. 

  5473.      }
    5474. 

  5474.  
    5475. 

  5475.      public Image getImage(URL url) {
    5476. 

  5476. +        if (BDJXletContext.getCurrentContext() == null) {
    5477. 

  5477. +            logger.error("getImage(): no context " + Logger.dumpStack());
    5478. 

  5478. +        }
    5479. 

  5479. +
    5480. 

  5480.          if (cachedImages.containsKey(url))
    5481. 

  5481.              return (Image)cachedImages.get(url);
    5482. 

  5482.          Image newImage = createImage(url);
    5483. 

  5483. @@ -142,6 +150,10 @@ abstract class BDToolkitBase extends Toolkit {
    5484. 

  5484.      }
    5485. 

  5485.  
    5486. 

  5486.      public Image createImage(String filename) {
    5487. 

  5487. +        if (BDJXletContext.getCurrentContext() == null) {
    5488. 

  5488. +            logger.error("createImage(): no context " + Logger.dumpStack());
    5489. 

  5489. +        }
    5490. 

  5490. +
    5491. 

  5491.          if (!new File(filename).isAbsolute()) {
    5492. 

  5492.              String home = BDJXletContext.getCurrentXletHome();
    5493. 

  5493.              if (home != null) {
    5494. 

  5494. @@ -161,6 +173,9 @@ abstract class BDToolkitBase extends Toolkit {
    5495. 

  5495.      }
    5496. 

  5496.  
    5497. 

  5497.      public Image createImage(URL url) {
    5498. 

  5498. +        if (BDJXletContext.getCurrentContext() == null) {
    5499. 

  5499. +            logger.error("createImage(): no context " + Logger.dumpStack());
    5500. 

  5500. +        }
    5501. 

  5501.          ImageProducer ip = new URLImageSource(url);
    5502. 

  5502.          Image newImage = createImage(ip);
    5503. 

  5503.          return newImage;
    5504. 

  5504. @@ -169,12 +184,20 @@ abstract class BDToolkitBase extends Toolkit {
    5505. 

  5505.      public Image createImage(byte[] imagedata,
    5506. 

  5506.          int imageoffset,
    5507. 

  5507.          int imagelength) {
    5508. 

  5508. +
    5509. 

  5509. +        if (BDJXletContext.getCurrentContext() == null) {
    5510. 

  5510. +            logger.error("createImage(): no context " + Logger.dumpStack());
    5511. 

  5511. +        }
    5512. 

  5512. +
    5513. 

  5513.          ImageProducer ip = new ByteArrayImageSource(imagedata, imageoffset, imagelength);
    5514. 

  5514.          Image newImage = createImage(ip);
    5515. 

  5515.          return newImage;
    5516. 

  5516.      }
    5517. 

  5517.  
    5518. 

  5518.      public Image createImage(ImageProducer producer) {
    5519. 

  5519. +        if (BDJXletContext.getCurrentContext() == null) {
    5520. 

  5520. +            logger.error("createImage(): no context " + Logger.dumpStack());
    5521. 

  5521. +        }
    5522. 

  5522.          return new BDImageConsumer(producer);
    5523. 

  5523.      }
    5524. 

  5524.  
    5525. 

  5525. diff --git a/src/libbluray/bdj/java/javax/media/MediaLocator.java b/src/libbluray/bdj/java/javax/media/MediaLocator.java
    5526. 

  5526. index a182e8d..245ac54 100644
    5527. 

  5527. --- a/src/libbluray/bdj/java/javax/media/MediaLocator.java
    5528. 

  5528. +++ b/src/libbluray/bdj/java/javax/media/MediaLocator.java
    5529. 

  5529. @@ -25,11 +25,11 @@ import java.net.URL;
    5530. 

  5530.  
    5531. 

  5531.  public class MediaLocator implements Serializable
    5532. 

  5532.  {
    5533. 

  5533. -    public MediaLocator(URL url) { 
    5534. 

  5534. +    public MediaLocator(URL url) {
    5535. 

  5535.          this(url.toExternalForm());
    5536. 

  5536.      }
    5537. 

  5537.  
    5538. 

  5538. -    public MediaLocator(String locatorString) { 
    5539. 

  5539. +    public MediaLocator(String locatorString) {
    5540. 

  5540.          int index = locatorString.indexOf(":");
    5541. 

  5541.          if (index <= 0)
    5542. 

  5542.              throw new IllegalArgumentException("Bad locator string.");
    5543. 

  5543. @@ -56,7 +56,7 @@ public class MediaLocator implements Serializable
    5544. 

  5544.      public String toExternalForm() {
    5545. 

  5545.          return protocol + ":" + remainder;
    5546. 

  5546.      }
    5547. 

  5547. -    
    5548. 

  5548. +
    5549. 

  5549.      private String protocol = "";
    5550. 

  5550.      private String remainder = "";
    5551. 

  5551.  
    5552. 

  5552. diff --git a/src/libbluray/bdj/java/javax/tv/locator/LocatorImpl.java b/src/libbluray/bdj/java/javax/tv/locator/LocatorImpl.java
    5553. 

  5553. index e14825c..a87269a 100644
    5554. 

  5554. --- a/src/libbluray/bdj/java/javax/tv/locator/LocatorImpl.java
    5555. 

  5555. +++ b/src/libbluray/bdj/java/javax/tv/locator/LocatorImpl.java
    5556. 

  5556. @@ -24,7 +24,7 @@ public class LocatorImpl implements Locator {
    5557. 

  5557.          this.url = url;
    5558. 

  5558.      }
    5559. 

  5559.  
    5560. 

  5560. -    public boolean hasMultipleTransformations()    {
    5561. 

  5561. +    public boolean hasMultipleTransformations() {
    5562. 

  5562.          return false;
    5563. 

  5563.      }
    5564. 

  5564.  
    5565. 

  5565. diff --git a/src/libbluray/bdj/java/org/videolan/BDJLoader.java b/src/libbluray/bdj/java/org/videolan/BDJLoader.java
    5566. 

  5566. index 59410c5..b2bcff3 100644
    5567. 

  5567. --- a/src/libbluray/bdj/java/org/videolan/BDJLoader.java
    5568. 

  5568. +++ b/src/libbluray/bdj/java/org/videolan/BDJLoader.java
    5569. 

  5569. @@ -185,11 +185,6 @@ public class BDJLoader {
    5570. 

  5570.                  throw new InvalidObjectException("bdjo not loaded");
    5571. 

  5571.              AppEntry[] appTable = bdjo.getAppTable();
    5572. 

  5572.  
    5573. 

  5573. -            // initialize AppCaches
    5574. 

  5574. -            if (vfsCache != null) {
    5575. 

  5575. -                vfsCache.add(bdjo.getAppCaches());
    5576. 

  5576. -            }
    5577. 

  5577. -
    5578. 

  5578.              // reuse appProxys
    5579. 

  5579.              BDJAppProxy[] proxys = new BDJAppProxy[appTable.length];
    5580. 

  5580.              AppsDatabase db = AppsDatabase.getAppsDatabase();
    5581. 

  5581. @@ -215,7 +210,6 @@ public class BDJLoader {
    5582. 

  5582.                              proxy.stop(true);
    5583. 

  5583.                          } else {
    5584. 

  5584.                              logger.info("Keeping xlet " + appTable[i].getInitialClass());
    5585. 

  5585. -                            proxy.getXletContext().update(appTable[i], bdjo.getAppCaches());
    5586. 

  5586.                              proxys[i] = proxy;
    5587. 

  5587.                              proxy = null;
    5588. 

  5588.                          }
    5589. 

  5589. @@ -240,6 +234,11 @@ public class BDJLoader {
    5590. 

  5590.              Libbluray.setUOMask(terminfo.getMenuCallMask(), terminfo.getTitleSearchMask());
    5591. 

  5591.              Libbluray.setKeyInterest(bdjo.getKeyInterestTable());
    5592. 

  5592.  
    5593. 

  5593. +            // initialize AppCaches
    5594. 

  5594. +            if (vfsCache != null) {
    5595. 

  5595. +                vfsCache.add(bdjo.getAppCaches());
    5596. 

  5596. +            }
    5597. 

  5597. +
    5598. 

  5598.              // initialize appProxys
    5599. 

  5599.              for (int i = 0; i < appTable.length; i++) {
    5600. 

  5600.                  if (proxys[i] == null) {
    5601. 

  5601. @@ -256,6 +255,7 @@ public class BDJLoader {
    5602. 

  5602.                      }
    5603. 

  5603.                      logger.info("Loaded class: " + appTable[i].getInitialClass() + p + " from " + appTable[i].getBasePath() + ".jar");
    5604. 

  5604.                  } else {
    5605. 

  5605. +                    proxys[i].getXletContext().update(appTable[i], bdjo.getAppCaches());
    5606. 

  5606.                      logger.info("Reused class: " + appTable[i].getInitialClass() +     " from " + appTable[i].getBasePath() + ".jar");
    5607. 

  5607.                  }
    5608. 

  5608.              }
    5609. 

  5609. @@ -266,6 +266,19 @@ public class BDJLoader {
    5610. 

  5610.              // notify AppsDatabase
    5611. 

  5611.              ((BDJAppsDatabase)BDJAppsDatabase.getAppsDatabase()).newDatabase(bdjo, proxys);
    5612. 

  5612.  
    5613. 

  5613. +            // auto start playlist
    5614. 

  5614. +            try {
    5615. 

  5615. +                PlayListTable plt = bdjo.getAccessiblePlaylists();
    5616. 

  5616. +                if ((plt != null) && (plt.isAutostartFirst())) {
    5617. 

  5617. +                    logger.info("Auto-starting playlist");
    5618. 

  5618. +                    String[] pl = plt.getPlayLists();
    5619. 

  5619. +                    if (pl.length > 0)
    5620. 

  5620. +                        Manager.createPlayer(new MediaLocator(new BDLocator("bd://PLAYLIST:" + pl[0]))).start();
    5621. 

  5621. +                }
    5622. 

  5622. +            } catch (Exception e) {
    5623. 

  5623. +                logger.error("loadN(): autoplaylist failed: " + e + "\n" + Logger.dumpStack(e));
    5624. 

  5624. +            }
    5625. 

  5625. +
    5626. 

  5626.              // now run all the xlets
    5627. 

  5627.              for (int i = 0; i < appTable.length; i++) {
    5628. 

  5628.                  int code = appTable[i].getControlCode();
    5629. 

  5629. @@ -282,15 +295,6 @@ public class BDJLoader {
    5630. 

  5630.  
    5631. 

  5631.              logger.info("Finished initializing and starting xlets.");
    5632. 

  5632.  
    5633. 

  5633. -            // auto start playlist
    5634. 

  5634. -            PlayListTable plt = bdjo.getAccessiblePlaylists();
    5635. 

  5635. -            if ((plt != null) && (plt.isAutostartFirst())) {
    5636. 

  5636. -                logger.info("Auto-starting playlist");
    5637. 

  5637. -                String[] pl = plt.getPlayLists();
    5638. 

  5638. -                if (pl.length > 0)
    5639. 

  5639. -                    Manager.createPlayer(new MediaLocator(new BDLocator("bd://PLAYLIST:" + pl[0]))).start();
    5640. 

  5640. -            }
    5641. 

  5641. -
    5642. 

  5642.              return true;
    5643. 

  5643.  
    5644. 

  5644.          } catch (Throwable e) {
    5645. 

  5645. diff --git a/src/libbluray/bdj/java/org/videolan/BDJXletContext.java b/src/libbluray/bdj/java/org/videolan/BDJXletContext.java
    5646. 

  5646. index 359cd28..8ee818a 100644
    5647. 

  5647. --- a/src/libbluray/bdj/java/org/videolan/BDJXletContext.java
    5648. 

  5648. +++ b/src/libbluray/bdj/java/org/videolan/BDJXletContext.java
    5649. 

  5649. @@ -70,7 +70,12 @@ public class BDJXletContext implements javax.tv.xlet.XletContext, javax.microedi
    5650. 

  5650.          try {
    5651. 

  5651.              int homeJarID = Integer.parseInt(home);
    5652. 

  5652.              long time = System.currentTimeMillis();
    5653. 

  5653. -            homeMountPoint = MountManager.mount(homeJarID, false) + java.io.File.separator;
    5654. 

  5654. +            homeMountPoint = MountManager.mount(homeJarID, false);
    5655. 

  5655. +            if (homeMountPoint == null) {
    5656. 

  5656. +                logger.error("Failed mounting " + home + ".jar");
    5657. 

  5657. +            } else {
    5658. 

  5658. +                homeMountPoint = homeMountPoint + java.io.File.separator;
    5659. 

  5659. +            }
    5660. 

  5660.              time = System.currentTimeMillis() - time;
    5661. 

  5661.              logger.info("Mounted Xlet home directory from " + home + ".jar " +
    5662. 

  5662.                          "to " + homeMountPoint + "(" + time + "ms)");
    5663. 

  5663. diff --git a/src/libbluray/bdj/java/org/videolan/IxcRegistryImpl.java b/src/libbluray/bdj/java/org/videolan/IxcRegistryImpl.java
    5664. 

  5664. index 144f1ab..bae986f 100644
    5665. 

  5665. --- a/src/libbluray/bdj/java/org/videolan/IxcRegistryImpl.java
    5666. 

  5666. +++ b/src/libbluray/bdj/java/org/videolan/IxcRegistryImpl.java
    5667. 

  5667. @@ -452,7 +452,7 @@ public class IxcRegistryImpl {
    5668. 

  5668.          }
    5669. 

  5669.          Object remoteObj = wrapOrCopy(wrappedObj, wrappedObj.context, (BDJXletContext)xc);
    5670. 

  5670.  
    5671. 

  5671. -        Debug("IxcRegistry.lookup(" + path + ") => " + remoteObj);
    5672. 

  5672. +        Debug("IxcRegistry.lookup(" + path + ") => OK");
    5673. 

  5673.  
    5674. 

  5674.          return (Remote)remoteObj;
    5675. 

  5675.      }
    5676. 

  5676. diff --git a/src/libbluray/bdj/java/org/videolan/MountManager.java b/src/libbluray/bdj/java/org/videolan/MountManager.java
    5677. 

  5677. index 5c9660a..6f6fd52 100644
    5678. 

  5678. --- a/src/libbluray/bdj/java/org/videolan/MountManager.java
    5679. 

  5679. +++ b/src/libbluray/bdj/java/org/videolan/MountManager.java
    5680. 

  5680. @@ -185,6 +185,7 @@ public class MountManager {
    5681. 

  5681.                  new PrivilegedAction() {
    5682. 

  5682.                      public Object run() {
    5683. 

  5683.                          if (mountPoint.decRefCount() < 1) {
    5684. 

  5684. +                            logger.error("Removing JAR " + id + " from mount cache");
    5685. 

  5685.                              mountPoints.remove(id);
    5686. 

  5686.                          }
    5687. 

  5687.                          return null;
    5688. 

  5688. diff --git a/src/libbluray/bdj/java/org/videolan/media/content/PlayerManager.java b/src/libbluray/bdj/java/org/videolan/media/content/PlayerManager.java
    5689. 

  5689. index cc06e84..d45358b 100644
    5690. 

  5690. --- a/src/libbluray/bdj/java/org/videolan/media/content/PlayerManager.java
    5691. 

  5691. +++ b/src/libbluray/bdj/java/org/videolan/media/content/PlayerManager.java
    5692. 

  5692. @@ -19,6 +19,7 @@
    5693. 

  5693.  package org.videolan.media.content;
    5694. 

  5694.  
    5695. 

  5695.  import java.util.ArrayList;
    5696. 

  5696. +import org.videolan.Logger;
    5697. 

  5697.  
    5698. 

  5698.  public class PlayerManager {
    5699. 

  5699.  
    5700. 

  5700. @@ -81,7 +82,7 @@ public class PlayerManager {
    5701. 

  5701.              return;
    5702. 

  5702.          }
    5703. 

  5703.  
    5704. 

  5704. -        System.err.println("unknown player type: " + player.getClass().getName());
    5705. 

  5705. +        logger.error("unknown player type: " + player.getClass().getName());
    5706. 

  5706.      }
    5707. 

  5707.  
    5708. 

  5708.      protected boolean allocateResource(BDHandler player) {
    5709. 

  5709. @@ -91,6 +92,9 @@ public class PlayerManager {
    5710. 

  5710.              }
    5711. 

  5711.              synchronized (playlistPlayerLock) {
    5712. 

  5712.                  if (playlistPlayer != null && player != playlistPlayer) {
    5713. 

  5713. +
    5714. 

  5714. +                    logger.info("allocateResource(): Stopping old playlist player");
    5715. 

  5715. +
    5716. 

  5716.                      playlistPlayer.stop();
    5717. 

  5717.                      playlistPlayer.deallocate();
    5718. 

  5718.                  }
    5719. 

  5719. @@ -108,7 +112,7 @@ public class PlayerManager {
    5720. 

  5720.              return true;
    5721. 

  5721.          }
    5722. 

  5722.  
    5723. 

  5723. -        System.err.println("unknown player type: " + player.getClass().getName());
    5724. 

  5724. +        logger.error("allocateResource(): unknown player type: " + player.getClass().getName());
    5725. 

  5725.          return false;
    5726. 

  5726.      }
    5727. 

  5727.  
    5728. 

  5728. @@ -153,4 +157,6 @@ public class PlayerManager {
    5729. 

  5729.          }
    5730. 

  5730.          }
    5731. 

  5731.      }
    5732. 

  5732. +
    5733. 

  5733. +    private static final Logger logger = Logger.getLogger(PlayerManager.class.getName());
    5734. 

  5734.  }
    5735. 

  5735. diff --git a/src/libbluray/bdnav/clpi_parse.c b/src/libbluray/bdnav/clpi_parse.c
    5736. 

  5736. index ec57a38..f0826de 100644
    5737. 

  5737. --- a/src/libbluray/bdnav/clpi_parse.c
    5738. 

  5738. +++ b/src/libbluray/bdnav/clpi_parse.c
    5739. 

  5739. @@ -39,6 +39,7 @@
    5740. 

  5740.  #define CLPI_SIG1  ('H' << 24 | 'D' << 16 | 'M' << 8 | 'V')
    5741. 

  5741.  #define CLPI_SIG2A ('0' << 24 | '2' << 16 | '0' << 8 | '0')
    5742. 

  5742.  #define CLPI_SIG2B ('0' << 24 | '1' << 16 | '0' << 8 | '0')
    5743. 

  5743. +#define CLPI_SIG2C ('0' << 24 | '2' << 16 | '4' << 8 | '0')
    5744. 

  5744.  
    5745. 

  5745.  static void
    5746. 

  5746.  _human_readable_sig(char *sig, uint32_t s1, uint32_t s2)
    5747. 

  5747. @@ -129,7 +130,8 @@ _parse_header(BITSTREAM *bits, CLPI_CL *cl)
    5748. 

  5748.      cl->type_indicator2 = bs_read(bits, 32);
    5749. 

  5749.      if (cl->type_indicator != CLPI_SIG1 || 
    5750. 

  5750.          (cl->type_indicator2 != CLPI_SIG2A &&
    5751. 

  5751. -         cl->type_indicator2 != CLPI_SIG2B)) {
    5752. 

  5752. +         cl->type_indicator2 != CLPI_SIG2B &&
    5753. 

  5753. +         cl->type_indicator2 != CLPI_SIG2C)) {
    5754. 

  5754.  
    5755. 

  5755.          char sig[9];
    5756. 

  5756.          char expect[9];
    5757. 

  5757. diff --git a/src/libbluray/bdnav/mpls_parse.c b/src/libbluray/bdnav/mpls_parse.c
    5758. 

  5758. index da01f7b..8bfbb8c 100644
    5759. 

  5759. --- a/src/libbluray/bdnav/mpls_parse.c
    5760. 

  5760. +++ b/src/libbluray/bdnav/mpls_parse.c
    5761. 

  5761. @@ -39,6 +39,7 @@
    5762. 

  5762.  #define MPLS_SIG1  ('M' << 24 | 'P' << 16 | 'L' << 8 | 'S')
    5763. 

  5763.  #define MPLS_SIG2A ('0' << 24 | '2' << 16 | '0' << 8 | '0')
    5764. 

  5764.  #define MPLS_SIG2B ('0' << 24 | '1' << 16 | '0' << 8 | '0')
    5765. 

  5765. +#define MPLS_SIG2C ('0' << 24 | '2' << 16 | '4' << 8 | '0')
    5766. 

  5766.  
    5767. 

  5767.  static void
    5768. 

  5768.  _human_readable_sig(char *sig, uint32_t s1, uint32_t s2)
    5769. 

  5769. @@ -137,8 +138,9 @@ _parse_appinfo(BITSTREAM *bits, MPLS_AI *ai)
    5770. 

  5770.      ai->random_access_flag = bs_read(bits, 1);
    5771. 

  5771.      ai->audio_mix_flag = bs_read(bits, 1);
    5772. 

  5772.      ai->lossless_bypass_flag = bs_read(bits, 1);
    5773. 

  5773. +    ai->mvc_base_view_r_flag = bs_read(bits, 1);
    5774. 

  5774.      // Reserved
    5775. 

  5775. -    bs_skip(bits, 13);
    5776. 

  5776. +    bs_skip(bits, 12);
    5777. 

  5777.      bs_seek_byte(bits, pos + len);
    5778. 

  5778.      return 1;
    5779. 

  5779.  }
    5780. 

  5780. @@ -155,7 +157,8 @@ _parse_header(BITSTREAM *bits, MPLS_PL *pl)
    5781. 

  5781.      pl->type_indicator2 = bs_read(bits, 32);
    5782. 

  5782.      if (pl->type_indicator != MPLS_SIG1 || 
    5783. 

  5783.          (pl->type_indicator2 != MPLS_SIG2A && 
    5784. 

  5784. -         pl->type_indicator2 != MPLS_SIG2B)) {
    5785. 

  5785. +         pl->type_indicator2 != MPLS_SIG2B &&
    5786. 

  5786. +         pl->type_indicator2 != MPLS_SIG2C)) {
    5787. 

  5787.  
    5788. 

  5788.          char sig[9];
    5789. 

  5789.          char expect[9];
    5790. 

  5790. @@ -259,6 +262,7 @@ _parse_stream(BITSTREAM *bits, MPLS_STREAM *s)
    5791. 

  5791.              break;
    5792. 

  5792.      };
    5793. 

  5793.      s->lang[3] = '\0';
    5794. 

  5794. +    s->ss_offset_sequence_id = 0xFF;
    5795. 

  5795.  
    5796. 

  5796.      bs_seek_byte(bits, pos + len);
    5797. 

  5797.      return 1;
    5798. 

  5798. @@ -882,6 +886,99 @@ _parse_subpath_extension(BITSTREAM *bits, MPLS_PL *pl)
    5799. 

  5799.  }
    5800. 

  5800.  
    5801. 

  5801.  static int
    5802. 

  5802. +_parse_stn_ss_extension(BITSTREAM *bits, MPLS_PL *pl)
    5803. 

  5803. +{
    5804. 

  5804. +    int ii, s;
    5805. 

  5805. +    int64_t pos;
    5806. 

  5806. +
    5807. 

  5807. +    for (ii = 0; ii < pl->list_count; ii++) {
    5808. 

  5808. +        uint32_t len = bs_read(bits, 16);
    5809. 

  5809. +        pos = bs_pos(bits) >> 3;
    5810. 

  5810. +        int Fixed_offset_during_PopUp_flag = bs_read(bits, 1);
    5811. 

  5811. +        bs_skip(bits, 15); // reserved
    5812. 

  5812. +
    5813. 

  5813. +        for (s = 0; s < pl->play_item[ii].stn.num_video; s++) {
    5814. 

  5814. +            // stream_entry
    5815. 

  5815. +            uint32_t slen = bs_read(bits, 8);
    5816. 

  5816. +            bs_skip(bits, slen * 8);
    5817. 

  5817. +
    5818. 

  5818. +            // stream_attributes_ss
    5819. 

  5819. +            slen = bs_read(bits, 8);
    5820. 

  5820. +            bs_skip(bits, slen * 8);
    5821. 

  5821. +
    5822. 

  5822. +            bs_skip(bits, 10); // reserved
    5823. 

  5823. +            bs_skip(bits, 6);  // number_of_offset_sequences
    5824. 

  5824. +        }
    5825. 

  5825. +
    5826. 

  5826. +        for (s = 0; s < pl->play_item[ii].stn.num_pg; s++) {
    5827. 

  5827. +            pl->play_item[ii].stn.pg[s].ss_offset_sequence_id = bs_read(bits, 8);
    5828. 

  5828. +
    5829. 

  5829. +            bs_skip(bits, 4); // reserved
    5830. 

  5830. +            bs_skip(bits, 1); // dialog_region_offset_valid_flag
    5831. 

  5831. +            int is_SS_PG = bs_read(bits, 1);
    5832. 

  5832. +            int is_top_AS_PG_textST = bs_read(bits, 1);
    5833. 

  5833. +            int is_bottom_AS_PG_textST = bs_read(bits, 1);
    5834. 

  5834. +            if (is_SS_PG) {
    5835. 

  5835. +                // stream_entry left eye
    5836. 

  5836. +                uint32_t slen = bs_read(bits, 8);
    5837. 

  5837. +                bs_skip(bits, slen * 8);
    5838. 

  5838. +
    5839. 

  5839. +                // stream_entry right eye
    5840. 

  5840. +                slen = bs_read(bits, 8);
    5841. 

  5841. +                bs_skip(bits, slen * 8);
    5842. 

  5842. +
    5843. 

  5843. +                bs_skip(bits, 8); // reserved
    5844. 

  5844. +                bs_skip(bits, 8); // PG offset
    5845. 

  5845. +            }
    5846. 

  5846. +            if (is_top_AS_PG_textST) {
    5847. 

  5847. +                // stream_entry
    5848. 

  5848. +                uint32_t slen = bs_read(bits, 8);
    5849. 

  5849. +                bs_skip(bits, slen * 8);
    5850. 

  5850. +
    5851. 

  5851. +                bs_skip(bits, 8); // reserved
    5852. 

  5852. +                bs_skip(bits, 8); // PG offset
    5853. 

  5853. +            }
    5854. 

  5854. +            if (is_bottom_AS_PG_textST) {
    5855. 

  5855. +                // stream_entry
    5856. 

  5856. +                uint32_t slen = bs_read(bits, 8);
    5857. 

  5857. +                bs_skip(bits, slen * 8);
    5858. 

  5858. +
    5859. 

  5859. +                bs_skip(bits, 8); // reserved
    5860. 

  5860. +                bs_skip(bits, 8); // PG offset
    5861. 

  5861. +            }
    5862. 

  5862. +        }
    5863. 

  5863. +
    5864. 

  5864. +        for (s = 0; s < pl->play_item[ii].stn.num_ig; s++) {
    5865. 

  5865. +            if (Fixed_offset_during_PopUp_flag)
    5866. 

  5866. +              bs_skip(bits, 8);
    5867. 

  5867. +            else
    5868. 

  5868. +              pl->play_item[ii].stn.ig[s].ss_offset_sequence_id = bs_read(bits, 8);
    5869. 

  5869. +
    5870. 

  5870. +            bs_skip(bits, 16); // IG_Plane_offset_during_BB_video
    5871. 

  5871. +            bs_skip(bits, 7); // reserved
    5872. 

  5872. +            int is_SS_IG = bs_read(bits, 1);
    5873. 

  5873. +            if (is_SS_IG) {
    5874. 

  5874. +                // stream_entry left eye
    5875. 

  5875. +                uint32_t slen = bs_read(bits, 8);
    5876. 

  5876. +                bs_skip(bits, slen * 8);
    5877. 

  5877. +
    5878. 

  5878. +                // stream_entry right eye
    5879. 

  5879. +                slen = bs_read(bits, 8);
    5880. 

  5880. +                bs_skip(bits, slen * 8);
    5881. 

  5881. +
    5882. 

  5882. +                bs_skip(bits, 8); // reserved
    5883. 

  5883. +                bs_skip(bits, 8); // PG offset
    5884. 

  5884. +            }
    5885. 

  5885. +        }
    5886. 

  5886. +
    5887. 

  5887. +        // Skip to next play item
    5888. 

  5888. +        bs_seek_byte(bits, pos + len);
    5889. 

  5889. +    }
    5890. 

  5890. +
    5891. 

  5891. +    return 0;
    5892. 

  5892. +}
    5893. 

  5893. +
    5894. 

  5894. +static int
    5895. 

  5895.  _parse_mpls_extension(BITSTREAM *bits, int id1, int id2, void *handle)
    5896. 

  5896.  {
    5897. 

  5897.      MPLS_PL *pl = (MPLS_PL*)handle;
    5898. 

  5898. @@ -895,7 +992,7 @@ _parse_mpls_extension(BITSTREAM *bits, int id1, int id2, void *handle)
    5899. 

  5899.  
    5900. 

  5900.      if (id1 == 2) {
    5901. 

  5901.          if (id2 == 1) {
    5902. 

  5902. -            return 0;
    5903. 

  5903. +            return _parse_stn_ss_extension(bits, pl);
    5904. 

  5904.          }
    5905. 

  5905.          if (id2 == 2) {
    5906. 

  5906.              // SubPath entries extension
    5907. 

  5907. diff --git a/src/libbluray/bdnav/mpls_parse.h b/src/libbluray/bdnav/mpls_parse.h
    5908. 

  5908. index f9f7a18..94add53 100644
    5909. 

  5909. --- a/src/libbluray/bdnav/mpls_parse.h
    5910. 

  5910. +++ b/src/libbluray/bdnav/mpls_parse.h
    5911. 

  5911. @@ -49,6 +49,7 @@ typedef struct
    5912. 

  5912.      uint8_t         sv_num_pip_pg_ref;
    5913. 

  5913.      uint8_t        *sv_secondary_audio_ref;
    5914. 

  5914.      uint8_t        *sv_pip_pg_ref;
    5915. 

  5915. +    uint8_t         ss_offset_sequence_id;
    5916. 

  5916.  } MPLS_STREAM;
    5917. 

  5917.  
    5918. 

  5918.  typedef struct
    5919. 

  5919. @@ -110,6 +111,7 @@ typedef struct
    5920. 

  5920.      uint8_t         random_access_flag;
    5921. 

  5921.      uint8_t         audio_mix_flag;
    5922. 

  5922.      uint8_t         lossless_bypass_flag;
    5923. 

  5923. +    uint8_t         mvc_base_view_r_flag;
    5924. 

  5924.  } MPLS_AI;
    5925. 

  5925.  
    5926. 

  5926.  typedef struct
    5927. 

  5927. diff --git a/src/libbluray/bdnav/navigation.c b/src/libbluray/bdnav/navigation.c
    5928. 

  5928. index 39be4b7..cfd7739 100644
    5929. 

  5929. --- a/src/libbluray/bdnav/navigation.c
    5930. 

  5930. +++ b/src/libbluray/bdnav/navigation.c
    5931. 

  5931. @@ -174,6 +174,21 @@ _pl_duration(MPLS_PL *pl)
    5932. 

  5932.      return duration;
    5933. 

  5933.  }
    5934. 

  5934.  
    5935. 

  5935. +static uint32_t
    5936. 

  5936. +_pl_chapter_count(MPLS_PL *pl)
    5937. 

  5937. +{
    5938. 

  5938. +    unsigned ii, chapters = 0;
    5939. 

  5939. +
    5940. 

  5940. +    // Count the number of "entry" marks (skipping "link" marks)
    5941. 

  5941. +    // This is the the number of chapters
    5942. 

  5942. +    for (ii = 0; ii < pl->mark_count; ii++) {
    5943. 

  5943. +        if (pl->play_mark[ii].mark_type == BD_MARK_ENTRY) {
    5944. 

  5944. +            chapters++;
    5945. 

  5945. +        }
    5946. 

  5946. +    }
    5947. 

  5947. +    return chapters;
    5948. 

  5948. +}
    5949. 

  5949. +
    5950. 

  5950.  NAV_TITLE_LIST* nav_get_title_list(BD_DISC *disc, uint32_t flags, uint32_t min_title_length)
    5951. 

  5951.  {
    5952. 

  5952.      BD_DIR_H *dir;
    5953. 

  5953. @@ -446,7 +461,7 @@ static void _fill_clip(NAV_TITLE *title,
    5954. 

  5954.  NAV_TITLE* nav_title_open(BD_DISC *disc, const char *playlist, unsigned angle)
    5955. 

  5955.  {
    5956. 

  5956.      NAV_TITLE *title = NULL;
    5957. 

  5957. -    unsigned ii, ss, chapters = 0;
    5958. 

  5958. +    unsigned ii, ss;
    5959. 

  5959.      uint32_t pos = 0;
    5960. 

  5960.      uint32_t time = 0;
    5961. 

  5961.  
    5962. 

  5962. @@ -506,15 +521,8 @@ NAV_TITLE* nav_title_open(BD_DISC *disc, const char *playlist, unsigned angle)
    5963. 

  5963.          }
    5964. 

  5964.      }
    5965. 

  5965.  
    5966. 

  5966. -    // Count the number of "entry" marks (skipping "link" marks)
    5967. 

  5967. -    // This is the the number of chapters
    5968. 

  5968. -    for (ii = 0; ii < title->pl->mark_count; ii++) {
    5969. 

  5969. -        if (title->pl->play_mark[ii].mark_type == BD_MARK_ENTRY) {
    5970. 

  5970. -            chapters++;
    5971. 

  5971. -        }
    5972. 

  5972. -    }
    5973. 

  5973. -    title->chap_list.count = chapters;
    5974. 

  5974. -    title->chap_list.mark = calloc(chapters, sizeof(NAV_MARK));
    5975. 

  5975. +    title->chap_list.count = _pl_chapter_count(title->pl);
    5976. 

  5976. +    title->chap_list.mark = calloc(title->chap_list.count, sizeof(NAV_MARK));
    5977. 

  5977.      title->mark_list.count = title->pl->mark_count;
    5978. 

  5978.      title->mark_list.mark = calloc(title->pl->mark_count, sizeof(NAV_MARK));
    5979. 

  5979.  
    5980. 

  5980. diff --git a/src/libbluray/bdnav/sound_parse.c b/src/libbluray/bdnav/sound_parse.c
    5981. 

  5981. index b5d11fd..7c267da 100644
    5982. 

  5982. --- a/src/libbluray/bdnav/sound_parse.c
    5983. 

  5983. +++ b/src/libbluray/bdnav/sound_parse.c
    5984. 

  5984. @@ -169,7 +169,7 @@ static SOUND_DATA *_sound_parse(BD_FILE_H *fp)
    5985. 

  5985.  
    5986. 

  5986.      data_offsets = calloc(num_sounds, sizeof(uint32_t));
    5987. 

  5987.      data = calloc(1, sizeof(SOUND_DATA));
    5988. 

  5988. -    if (!data_offsets | !data) {
    5989. 

  5989. +    if (!data_offsets || !data) {
    5990. 

  5990.          BD_DEBUG(DBG_CRIT, "out of memory\n");
    5991. 

  5991.          goto error;
    5992. 

  5992.      }
    5993. 

  5993. diff --git a/src/libbluray/bluray.c b/src/libbluray/bluray.c
    5994. 

  5994. index 1aedf2c..27beed7 100644
    5995. 

  5995. --- a/src/libbluray/bluray.c
    5996. 

  5996. +++ b/src/libbluray/bluray.c
    5997. 

  5997. @@ -952,6 +952,7 @@ static void _fill_disc_info(BLURAY *bd, BD_ENC_INFO *enc_info)
    5998. 

  5998.      bd->disc_info.bdplus_handled     = enc_info->bdplus_handled;
    5999. 

  5999.      bd->disc_info.bdplus_gen         = enc_info->bdplus_gen;
    6000. 

  6000.      bd->disc_info.bdplus_date        = enc_info->bdplus_date;
    6001. 

  6001. +    bd->disc_info.no_menu_support    = enc_info->no_menu_support;
    6002. 

  6002.  
    6003. 

  6003.      bd->disc_info.udf_volume_id      = disc_volume_id(bd->disc);
    6004. 

  6004.  
    6005. 

  6005. @@ -1098,6 +1099,10 @@ static void _fill_disc_info(BLURAY *bd, BD_ENC_INFO *enc_info)
    6006. 

  6006.          indx_free(&index);
    6007. 

  6007.      }
    6008. 

  6008.  
    6009. 

  6009. +    if (!bd->disc_info.first_play_supported || !bd->disc_info.top_menu_supported) {
    6010. 

  6010. +        bd->disc_info.no_menu_support = 1;
    6011. 

  6011. +    }
    6012. 

  6012. +
    6013. 

  6013.      if (bd->disc_info.bdj_detected) {
    6014. 

  6014.          BDID_DATA *bdid = bdid_get(bd->disc); /* parse id.bdmv */
    6015. 

  6015.          if (bdid) {
    6016. 

  6016. @@ -1637,6 +1642,25 @@ int64_t bd_seek_time(BLURAY *bd, uint64_t tick)
    6017. 

  6017.      return bd->s_pos;
    6018. 

  6018.  }
    6019. 

  6019.  
    6020. 

  6020. +int64_t bd_find_seek_point(BLURAY *bd, uint64_t tick)
    6021. 

  6021. +{
    6022. 

  6022. +  uint32_t clip_pkt, out_pkt;
    6023. 

  6023. +  NAV_CLIP *clip;
    6024. 

  6024. +
    6025. 

  6025. +  tick /= 2;
    6026. 

  6026. +
    6027. 

  6027. +  if (bd->title &&
    6028. 

  6028. +    tick < bd->title->duration) {
    6029. 

  6029. +
    6030. 

  6030. +      // Find the closest access unit to the requested position
    6031. 

  6031. +      clip = nav_time_search(bd->title, (uint32_t)tick, &clip_pkt, &out_pkt);
    6032. 

  6032. +
    6033. 

  6033. +      return (int64_t)out_pkt * 192;
    6034. 

  6034. +  }
    6035. 

  6035. +
    6036. 

  6036. +  return bd->s_pos;
    6037. 

  6037. +}
    6038. 

  6038. +
    6039. 

  6039.  uint64_t bd_tell_time(BLURAY *bd)
    6040. 

  6040.  {
    6041. 

  6041.      uint32_t clip_pkt = 0, out_pkt = 0, out_time = 0;
    6042. 

  6042. @@ -2539,6 +2563,9 @@ uint32_t bd_get_titles(BLURAY *bd, uint8_t flags, uint32_t min_title_length)
    6043. 

  6043.  
    6044. 

  6044.  int bd_get_main_title(BLURAY *bd)
    6045. 

  6045.  {
    6046. 

  6046. +    if (!bd) {
    6047. 

  6047. +        return -1;
    6048. 

  6048. +    }
    6049. 

  6049.      if (bd->title_type != title_undef) {
    6050. 

  6050.          BD_DEBUG(DBG_CRIT | DBG_BLURAY, "bd_get_main_title() can't be used with BluRay menus\n");
    6051. 

  6051.      }
    6052. 

  6052. @@ -2606,6 +2633,7 @@ static BLURAY_TITLE_INFO* _fill_title_info(NAV_TITLE* title, uint32_t title_idx,
    6053. 

  6053.          BLURAY_CLIP_INFO *ci = &title_info->clips[ii];
    6054. 

  6054.          NAV_CLIP *nc = &title->clip_list.clip[ii];
    6055. 

  6055.  
    6056. 

  6056. +        ci->idx = nc->clip_id;
    6057. 

  6057.          ci->pkt_count = nc->end_pkt - nc->start_pkt;
    6058. 

  6058.          ci->start_time = (uint64_t)nc->title_time * 2;
    6059. 

  6059.          ci->in_time = (uint64_t)pi->in_time * 2;
    6060. 

  6060. @@ -2632,6 +2660,8 @@ static BLURAY_TITLE_INFO* _fill_title_info(NAV_TITLE* title, uint32_t title_idx,
    6061. 

  6061.          _copy_streams(nc, ci->sec_audio_streams, pi->stn.secondary_audio, ci->sec_audio_stream_count);
    6062. 

  6062.      }
    6063. 

  6063.  
    6064. 

  6064. +    title_info->mvc_base_view_r_flag = title->pl->app_info.mvc_base_view_r_flag;
    6065. 

  6065. +
    6066. 

  6066.      return title_info;
    6067. 

  6067.  }
    6068. 

  6068.  
    6069. 

  6069. @@ -2745,7 +2775,7 @@ int bd_set_player_setting(BLURAY *bd, uint32_t idx, uint32_t value)
    6070. 

  6070.      for (i = 0; i < sizeof(map) / sizeof(map[0]); i++) {
    6071. 

  6071.          if (idx == map[i].idx) {
    6072. 

  6072.              bd_mutex_lock(&bd->mutex);
    6073. 

  6073. -            result = !bd_psr_setting_write(bd->regs, idx, value);
    6074. 

  6074. +            result = !bd_psr_setting_write(bd->regs, map[i].psr, value);
    6075. 

  6075.              bd_mutex_unlock(&bd->mutex);
    6076. 

  6076.              return result;
    6077. 

  6077.          }
    6078. 

  6078. @@ -3119,6 +3149,11 @@ static int _play_title(BLURAY *bd, unsigned title)
    6079. 

  6079.          return 0;
    6080. 

  6080.      }
    6081. 

  6081.  
    6082. 

  6082. +    if (bd->disc_info.no_menu_support) {
    6083. 

  6083. +        BD_DEBUG(DBG_BLURAY | DBG_CRIT, "bd_play(): no menu support\n");
    6084. 

  6084. +        return 0;
    6085. 

  6085. +    }
    6086. 

  6086. +
    6087. 

  6087.      /* first play object ? */
    6088. 

  6088.      if (title == BLURAY_TITLE_FIRST_PLAY) {
    6089. 

  6089.  
    6090. 

  6090. @@ -3743,3 +3778,28 @@ void bd_free_bdjo(struct bdjo_data *obj)
    6091. 

  6091.      (void)obj;
    6092. 

  6092.  #endif
    6093. 

  6093.  }
    6094. 

  6094. +
    6095. 

  6095. +int bd_get_clip_infos(BLURAY *bd, unsigned clip, uint64_t *clip_start_time, uint64_t *stream_start_time, uint64_t *pos, uint64_t *duration)
    6096. 

  6096. +{
    6097. 

  6097. +    if (bd && bd->title && bd->title->clip_list.count > clip) {
    6098. 

  6098. +      if (clip_start_time)
    6099. 

  6099. +        *clip_start_time = (uint64_t)bd->title->clip_list.clip[clip].title_time << 1;
    6100. 

  6100. +      if (stream_start_time)
    6101. 

  6101. +        *stream_start_time = (uint64_t)bd->title->clip_list.clip[clip].in_time << 1;
    6102. 

  6102. +      if (pos)
    6103. 

  6103. +        *pos = (uint64_t)bd->title->clip_list.clip[clip].title_pkt * 192;
    6104. 

  6104. +      if (duration)
    6105. 

  6105. +        *duration = (uint64_t)bd->title->clip_list.clip[clip].duration << 1;
    6106. 

  6106. +
    6107. 

  6107. +      return 1;
    6108. 

  6108. +    }
    6109. 

  6109. +    return 0;
    6110. 

  6110. +}
    6111. 

  6111. +
    6112. 

  6112. +struct mpls_pl* bd_get_title_mpls(BLURAY * bd)
    6113. 

  6113. +{
    6114. 

  6114. +  if (bd && bd->title) {
    6115. 

  6115. +    return bd->title->pl;
    6116. 

  6116. +  }
    6117. 

  6117. +  return NULL;
    6118. 

  6118. +}
    6119. 

  6119. diff --git a/src/libbluray/bluray.h b/src/libbluray/bluray.h
    6120. 

  6120. index ae9f412..6e74df4 100644
    6121. 

  6121. --- a/src/libbluray/bluray.h
    6122. 

  6122. +++ b/src/libbluray/bluray.h
    6123. 

  6123. @@ -32,6 +32,7 @@ extern "C" {
    6124. 

  6124.   */
    6125. 

  6125.  
    6126. 

  6126.  #include <stdint.h>
    6127. 

  6127. +#include "bdnav/clpi_data.h"
    6128. 

  6128.  
    6129. 

  6129.  #define TITLES_ALL              0    /**< all titles. */
    6130. 

  6130.  #define TITLES_FILTER_DUP_TITLE 0x01 /**< remove duplicate titles. */
    6131. 

  6131. @@ -119,6 +120,9 @@ typedef struct {
    6132. 

  6132.      char bdj_disc_id[33];    /* (BD-J) disc ID */
    6133. 

  6133.  
    6134. 

  6134.      const char *udf_volume_id; /* optional UDF volume identifier */
    6135. 

  6135. +
    6136. 

  6136. +    uint8_t no_menu_support;   /* 1 if this disc can't be played using on-disc menus */
    6137. 

  6137. +
    6138. 

  6138.  } BLURAY_DISC_INFO;
    6139. 

  6139.  
    6140. 

  6140.  /*
    6141. 

  6141. @@ -216,6 +220,7 @@ typedef struct bd_stream_info {
    6142. 

  6142.  } BLURAY_STREAM_INFO;
    6143. 

  6143.  
    6144. 

  6144.  typedef struct bd_clip {
    6145. 

  6145. +    uint32_t           idx;
    6146. 

  6146.      uint32_t           pkt_count;
    6147. 

  6147.      uint8_t            still_mode;
    6148. 

  6148.      uint16_t           still_time;  /* seconds */
    6149. 

  6149. @@ -266,6 +271,8 @@ typedef struct bd_title_info {
    6150. 

  6150.  
    6151. 

  6151.      uint32_t             mark_count;
    6152. 

  6152.      BLURAY_TITLE_MARK    *marks;
    6153. 

  6153. +
    6154. 

  6154. +    uint8_t              mvc_base_view_r_flag;
    6155. 

  6155.  } BLURAY_TITLE_INFO;
    6156. 

  6156.  
    6157. 

  6157.  /*
    6158. 

  6158. @@ -458,6 +465,16 @@ uint32_t bd_get_current_title(BLURAY *bd);
    6159. 

  6159.  
    6160. 

  6160.  /**
    6161. 

  6161.   *
    6162. 

  6162. + * Find the byte position to specific time in 90Khz ticks
    6163. 

  6163. + *
    6164. 

  6164. + * @param bd    BLURAY ojbect
    6165. 

  6165. + * @param tick  tick count
    6166. 

  6166. + * @return byte position
    6167. 

  6167. + */
    6168. 

  6168. +int64_t bd_find_seek_point(BLURAY *bd, uint64_t tick);
    6169. 

  6169. +
    6170. 

  6170. +/**
    6171. 

  6171. + *
    6172. 

  6172.   *  Read from currently selected title file, decrypt if possible
    6173. 

  6173.   *
    6174. 

  6174.   * @param bd  BLURAY object
    6175. 

  6175. @@ -981,7 +998,6 @@ int bd_mouse_select(BLURAY *bd, int64_t pts, uint16_t x, uint16_t y);
    6176. 

  6176.  
    6177. 

  6177.  /* access to internal information */
    6178. 

  6178.  
    6179. 

  6179. -struct clpi_cl;
    6180. 

  6180.  /**
    6181. 

  6181.   *
    6182. 

  6182.   *  Get copy of clip information for requested playitem.
    6183. 

  6183. @@ -1034,6 +1050,28 @@ void bd_stop_bdj(BLURAY *bd); // shutdown BD-J and clean up resources
    6184. 

  6184.   */
    6185. 

  6185.  int bd_read_file(BLURAY *, const char *path, void **data, int64_t *size);
    6186. 

  6186.  
    6187. 

  6187. +/**
    6188. 

  6188. + *
    6189. 

  6189. + * Get information about the clip
    6190. 

  6190. + *
    6191. 

  6191. + * @param bd  BLURAY object
    6192. 

  6192. + * @param clip clip index
    6193. 

  6193. + * @param clip_start_time start of the clip (in the total title) (in 90khz)
    6194. 

  6194. + * @param stream_start_time first pts in the clip (in 90khz)
    6195. 

  6195. + * @param byte position of the clip (absolute)
    6196. 

  6196. + * @param duration duration of the clip (in 90khz)
    6197. 

  6197. + */
    6198. 

  6198. +int bd_get_clip_infos(BLURAY *bd, unsigned clip, uint64_t *clip_start_time, uint64_t *stream_start_time, uint64_t *pos, uint64_t *duration);
    6199. 

  6199. +
    6200. 

  6200. +/**
    6201. 

  6201. + * Get the MPLS struct of the current title
    6202. 

  6202. + *
    6203. 

  6203. + * @param bd BLURAY object
    6204. 

  6204. + * @return the MPLS struct
    6205. 

  6205. + *
    6206. 

  6206. + * Lifetime of the MPLS pointer is limited to the lifetime of the BD title
    6207. 

  6207. + */
    6208. 

  6208. +struct mpls_pl* bd_get_title_mpls(BLURAY * bd);
    6209. 

  6209.  
    6210. 

  6210.  #ifdef __cplusplus
    6211. 

  6211.  }
    6212. 

  6212. diff --git a/src/libbluray/decoders/graphics_controller.c b/src/libbluray/decoders/graphics_controller.c
    6213. 

  6213. index dabde1c..d3c775a 100644
    6214. 

  6214. --- a/src/libbluray/decoders/graphics_controller.c
    6215. 

  6215. +++ b/src/libbluray/decoders/graphics_controller.c
    6216. 

  6216. @@ -825,6 +825,8 @@ void gc_free(GRAPHICS_CONTROLLER **p)
    6217. 

  6217.  
    6218. 

  6218.          bd_mutex_destroy(&gc->mutex);
    6219. 

  6219.  
    6220. 

  6220. +        X_FREE(gc->saved_bog_data);
    6221. 

  6221. +
    6222. 

  6222.          X_FREE(*p);
    6223. 

  6223.      }
    6224. 

  6224.  }
    6225. 

  6225. diff --git a/src/libbluray/disc/aacs.c b/src/libbluray/disc/aacs.c
    6226. 

  6226. index 3059d66..9ae8efb 100644
    6227. 

  6227. --- a/src/libbluray/disc/aacs.c
    6228. 

  6228. +++ b/src/libbluray/disc/aacs.c
    6229. 

  6229. @@ -47,6 +47,8 @@ struct bd_aacs {
    6230. 

  6230.      fptr_p_void    get_device_binding_id;
    6231. 

  6231.      fptr_p_void    get_device_nonce;
    6232. 

  6232.      fptr_p_void    get_media_key;
    6233. 

  6233. +
    6234. 

  6234. +    int            impl_id;
    6235. 

  6235.  };
    6236. 

  6236.  
    6237. 

  6237.  
    6238. 

  6238. @@ -58,15 +60,19 @@ static void _libaacs_close(BD_AACS *p)
    6239. 

  6239.      }
    6240. 

  6240.  }
    6241. 

  6241.  
    6242. 

  6242. -void libaacs_unload(BD_AACS **p)
    6243. 

  6243. +static void _unload(BD_AACS *p)
    6244. 

  6244.  {
    6245. 

  6245. -    if (p && *p) {
    6246. 

  6246. -        _libaacs_close(*p);
    6247. 

  6247. +    _libaacs_close(p);
    6248. 

  6248.  
    6249. 

  6249. -        if ((*p)->h_libaacs) {
    6250. 

  6250. -            dl_dlclose((*p)->h_libaacs);
    6251. 

  6251. -        }
    6252. 

  6252. +    if (p->h_libaacs) {
    6253. 

  6253. +        dl_dlclose(p->h_libaacs);
    6254. 

  6254. +    }
    6255. 

  6255. +}
    6256. 

  6256.  
    6257. 

  6257. +void libaacs_unload(BD_AACS **p)
    6258. 

  6258. +{
    6259. 

  6259. +    if (p && *p) {
    6260. 

  6260. +        _unload(*p);
    6261. 

  6261.          X_FREE(*p);
    6262. 

  6262.      }
    6263. 

  6263.  }
    6264. 

  6264. @@ -82,7 +88,7 @@ int libaacs_required(void *have_file_handle, int (*have_file)(void *, const char
    6265. 

  6265.      return 0;
    6266. 

  6266.  }
    6267. 

  6267.  
    6268. 

  6268. -static void *_open_libaacs(void)
    6269. 

  6269. +static void *_open_libaacs(int *impl_id)
    6270. 

  6270.  {
    6271. 

  6271.      const char * const libaacs[] = {
    6272. 

  6272.        getenv("LIBAACS_PATH"),
    6273. 

  6273. @@ -91,10 +97,11 @@ static void *_open_libaacs(void)
    6274. 

  6274.      };
    6275. 

  6275.      unsigned ii;
    6276. 

  6276.  
    6277. 

  6277. -    for (ii = 0; ii < sizeof(libaacs) / sizeof(libaacs[0]); ii++) {
    6278. 

  6278. +    for (ii = *impl_id; ii < sizeof(libaacs) / sizeof(libaacs[0]); ii++) {
    6279. 

  6279.          if (libaacs[ii]) {
    6280. 

  6280.              void *handle = dl_dlopen(libaacs[ii], "0");
    6281. 

  6281.              if (handle) {
    6282. 

  6282. +                *impl_id = ii;
    6283. 

  6283.                  BD_DEBUG(DBG_BLURAY, "Using %s for AACS\n", libaacs[ii]);
    6284. 

  6284.                  return handle;
    6285. 

  6285.              }
    6286. 

  6286. @@ -105,14 +112,15 @@ static void *_open_libaacs(void)
    6287. 

  6287.      return NULL;
    6288. 

  6288.  }
    6289. 

  6289.  
    6290. 

  6290. -BD_AACS *libaacs_load(void)
    6291. 

  6291. +static BD_AACS *_load(int impl_id)
    6292. 

  6292.  {
    6293. 

  6293.      BD_AACS *p = calloc(1, sizeof(BD_AACS));
    6294. 

  6294.      if (!p) {
    6295. 

  6295.          return NULL;
    6296. 

  6296.      }
    6297. 

  6297. +    p->impl_id = impl_id;
    6298. 

  6298.  
    6299. 

  6299. -    p->h_libaacs = _open_libaacs();
    6300. 

  6300. +    p->h_libaacs = _open_libaacs(&p->impl_id);
    6301. 

  6301.      if (!p->h_libaacs) {
    6302. 

  6302.          X_FREE(p);
    6303. 

  6303.          return NULL;
    6304. 

  6304. @@ -143,6 +151,11 @@ BD_AACS *libaacs_load(void)
    6305. 

  6305.      return p;
    6306. 

  6306.  }
    6307. 

  6307.  
    6308. 

  6308. +BD_AACS *libaacs_load(void)
    6309. 

  6309. +{
    6310. 

  6310. +    return _load(0);
    6311. 

  6311. +}
    6312. 

  6312. +
    6313. 

  6313.  int libaacs_open(BD_AACS *p, const char *device,
    6314. 

  6314.                     void *file_open_handle, void *file_open_fp,
    6315. 

  6315.                     const char *keyfile_path)
    6316. 

  6316. @@ -180,6 +193,22 @@ int libaacs_open(BD_AACS *p, const char *device,
    6317. 

  6317.          BD_DEBUG(DBG_BLURAY, "aacs_open() not found\n");
    6318. 

  6318.      }
    6319. 

  6319.  
    6320. 

  6320. +    if (error_code) {
    6321. 

  6321. +        /* failed. try next aacs implementation if available. */
    6322. 

  6322. +        BD_AACS *p2 = _load(p->impl_id + 1);
    6323. 

  6323. +        if (p2) {
    6324. 

  6324. +            if (!libaacs_open(p2, device, file_open_handle, file_open_fp, keyfile_path)) {
    6325. 

  6325. +                /* succeed - swap implementations */
    6326. 

  6326. +                _unload(p);
    6327. 

  6327. +                *p = *p2;
    6328. 

  6328. +                X_FREE(p2);
    6329. 

  6329. +                return 0;
    6330. 

  6330. +            }
    6331. 

  6331. +            /* failed - report original errors */
    6332. 

  6332. +            libaacs_unload(&p2);
    6333. 

  6333. +        }
    6334. 

  6334. +    }
    6335. 

  6335. +
    6336. 

  6336.      if (p->aacs) {
    6337. 

  6337.          if (aacs_get_mkb_version) {
    6338. 

  6338.              p->mkbv = aacs_get_mkb_version(p->aacs);
    6339. 

  6339. diff --git a/src/libbluray/disc/dec.c b/src/libbluray/disc/dec.c
    6340. 

  6340. index 290dd4d..1c8a601 100644
    6341. 

  6341. --- a/src/libbluray/disc/dec.c
    6342. 

  6342. +++ b/src/libbluray/disc/dec.c
    6343. 

  6343. @@ -179,6 +179,8 @@ static int _libaacs_init(BD_DEC *dec, struct dec_dev *dev,
    6344. 

  6344.      int result;
    6345. 

  6345.      const uint8_t *disc_id;
    6346. 

  6346.  
    6347. 

  6347. +    memset(i, 0, sizeof(*i));
    6348. 

  6348. +
    6349. 

  6349.      libaacs_unload(&dec->aacs);
    6350. 

  6350.  
    6351. 

  6351.      i->aacs_detected = libaacs_required((void*)dev, _bdrom_have_file);
    6352. 

  6352. @@ -205,7 +207,7 @@ static int _libaacs_init(BD_DEC *dec, struct dec_dev *dev,
    6353. 

  6353.      }
    6354. 

  6354.  
    6355. 

  6355.      if (result) {
    6356. 

  6356. -        BD_DEBUG(DBG_BLURAY | DBG_CRIT, "aacs_open() failed!\n");
    6357. 

  6357. +        BD_DEBUG(DBG_BLURAY | DBG_CRIT, "aacs_open() failed: %d!\n", result);
    6358. 

  6358.          libaacs_unload(&dec->aacs);
    6359. 

  6359.          return 0;
    6360. 

  6360.      }
    6361. 

  6361. @@ -259,6 +261,13 @@ static int _libbdplus_init(BD_DEC *dec, struct dec_dev *dev,
    6362. 

  6362.      i->bdplus_gen     = libbdplus_get_gen(dec->bdplus);
    6363. 

  6363.      i->bdplus_date    = libbdplus_get_date(dec->bdplus);
    6364. 

  6364.      i->bdplus_handled = 1;
    6365. 

  6365. +
    6366. 

  6366. +    if (i->bdplus_date == 0) {
    6367. 

  6367. +        // libmmbd -> no menu support
    6368. 

  6368. +        BD_DEBUG(DBG_BLURAY | DBG_CRIT, "WARNING: using libmmbd for BD+. On-disc menus will not work.\n");
    6369. 

  6369. +        i->no_menu_support = 1;
    6370. 

  6370. +    }
    6371. 

  6371. +
    6372. 

  6372.      return 1;
    6373. 

  6373.  }
    6374. 

  6374.  
    6375. 

  6375. diff --git a/src/libbluray/disc/disc.c b/src/libbluray/disc/disc.c
    6376. 

  6376. index 8f275b8..757b6ed 100644
    6377. 

  6377. --- a/src/libbluray/disc/disc.c
    6378. 

  6378. +++ b/src/libbluray/disc/disc.c
    6379. 

  6379. @@ -69,7 +69,7 @@ static BD_FILE_H *_bdrom_open_path(void *p, const char *rel_path)
    6380. 

  6380.          return NULL;
    6381. 

  6381.      }
    6382. 

  6382.  
    6383. 

  6383. -    fp = file_open(abs_path, "rb");
    6384. 

  6384. +    fp = file_open(abs_path, "rbS");
    6385. 

  6385.      X_FREE(abs_path);
    6386. 

  6386.  
    6387. 

  6387.      return fp;
    6388. 

  6388. @@ -177,7 +177,7 @@ static void _comb_dir_append(BD_DIR_H *dp, BD_DIRENT *entry)
    6389. 

  6389.      }
    6390. 

  6390.  
    6391. 

  6391.      /* append */
    6392. 

  6392. -    priv = realloc(priv, sizeof(*priv) + priv->count * sizeof(BD_DIRENT));
    6393. 

  6393. +    priv = realloc(dp->internal, sizeof(*priv) + priv->count * sizeof(BD_DIRENT));
    6394. 

  6394.      if (!priv) {
    6395. 

  6395.          return;
    6396. 

  6396.      }
    6397. 

  6397. diff --git a/src/libbluray/disc/enc_info.h b/src/libbluray/disc/enc_info.h
    6398. 

  6398. index d45d891..47ca94f 100644
    6399. 

  6399. --- a/src/libbluray/disc/enc_info.h
    6400. 

  6400. +++ b/src/libbluray/disc/enc_info.h
    6401. 

  6401. @@ -34,6 +34,8 @@ typedef struct bd_enc_info {
    6402. 

  6402.      uint8_t  disc_id[20];
    6403. 

  6403.      uint8_t  bdplus_gen;
    6404. 

  6404.      uint32_t bdplus_date;
    6405. 

  6405. +
    6406. 

  6406. +    uint8_t  no_menu_support;
    6407. 

  6407.  } BD_ENC_INFO;
    6408. 

  6408.  
    6409. 

  6409.  #endif /* _BD_DISC_ENC_INFO_H_ */
    6410. 

  6410.