Merge commit '0e020921726ee812e633959d9ad6315ff58b902b'

Author: Sibras

Makefile.am

@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -Im4
 
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src/dvdread $(CSS_CFLAGS)
 
-dist_doc_DATA = AUTHORS ChangeLog COPYING NEWS README TODO
+dist_doc_DATA = AUTHORS ChangeLog COPYING NEWS README.md TODO
 
 MAINTAINERCLEANFILES = ChangeLog
 
@@ -12,7 +12,7 @@ ChangeLog: $(wildcard $(srcdir)/.git/logs/HEAD)
 	-rm -f $(@)-tmp
 	test -e $(@) || touch $(@)
 
-EXTRA_DIST = msvc/ doc/footer.html doc/header.html
+EXTRA_DIST = msvc doc/footer.html doc/header.html
 
 lib_LTLIBRARIES = libdvdread.la
 

NEWS

@@ -1,3 +1,8 @@
+libdvdread (6.1.3)
+ * Improvements for OpenBSD
+ * Fix crashes on some DVD (0 PCGI SRP)
+ * Misc source fixes and cleanups, including fixes for recent toolchains
+
 libdvdread (6.1.2)
  * Fix Win32 Unicode paths opening
  * Fix warnings and build improvements
@@ -84,7 +89,7 @@ libdvdread (4.2.0)
   * fixed segfault when reading certain DVDs, for example "Thor"
 
 libdvdread (4.1.3)
-  * an embarassing amount of fixes regarding potential memory and resource leaks
+  * an embarrassing amount of fixes regarding potential memory and resource leaks
     (patches contributed by Erik Hovland)
   * added dvdread-config (dvdnav-config's younger brother)
   * added pkgconfig support
@@ -105,7 +110,7 @@ libdvdnav (4.1.1)
     dvdnav_{title,part}_play() works again
   * removed wrong SPU stream change event filter
     (fixes unwanted subtitles in the trailer of "Girl, interrupted", RC2)
-  * fixed error "Expected NAV packet but none found." occuring sometimes
+  * fixed error "Expected NAV packet but none found." occurring sometimes
     on resume from menu
 
 libdvdnav (0.1.10)
@@ -139,7 +144,7 @@ libdvdnav (0.1.6) unstable; urgency=low
   * method to try-run VM operations, now used for safer chapter skipping and menu jumps
   * fixed detection of current PTT to not assume a 1:1 mapping between PTTs and PGs
   * releasing stills when jumping to menu fixes some state inconsistencies
-  * do not assume PGs to be physically layed out in sequence on the disc
+  * do not assume PGs to be physically laid out in sequence on the disc
   * optional PGC based seeking
   * new event on cell changes for timing info
 

README

@@ -0,0 +1,41 @@
+# Goals and features
+
+**libdvdread** is a library for simpler navigation (DVDs without menus)
+
+## Where does it come from?
+
+This library is based on a lot of code and expertise from the **Ogle project**.
+**Ogle** was the first DVD player who implemented **free DVD navigation**. The
+**libdvdread** developers wish to express their gratitude to the Ogle people
+for all the valuable research work they have done.
+
+Initially, the dvdnav code was part of a plugin to the xine media player
+called xine-dvdnav. Later on, the DVD VM specific code was split
+from xine-dvdnav and went into the first version of libdvdnav.
+
+Then, it was forked, and forked again on MPlayer repositories.
+libdvdnav and libdvdread were merged, and then split again.
+
+## Where is it now?
+
+Libdvdread is hosted [here](https://code.videolan.org/videolan/libdvdread)
+
+You can find more information [here](https://www.videolan.org/developers/libdvdnav.html)
+
+Please report bugs to the developers mailinglist at
+[dvdnav mailing list](https://mailman.videolan.org/listinfo/libdvdnav-devel)
+
+## License
+
+**Libdvdread** is completely licensed under GPL. You may use it at wish within the
+bounds of this license. See the file [COPYING](https://code.videolan.org/videolan/libdvdread/-/blob/master/COPYING) for a copy of the GPL.
+
+## Using libdvdread
+
+A detailed description of DVD structures is available [here](http://www.mpucoder.com/dvd/)
+
+All documentation is also accessible [here](http://dvdnav.mplayerhq.hu/#docs)
+
+## CoC
+
+The [VideoLAN Code of Conduct](https://wiki.videolan.org/Code_of_Conduct/) applies to this project.

README.md

@@ -1,7 +1,7 @@
 dnl library version number
 m4_define([dvdread_major], 6)
 m4_define([dvdread_minor], 1)
-m4_define([dvdread_micro], 2)
+m4_define([dvdread_micro], 3)
 m4_define([dvdread_version],[dvdread_major.dvdread_minor.dvdread_micro])
 
 AC_INIT(libdvdread, dvdread_version)
@@ -98,7 +98,7 @@ CC_CHECK_CFLAGS_APPEND([-Wall -Wsign-compare -Wextra])
 
 
 AC_ARG_ENABLE([apidoc],
-  AS_HELP_STRING([--disable-apidoc], [Disable building (with Doxygen) and intalling API documentation @<:@default=auto@:@>]))
+  AS_HELP_STRING([--disable-apidoc], [Disable building (with Doxygen) and installing API documentation @<:@default=auto@:@>]))
 
 AC_PATH_PROG([DOXYGEN], [doxygen])
 

configure.ac

@@ -23,15 +23,15 @@
 #include <stdlib.h>
 #include <string.h>
 #include <inttypes.h>
+#include <assert.h>
 
 #include "dvdread/bitreader.h"
 
-int dvdread_getbits_init(getbits_state_t *state, uint8_t *start) {
+int dvdread_getbits_init(getbits_state_t *state, const uint8_t *start) {
   if ((state == NULL) || (start == NULL)) return 0;
   state->start = start;
   state->bit_position = 0;
   state->byte_position = 0;
-  state->byte = start[0];
   return 1;
 }
 
@@ -47,37 +47,32 @@ uint32_t dvdread_getbits(getbits_state_t *state, uint32_t number_of_bits) {
 
   if ((state->bit_position) > 0) {  /* Last getbits left us in the middle of a byte. */
     if (number_of_bits > (8-state->bit_position)) { /* this getbits will span 2 or more bytes. */
-      byte = state->byte;
+      byte = state->start[state->byte_position] << state->bit_position;
       byte = byte >> (state->bit_position);
       result = byte;
       number_of_bits -= (8-state->bit_position);
       state->bit_position = 0;
       state->byte_position++;
-      state->byte = state->start[state->byte_position];
     } else {
-      byte=state->byte;
-      state->byte = state->byte << number_of_bits;
+      byte = state->start[state->byte_position] << state->bit_position;
       byte = byte >> (8 - number_of_bits);
       result = byte;
       state->bit_position += number_of_bits; /* Here it is impossible for bit_position > 8 */
       if (state->bit_position == 8) {
         state->bit_position = 0;
         state->byte_position++;
-        state->byte = state->start[state->byte_position];
       }
       number_of_bits = 0;
     }
   }
   if ((state->bit_position) == 0) {
     while (number_of_bits > 7) {
-      result = (result << 8) + state->byte;
+      result = (result << 8) + state->start[state->byte_position];
       state->byte_position++;
-      state->byte = state->start[state->byte_position];
       number_of_bits -= 8;
     }
     if (number_of_bits > 0) { /* number_of_bits < 8 */
-      byte = state->byte;
-      state->byte = state->byte << number_of_bits;
+      byte = state->start[state->byte_position] << state->bit_position;
       state->bit_position += number_of_bits; /* Here it is impossible for bit_position > 7 */
       byte = byte >> (8 - number_of_bits);
       result = (result << number_of_bits) + byte;
@@ -115,3 +110,54 @@ uint32_t dvdread_get32bits(getbits_state_t *state) {
 }
 
 #endif
+
+#ifdef BITREADER_TESTS
+
+int main()
+{
+    uint8_t buff[2] = {
+        0x6E, 0xC2
+        // 0b 01101110 11000010
+    };
+    getbits_state_t state;
+    dvdread_getbits_init(&state, buff);
+
+    uint32_t bits = dvdread_getbits(&state, 3);
+    assert(bits == 3);
+
+    bits = dvdread_getbits(&state, 3);
+    assert(bits == 3);
+
+    bits = dvdread_getbits(&state, 4);
+    assert(bits == 11);
+
+    bits = dvdread_getbits(&state, 6);
+    assert(bits == 2);
+
+    dvdread_getbits_init(&state, buff);
+    bits = dvdread_getbits(&state, 10);
+    assert(bits == 443);
+
+    bits = dvdread_getbits(&state, 6);
+    assert(bits == 2);
+
+    dvdread_getbits_init(&state, buff);
+    bits = dvdread_getbits(&state, 16);
+    assert(bits == 28354);
+
+    buff[0] = buff[1] = 0xFF;
+    dvdread_getbits_init(&state, buff);
+    bits = dvdread_getbits(&state, 16);
+    assert(bits == 0xFFFF);
+
+    uint8_t large[5] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
+    dvdread_getbits_init(&state, large);
+    bits = dvdread_getbits(&state, 8);
+    assert(bits == 0xFF);
+    bits = dvdread_getbits(&state, 32);
+    assert(bits == 0xFFFFFFFF);
+
+    return 0;
+}
+
+#endif

src/bitreader.c

@@ -350,13 +350,15 @@ int dvdinput_setup(void *priv, dvd_logger_cb *logcb)
   #define CSS_LIB "libdvdcss-2.dll"
 #elif defined(__OS2__)
   #define CSS_LIB "dvdcss2.dll"
+#elif defined(__OpenBSD__)
+  #define CSS_LIB "libdvdcss.so"
 #else
   #define CSS_LIB "libdvdcss.so.2"
 #endif
   dvdcss_library = dlopen(CSS_LIB, RTLD_LAZY);
 
   if(dvdcss_library != NULL) {
-#if defined(__OpenBSD__) && !defined(__ELF__) || defined(__OS2__)
+#ifdef __OS2__
 #define U_S "_"
 #else
 #define U_S

src/dvd_input.c

@@ -29,9 +29,7 @@
 #include <stdio.h>          /* fprintf */
 #include <errno.h>          /* errno, EIN* */
 #include <string.h>         /* memcpy, strlen */
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>         /* chdir, getcwd */
-#endif
+#include <unistd.h>         /* pclose */
 #include <limits.h>         /* PATH_MAX */
 #include <dirent.h>         /* opendir, readdir */
 #include <ctype.h>          /* isalpha */
@@ -290,7 +288,7 @@ static int initAllCSSKeys( dvd_reader_t *ctx )
   for( title = 0; title < 100; title++ ) {
     gettimeofday( &t_s, NULL );
     if( title == 0 ) {
-      sprintf( filename, "/VIDEO_TS/VIDEO_TS.VOB" );
+      strcpy( filename, "/VIDEO_TS/VIDEO_TS.VOB" );
     } else {
       sprintf( filename, "/VIDEO_TS/VTS_%02d_%d.VOB", title, 0 );
     }
@@ -553,33 +551,18 @@ static dvd_reader_t *DVDOpenCommon( void *priv,
     if( !(path_copy = strdup( path ) ) )
       goto DVDOpen_error;
 
-#ifndef _WIN32 /* don't have fchdir, and getcwd( NULL, ... ) is strange */
+#ifndef _WIN32 /* win32 doesn't have realpath */
               /* Also WIN32 does not have symlinks, so we don't need this bit of code. */
 
     /* Resolve any symlinks and get the absolute dir name. */
     {
-      if( ( cdir  = open( ".", O_RDONLY ) ) >= 0 ) {
-        int retval;
-        if( chdir( path_copy ) == -1 ) {
-          goto DVDOpen_error;
-        }
-        new_path = malloc(PATH_MAX+1);
-        if(!new_path) {
-          goto DVDOpen_error;
-        }
-        if( getcwd( new_path, PATH_MAX ) == NULL ) {
-          goto DVDOpen_error;
-        }
-        retval = fchdir( cdir );
-        close( cdir );
-        cdir = -1;
-        if( retval == -1 ) {
+        new_path = realpath( path_copy, NULL );
+        if( new_path == NULL ) {
           goto DVDOpen_error;
         }
         free(path_copy);
         path_copy = new_path;
         new_path = NULL;
-      }
     }
 #endif