Packman Build Service PMBS

makemkv.changes Changed

makemkv.spec Changed

@@ -28,22 +28,32 @@
 
 Name:           makemkv
 Summary:        DVD and BlueRay Ripping tool
-Version:        1.9.0
+Version:        1.9.5
 Release:        0.pm.1
 License:        see eula_en_linux.txt
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 Url:            http://www.makemkv.com
-Source0:        %{name}-oss-%{version}.tar.gz
-Source1:        %{name}-bin-%{version}.tar.gz
-Patch0:         %{name}-oss-%{version}.diff
+Source0:        %{name}-oss-%{version}.tar.xz
+Source1:        %{name}-bin-%{version}.tar.xz
+Patch0:         makemkv-oss-1.9.0.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:       %{libnamedriveio} = %{version}-%{release}
 Requires:       %{libnamemakemkve} = %{version}-%{release}
 Requires:       %{libnamemmbd} = %{version}-%{release}
 BuildRequires:  libopenssl-devel
-BuildRequires:  libqt4-devel
 BuildRequires:  libexpat-devel
-BuildRequires:  libffmpeg-devel
+%if 0%{?suse_version} >= 1320 
+BuildRequires:  pkgconfig(Qt5Core)
+BuildRequires:  pkgconfig(Qt5DBus)
+BuildRequires:  pkgconfig(Qt5Gui)
+BuildRequires:  pkgconfig(Qt5Widgets)
+%else
+BuildRequires:  pkgconfig(QtCore)
+BuildRequires:  pkgconfig(QtGui)
+BuildRequires:  pkgconfig(QtDBus)
+%endif
+BuildRequires:  pkgconfig(libavcodec)
+BuildRequires:  pkgconfig(libavutil)
 BuildRequires:  update-desktop-files
 ExclusiveArch:  i586 x86_64
 
@@ -114,7 +124,7 @@
 %install
 %makeinstall
 %suse_update_desktop_file -c makemkv makemkv "makemkv" makemkv makemkv.png AudioVideo AudioVideoEditing
-tar xzf %{SOURCE1}
+tar xaf %{SOURCE1}
 %ifarch x86_64
   %{__install} -m 755 %{name}-bin-%{version}/bin/amd64/makemkvcon %{buildroot}%{_bindir}/
 %else
@@ -123,9 +133,6 @@
 %endif
 
 
-%clean
-[ "%{buildroot}" != "/" ] && %{__rm} -rf "%{buildroot}"
-
 %post -n %{libnamedriveio} -p /sbin/ldconfig
 %postun -n %{libnamedriveio} -p /sbin/ldconfig

makemkv-bin-1.9.0.tar.gz/Makefile -> makemkv-bin-1.9.5.tar.xz/Makefile Changed

@@ -1,6 +1,7 @@
 
 ARCH=$(shell uname -m)
 DESTDIR=
+PREFIX=/usr
 
 ifeq ($(ARCH),i586)
 ARCH=i386
@@ -33,26 +34,27 @@
 	@echo accepted > $@
 
 install: tmp/eula_accepted bin/$(ARCH)/makemkvcon
-	rm -f $(DESTDIR)/usr/bin/makemkvcon
-	rm -f $(DESTDIR)/usr/bin/mmdtsdec
-	rm -f $(DESTDIR)/usr/share/MakeMKV/*.mo.gz
-	install -d $(DESTDIR)/usr/share/MakeMKV
-	install -d $(DESTDIR)/usr/bin
-	install -t $(DESTDIR)/usr/bin bin/$(ARCH)/makemkvcon
-	install -t $(DESTDIR)/usr/bin bin/i386/mmdtsdec
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/default.mmcp.xml
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/flac.mmcp.xml
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/wdtv.mmcp.xml
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/aac-stereo.mmcp.xml
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_deu.mo.gz
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_jpn.mo.gz
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_spa.mo.gz
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_ptb.mo.gz
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_dut.mo.gz
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_swe.mo.gz
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_ita.mo.gz
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_chi.mo.gz
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_pol.mo.gz
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_dan.mo.gz
-	install -m 644 -t $(DESTDIR)/usr/share/MakeMKV src/share/makemkv_fra.mo.gz
+	rm -f $(DESTDIR)$(PREFIX)/bin/makemkvcon
+	rm -f $(DESTDIR)$(PREFIX)/bin/mmdtsdec
+	rm -f $(DESTDIR)$(PREFIX)/share/MakeMKV/*.mo.gz
+	install -d $(DESTDIR)$(PREFIX)/share/MakeMKV
+	install -d $(DESTDIR)$(PREFIX)/bin
+	install -t $(DESTDIR)$(PREFIX)/bin bin/$(ARCH)/makemkvcon
+	install -t $(DESTDIR)$(PREFIX)/bin bin/i386/mmdtsdec
+	install -m 644 -t $(DESTDIR)$(PREFIX)/share/MakeMKV src/share/default.mmcp.xml
+	install -m 644 -t $(DESTDIR)$(PREFIX)/share/MakeMKV src/share/flac.mmcp.xml
+	install -m 644 -t $(DESTDIR)$(PREFIX)/share/MakeMKV src/share/wdtv.mmcp.xml
+	install -m 644 -t $(DESTDIR)$(PREFIX)/share/MakeMKV src/share/aac-stereo.mmcp.xml
+	install -m 644 -t $(DESTDIR)$(PREFIX)/share/MakeMKV src/share/makemkv_deu.mo.gz
+	install -m 644 -t $(DESTDIR)$(PREFIX)/share/MakeMKV src/share/makemkv_jpn.mo.gz
+	install -m 644 -t $(DESTDIR)$(PREFIX)/share/MakeMKV src/share/makemkv_spa.mo.gz
+	install -m 644 -t $(DESTDIR)$(PREFIX)/share/MakeMKV src/share/makemkv_ptb.mo.gz
+	install -m 644 -t $(DESTDIR)$(PREFIX)/share/MakeMKV src/share/makemkv_dut.mo.gz
+	install -m 644 -t $(DESTDIR)$(PREFIX)/share/MakeMKV src/share/makemkv_swe.mo.gz
+	install -m 644 -t $(DESTDIR)$(PREFIX)/share/MakeMKV src/share/makemkv_nor.mo.gz
+	install -m 644 -t $(DESTDIR)$(PREFIX)/share/MakeMKV src/share/makemkv_ita.mo.gz
+	install -m 644 -t $(DESTDIR)$(PREFIX)/share/MakeMKV src/share/makemkv_chi.mo.gz
+	install -m 644 -t $(DESTDIR)$(PREFIX)/share/MakeMKV src/share/makemkv_pol.mo.gz
+	install -m 644 -t $(DESTDIR)$(PREFIX)/share/MakeMKV src/share/makemkv_dan.mo.gz
+	install -m 644 -t $(DESTDIR)$(PREFIX)/share/MakeMKV src/share/makemkv_fra.mo.gz

makemkv-bin-1.9.0.tar.gz/bin/amd64/makemkvcon -> makemkv-bin-1.9.5.tar.xz/bin/amd64/makemkvcon Changed

makemkv-bin-1.9.0.tar.gz/bin/i386/makemkvcon -> makemkv-bin-1.9.5.tar.xz/bin/i386/makemkvcon Changed

makemkv-bin-1.9.0.tar.gz/bin/i386/mmdtsdec -> makemkv-bin-1.9.5.tar.xz/bin/i386/mmdtsdec Changed

makemkv-bin-1.9.0.tar.gz/src/eula_en_linux.txt -> makemkv-bin-1.9.5.tar.xz/src/eula_en_linux.txt Changed

makemkv-bin-1.9.0.tar.gz/src/share/aac-stereo.mmcp.xml -> makemkv-bin-1.9.5.tar.xz/src/share/aac-stereo.mmcp.xml Changed

makemkv-bin-1.9.0.tar.gz/src/share/default.mmcp.xml -> makemkv-bin-1.9.5.tar.xz/src/share/default.mmcp.xml Changed

makemkv-bin-1.9.0.tar.gz/src/share/flac.mmcp.xml -> makemkv-bin-1.9.5.tar.xz/src/share/flac.mmcp.xml Changed

makemkv-bin-1.9.0.tar.gz/src/share/makemkv_fra.mo.gz -> makemkv-bin-1.9.5.tar.xz/src/share/makemkv_fra.mo.gz Changed

makemkv-bin-1.9.0.tar.gz/src/share/makemkv_ita.mo.gz -> makemkv-bin-1.9.5.tar.xz/src/share/makemkv_ita.mo.gz Changed

makemkv-bin-1.9.5.tar.xz/src/share/makemkv_nor.mo.gz Added

makemkv-bin-1.9.0.tar.gz/src/share/wdtv.mmcp.xml -> makemkv-bin-1.9.5.tar.xz/src/share/wdtv.mmcp.xml Changed

makemkv-oss-1.9.0.tar.gz/License.txt -> makemkv-oss-1.9.5.tar.xz/License.txt Changed

makemkv-oss-1.9.0.tar.gz/Makefile.in -> makemkv-oss-1.9.5.tar.xz/Makefile.in Changed

@@ -2,12 +2,9 @@
 include makefile.common
 
 GCC=@CC@
-MOC=$(strip $(shell which moc-qt4))
-ifeq ($(MOC),)
-MOC=moc
-endif
+MOC=@QT_MOC@
 
-CFLAGS=@CFLAGS_OPT@ -D_GNU_SOURCE -D_linux_
+CFLAGS=@CFLAGS_OPT@ -D_linux_ -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
 DESTDIR=@DESTDIR@
 PREFIX=@prefix@
 ENABLE_GUI=@ENABLE_GUI@
@@ -61,9 +58,9 @@
 out/libmakemkv.so.1.full: tmp/gen_buildinfo.h
 	mkdir -p out
 	$(GCC) $(CFLAGS) -D_REENTRANT -shared -Wl,-z,defs -o$@ $(LIBEBML_INC) $(LIBEBML_DEF) $(LIBMATROSKA_INC) \
-	$(LIBMAKEMKV_INC) $(SSTRING_INC) $(MAKEMKVGUI_INC) $(LIBABI_INC) $(LIBFFABI_INC) \
+	$(LIBMAKEMKV_INC) $(SSTRING_INC) $(MAKEMKVGUI_INC) $(LIBABI_INC) $(LIBFFABI_INC) $(LIBDCADEC_DEF) \
 	$(LIBEBML_SRC) $(LIBMATROSKA_SRC) $(LIBMAKEMKV_SRC) $(GLIBC_SRC) $(SSTRING_SRC) \
-	$(LIBABI_SRC) $(LIBABI_SRC_LINUX) $(LIBFFABI_SRC) \
+	$(LIBABI_SRC) $(LIBABI_SRC_LINUX) $(LIBFFABI_SRC) $(LIBDCADEC_SRC) \
 	-DHAVE_BUILDINFO_H -Itmp $(FFMPEG_CFLAGS) \
 	-fPIC -Xlinker -dy -Xlinker --version-script=libmakemkv/src/libmakemkv.vers \
 	-Xlinker -soname=libmakemkv.so.1 -lc -lstdc++ -lcrypto -lz -lexpat $(FFMPEG_LIBS) -lm -lrt
@@ -80,8 +77,8 @@
 	$(GCC) $(CFLAGS) -o$@ $(MAKEMKVGUI_INC) $(LIBMAKEMKV_INC) $(SSTRING_INC) $(LIBDRIVEIO_INC) $(LIBABI_INC) \
 	$(MAKEMKVGUI_SRC) $(MAKEMKVGUI_SRC_LINUX) $(MAKEMKVGUI_GEN) $(SSTRING_SRC) $(LIBDRIVEIO_SRC_PUB) \
 	-DHAVE_BUILDINFO_H -Itmp \
-	-I/usr/include/qt4 -I/usr/lib/qt4/include -L/usr/lib/qt4 -L/usr/lib/qt4/lib -lc -lstdc++ \
-	-lQtGui -lQtCore -lQtDBus -lpthread -lz -lrt
+	@QT_INC@ -lc -lstdc++ \
+	@QT_LIB@ -lpthread -lz -lrt
 
 tmp/gen_buildinfo.h:
 	mkdir -p tmp
@@ -94,6 +91,5 @@
 
 tmp/image_data.o : makemkvgui/bin/image_data.bin
 	mkdir -p tmp
-	$(LD) -r -b binary -o $@.rw $<
-	$(OBJCOPY) --rename-section .data=.rodata2,readonly,alloc,load,data,contents $@.rw $@
+	$(LD) -r -b binary -o $@ $<

makemkv-oss-1.9.0.tar.gz/configure -> makemkv-oss-1.9.5.tar.xz/configure Changed

@@ -621,6 +621,13 @@
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+QT_MOC
+QT_LIB
+QT_INC
+qt4_LIBS
+qt4_CFLAGS
+qt5_LIBS
+qt5_CFLAGS
 ffmpeg_LIBS
 ffmpeg_CFLAGS
 PKG_CONFIG_LIBDIR
@@ -720,7 +727,11 @@
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
 ffmpeg_CFLAGS
-ffmpeg_LIBS'
+ffmpeg_LIBS
+qt5_CFLAGS
+qt5_LIBS
+qt4_CFLAGS
+qt4_LIBS'
 
 
 # Initialize some variables set by options.
@@ -1359,6 +1370,10 @@
   ffmpeg_CFLAGS
               C compiler flags for ffmpeg, overriding pkg-config
   ffmpeg_LIBS linker flags for ffmpeg, overriding pkg-config
+  qt5_CFLAGS  C compiler flags for qt5, overriding pkg-config
+  qt5_LIBS    linker flags for qt5, overriding pkg-config
+  qt4_CFLAGS  C compiler flags for qt4, overriding pkg-config
+  qt4_LIBS    linker flags for qt4, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -5028,6 +5043,255 @@
 
 
 fi
+
+
+if test "$enable_gui" != "no"; then
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for qt5" >&5
+$as_echo_n "checking for qt5... " >&6; }
+
+if test -n "$qt5_CFLAGS"; then
+    pkg_cv_qt5_CFLAGS="$qt5_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core Qt5Gui Qt5Widgets Qt5DBus\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "Qt5Core Qt5Gui Qt5Widgets Qt5DBus") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_qt5_CFLAGS=`$PKG_CONFIG --cflags "Qt5Core Qt5Gui Qt5Widgets Qt5DBus" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$qt5_LIBS"; then
+    pkg_cv_qt5_LIBS="$qt5_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core Qt5Gui Qt5Widgets Qt5DBus\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "Qt5Core Qt5Gui Qt5Widgets Qt5DBus") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_qt5_LIBS=`$PKG_CONFIG --libs "Qt5Core Qt5Gui Qt5Widgets Qt5DBus" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        qt5_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5Core Qt5Gui Qt5Widgets Qt5DBus" 2>&1`
+        else
+	        qt5_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5Core Qt5Gui Qt5Widgets Qt5DBus" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$qt5_PKG_ERRORS" >&5
+
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for qt4" >&5
+$as_echo_n "checking for qt4... " >&6; }
+
+if test -n "$qt4_CFLAGS"; then
+    pkg_cv_qt4_CFLAGS="$qt4_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore QtGui QtDBus\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "QtCore QtGui QtDBus") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_qt4_CFLAGS=`$PKG_CONFIG --cflags "QtCore QtGui QtDBus" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$qt4_LIBS"; then
+    pkg_cv_qt4_LIBS="$qt4_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore QtGui QtDBus\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "QtCore QtGui QtDBus") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_qt4_LIBS=`$PKG_CONFIG --libs "QtCore QtGui QtDBus" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        qt4_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "QtCore QtGui QtDBus" 2>&1`
+        else
+	        qt4_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "QtCore QtGui QtDBus" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$qt4_PKG_ERRORS" >&5
+
+
+      as_fn_error $? "Qt library (version 5 or 4) is required to build GUI" "$LINENO" 5
+
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+      as_fn_error $? "Qt library (version 5 or 4) is required to build GUI" "$LINENO" 5
+
+else
+	qt4_CFLAGS=$pkg_cv_qt4_CFLAGS
+	qt4_LIBS=$pkg_cv_qt4_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+      QT_INC="$qt4_CFLAGS";
+      QT_LIB="$qt4_LIBS";
+      QT_MOC=`$PKG_CONFIG --variable moc_location "QtCore" 2>/dev/null`;
+
+fi
+
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for qt4" >&5
+$as_echo_n "checking for qt4... " >&6; }
+
+if test -n "$qt4_CFLAGS"; then
+    pkg_cv_qt4_CFLAGS="$qt4_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore QtGui QtDBus\""; } >&5

makemkv-oss-1.9.0.tar.gz/libabi/inc/lgpl/expatabi.h -> makemkv-oss-1.9.5.tar.xz/libabi/inc/lgpl/expatabi.h Changed

makemkv-oss-1.9.0.tar.gz/libabi/inc/lgpl/httpabi.h -> makemkv-oss-1.9.5.tar.xz/libabi/inc/lgpl/httpabi.h Changed

makemkv-oss-1.9.0.tar.gz/libabi/inc/lgpl/libmabi.h -> makemkv-oss-1.9.5.tar.xz/libabi/inc/lgpl/libmabi.h Changed

makemkv-oss-1.9.0.tar.gz/libabi/inc/lgpl/osslabi.h -> makemkv-oss-1.9.5.tar.xz/libabi/inc/lgpl/osslabi.h Changed

makemkv-oss-1.9.0.tar.gz/libabi/inc/lgpl/sysabi.h -> makemkv-oss-1.9.5.tar.xz/libabi/inc/lgpl/sysabi.h Changed

makemkv-oss-1.9.0.tar.gz/libabi/inc/lgpl/zlibabi.h -> makemkv-oss-1.9.5.tar.xz/libabi/inc/lgpl/zlibabi.h Changed

makemkv-oss-1.9.0.tar.gz/libabi/src/httplinux.cpp -> makemkv-oss-1.9.5.tar.xz/libabi/src/httplinux.cpp Changed

makemkv-oss-1.9.0.tar.gz/libabi/src/httpmac.cpp -> makemkv-oss-1.9.5.tar.xz/libabi/src/httpmac.cpp Changed

makemkv-oss-1.9.0.tar.gz/libabi/src/httpwin.cpp -> makemkv-oss-1.9.5.tar.xz/libabi/src/httpwin.cpp Changed

makemkv-oss-1.9.0.tar.gz/libabi/src/libm.c -> makemkv-oss-1.9.5.tar.xz/libabi/src/libm.c Changed

makemkv-oss-1.9.0.tar.gz/libabi/src/ossl_aes.c -> makemkv-oss-1.9.5.tar.xz/libabi/src/ossl_aes.c Changed

makemkv-oss-1.9.0.tar.gz/libabi/src/ossl_ec.c -> makemkv-oss-1.9.5.tar.xz/libabi/src/ossl_ec.c Changed

makemkv-oss-1.9.0.tar.gz/libabi/src/ossl_sha.c -> makemkv-oss-1.9.5.tar.xz/libabi/src/ossl_sha.c Changed

makemkv-oss-1.9.0.tar.gz/libabi/src/sys_linux.c -> makemkv-oss-1.9.5.tar.xz/libabi/src/sys_linux.c Changed

makemkv-oss-1.9.0.tar.gz/libabi/src/xpat.c -> makemkv-oss-1.9.5.tar.xz/libabi/src/xpat.c Changed

makemkv-oss-1.9.0.tar.gz/libabi/src/zlib.c -> makemkv-oss-1.9.5.tar.xz/libabi/src/zlib.c Changed

makemkv-oss-1.9.0.tar.gz/libdriveio/inc/driveio/driveio.h -> makemkv-oss-1.9.5.tar.xz/libdriveio/inc/driveio/driveio.h Changed

makemkv-oss-1.9.0.tar.gz/libdriveio/inc/driveio/scsicmd.h -> makemkv-oss-1.9.5.tar.xz/libdriveio/inc/driveio/scsicmd.h Changed

makemkv-oss-1.9.0.tar.gz/libdriveio/inc/lgpl/tcpip.h -> makemkv-oss-1.9.5.tar.xz/libdriveio/inc/lgpl/tcpip.h Changed

makemkv-oss-1.9.0.tar.gz/libdriveio/src/drives/drive.h -> makemkv-oss-1.9.5.tar.xz/libdriveio/src/drives/drive.h Changed

makemkv-oss-1.9.0.tar.gz/libdriveio/src/drives/pioneer.cpp -> makemkv-oss-1.9.5.tar.xz/libdriveio/src/drives/pioneer.cpp Changed

makemkv-oss-1.9.0.tar.gz/libdriveio/src/drives/xboxhddvd.cpp -> makemkv-oss-1.9.5.tar.xz/libdriveio/src/drives/xboxhddvd.cpp Changed

makemkv-oss-1.9.0.tar.gz/libdriveio/src/infolist.cpp -> makemkv-oss-1.9.5.tar.xz/libdriveio/src/infolist.cpp Changed

makemkv-oss-1.9.0.tar.gz/libdriveio/src/scsihlp.cpp -> makemkv-oss-1.9.5.tar.xz/libdriveio/src/scsihlp.cpp Changed

makemkv-oss-1.9.0.tar.gz/libdriveio/src/scsihlp.h -> makemkv-oss-1.9.5.tar.xz/libdriveio/src/scsihlp.h Changed

makemkv-oss-1.9.0.tar.gz/libdriveio/src/stdquery.cpp -> makemkv-oss-1.9.5.tar.xz/libdriveio/src/stdquery.cpp Changed

@@ -1,7 +1,7 @@
 /*
     libDriveIo - MMC drive interrogation library
 
-    Copyright (C) 2007-2014 GuinpinSoft inc <libdriveio@makemkv.com>
+    Copyright (C) 2007-2015 GuinpinSoft inc <libdriveio@makemkv.com>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -180,7 +180,7 @@
 // BD DI structure is huge (4+4096 bytes) but only small part is usually filled.
 // This function reduces amount of zeroes to store :)
 //
-static unsigned int CalculateRealBDDISize(const uint8_t* Buffer,unsigned int Len,bool ZeroOnOverflow)
+static unsigned int CalculateRealBDDISize(const uint8_t* Buffer,unsigned int Len)
 {
     // very little public information on BD DI structures is available, going with the most conservative way
 
@@ -200,7 +200,6 @@
         if (0==struct_size) break;
         if (struct_size>rest)
         {
-            if (ZeroOnOverflow) return 0;
             break;
         }
 
@@ -287,70 +286,42 @@
     // Disc structures
     //
 
-    // 0000TTTTCCCCCCCCC type code
+    // type, code, size
     static const uint16_t disc_struct_ids[]={
-        0x090,
-        0x000,0x001,0x003,0x009,0x00e,0x00f,0x010,0x011,
-        0x100,0x108,0x109,
-        0xffff
+        0x0000,0x03f0, // DVD Physical Format Information
+        0x0001,0x0008, // DVD Copyright Information
+        0x0003,0x00f0, // DVD BCA Information
+        0x000e,0x00f0, // DVD Pre-recorded Information in Lead-in
+        0x000f,0x00f0, // DVD Unique Disc Identifier
+        0x0100,0x03f0, // BD Disc Information (DI)
+        0,0
     };
 
-    for (unsigned int disc_struct_id=0;disc_struct_ids[disc_struct_id]!=0xffff;disc_struct_id++)
+
+    for (unsigned int disc_struct_id=0;disc_struct_ids[disc_struct_id+1]!=0;disc_struct_id+=2)
     {
         uint16_t code;
         unsigned int maxlen;
 
         code = disc_struct_ids[disc_struct_id];
+        len = disc_struct_ids[disc_struct_id+1];
 
-        err=QueryDiscStructure(ScsiTarget,code,data_buffer,0x3f0,&slen);
+        err=QueryDiscStructure(ScsiTarget,code,data_buffer,len,&slen);
         if (err!=0) return err;
 
         if (slen<4) continue;
 
-        if (slen>=0x3f0)
-        {
-            switch(code)
-            {
-            case 0x000: // dvd physical info
-                slen = 0x20;
-                break;
-            case 0x100: // bd disc info
-                len = CalculateRealBDDISize(data_buffer,slen,true);
-                if (len!=0) slen=len;
-                break;
-            default:
-                if (slen>=0x400)
-                {
-                    slen += 0x10;
-                } else {
-                    slen = sizeof(data_buffer);
-                }
-                break;
-            }
-            if (slen>sizeof(data_buffer))
-            {
-                slen = sizeof(data_buffer);
-            }
-            if (slen>=0x3f0)
-            {
-                err=QueryDiscStructure(ScsiTarget,code,data_buffer,slen,&slen);
-                if (err!=0) return err;
-            }
-        }
-
-        if (slen<4) continue;
-
         // limit the size of some structures
         switch(code)
         {
-        case 0x000: // dvd physical info
+        case 0x0000: // DVD Physical Format Information
             maxlen = (4+17);
             break;
-        case 0x100: // bd disc info
-            maxlen = CalculateRealBDDISize(data_buffer,slen,false);
+        case 0x0100: // BD Disc Information (DI)
+            maxlen = CalculateRealBDDISize(data_buffer,slen);
             break;
         default:
-            maxlen=sizeof(data_buffer);
+            maxlen=len;
             break;
         }

makemkv-oss-1.9.0.tar.gz/libdriveio/src/tipclient.cpp -> makemkv-oss-1.9.5.tar.xz/libdriveio/src/tipclient.cpp Changed

makemkv-oss-1.9.0.tar.gz/libdriveio/src/tipcommon.cpp -> makemkv-oss-1.9.5.tar.xz/libdriveio/src/tipcommon.cpp Changed

makemkv-oss-1.9.0.tar.gz/libdriveio/src/tipcommon.h -> makemkv-oss-1.9.5.tar.xz/libdriveio/src/tipcommon.h Changed

makemkv-oss-1.9.0.tar.gz/libdriveio/src/tipserver.cpp -> makemkv-oss-1.9.5.tar.xz/libdriveio/src/tipserver.cpp Changed

makemkv-oss-1.9.0.tar.gz/libffabi/inc/lgpl/ffabi.h -> makemkv-oss-1.9.5.tar.xz/libffabi/inc/lgpl/ffabi.h Changed

@@ -1,7 +1,7 @@
 /*
     libMakeMKV - MKV multiplexer library
 
-    Copyright (C) 2007-2014 GuinpinSoft inc <libmkv@makemkv.com>
+    Copyright (C) 2007-2015 GuinpinSoft inc <libmkv@makemkv.com>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -110,6 +110,9 @@
 struct _FFM_AudioMix;
 typedef struct _FFM_AudioMix FFM_AudioMix;
 
+struct _FFM_DcaDec;
+typedef struct _FFM_DcaDec FFM_DcaDec;
+
 typedef void  (__cdecl *ffm_log_callback_t)(void* ctx,void* ctx2,int level,char* text);
 typedef void* (__cdecl *ffm_memalign_t)(uintptr_t align, uintptr_t size);
 typedef void* (__cdecl *ffm_realloc_t)(void *ptr, uintptr_t size);
@@ -151,6 +154,12 @@
 
 int __cdecl ffm_get_channel_layout_string(char *buf,int buf_size,uint64_t channel_layout);
 
+FFM_DcaDec* __cdecl ffm_dcadec_context_create(void* logctx,int native_layout);
+void __cdecl ffm_dcadec_context_destroy(FFM_DcaDec* dca);
+int __cdecl ffm_dcadec_put_data(FFM_DcaDec* dca, const uint8_t *data, size_t size);
+int __cdecl ffm_dcadec_get_frame(FFM_DcaDec* dca, int ***data, FFM_AudioInfo* info);
+
+
 #ifdef __cplusplus
 };
 #endif

makemkv-oss-1.9.0.tar.gz/libffabi/src/audio_mix_matrix.c -> makemkv-oss-1.9.5.tar.xz/libffabi/src/audio_mix_matrix.c Changed

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec Added

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/bitstream.cpp Added

@@ -0,0 +1,190 @@
+/*
+ * This file is part of libdcadec.
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "common.h"
+#include "bitstream.h"
+
+#define DCA_LOGCTX (bits->logctx)
+
+void bits_init(struct bitstream *bits, uint8_t *data, size_t size,struct dcadec_log_context *logctx)
+{
+    bits->logctx = logctx;
+    dbg_assert(!((uintptr_t)data & 3));
+    bits->data = (uint32_t *)data;
+    bits->total = size << 3;
+    bits->index = 0;
+}
+
+static inline uint32_t bits_peek(struct bitstream *bits)
+{
+    if (bits->index >= bits->total)
+        return 0;
+
+    size_t pos = bits->index >> 5;
+    size_t shift = bits->index & 31;
+
+    uint32_t v = DCA_32BE(bits->data[pos]);
+    if (shift) {
+        v <<= shift;
+        v |= DCA_32BE(bits->data[pos + 1]) >> (32 - shift);
+    }
+
+    return v;
+}
+
+bool bits_get1(struct bitstream *bits)
+{
+    if (bits->index >= bits->total)
+        return false;
+
+    uint32_t v = DCA_32BE(bits->data[bits->index >> 5]);
+    v <<= bits->index & 31;
+    v >>= 32 - 1;
+
+    bits->index++;
+    return (v!=0);
+}
+
+int bits_get(struct bitstream *bits, int n)
+{
+    dbg_assert(n > 0 && n <= 32);
+
+    uint32_t v = bits_peek(bits);
+    v >>= 32 - n;
+
+    bits->index += n;
+    return v;
+}
+
+int bits_get_signed(struct bitstream *bits, int n)
+{
+    dbg_assert(n > 0 && n <= 32);
+
+    int32_t v = bits_peek(bits);
+    v >>= 32 - n;
+
+    bits->index += n;
+    return v;
+}
+
+int bits_get_signed_linear(struct bitstream *bits, int n)
+{
+    if (n == 0)
+        return 0;
+
+    int v = bits_get(bits, n);
+    return (v >> 1) ^ -(v & 1);
+}
+
+int bits_get_unsigned_rice(struct bitstream *bits, int k)
+{
+    int unary = 0;
+
+    while (bits->index < bits->total) {
+        uint32_t v = bits_peek(bits);
+        if (v) {
+            int z = dca_clz32(v);
+            bits->index += z + 1;
+            unary += z;
+            break;
+        }
+        bits->index += 32;
+        unary += 32;
+    }
+
+    return k > 0 ? (unary << k) | bits_get(bits, k) : unary;
+}
+
+int bits_get_signed_rice(struct bitstream *bits, int k)
+{
+    int v = bits_get_unsigned_rice(bits, k);
+    return (v >> 1) ^ -(v & 1);
+}
+
+int bits_get_unsigned_vlc(struct bitstream *bits, const struct huffman *h)
+{
+    uint32_t v = bits_peek(bits);
+
+    for (int i = 0; i < h->size; i++) {
+        if (v >> (32 - h->len[i]) == h->code[i]) {
+            bits->index += h->len[i];
+            return i;
+        }
+    }
+
+    return BITS_INVALID_VLC_UN;
+}
+
+int bits_get_signed_vlc(struct bitstream *bits, const struct huffman *h)
+{
+    int v = bits_get_unsigned_vlc(bits, h);
+    return ((v >> 1) ^ ((v & 1) - 1)) + 1;
+}
+
+void bits_skip(struct bitstream *bits, int n)
+{
+    dbg_assert(n >= 0);
+    bits->index += n;
+}
+
+void bits_skip1(struct bitstream *bits)
+{
+    bits->index++;
+}
+
+int bits_seek(struct bitstream *bits, size_t n)
+{
+    if (n < bits->index || n > bits->total)
+        return -DCADEC_EBADREAD;
+    bits->index = n;
+    return 0;
+}
+
+void bits_align1(struct bitstream *bits)
+{
+    bits->index = (bits->index + 7) & ~7;
+}
+
+void bits_align4(struct bitstream *bits)
+{
+    bits->index = (bits->index + 31) & ~31;
+}
+
+static uint16_t crc16(const uint8_t *data, size_t size)
+{
+    static const uint16_t crctab[16] = {
+        0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7,
+        0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef
+    };
+    uint16_t res = 0xffff;
+    while (size--) {
+        uint8_t c = *data++;
+        res = (res << 4) ^ crctab[(c >> 4) ^ (res >> 12)];
+        res = (res << 4) ^ crctab[(c & 15) ^ (res >> 12)];
+    }
+    return res;
+}
+
+int bits_check_crc(struct bitstream *bits, size_t p1, size_t p2)
+{
+    if (((p1 | p2) & 7) || p1 > p2 || p2 - p1 < 16 || p2 > bits->total)
+        return -DCADEC_EBADREAD;
+    if (crc16((uint8_t *)bits->data + (p1 >> 3), (p2 - p1) >> 3))
+        return -DCADEC_EBADCRC;
+    return 0;
+}

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/bitstream.h Added

@@ -0,0 +1,95 @@
+/*
+ * This file is part of libdcadec.
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef BITSTREAM_H
+#define BITSTREAM_H
+
+#include "huffman.h"
+#include "compiler.h"
+
+#define BITS_INVALID_VLC_UN  32768
+#define BITS_INVALID_VLC_SI -16384
+
+struct bitstream {
+    struct dcadec_log_context *logctx;
+    uint32_t    *data;
+    size_t      total;
+    size_t      index;
+};
+
+void bits_init(struct bitstream *bits, uint8_t *data, size_t size,struct dcadec_log_context *logctx);
+bool bits_get1(struct bitstream *bits);
+int bits_get(struct bitstream *bits, int n);
+int bits_get_signed(struct bitstream *bits, int n);
+int bits_get_signed_linear(struct bitstream *bits, int n);
+int bits_get_unsigned_rice(struct bitstream *bits, int k);
+int bits_get_signed_rice(struct bitstream *bits, int k);
+int bits_get_unsigned_vlc(struct bitstream *bits, const struct huffman *h);
+int bits_get_signed_vlc(struct bitstream *bits, const struct huffman *h);
+void bits_skip(struct bitstream *bits, int n);
+void bits_skip1(struct bitstream *bits);
+int bits_seek(struct bitstream *bits, size_t n);
+void bits_seek1(struct bitstream *bits);
+void bits_align1(struct bitstream *bits);
+void bits_align4(struct bitstream *bits);
+int bits_check_crc(struct bitstream *bits, size_t p1, size_t p2);
+
+static inline void bits_get_array(struct bitstream *bits,
+                                  int *array, int size, int n)
+{
+    for (int i = 0; i < size; i++)
+        array[i] = bits_get(bits, n);
+}
+
+static inline void bits_get_signed_array(struct bitstream *bits,
+                                         int *array, int size, int n)
+{
+    for (int i = 0; i < size; i++)
+        array[i] = bits_get_signed(bits, n);
+}
+
+static inline void bits_get_signed_linear_array(struct bitstream *bits,
+                                                int *array, int size, int n)
+{
+    if (n == 0) {
+        memset(array, 0, sizeof(*array) * size);
+    } else for (int i = 0; i < size; i++) {
+        int v = bits_get(bits, n);
+        array[i] = (v >> 1) ^ -(v & 1);
+    }
+}
+
+static inline void bits_get_signed_rice_array(struct bitstream *bits,
+                                              int *array, int size, int k)
+{
+    for (int i = 0; i < size; i++)
+        array[i] = bits_get_signed_rice(bits, k);
+}
+
+static inline int bits_get_signed_vlc_array(struct bitstream *bits,
+                                            int *array, int size,
+                                            const struct huffman *h)
+{
+    for (int i = 0; i < size; i++) {
+        if ((array[i] = bits_get_signed_vlc(bits, h)) == BITS_INVALID_VLC_SI)
+            return -DCADEC_EBADDATA;
+    }
+    return 0;
+}
+
+#endif

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/common.h Added

@@ -0,0 +1,216 @@
+/*
+ * This file is part of libdcadec.
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef COMMON_H
+#define COMMON_H
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <math.h>
+#include <errno.h>
+
+#include "dca_context.h"
+#include "ta.h"
+#include "compiler.h"
+
+struct dcadec_log_context;
+void dca_log(struct dcadec_log_context *context,const char* msg,unsigned int line);
+
+#ifdef NDEBUG
+
+#define DCA_DEBUG(m)
+
+#elif defined(DCA_LOG)
+
+#define DCA_DEBUG(m) \
+    dca_log(DCA_LOGCTX,m,__LINE__)
+
+#else
+
+#define DCA_DEBUG(m) \
+    fprintf(stderr, "%s+%d: %s\n", __FILE__, __LINE__, m)
+
+#endif
+
+#define enforce(x, m) \
+    do {                                \
+        if (!(x)) {                     \
+            DCA_DEBUG(m);               \
+            return -DCADEC_EBADDATA;    \
+        }                               \
+    } while (false)
+
+#define require(x, m) \
+    do {                            \
+        if (!(x)) {                 \
+            DCA_DEBUG(m);           \
+            return -DCADEC_ENOSUP;  \
+        }                           \
+    } while (false)
+
+#define dca_assert(x) \
+    do {                                  \
+        if (!(x)) {                       \
+            DCA_DEBUG("dca_assert: " #x); \
+            return -DCADEC_EINVAL;        \
+        }                                 \
+    } while (false)
+
+#define dbg_assert(x) \
+    do {                                  \
+        if (!(x)) {                       \
+            DCA_DEBUG("dbg_assert: "#x);  \
+        }                                 \
+    } while (false)
+
+
+#define dca_countof(x)  (sizeof(x) / sizeof((x)[0]))
+
+static inline int dca_realloc(void *parent, void *ptr, size_t nmemb, size_t size)
+{
+    void **_ptr = (void **)ptr;
+    size_t old_size = ta_get_size(*_ptr);
+    size_t new_size = ta_calc_array_size(size, nmemb);
+    if (old_size < new_size) {
+        ta_free(*_ptr);
+        if (!(*_ptr = ta_zalloc_size(parent, new_size)))
+            return -DCADEC_ENOMEM;
+        return 1;
+    }
+    return 0;
+}
+
+// WAVEFORMATEX speakers
+enum WaveSpeaker {
+    WAVESPKR_FL,  WAVESPKR_FR,  WAVESPKR_FC,  WAVESPKR_LFE,
+    WAVESPKR_BL,  WAVESPKR_BR,  WAVESPKR_FLC, WAVESPKR_FRC,
+    WAVESPKR_BC,  WAVESPKR_SL,  WAVESPKR_SR,  WAVESPKR_TC,
+    WAVESPKR_TFL, WAVESPKR_TFC, WAVESPKR_TFR, WAVESPKR_TBL,
+    WAVESPKR_TBC, WAVESPKR_TBR,
+
+    WAVESPKR_COUNT
+};
+
+// Table 6-22: Loudspeaker masks
+enum SpeakerMask {
+    SPEAKER_MASK_C      = 0x00000001,
+    SPEAKER_MASK_L      = 0x00000002,
+    SPEAKER_MASK_R      = 0x00000004,
+    SPEAKER_MASK_Ls     = 0x00000008,
+    SPEAKER_MASK_Rs     = 0x00000010,
+    SPEAKER_MASK_LFE1   = 0x00000020,
+    SPEAKER_MASK_Cs     = 0x00000040,
+    SPEAKER_MASK_Lsr    = 0x00000080,
+    SPEAKER_MASK_Rsr    = 0x00000100,
+    SPEAKER_MASK_Lss    = 0x00000200,
+    SPEAKER_MASK_Rss    = 0x00000400,
+    SPEAKER_MASK_Lc     = 0x00000800,
+    SPEAKER_MASK_Rc     = 0x00001000,
+    SPEAKER_MASK_Lh     = 0x00002000,
+    SPEAKER_MASK_Ch     = 0x00004000,
+    SPEAKER_MASK_Rh     = 0x00008000,
+    SPEAKER_MASK_LFE2   = 0x00010000,
+    SPEAKER_MASK_Lw     = 0x00020000,
+    SPEAKER_MASK_Rw     = 0x00040000,
+    SPEAKER_MASK_Oh     = 0x00080000,
+    SPEAKER_MASK_Lhs    = 0x00100000,
+    SPEAKER_MASK_Rhs    = 0x00200000,
+    SPEAKER_MASK_Chr    = 0x00400000,
+    SPEAKER_MASK_Lhr    = 0x00800000,
+    SPEAKER_MASK_Rhr    = 0x01000000,
+    SPEAKER_MASK_Cl     = 0x02000000,
+    SPEAKER_MASK_Ll     = 0x04000000,
+    SPEAKER_MASK_Rl     = 0x08000000,
+    SPEAKER_MASK_RSV1   = 0x10000000,
+    SPEAKER_MASK_RSV2   = 0x20000000,
+    SPEAKER_MASK_RSV3   = 0x40000000,
+    SPEAKER_MASK_RSV4   = 0x80000000
+};
+
+// Table 6-22: Loudspeaker masks
+enum Speaker {
+    SPEAKER_C,    SPEAKER_L,    SPEAKER_R,    SPEAKER_Ls,
+    SPEAKER_Rs,   SPEAKER_LFE1, SPEAKER_Cs,   SPEAKER_Lsr,
+    SPEAKER_Rsr,  SPEAKER_Lss,  SPEAKER_Rss,  SPEAKER_Lc,
+    SPEAKER_Rc,   SPEAKER_Lh,   SPEAKER_Ch,   SPEAKER_Rh,
+    SPEAKER_LFE2, SPEAKER_Lw,   SPEAKER_Rw,   SPEAKER_Oh,
+    SPEAKER_Lhs,  SPEAKER_Rhs,  SPEAKER_Chr,  SPEAKER_Lhr,
+    SPEAKER_Rhr,  SPEAKER_Cl,   SPEAKER_Ll,   SPEAKER_Rl,
+    SPEAKER_RSV1, SPEAKER_RSV2, SPEAKER_RSV3, SPEAKER_RSV4,
+
+    SPEAKER_COUNT
+};
+
+// Table 7-1: Sync words
+enum SyncWord {
+    SYNC_WORD_CORE      = 0x7ffe8001,
+    SYNC_WORD_CORE_LE   = 0xfe7f0180,
+    SYNC_WORD_REV1AUX   = 0x9a1105a0,
+    SYNC_WORD_REV2AUX   = 0x7004c070,
+    SYNC_WORD_XCH       = 0x5a5a5a5a,
+    SYNC_WORD_XXCH      = 0x47004a03,
+    SYNC_WORD_X96       = 0x1d95f262,
+    SYNC_WORD_XBR       = 0x655e315e,
+    SYNC_WORD_LBR       = 0x0a801921,
+    SYNC_WORD_XLL       = 0x41a29547,
+    SYNC_WORD_EXSS      = 0x64582025,
+    SYNC_WORD_EXSS_LE   = 0x58642520,
+    SYNC_WORD_CORE_EXSS = 0x02b09261,
+};
+
+// Table 7-10: Loudspeaker bit mask for speaker activity
+enum SpeakerPair {
+    SPEAKER_PAIR_C      = 0x0001,
+    SPEAKER_PAIR_LR     = 0x0002,
+    SPEAKER_PAIR_LsRs   = 0x0004,
+    SPEAKER_PAIR_LFE1   = 0x0008,
+    SPEAKER_PAIR_Cs     = 0x0010,
+    SPEAKER_PAIR_LhRh   = 0x0020,
+    SPEAKER_PAIR_LsrRsr = 0x0040,
+    SPEAKER_PAIR_Ch     = 0x0080,
+    SPEAKER_PAIR_Oh     = 0x0100,
+    SPEAKER_PAIR_LcRc   = 0x0200,
+    SPEAKER_PAIR_LwRw   = 0x0400,
+    SPEAKER_PAIR_LssRss = 0x0800,
+    SPEAKER_PAIR_LFE2   = 0x1000,
+    SPEAKER_PAIR_LhsRhs = 0x2000,
+    SPEAKER_PAIR_Chr    = 0x4000,
+    SPEAKER_PAIR_LhrRhr = 0x8000,
+    SPEAKER_PAIR_ALL_1  = 0x5199,
+    SPEAKER_PAIR_ALL_2  = 0xae66
+};
+

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/compiler.h Added

@@ -0,0 +1,104 @@
+/*
+ * This file is part of libdcadec.
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef COMPILER_H
+#define COMPILER_H
+
+#ifdef __GNUC__
+
+#define dca_bswap16(x)  __builtin_bswap16(x)
+#define dca_bswap32(x)  __builtin_bswap32(x)
+#define dca_bswap64(x)  __builtin_bswap64(x)
+#define dca_clz32(x)    __builtin_clz(x)
+#define dca_clz64(x)    __builtin_clzll(x)
+#define dca_popcount(x) __builtin_popcount(x)
+
+#elif (defined(_MSC_VER) && defined(WIN32))
+
+#define __ORDER_LITTLE_ENDIAN__ 0x1234
+#define __ORDER_BIG_ENDIAN__    0x4321
+#define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__
+
+#include <stdint.h>
+#include <stdlib.h>
+#pragma intrinsic(_byteswap_ulong, _byteswap_uint64, _byteswap_ushort)
+
+extern "C" unsigned char _BitScanReverse (unsigned int *Index,unsigned int Mask);
+extern "C" unsigned int __popcnt(unsigned int value);
+#pragma intrinsic(_BitScanReverse,__popcnt)
+
+#define dca_bswap16(x)  _byteswap_ushort((x))
+#define dca_bswap32(x)  _byteswap_ulong((x))
+#define dca_bswap64(x)  _byteswap_uint64((x))
+#define dca_clz32(x)    (31-msvc_bsr32((x)))
+#define dca_clz64(x)    (63-msvc_bsr64((x)))
+#define dca_popcount(x) __popcnt((x))
+
+static unsigned int inline __forceinline msvc_bsr32(uint32_t value)
+{
+    unsigned int r;
+    _BitScanReverse(&r,value);
+    return r;
+}
+
+#ifdef _WIN64
+extern "C" unsigned char _BitScanReverse64 (unsigned int *Index,uint64_t Mask);
+#pragma intrinsic(_BitScanReverse64)
+static unsigned int inline __forceinline msvc_bsr64(uint64_t value)
+{
+    unsigned int r;
+    _BitScanReverse64(&r,value);
+    return r;
+}
+#else
+static uint32_t inline __forceinline msvc_bsr64(uint64_t value)
+{
+    uint32_t top = (uint32_t)(value>>32);
+    if (0==top)
+    {
+        return msvc_bsr32((uint32_t)value);
+    } else {
+        return 32+msvc_bsr32(top);
+    }
+}
+#endif
+
+#else
+#error Unsupported compiler
+#endif
+
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+#define DCA_16LE(x) ((uint16_t)(x))
+#define DCA_32LE(x) ((uint32_t)(x))
+#define DCA_64LE(x) ((uint64_t)(x))
+#define DCA_16BE(x) dca_bswap16(x)
+#define DCA_32BE(x) dca_bswap32(x)
+#define DCA_64BE(x) dca_bswap64(x)
+#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+#define DCA_16LE(x) dca_bswap16(x)
+#define DCA_32LE(x) dca_bswap32(x)
+#define DCA_64LE(x) dca_bswap64(x)
+#define DCA_16BE(x) ((uint16_t)(x))
+#define DCA_32BE(x) ((uint32_t)(x))
+#define DCA_64BE(x) ((uint64_t)(x))
+#else
+#error Unsupported byte order
+#endif
+
+
+#endif

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/core_decoder.cpp Added

@@ -0,0 +1,2085 @@
+/*
+ * This file is part of libdcadec.
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "common.h"
+#include "bitstream.h"
+#include "interpolator.h"
+#include "fixed_math.h"
+#include "core_decoder.h"
+#include "exss_parser.h"
+#include "dmix_tables.h"
+
+#include "core_tables.h"
+#include "core_huffman.h"
+#include "core_vectors.h"
+
+enum sample_type {
+    NO_BITS_ALLOCATED,
+    HUFFMAN_CODE,
+    BLOCK_CODE,
+    NO_FURTHER_ENCODING
+};
+
+enum header_type {
+    HEADER_CORE,
+    HEADER_XCH,
+    HEADER_XXCH
+};
+
+// Mode 0: A (mono)
+// Mode 1: A + B (dual mono)
+// Mode 2: L + R (stereo)
+// Mode 3: (L+R) + (L-R) (sum-diff)
+// Mode 4: LT + RT (left and right total)
+// Mode 5: C + L + R
+// Mode 6: L + R + S
+// Mode 7: C + L + R + S
+// Mode 8: L + R + SL + SR
+// Mode 9: C + L + R + SL + SR
+
+static const int8_t prm_ch_to_spkr_map[10][5] = {
+    { SPEAKER_C,        -1,         -1,         -1,         -1 },
+    { SPEAKER_L, SPEAKER_R,         -1,         -1,         -1 },
+    { SPEAKER_L, SPEAKER_R,         -1,         -1,         -1 },
+    { SPEAKER_L, SPEAKER_R,         -1,         -1,         -1 },
+    { SPEAKER_L, SPEAKER_R,         -1,         -1,         -1 },
+    { SPEAKER_C, SPEAKER_L, SPEAKER_R ,         -1,         -1 },
+    { SPEAKER_L, SPEAKER_R, SPEAKER_Cs,         -1          -1 },
+    { SPEAKER_C, SPEAKER_L, SPEAKER_R , SPEAKER_Cs,         -1 },
+    { SPEAKER_L, SPEAKER_R, SPEAKER_Ls, SPEAKER_Rs,         -1 },
+    { SPEAKER_C, SPEAKER_L, SPEAKER_R,  SPEAKER_Ls, SPEAKER_Rs }
+};
+
+static const uint8_t audio_mode_ch_mask[10] = {
+    SPEAKER_MASK_C,
+    SPEAKER_MASK_L | SPEAKER_MASK_R,
+    SPEAKER_MASK_L | SPEAKER_MASK_R,
+    SPEAKER_MASK_L | SPEAKER_MASK_R,
+    SPEAKER_MASK_L | SPEAKER_MASK_R,
+    SPEAKER_MASK_C | SPEAKER_MASK_L | SPEAKER_MASK_R,
+    SPEAKER_MASK_L | SPEAKER_MASK_R | SPEAKER_MASK_Cs,
+    SPEAKER_MASK_C | SPEAKER_MASK_L | SPEAKER_MASK_R  | SPEAKER_MASK_Cs,
+    SPEAKER_MASK_L | SPEAKER_MASK_R | SPEAKER_MASK_Ls | SPEAKER_MASK_Rs,
+    SPEAKER_MASK_C | SPEAKER_MASK_L | SPEAKER_MASK_R  | SPEAKER_MASK_Ls | SPEAKER_MASK_Rs
+};
+
+#define DCA_LOGCTX (core->bits.logctx)
+
+// 5.3.1 - Bit stream header
+static int parse_frame_header(struct core_decoder *core)
+{
+    // Frame type
+    core->normal_frame = bits_get1(&core->bits);
+
+    // Deficit sample count
+    core->deficit_samples = bits_get(&core->bits, 5) + 1;
+    enforce(core->deficit_samples == 32 || core->normal_frame == false,
+            "Invalid deficit sample count");
+
+    // CRC present flag
+    core->crc_present = bits_get1(&core->bits);
+
+    // Number of PCM sample blocks
+    core->npcmblocks = bits_get(&core->bits, 7) + 1;
+    enforce(core->npcmblocks >= 8, "Invalid number of PCM sample blocks");
+
+    // Primary frame byte size
+    core->frame_size = bits_get(&core->bits, 14) + 1;
+    enforce(core->frame_size >= 96, "Invalid frame size");
+
+    // Audio channel arrangement
+    core->audio_mode = bits_get(&core->bits, 6);
+    require(core->audio_mode < 10, "Unsupported audio channel arrangement");
+
+    // Core audio sampling frequency
+    core->sample_rate = sample_rates[bits_get(&core->bits, 4)];
+    enforce(core->sample_rate != 0, "Invalid core audio sampling frequency");
+
+    // Transmission bit rate
+    core->bit_rate = bit_rates[bits_get(&core->bits, 5)];
+    enforce(core->bit_rate != -1, "Invalid transmission bit rate");
+
+    // Reserved field
+    bits_skip1(&core->bits);
+
+    // Embedded dynamic range flag
+    core->drc_present = bits_get1(&core->bits);
+
+    // Embedded time stamp flag
+    core->ts_present = bits_get1(&core->bits);
+
+    // Auxiliary data flag
+    core->aux_present = bits_get1(&core->bits);
+
+    // HDCD mastering flag
+    bits_skip1(&core->bits);
+
+    // Extension audio descriptor flag
+    // 0 - Channel extension (XCH)
+    // 2 - Frequency extension (X96)
+    // 6 - Channel extension (XXCH)
+    core->ext_audio_type = bits_get(&core->bits, 3);
+
+    // Extended coding flag
+    core->ext_audio_present = bits_get1(&core->bits);
+
+    // Audio sync word insertion flag
+    core->sync_ssf = bits_get1(&core->bits);
+
+    // Low frequency effects flag
+    core->lfe_present = bits_get(&core->bits, 2);
+    enforce(core->lfe_present < 3, "Invalid low frequency effects flag");
+
+    // Predictor history flag switch
+    core->predictor_history = bits_get1(&core->bits);
+
+    // Header CRC check bytes
+    if (core->crc_present)
+        bits_skip(&core->bits, 16);
+
+    // Multirate interpolator switch
+    core->filter_perfect = bits_get1(&core->bits);
+
+    // Encoder software revision
+    bits_skip(&core->bits, 4);
+
+    // Copy history
+    bits_skip(&core->bits, 2);
+
+    // Source PCM resolution
+    int pcmr_index = bits_get(&core->bits, 3);
+    core->source_pcm_res = sample_res[pcmr_index];
+    enforce(core->source_pcm_res != 0, "Invalid source PCM resolution");
+    core->es_format = !!(pcmr_index & 1);
+
+    // Front sum/difference flag
+    require(bits_get1(&core->bits) == false, "Front sum/difference not supported");
+
+    // Surround sum/difference flag
+    require(bits_get1(&core->bits) == false, "Surround sum/difference not supported");
+
+    // Dialog normalization / unspecified
+    bits_skip(&core->bits, 4);
+
+    return 0;
+}
+
+// 5.3.2 - Primary audio coding header
+static int parse_coding_header(struct core_decoder *core, enum header_type header, int xch_base)
+{
+    int ch, n, ret;
+
+    size_t header_pos = core->bits.index;
+    size_t header_size = 0;
+
+    switch (header) {
+    case HEADER_CORE:
+        // Number of subframes
+        core->nsubframes = bits_get(&core->bits, 4) + 1;
+
+        // Number of primary audio channels
+        core->nchannels = bits_get(&core->bits, 3) + 1;
+        enforce(core->nchannels == audio_mode_nch[core->audio_mode],
+                "Invalid number of primary audio channels");
+        dca_assert(core->nchannels <= MAX_CHANNELS - 2);

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/core_decoder.h Added

@@ -0,0 +1,156 @@
+/*
+ * This file is part of libdcadec.
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef CORE_DECODER_H
+#define CORE_DECODER_H
+
+#include "bitstream.h"
+
+#define MAX_CHANNELS            7
+#define MAX_SUBBANDS            32
+#define MAX_LFE_SAMPLES         16
+#define MAX_SUBFRAMES           16
+#define NUM_SUBBAND_SAMPLES     8
+#define NUM_PCMBLOCK_SAMPLES    32
+#define NUM_ADPCM_COEFFS        4
+#define NUM_CODE_BOOKS          10
+
+#define MAX_SUBBANDS_X96        64
+
+struct core_decoder;
+struct exss_asset;
+struct dcadec_core_info;
+
+struct x96_decoder {
+    struct core_decoder *core;
+
+    int     rev_no;
+    bool    crc_present;
+    int     nchannels;
+    bool    high_res;
+    int     subband_start;
+    int     nsubbands[MAX_CHANNELS];
+    int     joint_intensity_index[MAX_CHANNELS];
+    int     scale_factor_sel[MAX_CHANNELS];
+    int     bit_allocation_sel[MAX_CHANNELS];
+    int     quant_index_sel[MAX_CHANNELS][NUM_CODE_BOOKS];
+
+    bool    prediction_mode[MAX_CHANNELS][MAX_SUBBANDS_X96];
+    int     prediction_vq_index[MAX_CHANNELS][MAX_SUBBANDS_X96];
+    int     bit_allocation[MAX_CHANNELS][MAX_SUBBANDS_X96];
+    int     scale_factors[MAX_CHANNELS][MAX_SUBBANDS_X96];
+    int     joint_scale_sel[MAX_CHANNELS];
+    int     joint_scale_factors[MAX_CHANNELS][MAX_SUBBANDS_X96];
+
+    int     rand;
+
+    int     *subband_buffer;
+    int     *subband_samples[MAX_CHANNELS][MAX_SUBBANDS_X96];
+};
+
+struct core_decoder {
+    struct bitstream    bits;
+
+    bool    normal_frame;
+    int     deficit_samples;
+    bool    crc_present;
+    int     npcmblocks;
+    int     frame_size;
+    int     audio_mode;
+    int     sample_rate;
+    int     bit_rate;
+    bool    drc_present;
+    bool    ts_present;
+    bool    aux_present;
+    int     ext_audio_type;
+    bool    ext_audio_present;
+    bool    sync_ssf;
+    int     lfe_present;
+    bool    predictor_history;
+    bool    filter_perfect;
+    int     source_pcm_res;
+    bool    es_format;
+
+    int     nsubframes;
+    int     nsubsubframes[MAX_SUBFRAMES];
+
+    int     nchannels;
+    int     ch_mask;
+
+    bool    dmix_coeffs_present;
+    bool    dmix_embedded;
+    int     dmix_scale;
+    int     dmix_mask[MAX_CHANNELS];
+    int     dmix_coeff[64];
+
+    int     nsubbands[MAX_CHANNELS];
+    int     subband_vq_start[MAX_CHANNELS];
+    int     joint_intensity_index[MAX_CHANNELS];
+    int     transition_mode_sel[MAX_CHANNELS];
+    int     scale_factor_sel[MAX_CHANNELS];
+    int     bit_allocation_sel[MAX_CHANNELS];
+    int     quant_index_sel[MAX_CHANNELS][NUM_CODE_BOOKS];
+    int     scale_factor_adj[MAX_CHANNELS][NUM_CODE_BOOKS];
+
+    bool    prediction_mode[MAX_CHANNELS][MAX_SUBBANDS];
+    int     prediction_vq_index[MAX_CHANNELS][MAX_SUBBANDS];
+    int     bit_allocation[MAX_CHANNELS][MAX_SUBBANDS];
+    int     transition_mode[MAX_SUBFRAMES][MAX_CHANNELS][MAX_SUBBANDS];
+    int     scale_factors[MAX_CHANNELS][MAX_SUBBANDS][2];
+    int     joint_scale_sel[MAX_CHANNELS];
+    int     joint_scale_factors[MAX_CHANNELS][MAX_SUBBANDS];
+
+    int                 *subband_buffer;
+    int                 *subband_samples[MAX_CHANNELS][MAX_SUBBANDS];
+    struct interpolator *subband_dsp[MAX_CHANNELS];
+    struct interpolator_data    *subband_dsp_data;
+
+    int     *lfe_samples;
+
+    bool    xch_present;
+
+    bool    xxch_present;
+    bool    xxch_crc_present;
+    int     xxch_mask_nbits;
+    int     xxch_core_mask;
+
+    bool    xbr_present;
+
+    bool                x96_present;
+    struct x96_decoder  *x96_decoder;
+
+    int     *output_buffer;
+    int     *output_samples[SPEAKER_COUNT];
+    int     output_history_lfe;
+
+    int     npcmsamples;
+    int     output_rate;
+    int     bits_per_sample;
+
+    int     filter_flags;
+};
+
+int core_parse(struct core_decoder *core, uint8_t *data, size_t size,
+               int flags, struct exss_asset *asset, struct dcadec_log_context *logctx);
+int core_parse_exss(struct core_decoder *core, uint8_t *data, size_t size,
+                    int flags, struct exss_asset *asset, struct dcadec_log_context *logctx);
+int core_filter(struct core_decoder *core, int flags);
+void core_clear(struct core_decoder *core);
+struct dcadec_core_info *core_get_info(struct core_decoder *core);
+
+#endif

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/core_huffman.h Added

@@ -0,0 +1,1354 @@
+/*
+ * This file is part of libdcadec.
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+//
+// Table A3
+//
+static const uint8_t A3_len[] = {
+     1,  2,  2
+};
+
+static const uint16_t A3_code[] = {
+    0x0000, 0x0002, 0x0003
+};
+
+//
+// Table A4
+//
+static const uint8_t A4_len[] = {
+     1,  2,  3,  3
+};
+
+static const uint16_t A4_code[] = {
+    0x0000, 0x0002, 0x0006, 0x0007
+};
+
+//
+// Table B4
+//
+static const uint8_t B4_len[] = {
+     2,  3,  3,  1
+};
+
+static const uint16_t B4_code[] = {
+    0x0002, 0x0006, 0x0007, 0x0000
+};
+
+//
+// Table C4
+//
+static const uint8_t C4_len[] = {
+     3,  3,  1,  2
+};
+
+static const uint16_t C4_code[] = {
+    0x0006, 0x0007, 0x0000, 0x0002
+};
+
+//
+// Table D4
+//
+static const uint8_t D4_len[] = {
+     2,  2,  2,  2
+};
+
+static const uint16_t D4_code[] = {
+    0x0000, 0x0001, 0x0002, 0x0003
+};
+
+//
+// Table A5
+//
+static const uint8_t A5_len[] = {
+     1,  2,  3,  4,  4
+};
+
+static const uint16_t A5_code[] = {
+    0x0000, 0x0002, 0x0006, 0x000e, 0x000f
+};
+
+//
+// Table B5
+//
+static const uint8_t B5_len[] = {
+     2,  2,  2,  3,  3
+};
+
+static const uint16_t B5_code[] = {
+    0x0002, 0x0000, 0x0001, 0x0006, 0x0007
+};
+
+//
+// Table C5
+//
+static const uint8_t C5_len[] = {
+     1,  3,  3,  3,  3
+};
+
+static const uint16_t C5_code[] = {
+    0x0000, 0x0004, 0x0005, 0x0006, 0x0007
+};
+
+//
+// Table A7
+//
+static const uint8_t A7_len[] = {
+     1,  3,  3,  3,  4,  5,  5
+};
+
+static const uint16_t A7_code[] = {
+    0x0000, 0x0006, 0x0005, 0x0004, 0x000e, 0x001f, 0x001e
+};
+
+//
+// Table B7
+//
+static const uint8_t B7_len[] = {
+     2,  2,  2,  3,  4,  5,  5
+};
+
+static const uint16_t B7_code[] = {
+    0x0003, 0x0001, 0x0000, 0x0004, 0x000b, 0x0015, 0x0014
+};
+
+//
+// Table C7
+//
+static const uint8_t C7_len[] = {
+     2,  2,  2,  4,  4,  4,  4
+};
+
+static const uint16_t C7_code[] = {
+    0x0003, 0x0002, 0x0001, 0x0003, 0x0002, 0x0001, 0x0000
+};
+
+//
+// Table A9
+//
+static const uint8_t A9_len[] = {
+     1,  3,  3,  4,  4,  4,  5,  6,  6
+};
+
+static const uint16_t A9_code[] = {
+    0x0000, 0x0007, 0x0005, 0x000d, 0x0009, 0x0008, 0x0019, 0x0031, 0x0030
+};
+
+//
+// Table B9
+//
+static const uint8_t B9_len[] = {
+     2,  2,  3,  3,  3,  5,  5,  5,  5
+};
+
+static const uint16_t B9_code[] = {
+    0x0002, 0x0000, 0x0007, 0x0003, 0x0002, 0x001b, 0x001a, 0x0019, 0x0018
+};
+
+//
+// Table C9
+//
+static const uint8_t C9_len[] = {
+     2,  2,  3,  3,  3,  4,  5,  6,  6
+};
+
+static const uint16_t C9_code[] = {
+    0x0002, 0x0000, 0x0007, 0x0006, 0x0002, 0x0006, 0x000f, 0x001d, 0x001c
+};
+
+//
+// Table A12
+//
+static const uint8_t A12_len[] = {
+     1,  2,  3,  4,  5,  6,  8,  8,  9,
+     9,  9,  9
+};
+
+static const uint16_t A12_code[] = {
+    0x0000, 0x0002, 0x0006, 0x000e, 0x001e, 0x003e, 0x00ff, 0x00fe, 0x01fb,
+    0x01fa, 0x01f9, 0x01f8
+};
+
+//
+// Table B12
+//
+static const uint8_t B12_len[] = {
+     1,  2,  3,  5,  5,  6,  7,  7,  7,
+     7,  7,  7
+};
+
+static const uint16_t B12_code[] = {
+    0x0001, 0x0000, 0x0002, 0x000f, 0x000c, 0x001d, 0x0039, 0x0038, 0x0037,
+    0x0036, 0x0035, 0x0034
+};
+
+//

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/core_tables.h Added

@@ -0,0 +1,135 @@
+/*
+ * This file is part of libdcadec.
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+// Table 5-4: Audio channel arrangement
+static const uint8_t audio_mode_nch[16] = {
+    1, 2, 2, 2, 2, 3, 3, 4, 4, 5, 6, 6, 6, 7, 8, 8
+};
+
+// Table 5-5: Core audio sampling frequencies
+static const int32_t sample_rates[16] = {
+    0,      8000,   16000,  32000,
+    0,      0,      11025,  22050,
+    44100,  0,      0,      12000,
+    24000,  48000,  0,      0
+};
+
+// Table 5-7: Rate parameter versus targeted bit-rate
+static const int32_t bit_rates[32] = {
+     32000,   56000,  64000,  96000, 112000, 128000, 192000, 224000,
+    256000,  320000, 384000, 448000, 512000, 576000, 640000, 768000,
+    960000, 1024000,1152000,1280000,1344000,1408000,1411200,1472000,
+    1536000,     -1,     -1,     -1,     -1,     0,      -1,     -2
+};
+
+// Table 5-17: Quantization resolution of source PCM samples
+static const uint8_t sample_res[8] = {
+    16, 16, 20, 20, 0, 24, 24, 0
+};
+
+// Table 5-26: Selection of quantization levels and codebooks
+static const int32_t quant_levels[32] = {
+          0,       3,       5,     7,      9,     13,     17,      25,
+         32,      64,     128,   256,    512,   1024,   2048,    4096,
+       8192,   16384,   32768, 65536, 131072, 262144, 524288, 1048576,
+    2097152, 4194304, 8388608,    -1,     -1,     -1,     -1,      -1
+};
+
+// Table 5-26: Selection of quantization levels and codebooks
+static const uint8_t quant_index_sel_nbits[10] = {
+    1, 2, 2, 2, 2, 3, 3, 3, 3, 3
+};
+
+// Table 5-27: Scale factor adjustment index
+static const int32_t scale_factor_adj[4] = {
+    4194304, 4718592, 5242880, 6029312
+};
+
+// Annex D.1.1 - 6 bit quantization (nominal 2,2 dB step)
+static const int32_t scale_factors_6bit[64] = {
+          1,       2,       2,       3,       3,       4,       6,       7,
+         10,      12,      16,      20,      26,      34,      44,      56,
+         72,      93,     120,     155,     200,     257,     331,     427,
+        550,     708,     912,    1175,    1514,    1950,    2512,    3236,
+       4169,    5370,    6918,    8913,   11482,   14791,   19055,   24547,
+      31623,   40738,   52481,   67608,   87096,  112202,  144544,  186209,
+     239883,  309030,  398107,  512861,  660693,  851138, 1096478, 1412538,
+    1819701, 2344229, 3019952, 3890451, 5011872, 6456542, 8317638,       0
+};
+
+// Annex D.1.2 - 7 bit quantization (nominal 1,1 dB step)
+static const int32_t scale_factors_7bit[128] = {
+          1,       1,       2,       2,       2,       2,       3,       3,
+          3,       4,       4,       5,       6,       7,       7,       8,
+         10,      11,      12,      14,      16,      18,      20,      23,
+         26,      30,      34,      38,      44,      50,      56,      64,
+         72,      82,      93,     106,     120,     136,     155,     176,
+        200,     226,     257,     292,     331,     376,     427,     484,
+        550,     624,     708,     804,     912,    1035,    1175,    1334,
+       1514,    1718,    1950,    2213,    2512,    2851,    3236,    3673,
+       4169,    4732,    5370,    6095,    6918,    7852,    8913,   10116,
+      11482,   13032,   14791,   16788,   19055,   21627,   24547,   27861,
+      31623,   35892,   40738,   46238,   52481,   59566,   67608,   76736,
+      87096,   98855,  112202,  127350,  144544,  164059,  186209,  211349,
+     239883,  272270,  309030,  350752,  398107,  451856,  512861,  582103,
+     660693,  749894,  851138,  966051, 1096478, 1244515, 1412538, 1603245,
+    1819701, 2065380, 2344229, 2660725, 3019952, 3427678, 3890451, 4415704,
+    5011872, 5688529, 6456542, 7328245, 8317638,       0,       0,       0
+};
+
+// Annex D.2.1 - Lossy quantization
+static const int32_t step_size_lossy[32] = {
+         0, 6710886, 4194304, 3355443, 2474639, 2097152, 1761608, 1426063,
+    796918,  461373,  251658,  146801,   79692,   46137,   27263,   16777,
+     10486,    5872,    3355,    1887,    1258,     713,     336,     168,
+        84,      42,      21,      -1,      -1,      -1,      -1,      -1
+};
+
+// Annex D.2.2 - Lossless quantization
+static const int32_t step_size_lossless[32] = {
+         0, 4194304, 2097152, 1384120, 1048576, 696254, 524288, 348127,
+    262144,  131072,   65431,   33026,   16450,   8208,   4100,   2049,
+      1024,     512,     256,     128,      64,     32,     16,      8,
+         4,       2,       1,      -1,      -1,     -1,     -1,     -1
+};
+
+// Annex D.3 - Scale factor for joint intensity coding
+static const int32_t joint_scale_factors[129] = {
+       3288,    3490,    3691,    3909,    4144,    4387,    4647,    4924,
+       5218,    5528,    5855,    6199,    6568,    6963,    7374,    7810,
+       8271,    8758,    9278,    9831,   10410,   11031,   11685,   12373,
+      13103,   13883,   14705,   15578,   16500,   17482,   18514,   19613,
+      20770,   22003,   23312,   24688,   26156,   27699,   29343,   31080,
+      32925,   34871,   36943,   39133,   41448,   43906,   46506,   49258,
+      52177,   55273,   58544,   62017,   65691,   69584,   73711,   78073,
+      82703,   87602,   92795,   98289,  104111,  110285,  116820,  123740,
+     131072,  138840,  147069,  155776,  165012,  174785,  185145,  196117,
+     207735,  220042,  233086,  246894,  261523,  277017,  293434,  310823,
+     329236,  348748,  369409,  391303,  414490,  439043,  465064,  492621,
+     521805,  552725,  585475,  620170,  656920,  695843,  737073,  780745,
+     827008,  876014,  927923,  982902, 1041144, 1102834, 1168181, 1237404,
+    1310720, 1388382, 1470649, 1557790, 1650098, 1747876, 1851441, 1961147,
+    2077355, 2200441, 2330825, 2468935, 2615232, 2770195, 2934335, 3108206,
+    3292378, 3487463, 3694108, 3913000, 4144862, 4390455, 4650611, 4926176,
+    5218066
+};
+
+// Annex D.6 - Block code books
+static const uint8_t block_code_nbits[8] = {
+    0, 7, 10, 12, 13, 15, 17, 19
+};

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/core_vectors.h Added

@@ -0,0 +1,10263 @@
+/*
+ * This file is part of libdcadec.
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+static const int16_t adpcm_coeffs[4096][4] = {
+    {   9928,  -2618,  -1093,  -1263 },
+    {  11077,  -2876,  -1747,   -308 },
+    {  10503,  -1082,  -1426,  -1167 },
+    {   9337,  -2403,  -1495,    274 },
+    {  10698,  -2529,   -532,  -1122 },
+    {  10368,  -3974,  -1264,   -750 },
+    {  10070,  -3667,    346,    863 },
+    {  10278,  -3093,    311,   -576 },
+    {   9894,  -1330,  -1428,   -860 },
+    {  10544,  -1923,  -1058,   -971 },
+    {  10996,  -1632,   -841,  -1404 },
+    {  11832,  -3465,   1658,  -1990 },
+    {  10852,   -688,  -2658,   -499 },
+    {  10546,  -1749,   -147,  -1733 },
+    {  10801,  -1004,   -708,  -1453 },
+    {  10588,   -441,  -2113,   -952 },
+    {  10141,  -3331,   -582,  -1432 },
+    {   9608,  -2590,    383,    258 },
+    {  11422,  -3265,    229,  -1544 },
+    {  10460,  -1338,   -713,  -1568 },
+    {  10306,  -1721,  -1660,   -603 },
+    {   9580,  -1812,  -1235,  -1061 },
+    {  11471,  -2285,  -1617,   -607 },
+    {  10081,  -2225,  -1408,   -868 },
+    {  10715,  -2624,  -1367,   -704 },
+    {  10616,  -1871,  -2770,    -35 },
+    {   9352,  -2340,  -1024,  -1566 },
+    {  11065,  -1458,  -1926,   -735 },
+    {  11334,  -2056,  -1041,  -1144 },
+    {   9825,  -2048,   -794,  -1536 },
+    {  11850,  -2695,  -1123,   -867 },
+    {  10654,  -2226,  -1891,   -373 },
+    {  10024,  -1557,   -808,  -1069 },
+    {  11142,  -1266,  -3238,    128 },
+    {  11729,  -3282,   -514,  -1011 },
+    {  11402,  -2094,  -2335,   -189 },
+    {  10195,  -3658,    181,  -1875 },
+    {  11431,  -2626,   -404,  -1377 },
+    {  11001,  -3868,   -619,  -1077 },
+    {  10894,  -2559,    274,  -1758 },
+    {   9633,  -1482,  -2253,   -773 },
+    {  11245,  -3321,    830,  -1972 },
+    {   9768,  -2701,   -199,  -1859 },
+    {  10500,  -2042,    525,  -2043 },
+    {  11669,  -4069,    293,  -1468 },
+    {   9192,  -1991,   -583,    -61 },
+    {  10057,  -3220,  -2015,   -473 },
+    {   9497,  -2315,  -2490,   -467 },
+    {  10455,  -3069,  -1194,  -1007 },
+    {   9994,  -1936,    -60,  -1225 },
+    {   9295,  -2156,  -1761,  -1134 },
+    {  10085,  -3748,  -1026,    197 },
+    {   9334,  -2360,    804,   -351 },
+    {  11561,  -2553,   1352,  -2313 },
+    {  12837,  -3998,   1195,  -1958 },
+    {  10114,  -1100,  -2414,   -394 },
+    {   9341,  -2530,    315,    755 },
+    {  10131,  -3164,   1411,   -674 },
+    {   9535,   -905,  -1551,    579 },
+    {  11717,  -1519,  -3051,     91 },
+    {   9824,  -2911,  -2775,    192 },
+    {   9662,  -2934,   -561,   1450 },
+    {  11085,  -3392,  -1298,   -659 },
+    {   8955,  -2102,  -1899,    703 },
+    {   8607,  -1742,  -4348,    814 },
+    {   7640,  -2063,  -3617,     52 },
+    {   7074,   -826,  -4325,   4375 },
+    {   7714,    584,  -4238,   1927 },
+    {   6355,   -952,  -4912,   3127 },
+    {   7069,   -660,  -6413,   4087 },
+    {   8313,   -132,  -2964,   -876 },
+    {   6952,  -1422,  -3962,    -24 },
+    {   9299,   -734,  -3088,   -263 },
+    {   9484,   -574,  -4513,    466 },
+    {   7246,    -91,  -3735,   -704 },
+    {   8325,  -1417,  -3090,   -530 },
+    {   6469,  -1226,  -4757,    829 },
+    {   6652,   -368,  -5682,   1393 },
+    {   7971,  -1278,  -2284,   1205 },
+    {   7229,   -699,  -3556,   1840 },
+    {   7994,   1284,  -2729,    732 },
+    {   9005,   -698,  -4522,   2189 },
+    {   6963,    197,  -2727,    380 },
+    {   8527,    135,  -3991,   -213 },
+    {   8840,    934,  -3014,   -567 },
+    {  10125,    418,  -3284,   -371 },
+    {   6367,    361,  -2318,   2554 },
+    {   7892,    172,  -5247,   4673 },
+    {   6674,    387,  -5424,   4398 },
+    {   6240,    684,  -4047,   1219 },
+    {  11170,   -794,  -5081,   1195 },
+    {  11765,   -648,  -6265,   2052 },
+    {  10845,   -775,  -3837,    366 },
+    {  12496,   -689,  -8260,   3562 },
+    {   7893,  -1166,  -4972,    988 },
+    {   8592,   1052,  -5986,   3087 },
+    {   7277,   1874,  -5685,   3579 },
+    {   6900,   2016,  -4809,   3491 },
+    {   8530,  -2405,  -3250,   1986 },
+    {   9426,    494,  -7067,   5038 },
+    {  10285,    564,  -8210,   5370 },
+    {   8749,  -2207,  -3980,   2852 },
+    {   9653,  -2686,  -4300,   1400 },
+    {   9770,  -2286,  -5663,   4233 },
+    {   8490,     -4,  -7048,   4496 },
+    {   7697,  -1209,  -5328,   3183 },
+    {   6451,    801,  -4324,   -554 },
+    {   7387,   1806,  -5265,    545 },
+    {   7450,  -2302,  -4445,   1418 },
+    {   8817,  -1370,  -5827,   2168 },
+    {  10324,  -2406,  -5629,   2579 },
+    {   8863,  -2578,  -3537,    467 },
+    {   6901,  -1624,  -3169,   3392 },
+    {   7846,    156,  -6948,   3381 },
+    {   7928,  -1115,  -5972,   4816 },
+    {   6089,   -599,  -4368,   -320 },
+    {   7833,   1246,  -3960,   -621 },
+    {   8931,   2521,  -6768,   2052 },
+    {   8900,   1944,  -4126,     40 },
+    {   7661,    -34,  -2855,   2480 },
+    {   5873,    474,  -3262,   3712 },
+    {   7535,   -234,  -4699,    216 },
+    {   5856,    143,  -5142,     73 },
+    {   8944,   -106,  -5874,   3663 },
+    {   7134,    426,  -5879,   2895 },
+    {  10199,   1011,  -4762,    369 },
+    {   8454,    264,  -5971,   1291 },
+    {   7822,  -2449,  -4333,   4540 },
+    {   6200,  -2758,  -2632,   1497 },
+    {   6070,  -4315,  -2699,    414 },
+    {   7047,  -3739,  -3210,   1060 },
+    {   5675,  -3801,  -2717,   -407 },
+    {   4789,  -4063,  -2628,   -744 },
+    {   4023,  -3366,  -3133,   -726 },
+    {   4296,  -2407,  -3381,   -513 },
+    {   4388,  -2931,  -2820,   1512 },
+    {   4559,  -4233,  -1941,   1976 },
+    {   6702,  -3208,  -1755,   1680 },
+    {   4416,  -3521,  -1052,   2984 },
+    {   7154,  -4266,  -1203,   3732 },
+    {   3625,  -4242,  -3244,   1395 },
+    {   6518,  -2856,  -1304,   2887 },
+    {   6170,  -1949,  -3014,   3973 },
+    {   5189,  -2451,  -4020,   3477 },
+    {   6218,  -2988,  -1921,   3844 },
+    {   4827,  -3688,  -1928,   3343 },
+    {   6668,  -3991,  -2805,   3095 },
+    {   5297,  -3115,  -3684,   2390 },
+    {   5354,  -4614,  -2662,   1504 },
+    {   4196,  -3091,  -4147,   1135 },
+    {   3540,  -2893,  -4007,    100 },
+    {   5569,  -1602,  -4007,   1909 },
+    {   4341,  -2091,  -4272,    252 },
+    {   5559,  -2878,  -3832,    498 },
+    {   4548,  -4479,  -2898,    -27 },
+    {   5176,  -2494,  -4635,   1476 },
+    {   3294,  -3485,  -3738,    716 },
+    {   4920,  -1229,  -4195,   -365 },
+    {   3257,  -3518,  -3349,   2862 },
+    {   5286,  -1948,  -3485,   -778 },
+    {   6502,  -3051,   -152,   2854 },
+    {   5864,  -4192,  -1076,   3451 },
+    {   4656,  -3122,  -3448,    179 },
+    {   5907,   -754,  -1596,   3116 },
+    {   7229,  -3680,  -1590,   2892 },
+    {   5107,  -3888,  -3364,    806 },
+    {   6764,  -2635,  -3450,    134 },
+    {   5258,  -2827,  -2844,  -1052 },
+    {   5798,  -1725,  -4305,    205 },
+    {   5404,  -1213,  -3362,    449 },
+    {   6224,  -2738,  -3046,   -581 },
+    {   4223,  -2438,  -2725,   3745 },
+    {   4751,  -3411,  -2123,    116 },
+    {   3868,  -3000,  -3954,   2297 },
+    {   6819,  -2899,  -4277,   2825 },
+    {   4207,  -4754,  -2808,    865 },
+    {   4804,  -1494,  -1997,   4688 },
+    {   5282,  -2213,   -548,   3559 },
+    {   5580,  -1912,   -566,   4370 },
+    {   6168,  -2857,   -672,   4053 },

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/dca_context.cpp Added

@@ -0,0 +1,704 @@
+/*
+ * This file is part of libdcadec.
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "common.h"
+#include "core_decoder.h"
+#include "exss_parser.h"
+#include "xll_decoder.h"
+#include "fixed_math.h"
+#include "dmix_tables.h"
+
+#define DCADEC_PACKET_CORE  0x01
+#define DCADEC_PACKET_EXSS  0x02
+#define DCADEC_PACKET_XLL   0x04
+
+#define DCA_LOGCTX (&dca->logctx)
+
+struct dcadec_log_context {
+    dcadec_log_fn       log_function;
+    void*               log_context;
+};
+
+struct dcadec_context {
+    int flags;
+    int packet;
+
+    struct core_decoder *core;
+    struct exss_parser *exss;
+    struct xll_decoder *xll;
+
+    struct dcadec_log_context logctx;
+
+    unsigned int ncoreframes;
+
+    int nframesamples;
+    int sample_rate;
+    int bits_per_sample;
+    int profile;
+    int channel_mask;
+    int *samples[SPEAKER_COUNT];
+};
+
+static const uint8_t dca2wav_norm[] = {
+    WAVESPKR_FC,  WAVESPKR_FL,  WAVESPKR_FR,  WAVESPKR_SL,
+    WAVESPKR_SR,  WAVESPKR_LFE, WAVESPKR_BC,  WAVESPKR_BL,
+    WAVESPKR_BR,  WAVESPKR_SL,  WAVESPKR_SR,  WAVESPKR_FLC,
+    WAVESPKR_FRC, WAVESPKR_TFL, WAVESPKR_TFC, WAVESPKR_TFR,
+    WAVESPKR_LFE, WAVESPKR_FLC, WAVESPKR_FRC, WAVESPKR_TC,
+    WAVESPKR_TFL, WAVESPKR_TFR, WAVESPKR_TBC, WAVESPKR_TBL,
+    WAVESPKR_TBR, WAVESPKR_BC,  WAVESPKR_BL,  WAVESPKR_BR
+};
+
+static const uint8_t dca2wav_wide[] = {
+    WAVESPKR_FC,  WAVESPKR_FL,  WAVESPKR_FR,  WAVESPKR_BL,
+    WAVESPKR_BR,  WAVESPKR_LFE, WAVESPKR_BC,  WAVESPKR_BL,
+    WAVESPKR_BR,  WAVESPKR_SL,  WAVESPKR_SR,  WAVESPKR_FLC,
+    WAVESPKR_FRC, WAVESPKR_TFL, WAVESPKR_TFC, WAVESPKR_TFR,
+    WAVESPKR_LFE, WAVESPKR_SL,  WAVESPKR_SR , WAVESPKR_TC,
+    WAVESPKR_TFL, WAVESPKR_TFR, WAVESPKR_TBC, WAVESPKR_TBL,
+    WAVESPKR_TBR, WAVESPKR_BC,  WAVESPKR_BL,  WAVESPKR_BR
+};
+
+#define DCADEC_LAYOUT_7POINT0_WIDE  \
+    (SPEAKER_MASK_C  | SPEAKER_MASK_L  | SPEAKER_MASK_R |   \
+     SPEAKER_MASK_Ls | SPEAKER_MASK_Rs |                    \
+     SPEAKER_MASK_Lw | SPEAKER_MASK_Rw)
+
+#define DCADEC_LAYOUT_7POINT1_WIDE  \
+    (DCADEC_LAYOUT_7POINT0_WIDE | SPEAKER_MASK_LFE1)
+
+static int reorder_samples(struct dcadec_context *dca, int **dca_samples, int dca_mask)
+{
+    int nchannels = 0;
+
+    if (dca->flags & DCADEC_FLAG_NATIVE_LAYOUT) {
+        for (int dca_ch = 0; dca_ch < SPEAKER_COUNT; dca_ch++) {
+            if (dca_mask & (1 << dca_ch)) {
+                if (!dca_samples[dca_ch])
+                    return -DCADEC_EINVAL;
+                dca->samples[nchannels++] = dca_samples[dca_ch];
+            }
+        }
+        dca->channel_mask = dca_mask;
+    } else {
+        int wav_mask = 0;
+        int *wav_samples[WAVESPKR_COUNT] = { NULL };
+        const uint8_t *dca2wav;
+        if (dca_mask == DCADEC_LAYOUT_7POINT0_WIDE ||
+            dca_mask == DCADEC_LAYOUT_7POINT1_WIDE)
+            dca2wav = dca2wav_wide;
+        else
+            dca2wav = dca2wav_norm;
+        for (size_t dca_ch = 0; dca_ch < sizeof(dca2wav_norm); dca_ch++) {
+            if (dca_mask & (1 << dca_ch)) {
+                if (!dca_samples[dca_ch])
+                    return -DCADEC_EINVAL;
+                int wav_ch = dca2wav[dca_ch];
+                if (!wav_samples[wav_ch]) {
+                    wav_samples[wav_ch] = dca_samples[dca_ch];
+                    wav_mask |= 1 << wav_ch;
+                }
+            }
+        }
+        for (int wav_ch = 0; wav_ch < WAVESPKR_COUNT; wav_ch++) {
+            if (wav_mask & (1 << wav_ch)) {
+                dca->samples[nchannels++] = wav_samples[wav_ch];
+            }
+        }
+        dca->channel_mask = wav_mask;
+    }
+
+    return nchannels;
+}
+
+static int filter_core_frame(struct dcadec_context *dca)
+{
+    struct core_decoder *core = dca->core;
+
+    dca->ncoreframes = 0;
+
+    // Filter core frame
+    int ret;
+    if ((ret = core_filter(core, dca->flags)) < 0)
+        return ret;
+
+    // Reorder sample buffer pointers
+    if (reorder_samples(dca, core->output_samples, core->ch_mask) <= 0)
+        return -DCADEC_EINVAL;
+
+    dca->nframesamples = core->npcmsamples;
+    dca->sample_rate = core->output_rate;
+    dca->bits_per_sample = core->bits_per_sample;
+    if (core->xbr_present || core->xxch_present)
+        dca->profile = DCADEC_PROFILE_HD_HRA;
+    else if (core->es_format && core->xch_present)
+        dca->profile = DCADEC_PROFILE_DS_ES;
+    else if (core->x96_present && !(dca->flags & DCADEC_FLAG_CORE_SYNTH_X96))
+        dca->profile = DCADEC_PROFILE_DS_96_24;
+    else
+        dca->profile = DCADEC_PROFILE_DS;
+    return 0;
+}
+
+static int map_spkr_to_core_ch(struct core_decoder *core, int spkr)
+{
+    if (core->ch_mask & (1 << spkr))
+        return spkr;
+    if (spkr == SPEAKER_Lss && (core->ch_mask & SPEAKER_MASK_Ls))
+        return SPEAKER_Ls;
+    if (spkr == SPEAKER_Rss && (core->ch_mask & SPEAKER_MASK_Rs))
+        return SPEAKER_Rs;
+    return -1;
+}
+
+static struct xll_chset *find_hier_dmix_chset(struct xll_decoder *xll, struct xll_chset *c)
+{
+    c++;
+    while (c != &xll->chset[xll->nchsets]) {
+        if (!c->primary_chset
+            && c->dmix_embedded
+            && c->hier_chset
+            && !c->replace_set_index
+            && c->ch_mask_enabled)
+            return c;
+        c++;
+    }
+    return NULL;
+}
+
+static int conv_dmix_scale(int code)
+{
+    unsigned int index = (code & 0xff) - 1;
+    if (index < dca_countof(dmix_table)) {
+        int sign = (code >> 8) - 1;
+        int coeff = dmix_table[index];
+        return (coeff ^ sign) - sign;
+    }
+    return 0;
+}
+
+static int conv_dmix_scale_inv(int code)
+{
+    unsigned int index = (code & 0xff) - 41;
+    if (index < dca_countof(dmix_table_inv)) {
+        int sign = (code >> 8) - 1;

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/dca_context.h Added

@@ -0,0 +1,290 @@
+/*
+ * This file is part of libdcadec.
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef DCA_CONTEXT_H
+#define DCA_CONTEXT_H
+
+#include <stdlib.h>
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#else
+#include <stdbool.h>
+#endif
+
+/**@{*/
+#ifdef _WIN32
+#define DCADEC_SHARED_EXPORT    __declspec(dllexport)
+#define DCADEC_SHARED_IMPORT    __declspec(dllimport)
+#else
+#define DCADEC_SHARED_EXPORT    __attribute__((visibility("default")))
+#define DCADEC_SHARED_IMPORT    __attribute__((visibility("default")))
+#endif
+
+#ifdef DCADEC_SHARED
+#ifdef DCADEC_INTERNAL
+#define DCADEC_API  DCADEC_SHARED_EXPORT
+#else
+#define DCADEC_API  DCADEC_SHARED_IMPORT
+#endif
+#else
+#define DCADEC_API
+#endif
+/**@}*/
+
+/**@{*/
+#define DCADEC_EINVAL       1   /**< Invalid argument */
+#define DCADEC_EBADDATA     2   /**< Invalid bitstream format */
+#define DCADEC_EBADCRC      3   /**< CRC check failed */
+#define DCADEC_EBADREAD     4   /**< Bitstream navigation error */
+#define DCADEC_ENOSYNC      5   /**< Synchronization error */
+#define DCADEC_ENOSUP       6   /**< Unsupported feature */
+#define DCADEC_ENOMEM       7   /**< Memory allocation error */
+#define DCADEC_EOVERFLOW    8   /**< PCM output overflow */
+#define DCADEC_EIO          9   /**< I/O error */
+#define DCADEC_EOUTCHG     10   /**< PCM output parameters changed */
+#define DCADEC_EFAIL       32   /**< Unspecified error */
+/**@}*/
+
+/**@{*/
+/** Decode DTS core only without extensions */
+#define DCADEC_FLAG_CORE_ONLY           0x01
+
+/** Force bit exact DTS core decoding */
+#define DCADEC_FLAG_CORE_BIT_EXACT      0x02
+
+/**
+ * Force DTS core synthesis using X96 filter, with high frequency subbands set
+ * to zero. If actual X96 data is present, it is discarded when this flag is
+ * set. Effectively doubles output sample rate.
+ */
+#define DCADEC_FLAG_CORE_SYNTH_X96      0x04
+
+/** Force DTS core bit width reducion to source PCM resolution */
+#define DCADEC_FLAG_CORE_SOURCE_PCM_RES 0x08
+
+/* Use FIR filter for floating point DTS core LFE channel interpolation */
+#define DCADEC_FLAG_CORE_LFE_FIR        0x10
+
+/** Extract embedded 2.0 downmix (NOT YET IMPLEMENTED) */
+#define DCADEC_FLAG_KEEP_DMIX_2CH       0x20
+
+/** Extract embedded 5.1 downmix (NOT YET IMPLEMENTED) */
+#define DCADEC_FLAG_KEEP_DMIX_6CH       0x40
+
+/** Output native DTS channel layout, not WAVEFORMATEX layout */
+#define DCADEC_FLAG_NATIVE_LAYOUT       0x80
+
+/** Don't conceal errors */
+#define DCADEC_FLAG_STRICT              0x100
+/**@}*/
+
+/**@{*/
+#define DCADEC_PROFILE_UNKNOWN  0       /**< Unknown Profile */
+#define DCADEC_PROFILE_DS       0x01    /**< Digital Surround */
+#define DCADEC_PROFILE_DS_96_24 0x02    /**< Digital Surround 96/24 */
+#define DCADEC_PROFILE_DS_ES    0x04    /**< Digital Surround ES */
+#define DCADEC_PROFILE_HD_HRA   0x08    /**< High-Resolution Audio */
+#define DCADEC_PROFILE_HD_MA    0x10    /**< Master Audio */
+#define DCADEC_PROFILE_EXPRESS  0x20    /**< Express */
+/**@}*/
+
+/**
+ * Size in bytes of empty padding that must be present after the end of input
+ * buffer. libdcadec may overread the input buffer up to this number of bytes.
+ */
+#define DCADEC_BUFFER_PADDING   8
+
+struct dcadec_context;
+
+struct dcadec_core_info {
+    int     nchannels;      /**< Number of primary audio channels */
+    int     audio_mode;     /**< Core audio channel arrangement (AMODE) */
+    int     lfe_present;    /**< LFE channel presence flag (can be 0, 1 or 2) */
+    int     sample_rate;    /**< Core audio sample rate in Hz */
+    int     source_pcm_res; /**< Source PCM resolution in bits */
+    bool    es_format;      /**< Extended surround (ES) mastering flag */
+    int     bit_rate;       /**< Core stream bit rate in bytes per second,
+                                 zero or negative if unavailable */
+    int     npcmblocks;     /**< Number of audio sample blocks in a frame */
+    bool    xch_present;    /**< XCH extension data present and valid */
+    bool    xxch_present;   /**< XXCH extension data present and valid */
+    bool    xbr_present;    /**< XBR extension data present and valid */
+    bool    x96_present;    /**< X96 extension data present and valid */
+};
+
+struct dcadec_exss_info {
+    int nchannels;          /**< Number of audio channels encoded among all
+                                 extension sub-streams */
+    int sample_rate;        /**< Maximum encoded audio sample rate in Hz */
+    int bits_per_sample;    /**< Highest encoded PCM resolution in bits */
+    int profile;            /**< Type of DTS profile encoded */
+    bool embedded_stereo;   /**< 2.0 downmix has been embedded into the stream */
+    bool embedded_6ch;      /**< 5.1 downmix has been embedded into the stream */
+};
+
+typedef void (*dcadec_log_fn)(void* log_context,const char* message,unsigned int lineno);
+
+/**
+ * Parse DTS packet. Packet data must be already converted into 16-bit
+ * big-endian format. Caller must have already established byte stream
+ * synchronization. Packet must start with a valid 32-bit sync word. EXSS frame
+ * must be aligned on 4-byte boundary if present in the packet.
+ *
+ * @param dca   Pointer to decoder context.
+ *
+ * @param data  Pointer to packet data buffer. Buffer must be aligned on 4-byte
+ *              boundary and padded at the end with DCADEC_BUFFER_PADDING bytes.
+ *
+ * @param size  Size in bytes of packet data. Size should not include padding.
+ *
+ * @return      0 on success, negative error code on failure.
+ */
+DCADEC_API int dcadec_context_parse(struct dcadec_context *dca, uint8_t *data, size_t size);
+
+/**
+ * Get information about DTS core payload of the parsed packet.
+ *
+ * @param dca   Pointer to decoder context.
+ *
+ * @return      Pointer to DTS core information structure on success,
+ *              NULL on failure. Returned data should be freed with
+ *              dcadec_context_free_core_info() function.
+ */
+DCADEC_API struct dcadec_core_info *dcadec_context_get_core_info(struct dcadec_context *dca);
+
+/**
+ * Free DTS core information structure.
+ *
+ * @param info  Pointer to DTS core information structure.
+ */
+DCADEC_API void dcadec_context_free_core_info(struct dcadec_core_info *info);
+
+/**
+ * Get information about extension sub-stream (EXSS) payload of the parsed
+ * packet. When no EXSS is present but backward compatible DTS core sub-stream
+ * contains extended audio, then information about extended audio in core
+ * sub-stream is returned.
+ *
+ * @param dca   Pointer to decoder context.
+ *
+ * @return      Pointer to EXSS information structure on success,
+ *              NULL on failure. Returned data should be freed with
+ *              dcadec_context_free_exss_info() function.
+ */
+DCADEC_API struct dcadec_exss_info *dcadec_context_get_exss_info(struct dcadec_context *dca);
+
+/**
+ * Free EXSS information structure.
+ *
+ * @param info  Pointer to EXSS information structure.
+ */
+DCADEC_API void dcadec_context_free_exss_info(struct dcadec_exss_info *info);
+

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/dca_stream.h Added

@@ -0,0 +1,31 @@
+/*
+ * This file is part of libdcadec.
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef DCA_STREAM_H
+#define DCA_STREAM_H
+
+#include "dca_context.h"
+
+struct dcadec_stream;
+
+DCADEC_API struct dcadec_stream *dcadec_stream_open(const char *name);
+DCADEC_API void dcadec_stream_close(struct dcadec_stream *stream);
+DCADEC_API int dcadec_stream_read(struct dcadec_stream *stream, uint8_t **data, size_t *size);
+DCADEC_API int dcadec_stream_progress(struct dcadec_stream *stream);
+
+#endif

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/dmix_tables.cpp Added

@@ -0,0 +1,82 @@
+/*
+ * This file is part of libdcadec.
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdint.h>
+
+extern const uint16_t dmix_table[241] = {
+       33,    35,    37,    39,    41,    44,    46,    49,
+       52,    55,    58,    62,    65,    69,    73,    78,
+       82,    87,    92,    98,   104,   110,   116,   123,
+      130,   138,   146,   155,   164,   174,   184,   195,
+      207,   219,   232,   246,   260,   276,   292,   309,
+      328,   347,   368,   389,   413,   437,   463,   490,
+      519,   550,   583,   617,   654,   693,   734,   777,
+      823,   872,   924,   978,  1036,  1066,  1098,  1130,
+     1163,  1197,  1232,  1268,  1305,  1343,  1382,  1422,
+     1464,  1506,  1550,  1596,  1642,  1690,  1740,  1790,
+     1843,  1896,  1952,  2009,  2068,  2128,  2190,  2254,
+     2320,  2388,  2457,  2529,  2603,  2679,  2757,  2838,
+     2920,  3006,  3093,  3184,  3277,  3372,  3471,  3572,
+     3677,  3784,  3894,  4008,  4125,  4246,  4370,  4497,
+     4629,  4764,  4903,  5046,  5193,  5345,  5501,  5662,
+     5827,  5912,  5997,  6084,  6172,  6262,  6353,  6445,
+     6538,  6633,  6729,  6827,  6925,  7026,  7128,  7231,
+     7336,  7442,  7550,  7659,  7771,  7883,  7997,  8113,
+     8231,  8350,  8471,  8594,  8719,  8845,  8973,  9103,
+     9235,  9369,  9505,  9643,  9783,  9924, 10068, 10214,
+    10362, 10512, 10665, 10819, 10976, 11135, 11297, 11460,
+    11627, 11795, 11966, 12139, 12315, 12494, 12675, 12859,
+    13045, 13234, 13426, 13621, 13818, 14018, 14222, 14428,
+    14637, 14849, 15064, 15283, 15504, 15729, 15957, 16188,
+    16423, 16661, 16902, 17147, 17396, 17648, 17904, 18164,
+    18427, 18694, 18965, 19240, 19519, 19802, 20089, 20380,
+    20675, 20975, 21279, 21587, 21900, 22218, 22540, 22867,
+    23170, 23534, 23875, 24221, 24573, 24929, 25290, 25657,
+    26029, 26406, 26789, 27177, 27571, 27970, 28376, 28787,
+    29205, 29628, 30057, 30493, 30935, 31383, 31838, 32300,
+    32768
+};
+
+extern const uint32_t dmix_table_inv[201] = {
+    6553600, 6186997, 5840902, 5514167, 5205710, 4914507, 4639593, 4380059,
+    4135042, 3903731, 3685360, 3479204, 3284581, 3100844, 2927386, 2763630,
+    2609035, 2463088, 2325305, 2195230, 2072430, 2013631, 1956500, 1900990,
+    1847055, 1794651, 1743733, 1694260, 1646190, 1599484, 1554103, 1510010,
+    1467168, 1425542, 1385096, 1345798, 1307615, 1270515, 1234468, 1199444,
+    1165413, 1132348, 1100221, 1069005, 1038676, 1009206,  980573,  952752,
+     925721,  899456,  873937,  849141,  825049,  801641,  778897,  756798,
+     735326,  714463,  694193,  674497,  655360,  636766,  618700,  601146,
+     584090,  567518,  551417,  535772,  520571,  505801,  491451,  477507,
+     463959,  450796,  438006,  425579,  413504,  401772,  390373,  379297,
+     368536,  363270,  358080,  352964,  347920,  342949,  338049,  333219,
+     328458,  323765,  319139,  314579,  310084,  305654,  301287,  296982,
+     292739,  288556,  284433,  280369,  276363,  272414,  268522,  264685,
+     260904,  257176,  253501,  249879,  246309,  242790,  239321,  235901,
+     232531,  229208,  225933,  222705,  219523,  216386,  213295,  210247,
+     207243,  204282,  201363,  198486,  195650,  192855,  190099,  187383,
+     184706,  182066,  179465,  176901,  174373,  171882,  169426,  167005,
+     164619,  162267,  159948,  157663,  155410,  153190,  151001,  148844,
+     146717,  144621,  142554,  140517,  138510,  136531,  134580,  132657,
+     130762,  128893,  127052,  125236,  123447,  121683,  119944,  118231,
+     116541,  114876,  113235,  111617,  110022,  108450,  106901,  105373,
+     103868,  102383,  100921,   99479,   98057,   96656,   95275,   93914,
+      92682,   91249,   89946,   88660,   87394,   86145,   84914,   83701,
+      82505,   81326,   80164,   79019,   77890,   76777,   75680,   74598,
+      73533,   72482,   71446,   70425,   69419,   68427,   67450,   66486,
+      65536
+};

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/dmix_tables.h Added

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/exss_parser.cpp Added

@@ -0,0 +1,490 @@
+/*
+ * This file is part of libdcadec.
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "common.h"
+#include "exss_parser.h"
+
+// Table 8-5: Sample rate decoding
+const uint32_t exss_sample_rates[16] = {
+      8000,  16000,  32000,  64000,
+    128000,  22050,  44100,  88200,
+    176400, 352800,  12000,  24000,
+     48000,  96000, 192000, 384000
+};
+
+static int count_chs_for_mask(int mask)
+{
+    return dca_popcount(mask) + dca_popcount(mask & SPEAKER_PAIR_ALL_2);
+}
+
+static void parse_xll_parameters(struct exss_asset *asset)
+{
+    struct exss_parser *exss = asset->parser;
+
+    // Size of XLL data in extension substream
+    asset->xll_size = bits_get(&exss->bits, exss->exss_size_nbits) + 1;
+    // XLL sync word present flag
+    asset->xll_sync_present = bits_get1(&exss->bits);
+    if (asset->xll_sync_present) {
+        // Peak bit rate smoothing buffer size
+        bits_skip(&exss->bits, 4);
+        // Number of bits for XLL decoding delay
+        int xll_delay_nbits = bits_get(&exss->bits, 5) + 1;
+        // Initial XLL decoding delay in frames
+        asset->xll_delay_nframes = bits_get(&exss->bits, xll_delay_nbits);
+        // Number of bytes offset to XLL sync
+        asset->xll_sync_offset = bits_get(&exss->bits, exss->exss_size_nbits);
+    } else {
+        asset->xll_delay_nframes = 0;
+        asset->xll_sync_offset = 0;
+    }
+}
+
+static void parse_lbr_parameters(struct exss_asset *asset)
+{
+    struct exss_parser *exss = asset->parser;
+
+    // Size of LBR component in extension substream
+    asset->lbr_size = bits_get(&exss->bits, 14) + 1;
+    // LBR sync word present flag
+    if (bits_get1(&exss->bits))
+        // LBR sync distance
+        bits_skip(&exss->bits, 2);
+}
+
+static int set_extension_offsets(struct exss_asset *asset)
+{
+    size_t offs = asset->asset_offset;
+    size_t size = asset->asset_size;
+
+    if (asset->extension_mask & EXSS_CORE) {
+        asset->core_offset = offs;
+        if (offs & 3)
+            return -DCADEC_EBADREAD;
+        if (asset->core_size > size)
+            return -DCADEC_EBADREAD;
+        offs += asset->core_size;
+        size -= asset->core_size;
+    }
+
+    if (asset->extension_mask & EXSS_XBR) {
+        asset->xbr_offset = offs;
+        if (offs & 3)
+            return -DCADEC_EBADREAD;
+        if (asset->xbr_size > size)
+            return -DCADEC_EBADREAD;
+        offs += asset->xbr_size;
+        size -= asset->xbr_size;
+    }
+
+    if (asset->extension_mask & EXSS_XXCH) {
+        asset->xxch_offset = offs;
+        if (offs & 3)
+            return -DCADEC_EBADREAD;
+        if (asset->xxch_size > size)
+            return -DCADEC_EBADREAD;
+        offs += asset->xxch_size;
+        size -= asset->xxch_size;
+    }
+
+    if (asset->extension_mask & EXSS_X96) {
+        asset->x96_offset = offs;
+        if (offs & 3)
+            return -DCADEC_EBADREAD;
+        if (asset->x96_size > size)
+            return -DCADEC_EBADREAD;
+        offs += asset->x96_size;
+        size -= asset->x96_size;
+    }
+
+    if (asset->extension_mask & EXSS_LBR) {
+        asset->lbr_offset = offs;
+        if (offs & 3)
+            return -DCADEC_EBADREAD;
+        if (asset->lbr_size > size)
+            return -DCADEC_EBADREAD;
+        offs += asset->lbr_size;
+        size -= asset->lbr_size;
+    }
+
+    if (asset->extension_mask & EXSS_XLL) {
+        asset->xll_offset = offs;
+        if (offs & 3)
+            return -DCADEC_EBADREAD;
+        if (asset->xll_size > size)
+            return -DCADEC_EBADREAD;
+        offs += asset->xll_size;
+        size -= asset->xll_size;
+    }
+
+    return 0;
+}
+
+static int parse_descriptor(struct exss_asset *asset)
+{
+    struct exss_parser *exss = asset->parser;
+    int i, j;
+
+    size_t descr_pos = exss->bits.index;
+
+    // Size of audio asset descriptor in bytes
+    size_t descr_size = bits_get(&exss->bits, 9) + 1;
+
+    // Audio asset identifier
+    asset->asset_index = bits_get(&exss->bits, 3);
+
+    //
+    // Per stream static metadata
+    //
+
+    if (exss->static_fields_present) {
+        // Asset type descriptor presence
+        if (bits_get1(&exss->bits))
+            // Asset type descriptor
+            bits_skip(&exss->bits, 4);
+
+        // Language descriptor presence
+        if (bits_get1(&exss->bits))
+            // Language descriptor
+            bits_skip(&exss->bits, 24);
+
+        // Additional textual information presence
+        if (bits_get1(&exss->bits)) {
+            // Byte size of additional text info
+            int text_size = bits_get(&exss->bits, 10) + 1;
+            // Additional textual information string
+            bits_skip(&exss->bits, text_size * 8);
+        }
+
+        // PCM bit resolution
+        asset->pcm_bit_res = bits_get(&exss->bits, 5) + 1;
+
+        // Maximum sample rate
+        asset->max_sample_rate = exss_sample_rates[bits_get(&exss->bits, 4)];
+
+        // Total number of channels
+        asset->nchannels_total = bits_get(&exss->bits, 8) + 1;
+
+        // One to one map channel to speakers
+        asset->one_to_one_map_ch_to_spkr = bits_get1(&exss->bits);
+        if (asset->one_to_one_map_ch_to_spkr) {
+            // Embedded stereo flag
+            if (asset->nchannels_total > 2)
+                asset->embedded_stereo = bits_get1(&exss->bits);
+
+            // Embedded 6 channels flag
+            if (asset->nchannels_total > 6)
+                asset->embedded_6ch = bits_get1(&exss->bits);
+
+            int spkr_mask_nbits = 16; // ???
+
+            // Speaker mask enabled flag
+            if (bits_get1(&exss->bits)) {
+                // Number of bits for speaker activity mask
+                spkr_mask_nbits = (bits_get(&exss->bits, 2) + 1) << 2;

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/exss_parser.h Added

@@ -0,0 +1,90 @@
+/*
+ * This file is part of libdcadec.
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef EXSS_PARSER_H
+#define EXSS_PARSER_H
+
+#include "bitstream.h"
+
+struct exss_parser;
+
+struct exss_asset {
+    struct exss_parser  *parser;
+
+    size_t  asset_offset;
+    size_t  asset_size;
+    int     asset_index;
+
+    int     pcm_bit_res;
+    int     max_sample_rate;
+    int     nchannels_total;
+    bool    one_to_one_map_ch_to_spkr;
+    bool    embedded_stereo;
+    bool    embedded_6ch;
+    int     representation_type;
+
+    int     coding_mode;
+    int     extension_mask;
+
+    size_t  core_offset;
+    size_t  core_size;
+
+    size_t  xbr_offset;
+    size_t  xbr_size;
+
+    size_t  xxch_offset;
+    size_t  xxch_size;
+
+    size_t  x96_offset;
+    size_t  x96_size;
+
+    size_t  lbr_offset;
+    size_t  lbr_size;
+
+    size_t  xll_offset;
+    size_t  xll_size;
+    bool    xll_sync_present;
+    int     xll_delay_nframes;
+    size_t  xll_sync_offset;
+
+    int     hd_stream_id;
+};
+
+struct exss_parser {
+    struct bitstream   bits;
+
+    int     exss_index;
+    int     exss_size_nbits;
+    size_t  exss_size;
+
+    bool    static_fields_present;
+    int     npresents;
+    int     nassets;
+
+    bool    mix_metadata_enabled;
+    int     nmixoutconfigs;
+    int     nmixoutchs[4];
+
+    struct exss_asset   *assets;
+};
+
+extern const uint32_t exss_sample_rates[16];
+
+int exss_parse(struct exss_parser *exss, uint8_t *data, size_t size,struct dcadec_log_context *logctx);
+
+#endif

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/fir_fixed.h Added

@@ -0,0 +1,611 @@
+/*
+ * This file is part of libdcadec.
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+//  floor(fir_float.band_fir_perfect[i] * SQRT2 * (1 << 28) + 0.5), (i & 63) <  16
+// -floor(fir_float.band_fir_perfect[i] * SQRT2 * (1 << 28) + 0.5), (i & 63) >= 16
+static const int32_t band_fir_perfect[512] = {
+           0,        0,       -3,      -10,
+         -35,     -105,     -218,     -141,
+        -170,     -216,     -239,     -254,
+        -257,     -251,     -235,     -212,
+        -267,     -317,     -362,     -400,
+        -425,     -434,     -427,     -373,
+        -339,     -593,     -321,     -120,
+         -39,      -16,        0,        1,
+           1,        1,       -3,       -1,
+          -6,      -38,      -93,     -496,
+        -723,     -970,    -1235,    -1501,
+       -1753,    -1978,    -2163,    -2295,
+       -2891,    -2915,    -2860,    -2726,
+       -2517,    -2243,    -1915,    -1590,
+       -1192,     -252,     -117,      -22,
+          -6,      -13,       12,       14,
+          32,       25,      469,      942,
+        1403,     1421,     1239,     2838,
+        3539,     4259,     5002,     5716,
+        6365,     6908,     7311,     7545,
+       11680,    12355,    12785,    12951,
+       12841,    12453,    11803,    10864,
+        9762,     7099,     6725,     5954,
+        4284,     2584,      215,      379,
+         557,      701,      -29,     -687,
+       -1578,    -2749,    -4076,    -7933,
+      -10049,   -12133,   -14039,   -15752,
+      -17213,   -18400,   -19291,   -19878,
+       -1444,    -3005,    -4523,    -5927,
+       -7143,    -8093,    -8713,    -8939,
+       -8700,    -9481,    -7515,    -5279,
+       -2725,       61,     5763,     6113,
+        7571,     6735,    17126,    20165,
+       23328,    26775,    30310,    32639,
+       35464,    38064,    40423,    42512,
+       44261,    45632,    46578,    46974,
+      -45572,   -45008,   -43753,   -41661,
+      -38655,   -34660,   -29587,   -23375,
+      -15998,    -7631,     2472,    13757,
+       26188,    39942,    49789,    67293,
+       84699,   101701,   127325,   148404,
+      170391,   193280,   217044,   241451,
+      266537,   292144,   318161,   344417,
+      370786,   397082,   423133,   448757,
+      475085,   499136,   522007,   543516,
+      563424,   581467,   597422,   611005,
+      621975,   630083,   634996,   636457,
+      634311,   628147,   619871,   604524,
+      585077,   561301,   529204,   494129,
+      453552,   407189,   354920,   296502,
+      231916,   161012,    83700,      -86,
+      -90377,  -187193,  -290528,  -400329,
+      516487,   639054,   767835,   902710,
+     1043512,  1190048,  1342100,  1499418,
+     1661729,  1828700,  2000071,  2175433,
+     2354437,  2536630,  2721120,  2908704,
+     3098059,  3288764,  3480801,  3672922,
+     3864970,  4056432,  4246767,  4435454,
+     4621921,  4805642,  4986073,  5162677,
+     5334921,  5502279,  5664239,  5820300,
+     5969913,  6112723,  6248225,  6375985,
+     6495593,  6606663,  6708832,  6801769,
+     6885168,  6958762,  7022294,  7075566,
+     7118382,  7150633,  7172314,  7183082,
+     7183082,  7172314,  7150633,  7118382,
+     7075566,  7022294,  6958762,  6885168,
+     6801769,  6708832,  6606663,  6495593,
+     6375985,  6248225,  6112723,  5969913,
+    -5820300, -5664239, -5502279, -5334921,
+    -5162677, -4986073, -4805642, -4621921,
+    -4435454, -4246767, -4056432, -3864970,
+    -3672922, -3480801, -3288764, -3098059,
+    -2908704, -2721120, -2536630, -2354437,
+    -2175433, -2000071, -1828700, -1661729,
+    -1499418, -1342100, -1190048, -1043512,
+     -902710,  -767835,  -639054,  -516487,
+     -400329,  -290528,  -187193,   -90377,
+         -86,    83700,   161012,   231916,
+      296502,   354920,   407189,   453552,
+      494129,   529204,   561301,   585077,
+      604524,   619871,   628147,   634311,
+      636457,   634996,   630083,   621975,
+      611005,   597422,   581467,   563424,
+      543516,   522007,   499136,   475085,
+     -448757,  -423133,  -397082,  -370786,
+     -344417,  -318161,  -292144,  -266537,
+     -241451,  -217044,  -193280,  -170391,
+     -148404,  -127325,  -101701,   -84699,
+      -67293,   -49789,   -39942,   -26188,
+      -13757,    -2472,     7631,    15998,
+       23375,    29587,    34660,    38655,
+       41661,    43753,    45008,    45572,
+       46974,    46578,    45632,    44261,
+       42512,    40423,    38064,    35464,
+       32639,    30310,    26775,    23328,
+       20165,    17126,     6735,     7571,
+        6113,     5763,       61,    -2725,
+       -5279,    -7515,    -9481,    -8700,
+       -8939,    -8713,    -8093,    -7143,
+       -5927,    -4523,    -3005,    -1444,
+       19878,    19291,    18400,    17213,
+       15752,    14039,    12133,    10049,
+        7933,     4076,     2749,     1578,
+         687,       29,     -701,     -557,
+        -379,     -215,    -2584,    -4284,
+       -5954,    -6725,    -7099,    -9762,
+      -10864,   -11803,   -12453,   -12841,
+      -12951,   -12785,   -12355,   -11680,
+        7545,     7311,     6908,     6365,
+        5716,     5002,     4259,     3539,
+        2838,     1239,     1421,     1403,
+         942,      469,       25,       32,
+          14,       12,      -13,       -6,
+         -22,     -117,     -252,    -1192,
+       -1590,    -1915,    -2243,    -2517,
+       -2726,    -2860,    -2915,    -2891,
+        2295,     2163,     1978,     1753,
+        1501,     1235,      970,      723,
+         496,       93,       38,        6,
+           1,        3,       -1,       -1,
+          -1,        0,       16,       39,
+         120,      321,      593,      339,
+         373,      427,      434,      425,
+         400,      362,      317,      267,
+        -212,     -235,     -251,     -257,
+        -254,     -239,     -216,     -170,
+        -141,     -218,     -105,      -35,
+         -10,       -3,        0,        0
+};
+
+//  floor(fir_float.band_fir_nonperfect[i] * SQRT2 * (1 << 28) + 0.5), (i & 63) <  16
+// -floor(fir_float.band_fir_nonperfect[i] * SQRT2 * (1 << 28) + 0.5), (i & 63) >= 16
+static const int32_t band_fir_nonperfect[512] = {
+         -53,      -64,      -77,      -91,
+        -107,     -124,     -144,     -165,
+        -189,     -215,     -244,     -277,
+        -313,     -353,     -397,     -447,
+         502,      563,      631,      706,
+         789,      881,      983,     1095,
+        1218,     1354,     1502,     1665,
+        1843,     2036,     2247,     2475,
+        2723,     2990,     3277,     3586,
+        3916,     4270,     4646,     5046,
+        5470,     5918,     6390,     6886,
+        7405,     7947,     8510,     9094,
+        9698,    10319,    10955,    11605,
+       12265,    12933,    13605,    14277,
+       14945,    15604,    16250,    16877,
+       17480,    18051,    18585,    19075,
+       19513,    19891,    20202,    20436,
+       20587,    20643,    20597,    20439,
+       20160,    19749,    19198,    18496,
+       17634,    16603,    15393,    13996,
+      -12403,   -10605,    -8595,    -6366,
+       -3911,    -1225,     1697,     4860,
+        8265,    11916,    15812,    19953,
+       24337,    28961,    33819,    38904,
+       44210,    49725,    55437,    61334,
+       67398,    73614,    79961,    86417,
+       92960,    99563,   106198,   112837,
+      119446,   125994,   132443,   138758,
+      144898,   150823,   156491,   161858,
+      166879,   171507,   175697,   179400,
+      182566,   185149,   187097,   188363,
+      188899,   188654,   187581,   185635,
+      182770,   178943,   174112,   168238,
+      161285,   153218,   144007,   133624,
+      122046,   109254,    95232,    79969,
+       63462,    45709,    26715,     6492,
+       14943,    37567,    61350,    86256,
+      112242,   139258,   167246,   196143,
+      225877,   256368,   287532,   319275,
+      351496,   384088,   416936,   449919,
+      482909,   515770,   548362,   580539,
+      612148,   643030,   673024,   701963,
+      729674,   755985,   780717,   803690,
+      824721,   843628,   860226,   874332,
+      885761,   894330,   899861,   902174,

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/fir_float.h Added

@@ -0,0 +1,1325 @@
+/*
+ * This file is part of libdcadec.
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#define SCALE(x)    ((x) * M_SQRT2 * 128)
+
+// Annex D.8 - 32-band interpolation FIR, perfect reconstruction
+static const double band_fir_perfect[512] = {
+     SCALE( 1.140033200E-10),  SCALE( 7.138742100E-11),
+     SCALE(-8.358679600E-09),  SCALE(-2.529296600E-08),
+     SCALE(-9.130198800E-08),  SCALE(-2.771560000E-07),
+     SCALE(-5.746147600E-07),  SCALE(-3.712986200E-07),
+     SCALE(-4.468735700E-07),  SCALE(-5.697322600E-07),
+     SCALE(-6.300390500E-07),  SCALE(-6.677818900E-07),
+     SCALE(-6.770656500E-07),  SCALE(-6.601852300E-07),
+     SCALE(-6.193701600E-07),  SCALE(-5.586146700E-07),
+    -SCALE( 7.034745600E-07), -SCALE( 8.348606100E-07),
+    -SCALE( 9.544782800E-07), -SCALE( 1.052683900E-06),
+    -SCALE( 1.119829700E-06), -SCALE( 1.144180200E-06),
+    -SCALE( 1.124542400E-06), -SCALE( 9.822894700E-07),
+    -SCALE( 8.920065800E-07), -SCALE( 1.560941800E-06),
+    -SCALE( 8.454480100E-07), -SCALE( 3.167104300E-07),
+    -SCALE( 1.028149000E-07), -SCALE( 4.147967800E-08),
+    -SCALE(-6.821591800E-10), -SCALE(-1.611726200E-09),
+    -SCALE(-2.668096400E-09), -SCALE(-3.377455500E-09),
+    -SCALE( 6.820855300E-09), -SCALE( 3.715261200E-09),
+    -SCALE( 1.643020800E-08), -SCALE( 1.007547900E-07),
+    -SCALE( 2.448299500E-07), -SCALE( 1.306777300E-06),
+    -SCALE( 1.904890000E-06), -SCALE( 2.555774300E-06),
+    -SCALE( 3.253336000E-06), -SCALE( 3.953604500E-06),
+    -SCALE( 4.617880200E-06), -SCALE( 5.210775600E-06),
+    -SCALE( 5.696789700E-06), -SCALE( 6.046428700E-06),
+    -SCALE( 7.614387900E-06), -SCALE( 7.678809700E-06),
+    -SCALE( 7.533601500E-06), -SCALE( 7.179758900E-06),
+    -SCALE( 6.629955000E-06), -SCALE( 5.908209500E-06),
+    -SCALE( 5.044609200E-06), -SCALE( 4.187209700E-06),
+    -SCALE( 3.139397100E-06), -SCALE( 6.650809100E-07),
+    -SCALE( 3.073465500E-07), -SCALE( 5.699348500E-08),
+    -SCALE( 1.510238900E-08), -SCALE( 3.384827600E-08),
+    -SCALE(-3.227406600E-08), -SCALE(-3.772031200E-08),
+     SCALE( 8.454083600E-08),  SCALE( 6.479789100E-08),
+     SCALE( 1.236415900E-06),  SCALE( 2.480143600E-06),
+     SCALE( 3.694976800E-06),  SCALE( 3.742137100E-06),
+     SCALE( 3.262621300E-06),  SCALE( 7.476824700E-06),
+     SCALE( 9.321632700E-06),  SCALE( 1.121856000E-05),
+     SCALE( 1.317522400E-05),  SCALE( 1.505747500E-05),
+     SCALE( 1.676702500E-05),  SCALE( 1.819741000E-05),
+     SCALE( 1.925789500E-05),  SCALE( 1.987389300E-05),
+    -SCALE(-3.076839000E-05), -SCALE(-3.254459900E-05),
+    -SCALE(-3.367812600E-05), -SCALE(-3.411568400E-05),
+    -SCALE(-3.382472000E-05), -SCALE(-3.280414400E-05),
+    -SCALE(-3.109003600E-05), -SCALE(-2.861654300E-05),
+    -SCALE(-2.571454500E-05), -SCALE(-1.870056200E-05),
+    -SCALE(-1.771374800E-05), -SCALE(-1.568432200E-05),
+    -SCALE(-1.128458200E-05), -SCALE(-6.805568100E-06),
+    -SCALE(-5.671807300E-07), -SCALE(-9.974569000E-07),
+    -SCALE(-1.466421500E-06), -SCALE(-1.846174800E-06),
+    -SCALE( 7.763173700E-08), -SCALE( 1.809597500E-06),
+    -SCALE( 4.157326000E-06), -SCALE( 7.240269200E-06),
+    -SCALE( 1.073666400E-05), -SCALE( 2.089583800E-05),
+    -SCALE( 2.647159500E-05), -SCALE( 3.196094400E-05),
+    -SCALE( 3.698112500E-05), -SCALE( 4.149260300E-05),
+    -SCALE( 4.534151200E-05), -SCALE( 4.846834800E-05),
+    -SCALE( 5.081695700E-05), -SCALE( 5.236303900E-05),
+    -SCALE( 3.803557300E-06), -SCALE( 7.916183300E-06),
+    -SCALE( 1.191309700E-05), -SCALE( 1.561346600E-05),
+    -SCALE( 1.881671400E-05), -SCALE( 2.131957100E-05),
+    -SCALE( 2.295038200E-05), -SCALE( 2.354812700E-05),
+    -SCALE( 2.291622100E-05), -SCALE( 2.497457200E-05),
+    -SCALE( 1.979628700E-05), -SCALE( 1.390508100E-05),
+    -SCALE( 7.179248900E-06), -SCALE(-1.614022200E-07),
+    -SCALE(-1.518084500E-05), -SCALE(-1.610369300E-05),
+     SCALE( 1.994364800E-05),  SCALE( 1.774116500E-05),
+     SCALE( 4.511232400E-05),  SCALE( 5.311715600E-05),
+     SCALE( 6.144976200E-05),  SCALE( 7.052899300E-05),
+     SCALE( 7.984114900E-05),  SCALE( 8.597821200E-05),
+     SCALE( 9.341758200E-05),  SCALE( 1.002681400E-04),
+     SCALE( 1.064814700E-04),  SCALE( 1.119841200E-04),
+     SCALE( 1.165901700E-04),  SCALE( 1.202018700E-04),
+     SCALE( 1.226936800E-04),  SCALE( 1.237377900E-04),
+    -SCALE( 1.200453700E-04), -SCALE( 1.185602000E-04),
+    -SCALE( 1.152534400E-04), -SCALE( 1.097435100E-04),
+    -SCALE( 1.018237000E-04), -SCALE( 9.130172200E-05),
+    -SCALE( 7.793692700E-05), -SCALE( 6.157321800E-05),
+    -SCALE( 4.214289700E-05), -SCALE( 2.010055900E-05),
+    -SCALE(-6.512868000E-06), -SCALE(-3.623958500E-05),
+    -SCALE(-6.898332300E-05), -SCALE(-1.052143400E-04),
+    -SCALE(-1.311540500E-04), -SCALE(-1.772621900E-04),
+    -SCALE(-2.231129500E-04), -SCALE(-2.678985000E-04),
+    -SCALE(-3.353960600E-04), -SCALE(-3.909221300E-04),
+    -SCALE(-4.488403900E-04), -SCALE(-5.091327500E-04),
+    -SCALE(-5.717321000E-04), -SCALE(-6.360244700E-04),
+    -SCALE(-7.021067600E-04), -SCALE(-7.695597500E-04),
+    -SCALE(-8.380918900E-04), -SCALE(-9.072555100E-04),
+    -SCALE(-9.767158300E-04), -SCALE(-1.045985500E-03),
+    -SCALE(-1.114606900E-03), -SCALE(-1.182107000E-03),
+    -SCALE(-1.251459700E-03), -SCALE(-1.314813200E-03),
+    -SCALE(-1.375058300E-03), -SCALE(-1.431717500E-03),
+    -SCALE(-1.484159500E-03), -SCALE(-1.531686400E-03),
+    -SCALE(-1.573715600E-03), -SCALE(-1.609496400E-03),
+    -SCALE(-1.638393400E-03), -SCALE(-1.659751400E-03),
+    -SCALE(-1.672691700E-03), -SCALE(-1.676540900E-03),
+    -SCALE(-1.670887400E-03), -SCALE(-1.654649800E-03),
+    -SCALE(-1.632849400E-03), -SCALE(-1.592423900E-03),
+     SCALE( 1.541196600E-03),  SCALE( 1.478566700E-03),
+     SCALE( 1.394017000E-03),  SCALE( 1.301623400E-03),
+     SCALE( 1.194737700E-03),  SCALE( 1.072608600E-03),
+     SCALE( 9.349224800E-04),  SCALE( 7.810380900E-04),
+     SCALE( 6.109076600E-04),  SCALE( 4.241331700E-04),
+     SCALE( 2.204804700E-04),  SCALE(-2.272228400E-07),
+     SCALE(-2.380696500E-04),  SCALE(-4.930996000E-04),
+     SCALE(-7.653038000E-04),  SCALE(-1.054538000E-03),
+    -SCALE(-1.360519200E-03), -SCALE(-1.683383000E-03),
+    -SCALE(-2.022614600E-03), -SCALE(-2.377899500E-03),
+    -SCALE(-2.748797700E-03), -SCALE(-3.134797500E-03),
+    -SCALE(-3.535329200E-03), -SCALE(-3.949734800E-03),
+    -SCALE(-4.377291000E-03), -SCALE(-4.817122000E-03),
+    -SCALE(-5.268542300E-03), -SCALE(-5.730478300E-03),
+    -SCALE(-6.202005100E-03), -SCALE(-6.681936000E-03),
+    -SCALE(-7.167914500E-03), -SCALE(-7.662045500E-03),
+    -SCALE(-8.160839200E-03), -SCALE(-8.663190500E-03),
+    -SCALE(-9.169050700E-03), -SCALE(-9.675131500E-03),
+    -SCALE(-1.018101800E-02), -SCALE(-1.068536400E-02),
+    -SCALE(-1.118674000E-02), -SCALE(-1.168377500E-02),
+    -SCALE(-1.217496400E-02), -SCALE(-1.265891600E-02),
+    -SCALE(-1.313420500E-02), -SCALE(-1.359941000E-02),
+    -SCALE(-1.405313100E-02), -SCALE(-1.449398400E-02),
+    -SCALE(-1.492061500E-02), -SCALE(-1.533170500E-02),
+    -SCALE(-1.572581500E-02), -SCALE(-1.610200000E-02),
+    -SCALE(-1.645893800E-02), -SCALE(-1.679548100E-02),
+    -SCALE(-1.711054800E-02), -SCALE(-1.740312600E-02),
+    -SCALE(-1.767225900E-02), -SCALE(-1.791707200E-02),
+    -SCALE(-1.813675700E-02), -SCALE(-1.833061700E-02),
+    -SCALE(-1.849797400E-02), -SCALE(-1.863830100E-02),
+    -SCALE(-1.875108700E-02), -SCALE(-1.883604000E-02),
+    -SCALE(-1.889315300E-02), -SCALE(-1.892151600E-02),
+     SCALE( 1.892151600E-02),  SCALE( 1.889315300E-02),
+     SCALE( 1.883604000E-02),  SCALE( 1.875108700E-02),
+     SCALE( 1.863830100E-02),  SCALE( 1.849797400E-02),
+     SCALE( 1.833061700E-02),  SCALE( 1.813675700E-02),
+     SCALE( 1.791707200E-02),  SCALE( 1.767225900E-02),
+     SCALE( 1.740312600E-02),  SCALE( 1.711054800E-02),
+     SCALE( 1.679548100E-02),  SCALE( 1.645893800E-02),
+     SCALE( 1.610200000E-02),  SCALE( 1.572581500E-02),
+    -SCALE( 1.533170500E-02), -SCALE( 1.492061500E-02),
+    -SCALE( 1.449398400E-02), -SCALE( 1.405313100E-02),
+    -SCALE( 1.359941000E-02), -SCALE( 1.313420500E-02),
+    -SCALE( 1.265891600E-02), -SCALE( 1.217496400E-02),
+    -SCALE( 1.168377500E-02), -SCALE( 1.118674000E-02),
+    -SCALE( 1.068536400E-02), -SCALE( 1.018101800E-02),
+    -SCALE( 9.675131500E-03), -SCALE( 9.169050700E-03),
+    -SCALE( 8.663190500E-03), -SCALE( 8.160839200E-03),
+    -SCALE( 7.662045500E-03), -SCALE( 7.167914500E-03),
+    -SCALE( 6.681936000E-03), -SCALE( 6.202005100E-03),
+    -SCALE( 5.730478300E-03), -SCALE( 5.268542300E-03),
+    -SCALE( 4.817122000E-03), -SCALE( 4.377291000E-03),
+    -SCALE( 3.949734800E-03), -SCALE( 3.535329200E-03),
+    -SCALE( 3.134797500E-03), -SCALE( 2.748797700E-03),
+    -SCALE( 2.377899500E-03), -SCALE( 2.022614600E-03),
+    -SCALE( 1.683383000E-03), -SCALE( 1.360519200E-03),
+    -SCALE( 1.054538000E-03), -SCALE( 7.653038000E-04),
+    -SCALE( 4.930996000E-04), -SCALE( 2.380696500E-04),
+    -SCALE( 2.272228400E-07), -SCALE(-2.204804700E-04),
+    -SCALE(-4.241331700E-04), -SCALE(-6.109076600E-04),
+    -SCALE(-7.810380900E-04), -SCALE(-9.349224800E-04),
+    -SCALE(-1.072608600E-03), -SCALE(-1.194737700E-03),
+    -SCALE(-1.301623400E-03), -SCALE(-1.394017000E-03),
+    -SCALE(-1.478566700E-03), -SCALE(-1.541196600E-03),
+     SCALE( 1.592423900E-03),  SCALE( 1.632849400E-03),
+     SCALE( 1.654649800E-03),  SCALE( 1.670887400E-03),
+     SCALE( 1.676540900E-03),  SCALE( 1.672691700E-03),
+     SCALE( 1.659751400E-03),  SCALE( 1.638393400E-03),
+     SCALE( 1.609496400E-03),  SCALE( 1.573715600E-03),
+     SCALE( 1.531686400E-03),  SCALE( 1.484159500E-03),
+     SCALE( 1.431717500E-03),  SCALE( 1.375058300E-03),
+     SCALE( 1.314813200E-03),  SCALE( 1.251459700E-03),
+    -SCALE( 1.182107000E-03), -SCALE( 1.114606900E-03),
+    -SCALE( 1.045985500E-03), -SCALE( 9.767158300E-04),
+    -SCALE( 9.072555100E-04), -SCALE( 8.380918900E-04),
+    -SCALE( 7.695597500E-04), -SCALE( 7.021067600E-04),
+    -SCALE( 6.360244700E-04), -SCALE( 5.717321000E-04),
+    -SCALE( 5.091327500E-04), -SCALE( 4.488403900E-04),
+    -SCALE( 3.909221300E-04), -SCALE( 3.353960600E-04),
+    -SCALE( 2.678985000E-04), -SCALE( 2.231129500E-04),
+    -SCALE( 1.772621900E-04), -SCALE( 1.311540500E-04),

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/fixed_math.h Added

@@ -0,0 +1,83 @@
+/*
+ * This file is part of libdcadec.
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef FIXED_MATH_H
+#define FIXED_MATH_H
+
+static inline int64_t round__(int64_t a, int bits)
+{
+    if (bits > 0)
+        return (a + (INT64_C(1) << (bits - 1))) & ~((INT64_C(1) << bits) - 1);
+    else
+        return a;
+}
+
+static inline int32_t norm__(int64_t a, int bits)
+{
+    if (bits > 0)
+        return (int32_t)((a + (INT64_C(1) << (bits - 1))) >> bits);
+    else
+        return (int32_t)a;
+}
+
+static inline int32_t mul__(int32_t a, int32_t b, int bits)
+{
+    return norm__((int64_t)a * b, bits);
+}
+
+static inline int32_t clip__(int32_t a, int bits)
+{
+    if ((a + (1 << bits)) & ~((1 << (bits + 1)) - 1))
+        return (a >> 31) ^ ((1 << bits) - 1);
+    else
+        return a;
+}
+
+static inline int64_t round20(int64_t a) { return round__(a, 20); }
+static inline int64_t round21(int64_t a) { return round__(a, 21); }
+
+static inline int32_t norm13(int64_t a) { return norm__(a, 13); }
+static inline int32_t norm16(int64_t a) { return norm__(a, 16); }
+static inline int32_t norm20(int64_t a) { return norm__(a, 20); }
+static inline int32_t norm21(int64_t a) { return norm__(a, 21); }
+static inline int32_t norm23(int64_t a) { return norm__(a, 23); }
+
+static inline int32_t mul3(int32_t a, int32_t b)
+{
+    return (a * b + (1 << 2)) >> 3;
+}
+
+static inline int32_t mul4(int32_t a, int32_t b)
+{
+    return (a * b + (1 << 3)) >> 4;
+}
+
+static inline int32_t mul22nrd(int32_t a, int32_t b)
+{
+    return (int32_t)(((int64_t)a * b) >> 22);
+}
+
+static inline int32_t mul15(int32_t a, int32_t b) { return mul__(a, b, 15); }
+static inline int32_t mul16(int32_t a, int32_t b) { return mul__(a, b, 16); }
+static inline int32_t mul17(int32_t a, int32_t b) { return mul__(a, b, 17); }
+static inline int32_t mul23(int32_t a, int32_t b) { return mul__(a, b, 23); }
+static inline int32_t mul31(int32_t a, int32_t b) { return mul__(a, b, 31); }
+
+static inline int32_t clip23(int32_t a) { return clip__(a, 23); }
+
+#endif

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/huffman.h Added

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/idct_fixed.cpp Added

@@ -0,0 +1,332 @@
+/*
+ * This file is part of libdcadec.
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "common.h"
+#include "fixed_math.h"
+#include "idct_fixed.h"
+
+static inline void sum_a(const int *input, int *output, int len)
+{
+    for (int i = 0; i < len; i++)
+        output[i] = input[2 * i] + input[2 * i + 1];
+}
+
+static inline void sum_b(const int *input, int *output, int len)
+{
+    for (int i = 0; i < len; i++) {
+        if (i > 0)
+            output[i] = input[2 * i] + input[2 * i - 1];
+        else
+            output[i] = input[2 * i];
+    }
+}
+
+static inline void sum_c(const int *input, int *output, int len)
+{
+    for (int i = 0; i < len; i++)
+        output[i] = input[2 * i];
+}
+
+static inline void sum_d(const int *input, int *output, int len)
+{
+    for (int i = 0; i < len; i++) {
+        if (i > 0)
+            output[i] = input[2 * i - 1] + input[2 * i + 1];
+        else
+            output[i] = input[2 * i + 1];
+    }
+}
+
+static inline void dct_a(const int *input, int *output)
+{
+    //  floor(sin((2 * i + 1) * (2 * (7 - j) + 1) * PI / 32) * (1 << 23) + 0.5), i = 2 * k
+    // -floor(sin((2 * i + 1) * (2 * (7 - j) + 1) * PI / 32) * (1 << 23) + 0.5), i = 2 * k + 1
+    static const int cos_mod[8][8] = {
+         { 8348215,  8027397,  7398092,  6484482,  5321677,  3954362,  2435084,   822227 },
+         { 8027397,  5321677,   822227, -3954362, -7398092, -8348215, -6484482, -2435084 },
+         { 7398092,   822227, -6484482, -8027397, -2435084,  5321677,  8348215,  3954362 },
+         { 6484482, -3954362, -8027397,   822227,  8348215,  2435084, -7398092, -5321677 },
+         { 5321677, -7398092, -2435084,  8348215,  -822227, -8027397,  3954362,  6484482 },
+         { 3954362, -8348215,  5321677,  2435084, -8027397,  6484482,   822227, -7398092 },
+         { 2435084, -6484482,  8348215, -7398092,  3954362,   822227, -5321677,  8027397 },
+         {  822227, -2435084,  3954362, -5321677,  6484482, -7398092,  8027397, -8348215 }
+    };
+
+    for (int i = 0; i < 8; i++) {
+        int64_t res = INT64_C(0);
+        for (int j = 0; j < 8; j++)
+            res += (int64_t)cos_mod[i][j] * input[j];
+        output[i] = norm23(res);
+    }
+}
+
+static inline void dct_b(const int *input, int *output)
+{
+    // floor(cos((2 * i + 1) * (j + 1) * PI / 16) * (1 << 23) + 0.5)
+    static const int cos_mod[8][7] = {
+        {  8227423,  7750063,  6974873,  5931642,  4660461,  3210181,  1636536 },
+        {  6974873,  3210181, -1636536, -5931642, -8227423, -7750063, -4660461 },
+        {  4660461, -3210181, -8227423, -5931642,  1636536,  7750063,  6974873 },
+        {  1636536, -7750063, -4660461,  5931642,  6974873, -3210181, -8227423 },
+        { -1636536, -7750063,  4660461,  5931642, -6974873, -3210181,  8227423 },
+        { -4660461, -3210181,  8227423, -5931642, -1636536,  7750063, -6974873 },
+        { -6974873,  3210181,  1636536, -5931642,  8227423, -7750063,  4660461 },
+        { -8227423,  7750063, -6974873,  5931642, -4660461,  3210181, -1636536 }
+    };
+
+    for (int i = 0; i < 8; i++) {
+        int64_t res = (int64_t)input[0] << 23;
+        for (int j = 0; j < 7; j++)
+            res += (int64_t)cos_mod[i][j] * input[1 + j];
+        output[i] = norm23(res);
+    }
+}
+
+static inline void mod_a(const int *input, int *output)
+{
+    //  floor(0.5 / cos((2 * (     i) + 1) * PI / 64) * (1 << 23) + 0.5), i = 0 ..  8
+    // -floor(0.5 / sin((2 * (15 - i) + 1) * PI / 64) * (1 << 23) + 0.5), i = 8 .. 16
+    static const int cos_mod[16] = {
+          4199362,   4240198,   4323885,   4454708,
+          4639772,   4890013,   5221943,   5660703,
+         -6245623,  -7040975,  -8158494,  -9809974,
+        -12450076, -17261920, -28585092, -85479984
+    };
+
+    for (int i = 0; i < 8; i++)
+        output[i] = mul23(cos_mod[i], input[i] + input[8 + i]);
+
+    for (int i = 8, k = 7; i < 16; i++, k--)
+        output[i] = mul23(cos_mod[i], input[k] - input[8 + k]);
+}
+
+static inline void mod_b(int *input, int *output)
+{
+    // floor(0.5 / cos((2 * (    i) + 1) * PI / 32) * (1 << 23) + 0.5), i = 0 .. 4
+    // floor(0.5 / sin((2 * (7 - i) + 1) * PI / 32) * (1 << 23) + 0.5), i = 4 .. 8
+    static const int cos_mod[8] = {
+        4214598,  4383036,  4755871,  5425934,
+        6611520,  8897610, 14448934, 42791536
+    };
+
+    for (int i = 0; i < 8; i++)
+        input[8 + i] = mul23(cos_mod[i], input[8 + i]);
+
+    for (int i = 0; i < 8; i++)
+        output[i] = input[i] + input[8 + i];
+
+    for (int i = 8, k = 7; i < 16; i++, k--)
+        output[i] = input[k] - input[8 + k];
+}
+
+static inline void mod_c(const int *input, int *output)
+{
+    //  floor(0.125 / cos((2 * (     i) + 1) * PI / 128) * (1 << 23) + 0.5), i =  0 .. 16
+    // -floor(0.125 / sin((2 * (31 - i) + 1) * PI / 128) * (1 << 23) + 0.5), i = 16 .. 32
+    static const int cos_mod[32] = {
+         1048892,  1051425,   1056522,   1064244,
+         1074689,  1087987,   1104313,   1123884,
+         1146975,  1173922,   1205139,   1241133,
+         1282529,  1330095,   1384791,   1447815,
+        -1520688, -1605358,  -1704360,  -1821051,
+        -1959964, -2127368,  -2332183,  -2587535,
+        -2913561, -3342802,  -3931480,  -4785806,
+        -6133390, -8566050, -14253820, -42727120
+    };
+
+    for (int i = 0; i < 16; i++)
+        output[i] = mul23(cos_mod[i], input[i] + input[16 + i]);
+
+    for (int i = 16, k = 15; i < 32; i++, k--)
+        output[i] = mul23(cos_mod[i], input[k] - input[16 + k]);
+}
+
+static inline void clp_v(int *input, int len)
+{
+    for (int i = 0; i < len; i++)
+        input[i] = clip23(input[i]);
+}
+
+void inverse_dct32_fixed(int *input, int *output)
+{
+    int mag = 0;
+    for (int i = 0; i < 32; i++)
+        mag += abs(input[i]);
+
+    int shift = mag > 0x400000 ? 2 : 0;
+    int round = shift > 0 ? 1 << (shift - 1) : 0;
+
+    for (int i = 0; i < 32; i++)
+        input[i] = (input[i] + round) >> shift;
+
+    sum_a(input, output +  0, 16);
+    sum_b(input, output + 16, 16);
+    clp_v(output, 32);
+
+    sum_a(output +  0, input +  0, 8);
+    sum_b(output +  0, input +  8, 8);
+    sum_c(output + 16, input + 16, 8);
+    sum_d(output + 16, input + 24, 8);
+    clp_v(input, 32);
+
+    dct_a(input +  0, output +  0);
+    dct_b(input +  8, output +  8);
+    dct_b(input + 16, output + 16);
+    dct_b(input + 24, output + 24);
+    clp_v(output, 32);
+
+    mod_a(output +  0, input +  0);
+    mod_b(output + 16, input + 16);
+    clp_v(input, 32);
+
+    mod_c(input, output);
+
+    for (int i = 0; i < 32; i++)

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/idct_fixed.h Added

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/interpolator.cpp Added

@@ -0,0 +1,73 @@
+/*
+ * This file is part of libdcadec.
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "common.h"
+#include "interpolator.h"
+
+struct interpolator_data *interpolator_init(struct core_decoder *parent)
+{
+    struct interpolator_data *data = ta_new(parent, struct interpolator_data);
+    if (!data)
+        return NULL;
+
+    for (int i = 0, k = 0; i < 32; i++)
+        for (int j = 0; j < 32; j++)
+            data->cos_mod_32[k++] = 0.250 * cos((2 * i + 1) * (2 * j + 1) * M_PI / 128);
+
+    for (int i = 0, k = 0; i < 64; i++)
+        for (int j = 0; j < 64; j++)
+            data->cos_mod_64[k++] = 0.125 * cos((2 * i + 1) * (2 * j + 1) * M_PI / 256);
+
+    return data;
+}
+
+struct interpolator *interpolator_create(struct interpolator_data *parent, int flags)
+{
+    struct interpolator *dsp = ta_new(parent, struct interpolator);
+    if (!dsp)
+        return NULL;
+
+    dsp->data = parent;
+    dsp->history = ta_znew_array_size(dsp,
+        (flags & DCADEC_FLAG_CORE_BIT_EXACT) ? sizeof(int) : sizeof(double),
+        (flags & DCADEC_FLAG_CORE_SYNTH_X96) ? 1024 : 512);
+    if (!dsp->history) {
+        ta_free(dsp);
+        return NULL;
+    }
+
+    if (flags & DCADEC_FLAG_CORE_BIT_EXACT) {
+        if (flags & DCADEC_FLAG_CORE_SYNTH_X96)
+            dsp->interpolate = interpolate_sub64_fixed;
+        else
+            dsp->interpolate = interpolate_sub32_fixed;
+    } else {
+        if (flags & DCADEC_FLAG_CORE_SYNTH_X96)
+            dsp->interpolate = interpolate_sub64_float;
+        else
+            dsp->interpolate = interpolate_sub32_float;
+    }
+
+    return dsp;
+}
+
+void interpolator_clear(struct interpolator *dsp)
+{
+    if (dsp)
+        memset(dsp->history, 0, ta_get_size(dsp->history));
+}

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/interpolator.h Added

@@ -0,0 +1,71 @@
+/*
+ * This file is part of libdcadec.
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef INTERPOLATOR_H
+#define INTERPOLATOR_H
+
+#define MAX_LFE_HISTORY     12
+
+struct interpolator;
+struct core_decoder;
+
+typedef void (*interpolate_lfe_t)(int *pcm_samples, int *lfe_samples,
+                                  int nsamples, bool dec_select,
+                                  bool synth_x96);
+
+typedef void (*interpolate_sub_t)(struct interpolator *dsp, int *pcm_samples,
+                                  int **subband_samples_lo,
+                                  int **subband_samples_hi,
+                                  int nsamples, bool perfect);
+
+struct interpolator_data {
+    double cos_mod_32[32 * 32];
+    double cos_mod_64[64 * 64];
+};
+
+struct interpolator {
+    struct interpolator_data *data;
+    void *history;
+    interpolate_sub_t interpolate;
+};
+
+struct interpolator_data *interpolator_init(struct core_decoder *parent);
+struct interpolator *interpolator_create(struct interpolator_data *parent, int flags);
+void interpolator_clear(struct interpolator *dsp);
+
+#define INTERPOLATE_LFE(x) \
+    void interpolate_##x(int *pcm_samples, int *lfe_samples, \
+                         int nsamples, bool dec_select, \
+                         bool synth_x96)
+
+#define INTERPOLATE_SUB(x) \
+    void interpolate_##x(struct interpolator *dsp, int *pcm_samples, \
+                         int **subband_samples_lo, \
+                         int **subband_samples_hi, \
+                         int nsamples, bool perfect)
+
+INTERPOLATE_LFE(lfe_float_fir);
+INTERPOLATE_LFE(lfe_float_iir);
+INTERPOLATE_SUB(sub32_float);
+INTERPOLATE_SUB(sub64_float);
+
+INTERPOLATE_LFE(lfe_fixed_fir);
+INTERPOLATE_SUB(sub32_fixed);
+INTERPOLATE_SUB(sub64_fixed);
+
+#endif

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/interpolator_fixed.cpp Added

@@ -0,0 +1,194 @@
+/*
+ * This file is part of libdcadec.
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "common.h"
+#include "interpolator.h"
+#include "fixed_math.h"
+#include "idct_fixed.h"
+#include "fir_fixed.h"
+
+#define DCA_LOGCTX (0)
+
+INTERPOLATE_LFE(lfe_fixed_fir)
+{
+    // Select decimation factor
+    int dec_factor = 64 << (dec_select?1:0);
+
+    // Interpolation
+    for (int i = 0; i < nsamples; i++) {
+        // One decimated sample generates 64 or 128 interpolated ones
+        for (int j = 0; j < dec_factor; j++) {
+            // Clear accumulation
+            int64_t res = INT64_C(0);
+
+            // Accumulate
+            for (int k = 0; k < 512 / dec_factor; k++)
+                res += (int64_t)lfe_fir_64[k * dec_factor + j] *
+                    lfe_samples[MAX_LFE_HISTORY + i - k];
+
+            // Save interpolated samples
+            pcm_samples[(i * dec_factor + j) << (synth_x96?1:0)] = clip23(norm23(res));
+        }
+    }
+
+    // Update history
+    for (int n = MAX_LFE_HISTORY - 1; n >= 0; n--)
+        lfe_samples[n] = lfe_samples[nsamples + n];
+}
+
+INTERPOLATE_SUB(sub32_fixed)
+{
+    (void)subband_samples_hi;
+    dbg_assert(subband_samples_hi == NULL);
+
+    // Get history pointer
+    int *history = (int*)dsp->history;
+
+    // Select filter
+    const int32_t *filter_coeff = perfect ?
+        band_fir_perfect : band_fir_nonperfect;
+
+    // Interpolation begins
+    for (int sample = 0; sample < nsamples; sample++) {
+        int i, j, k;
+
+        // Load in one sample from each subband
+        int input[32];
+        for (i = 0; i < 32; i++)
+            input[i] = subband_samples_lo[i][sample];
+
+        // Inverse DCT
+        int output[32];
+        inverse_dct32_fixed(input, output);
+
+        // Store history
+        for (i = 0, k = 31; i < 16; i++, k--) {
+            history[     i] = clip23(output[i] - output[k]);
+            history[16 + i] = clip23(output[i] + output[k]);
+        }
+
+        // One subband sample generates 32 interpolated ones
+        for (i = 0; i < 16; i++) {
+            // Clear accumulation
+            int64_t res = INT64_C(0);
+
+            // Accumulate
+            for (j = 32; j < 512; j += 64)
+                res += (int64_t)history[16 + i + j] * filter_coeff[i + j];
+            res = round21(res);
+            for (j =  0; j < 512; j += 64)
+                res += (int64_t)history[     i + j] * filter_coeff[i + j];
+
+            // Save interpolated samples
+            pcm_samples[sample * 32 + i] = clip23(norm21(res));
+        }
+
+        for (i = 16, k = 15; i < 32; i++, k--) {
+            // Clear accumulation
+            int64_t res = INT64_C(0);
+
+            // Accumulate
+            for (j = 32; j < 512; j += 64)
+                res += (int64_t)history[16 + k + j] * filter_coeff[i + j];
+            res = round21(res);
+            for (j =  0; j < 512; j += 64)
+                res += (int64_t)history[     k + j] * filter_coeff[i + j];
+
+            // Save interpolated samples
+            pcm_samples[sample * 32 + i] = clip23(norm21(res));
+        }
+
+        // Shift history
+        for (i = 511; i >= 32; i--)
+            history[i] = history[i - 32];
+    }
+}
+
+INTERPOLATE_SUB(sub64_fixed)
+{
+    (void)perfect;
+
+    // Get history pointer
+    int *history = (int*)dsp->history;
+
+    // Interpolation begins
+    for (int sample = 0; sample < nsamples; sample++) {
+        int i, j, k;
+
+        // Load in one sample from each subband
+        int input[64];
+        if (subband_samples_hi) {
+            // Full 64 subbands, first 32 are residual coded
+            for (i =  0; i < 32; i++)
+                input[i] = subband_samples_lo[i][sample] + subband_samples_hi[i][sample];
+            for (i = 32; i < 64; i++)
+                input[i] = subband_samples_hi[i][sample];
+        } else {
+            // Only first 32 subbands
+            for (i =  0; i < 32; i++)
+                input[i] = subband_samples_lo[i][sample];
+            for (i = 32; i < 64; i++)
+                input[i] = 0;
+        }
+
+        // Inverse DCT
+        int output[64];
+        inverse_dct64_fixed(input, output);
+
+        // Store history
+        for (i = 0, k = 63; i < 32; i++, k--) {
+            history[     i] = clip23(output[i] - output[k]);
+            history[32 + i] = clip23(output[i] + output[k]);
+        }
+
+        // One subband sample generates 64 interpolated ones
+        for (i = 0; i < 32; i++) {
+            // Clear accumulation
+            int64_t res = INT64_C(0);
+
+            // Accumulate
+            for (j = 64; j < 1024; j += 128)
+                res += (int64_t)history[32 + i + j] * band_fir_x96[i + j];
+            res = round20(res);
+            for (j =  0; j < 1024; j += 128)
+                res += (int64_t)history[     i + j] * band_fir_x96[i + j];
+
+            // Save interpolated samples
+            pcm_samples[sample * 64 + i] = clip23(norm20(res));
+        }
+
+        for (i = 32, k = 31; i < 64; i++, k--) {
+            // Clear accumulation
+            int64_t res = INT64_C(0);
+
+            // Accumulate
+            for (j = 64; j < 1024; j += 128)
+                res += (int64_t)history[32 + k + j] * band_fir_x96[i + j];
+            res = round20(res);
+            for (j =  0; j < 1024; j += 128)
+                res += (int64_t)history[     k + j] * band_fir_x96[i + j];
+
+            // Save interpolated samples
+            pcm_samples[sample * 64 + i] = clip23(norm20(res));
+        }
+
+        // Shift history
+        for (i = 1023; i >= 64; i--)
+            history[i] = history[i - 64];
+    }
+}

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/interpolator_float.cpp Added

@@ -0,0 +1,262 @@
+/*
+ * This file is part of libdcadec.
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "common.h"
+#include "interpolator.h"
+#include "fir_float.h"
+
+#define DCA_LOGCTX (0)
+
+static const double lfe_iir_scale = 0.001985816114019982;
+
+static const double lfe_iir[12] = {
+    -0.9698530866436986,  1.9696040724997900,  0.9999999999999996,
+    -1.9643358221499630, -0.9787938538720836,  1.9785545764679620,
+     1.0000000000000020, -1.9951847249255470, -0.9925096137076496,
+     1.9922787089263100,  1.0000000000000000, -1.9974180593495760
+};
+
+static inline int convert(double a)
+{
+    if (a > 0x7fffff)
+        return 0x7fffff;
+    if (a < -0x800000)
+        return -0x800000;
+    return (int)floor(a + 0.5);
+}
+
+INTERPOLATE_LFE(lfe_float_fir)
+{
+    // Select decimation filter
+    int dec_factor              = dec_select ? 128 : 64;
+    const double *filter_coeff  = dec_select ? lfe_fir_128 : lfe_fir_64;
+
+    // Interpolation
+    for (int i = 0; i < nsamples; i++) {
+        // One decimated sample generates 64 or 128 interpolated ones
+        for (int j = 0; j < dec_factor; j++) {
+            // Clear accumulation
+            double res = 0.0;
+
+            // Accumulate
+            for (int k = 0; k < 512 / dec_factor; k++)
+                res += lfe_samples[MAX_LFE_HISTORY + i - k] *
+                    filter_coeff[k * dec_factor + j];
+
+            // Save interpolated samples
+            pcm_samples[(i * dec_factor + j) << (synth_x96?1:0)] = convert(res);
+        }
+    }
+
+    // Update history
+    for (int n = MAX_LFE_HISTORY - 1; n >= 0; n--)
+        lfe_samples[n] = lfe_samples[nsamples + n];
+}
+
+INTERPOLATE_LFE(lfe_float_iir)
+{
+    // Select decimation factor
+    int dec_factor = 64 << (dec_select?1:0);
+
+    // Load history
+    double lfe_history[6];
+    for (int i = 0; i < 6; i++)
+        lfe_history[i] = ((double *)lfe_samples)[i];
+
+    // Interpolation
+    for (int i = 0; i < nsamples; i++) {
+        double res1 = lfe_samples[MAX_LFE_HISTORY + i] * lfe_iir_scale;
+        double res2;
+
+        // One decimated sample generates 64 or 128 interpolated ones
+        for (int j = 0; j < dec_factor; j++) {
+            // Filter
+            for (int k = 0; k < 3; k++) {
+                double tmp1 = lfe_history[k * 2 + 0];
+                double tmp2 = lfe_history[k * 2 + 1];
+
+                res2 = tmp1 * lfe_iir[k * 4 + 0] + tmp2 * lfe_iir[k * 4 + 1] + res1;
+                res1 = tmp1 * lfe_iir[k * 4 + 2] + tmp2 * lfe_iir[k * 4 + 3] + res2;
+
+                lfe_history[k * 2 + 0] = tmp2;
+                lfe_history[k * 2 + 1] = res2;
+            }
+
+            // Save interpolated samples
+            pcm_samples[(i * dec_factor + j) << (synth_x96?1:0)] = convert(res1);
+            res1 = 0.0;
+        }
+    }
+
+    // Store history
+    for (int i = 0; i < 6; i++)
+        ((double *)lfe_samples)[i] = lfe_history[i];
+}
+
+INTERPOLATE_SUB(sub32_float)
+{
+    (void)subband_samples_hi;
+    dbg_assert(subband_samples_hi == NULL);
+
+    // Get history pointer
+    double *history = (double*)dsp->history;
+
+    // Get IDCT coefficients
+    const double *cos_mod = dsp->data->cos_mod_32;
+
+    // Select filter
+    const double *filter_coeff = perfect ? band_fir_perfect : band_fir_nonperfect;
+
+    // Interpolation begins
+    for (int sample = 0; sample < nsamples; sample++) {
+        int i, j, k;
+
+        // Load in one sample from each subband
+        double input[32];
+        for (i = 0; i < 32; i++)
+            input[i] = subband_samples_lo[i][sample];
+
+        // Inverse DCT
+        double output[32];
+        for (i = 0, k = 0; i < 32; i++) {
+            double res = 0.0;
+            for (j = 0; j < 32; j++)
+                res += input[j] * cos_mod[k++];
+            output[i] = res;
+        }
+
+        // Store history
+        for (i = 0, k = 31; i < 16; i++, k--) {
+            history[     i] = output[i] - output[k];
+            history[16 + i] = output[i] + output[k];
+        }
+
+        // One subband sample generates 32 interpolated ones
+        for (i = 0; i < 16; i++) {
+            // Clear accumulation
+            double res = 0.0;
+
+            // Accumulate
+            for (j =  0; j < 512; j += 64)
+                res += history[     i + j] * filter_coeff[i + j];
+            for (j = 32; j < 512; j += 64)
+                res += history[16 + i + j] * filter_coeff[i + j];
+
+            // Save interpolated samples
+            pcm_samples[sample * 32 + i] = convert(res);
+        }
+
+        for (i = 16, k = 15; i < 32; i++, k--) {
+            // Clear accumulation
+            double res = 0.0;
+
+            // Accumulate
+            for (j =  0; j < 512; j += 64)
+                res += history[     k + j] * filter_coeff[i + j];
+            for (j = 32; j < 512; j += 64)
+                res += history[16 + k + j] * filter_coeff[i + j];
+
+            // Save interpolated samples
+            pcm_samples[sample * 32 + i] = convert(res);
+        }
+
+        // Shift history
+        for (i = 511; i >= 32; i--)
+            history[i] = history[i - 32];
+    }
+}
+
+INTERPOLATE_SUB(sub64_float)
+{
+    (void)perfect;
+
+    // Get history pointer
+    double *history = (double*)dsp->history;
+
+    // Get IDCT coefficients
+    const double *cos_mod = dsp->data->cos_mod_64;
+
+    // Interpolation begins
+    for (int sample = 0; sample < nsamples; sample++) {
+        int i, j, k;
+
+        // Load in one sample from each subband
+        double input[64];

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/ta.cpp Added

@@ -0,0 +1,323 @@
+/* Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "ta.h"
+
+
+// Note: the actual minimum alignment is dictated by malloc(). It doesn't
+//       make sense to set this value higher than malloc's alignment.
+#define MIN_ALIGN 16
+
+#ifdef DCA_FFMALLOC
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void *ffabi_memalign(size_t align, size_t size);
+void *ffabi_realloc(void *ptr, size_t size);
+void ffabi_free(void *ptr);
+
+#ifdef __cplusplus
+}
+#endif
+
+#undef  realloc
+#define realloc ffabi_realloc
+
+#undef  free
+#define free ffabi_free
+
+static inline void* talloc(bool zero,size_t size)
+{
+    void *p = ffabi_memalign(MIN_ALIGN,size);
+    if ((p) && zero) {
+        memset(p,0,size);
+    }
+    return p;
+}
+
+#else
+
+static inline void* talloc(bool zero,size_t size)
+{
+    if (zero) {
+        return calloc(1,size);
+    } else {
+        return malloc(size);
+    }
+}
+
+#endif
+
+struct ta_header {
+    size_t size;                // size of the user allocation
+    struct ta_header *prev;     // ring list containing siblings
+    struct ta_header *next;
+    struct ta_ext_header *ext;
+};
+
+union aligned_header {
+    struct ta_header ta;
+    // Make sure to satisfy typical alignment requirements
+    void *align_ptr;
+    int align_int;
+    double align_d;
+    long long align_ll;
+    char align_min[(sizeof(struct ta_header) + MIN_ALIGN - 1) & ~(MIN_ALIGN - 1)];
+};
+
+#define PTR_TO_HEADER(ptr) (&((union aligned_header *)(ptr) - 1)->ta)
+#define PTR_FROM_HEADER(h) ((void *)((union aligned_header *)(h) + 1))
+
+#define MAX_ALLOC (((size_t)-1) - sizeof(union aligned_header))
+
+// Needed for non-leaf allocations, or extended features such as destructors.
+struct ta_ext_header {
+    struct ta_header *header;  // points back to normal header
+    struct ta_header children; // list of children, with this as sentinel
+    void (*destructor)(void *);
+};
+
+// ta_ext_header.children.size is set to this
+#define CHILDREN_SENTINEL ((size_t)-1)
+
+static struct ta_header *get_header(void *ptr)
+{
+    return ptr ? PTR_TO_HEADER(ptr) : NULL;
+}
+
+static struct ta_ext_header *get_or_alloc_ext_header(void *ptr)
+{
+    struct ta_header *h = get_header(ptr);
+    if (!h)
+        return NULL;
+    if (!h->ext) {
+        h->ext = (struct ta_ext_header*)talloc(true,sizeof(struct ta_ext_header));
+        if (!h->ext)
+            return NULL;
+
+        h->ext->header = h;
+        h->ext->children.next = &h->ext->children;
+        h->ext->children.prev = &h->ext->children;
+
+        // Needed by ta_find_parent():
+        h->ext->children.size = CHILDREN_SENTINEL;
+        h->ext->children.ext = h->ext;
+    }
+    return h->ext;
+}
+
+/* Set the parent allocation of ptr. If parent==NULL, remove the parent.
+ * Setting parent==NULL (with ptr!=NULL) always succeeds, and unsets the
+ * parent of ptr. Operations ptr==NULL always succeed and do nothing.
+ * Returns true on success, false on OOM.
+ *
+ * Warning: if ta_parent is a direct or indirect child of ptr, things will go
+ *          wrong. The function will apparently succeed, but creates circular
+ *          parent links, which are not allowed.
+ */
+bool ta_set_parent(void *ptr, void *ta_parent)
+{
+    struct ta_header *ch = get_header(ptr);
+    if (!ch)
+        return true;
+    struct ta_ext_header *parent_eh = get_or_alloc_ext_header(ta_parent);
+    if (ta_parent && !parent_eh) // do nothing on OOM
+        return false;
+    // Unlink from previous parent
+    if (ch->next) {
+        ch->next->prev = ch->prev;
+        ch->prev->next = ch->next;
+        ch->next = ch->prev = NULL;
+    }
+    // Link to new parent - insert at end of list (possibly orders destructors)
+    if (parent_eh) {
+        struct ta_header *children = &parent_eh->children;
+        ch->next = children;
+        ch->prev = children->prev;
+        children->prev->next = ch;
+        children->prev = ch;
+    }
+    return true;
+}
+
+/* Allocate size bytes of memory. If ta_parent is not NULL, this is used as
+ * parent allocation (if ta_parent is freed, this allocation is automatically
+ * freed as well). size==0 allocates a block of size 0 (i.e. returns non-NULL).
+ * Returns NULL on OOM.
+ */
+void *ta_alloc_size(void *ta_parent, size_t size)
+{
+    if (size >= MAX_ALLOC)
+        return NULL;
+    struct ta_header *h = (struct ta_header *)talloc(false,sizeof(union aligned_header) + size);
+    if (!h)
+        return NULL;
+    memset(h,0,sizeof(struct ta_header));
+    h->size = size;
+    void *ptr = PTR_FROM_HEADER(h);
+    if (!ta_set_parent(ptr, ta_parent)) {
+        ta_free(ptr);
+        return NULL;
+    }
+    return ptr;
+}
+
+/* Exactly the same as ta_alloc_size(), but the returned memory block is
+ * initialized to 0.
+ */
+void *ta_zalloc_size(void *ta_parent, size_t size)
+{
+    if (size >= MAX_ALLOC)
+        return NULL;
+    struct ta_header *h = (struct ta_header *)talloc(true,sizeof(union aligned_header) + size);
+    if (!h)
+        return NULL;
+    h->size = size;
+    void *ptr = PTR_FROM_HEADER(h);
+    if (!ta_set_parent(ptr, ta_parent)) {
+        ta_free(ptr);
+        return NULL;
+    }
+    return ptr;
+}
+

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/ta.h Added

@@ -0,0 +1,71 @@
+/* Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef TA_H_
+#define TA_H_
+
+#include <stddef.h>
+#include <stdarg.h>
+
+#ifndef __cplusplus
+#include <stdbool.h>
+#endif
+
+void *ta_alloc_size(void *ta_parent, size_t size);
+void *ta_zalloc_size(void *ta_parent, size_t size);
+void *ta_realloc_size(void *ta_parent, void *ptr, size_t size);
+size_t ta_get_size(void *ptr);
+void ta_free(void *ptr);
+void ta_free_children(void *ptr);
+bool ta_set_destructor(void *ptr, void (*destructor)(void *));
+bool ta_set_parent(void *ptr, void *ta_parent);
+void *ta_find_parent(void *ptr);
+
+static inline size_t ta_calc_array_size(size_t element_size, size_t count)
+{
+    if (count > (((size_t)-1) / element_size))
+        return (size_t)-1;
+    return element_size * count;
+}
+
+#define ta_new(ta_parent, type)  (type *)ta_alloc_size(ta_parent, sizeof(type))
+#define ta_znew(ta_parent, type) (type *)ta_zalloc_size(ta_parent, sizeof(type))
+
+#define ta_new_array(ta_parent, type, count) \
+    (type *)ta_alloc_size(ta_parent, ta_calc_array_size(sizeof(type), count))
+
+#define ta_znew_array(ta_parent, type, count) \
+    (type *)ta_zalloc_size(ta_parent, ta_calc_array_size(sizeof(type), count))
+
+#define ta_new_array_size(ta_parent, element_size, count) \
+    ta_alloc_size(ta_parent, ta_calc_array_size(element_size, count))
+
+#define ta_znew_array_size(ta_parent, element_size, count) \
+    ta_zalloc_size(ta_parent, ta_calc_array_size(element_size, count))
+
+#define ta_realloc(ta_parent, ptr, type, count) \
+    (type *)ta_realloc_size(ta_parent, ptr, ta_calc_array_size(sizeof(type), count))
+
+#define ta_new_ptrtype(ta_parent, ptr) \
+    (__typeof__(ptr))ta_alloc_size(ta_parent, sizeof(*ptr))
+
+#define ta_znew_ptrtype(ta_parent, ptr) \
+    (__typeof__(ptr))ta_zalloc_size(ta_parent, sizeof(*ptr))
+
+#define ta_new_array_ptrtype(ta_parent, ptr, count) \
+    (__typeof__(ptr))ta_new_array_size(ta_parent, sizeof(*(ptr)), count)
+
+#define ta_znew_array_ptrtype(ta_parent, ptr, count) \
+    (__typeof__(ptr))ta_znew_array_size(ta_parent, sizeof(*(ptr)), count)
+
+#endif

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/xll_decoder.cpp Added

@@ -0,0 +1,880 @@
+/*
+ * This file is part of libdcadec.
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "common.h"
+#include "bitstream.h"
+#include "fixed_math.h"
+#include "xll_decoder.h"
+#include "exss_parser.h"
+
+#include "xll_tables.h"
+
+#define XLL_PBR_SIZE    (240 << 10)
+
+#define DCA_LOGCTX (chs->decoder->logctx)
+
+static int parse_dmix_coeffs(struct xll_chset *chs)
+{
+    struct xll_decoder *xll = chs->decoder;
+    int m, n;
+
+    if (chs->primary_chset) {
+        m = prim_dmix_nch[chs->dmix_type];
+        n = chs->nchannels;
+    } else {
+        m = xll->nchannels;
+        n = chs->nchannels + 1;
+    }
+
+    // Reallocate downmix coefficients matrix
+    int ret;
+    if ((ret = dca_realloc(xll->chset, &chs->dmix_coeff, m * n, sizeof(int))) < 0)
+        return ret;
+
+    // Parse downmix coefficients
+    int *coeff_ptr = chs->dmix_coeff;
+    for (int i = 0; i < m; i++)
+        for (int j = 0; j < n; j++)
+            *coeff_ptr++ = bits_get(&xll->bits, 9);
+
+    return 0;
+}
+
+static int chs_parse_header(struct xll_chset *chs, struct exss_asset *asset)
+{
+    struct xll_decoder *xll = chs->decoder;
+    int i, j, k, ret;
+    size_t header_pos = xll->bits.index;
+
+    // Size of channel set sub-header
+    size_t header_size = bits_get(&xll->bits, 10) + 1;
+
+    // Check CRC
+    if ((ret = bits_check_crc(&xll->bits, header_pos, header_pos + header_size * 8)) < 0)
+        return ret;
+
+    // Number of channels in the channel set
+    chs->nchannels = bits_get(&xll->bits, 4) + 1;
+
+    // Residual type
+    chs->residual_encode = bits_get(&xll->bits, chs->nchannels);
+
+    // PCM bit resolution
+    chs->pcm_bit_res = bits_get(&xll->bits, 5) + 1;
+
+    // Storage unit width
+    chs->storage_bit_res = bits_get(&xll->bits, 5) + 1;
+
+    // Original sampling frequency
+    chs->freq = exss_sample_rates[bits_get(&xll->bits, 4)];
+
+    // Sampling frequency modifier
+    bits_skip(&xll->bits, 2);
+
+    // Which replacement set this channel set is member of
+    chs->replace_set_index = bits_get(&xll->bits, 2);
+
+    // Default replacement set flag
+    if (chs->replace_set_index)
+        bits_skip1(&xll->bits);
+
+    if (asset->one_to_one_map_ch_to_spkr) {
+        // Primary channel set flag
+        chs->primary_chset = bits_get1(&xll->bits);
+
+        // Downmix coefficients present in stream
+        chs->dmix_coeffs_present = bits_get1(&xll->bits);
+
+        // Downmix already performed by encoder
+        chs->dmix_embedded = chs->dmix_coeffs_present && bits_get1(&xll->bits);
+
+        // Downmix type
+        // 0 - 1/0, 1 - Lo/Ro, 2 - Lt/Rt, 3 - 3/0,
+        // 4 - 2/1, 5 - 2/2, 6 - 3/1
+        if (chs->dmix_coeffs_present && chs->primary_chset) {
+            chs->dmix_type = bits_get(&xll->bits, 3);
+            enforce(chs->dmix_type < 7, "Invalid primary channel set downmix type");
+        }
+
+        // Whether the channel set is part of a hierarchy
+        chs->hier_chset = bits_get1(&xll->bits);
+
+        // Downmix coefficients
+        if (chs->dmix_coeffs_present && (ret = parse_dmix_coeffs(chs)) < 0)
+            return ret;
+
+        // Channel mask enabled
+        chs->ch_mask_enabled = bits_get1(&xll->bits);
+        if (chs->ch_mask_enabled) {
+            // Channel mask for set
+            chs->ch_mask = bits_get(&xll->bits, xll->ch_mask_nbits);
+        } else {
+            chs->ch_mask = 0;
+            // Angular speaker position table
+            for (i = 0; i < chs->nchannels; i++) {
+                bits_skip(&xll->bits, 9);
+                bits_skip(&xll->bits, 9);
+                bits_skip(&xll->bits, 7);
+            }
+        }
+    } else {
+        chs->primary_chset = true;
+        chs->dmix_coeffs_present = false;
+        chs->dmix_embedded = false;
+        chs->hier_chset = false;
+        chs->ch_mask_enabled = false;
+        chs->ch_mask = 0;
+
+        // Mapping coeffs present flag
+        if (bits_get1(&xll->bits)) {
+            // Number of bits used to pack each
+            // channel-to-speaker mapping coefficient
+            int nchspkrcoefbits = 6 + 2 * bits_get(&xll->bits, 3);
+
+            // Number of loudspeaker configurations
+            int nspkrconfigs = bits_get(&xll->bits, 2) + 1;
+
+            for (i = 0; i < nspkrconfigs; i++) {
+                // Active channel mask for current configuration
+                int active_ch_mask = bits_get(&xll->bits, chs->nchannels);
+
+                // Number of speakers in current configuration
+                int nspeakers = bits_get(&xll->bits, 6) + 1;
+
+                // Speaker mask or polar coordinates flag
+                if (bits_get1(&xll->bits)) {
+                    // Speaker mask for current configuration
+                    bits_skip(&xll->bits, xll->ch_mask_nbits);
+                } else {
+                    // Angular speaker position table for current configuration
+                    for (j = 0; j < nspeakers; j++) {
+                        bits_skip(&xll->bits, 9);
+                        bits_skip(&xll->bits, 9);
+                        bits_skip(&xll->bits, 7);
+                    }
+                }
+
+                // Channel to loudspeaker mapping coefficients
+                for (j = 0; j < chs->nchannels; j++)
+                    if (active_ch_mask & (1 << j))
+                        bits_skip(&xll->bits, nchspkrcoefbits);
+            }
+        }
+    }
+
+    if (chs->freq > 96000)
+        // Extra frequency bands flag
+        chs->nfreqbands = 2 * (1 + bits_get1(&xll->bits));
+    else
+        chs->nfreqbands = 1;
+
+    if (chs->storage_bit_res > 16)
+        chs->nabits = 5;
+    else if (chs->storage_bit_res > 8)
+        chs->nabits = 4;
+    else
+        chs->nabits = 3;
+    if (xll->nchsets > 1 && chs->nabits < 5)
+        chs->nabits++;
+
+    // Pairwise channel decorrelation for frequency band 0
+    chs->decor_enabled = bits_get1(&xll->bits);
+    if (chs->decor_enabled && chs->nchannels > 1) {
+        // Original channel order
+        for (i = 0; i < chs->nchannels; i++)

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/xll_decoder.h Added

@@ -0,0 +1,118 @@
+/*
+ * This file is part of libdcadec.
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef XLL_DECODER_H
+#define XLL_DECODER_H
+
+#include "bitstream.h"
+
+#define XLL_MAX_CHANNELS    16
+
+#define for_each_chset(xll, chs) \
+    for (struct xll_chset *(chs) = (xll)->chset; \
+         (chs) != &(xll)->chset[(xll)->nchsets]; (chs)++)
+
+struct xll_decoder;
+struct exss_asset;
+
+struct xll_chset {
+    struct xll_decoder  *decoder;
+
+    int     nchannels;
+    int     residual_encode;
+    int     pcm_bit_res;
+    int     storage_bit_res;
+    int     freq;
+    int     replace_set_index;
+
+    bool    primary_chset;
+    bool    dmix_coeffs_present;
+    bool    dmix_embedded;
+    int     dmix_type;
+    bool    hier_chset;
+    int     *dmix_coeff;
+    bool    ch_mask_enabled;
+    int     ch_mask;
+
+    int     nfreqbands;
+    int     nabits;
+
+    bool    decor_enabled;
+    int     orig_order[XLL_MAX_CHANNELS];
+    int     decor_coef[XLL_MAX_CHANNELS / 2];
+
+    int     adapt_pred_order[XLL_MAX_CHANNELS];
+    int     highest_pred_order;
+    int     fixed_pred_order[XLL_MAX_CHANNELS];
+    int     adapt_refl_coef[XLL_MAX_CHANNELS][16];
+
+    size_t  lsb_section_size;
+    int     nscalablelsbs[XLL_MAX_CHANNELS];
+    int     bit_width_adjust[XLL_MAX_CHANNELS];
+
+    bool    seg_type;
+    bool    rice_code_flag[XLL_MAX_CHANNELS];
+    int     bitalloc_hybrid_linear[XLL_MAX_CHANNELS];
+    int     bitalloc_part_a[XLL_MAX_CHANNELS];
+    int     bitalloc_part_b[XLL_MAX_CHANNELS];
+    int     nsamples_part_a[XLL_MAX_CHANNELS];
+    int     *msb_sample_buffer[XLL_MAX_CHANNELS];
+    int     *lsb_sample_buffer[XLL_MAX_CHANNELS];
+    int     *sample_buffer;
+};
+
+struct xll_decoder {
+    struct bitstream    bits;
+
+    struct dcadec_log_context *logctx;
+
+    size_t  frame_size;
+    int     nchsets;
+    int     nframesegs;
+    int     nsegsamples_log2;
+    int     nsegsamples;
+    int     nframesamples;
+    int     seg_size_nbits;
+    int     band_crc_present;
+    bool    scalable_lsbs;
+    int     ch_mask_nbits;
+    int     fixed_lsb_width;
+
+    struct xll_chset    *chset;
+
+    size_t  *navi;
+
+    int     nfreqbands;
+    int     nchannels;
+
+    int     hd_stream_id;
+
+    uint8_t     *pbr_buffer;
+    size_t      pbr_length;
+    int         pbr_delay;
+};
+
+void xll_clear_band_data(struct xll_chset *chs);
+void xll_filter_band_data(struct xll_chset *chs);
+int xll_get_lsb_width(struct xll_chset *chs, int ch);
+void xll_assemble_msbs_lsbs(struct xll_chset *chs);
+int xll_map_ch_to_spkr(struct xll_chset *chs, int ch);
+int xll_parse(struct xll_decoder *xll, uint8_t *data, size_t size, struct exss_asset *asset, struct dcadec_log_context *logctx);
+void xll_clear(struct xll_decoder *xll);
+
+#endif

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/xll_tables.h Added

@@ -0,0 +1,45 @@
+/*
+ * This file is part of libdcadec.
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+// Section 8.4.3: Look-up table of quantized reflection coefficients
+static const uint16_t refl_coef_table[128] = {
+        0,  3070,  5110,  7140,  9156, 11154, 13132, 15085,
+    17010, 18904, 20764, 22588, 24373, 26117, 27818, 29474,
+    31085, 32648, 34164, 35631, 37049, 38418, 39738, 41008,
+    42230, 43404, 44530, 45609, 46642, 47630, 48575, 49477,
+    50337, 51157, 51937, 52681, 53387, 54059, 54697, 55302,
+    55876, 56421, 56937, 57426, 57888, 58326, 58741, 59132,
+    59502, 59852, 60182, 60494, 60789, 61066, 61328, 61576,
+    61809, 62029, 62236, 62431, 62615, 62788, 62951, 63105,
+    63250, 63386, 63514, 63635, 63749, 63855, 63956, 64051,
+    64140, 64224, 64302, 64376, 64446, 64512, 64573, 64631,
+    64686, 64737, 64785, 64830, 64873, 64913, 64950, 64986,
+    65019, 65050, 65079, 65107, 65133, 65157, 65180, 65202,
+    65222, 65241, 65259, 65275, 65291, 65306, 65320, 65333,
+    65345, 65357, 65368, 65378, 65387, 65396, 65405, 65413,
+    65420, 65427, 65434, 65440, 65446, 65451, 65456, 65461,
+    65466, 65470, 65474, 65478, 65481, 65485, 65488, 65491
+};
+
+static const uint8_t ch_nbits[16] = {
+    0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4
+};
+
+static const uint8_t prim_dmix_nch[7] = {
+    1, 2, 2, 3, 3, 4, 4
+};

makemkv-oss-1.9.0.tar.gz/libffabi/src/ffabi.c -> makemkv-oss-1.9.5.tar.xz/libffabi/src/ffabi.c Changed

@@ -1,7 +1,7 @@
 /*
     libMakeMKV - MKV multiplexer library
 
-    Copyright (C) 2007-2014 GuinpinSoft inc <libmkv@makemkv.com>
+    Copyright (C) 2007-2015 GuinpinSoft inc <libmkv@makemkv.com>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -25,6 +25,7 @@
 #include <libavutil/opt.h>
 #include <string.h>
 #include "internal.h"
+#include "dcadec/dca_context.h"
 
 static int                  log_print_prefix = 1;
 static void*                log_context = NULL;
@@ -638,3 +639,61 @@
     return 0;
 }
 
+static void ffabi_dca_log(void* ctx,const char* msg,unsigned int lineno)
+{
+    if (log_callback) {
+        size_t len=strlen(msg)+1;
+        char* text = (char*)alloca(len);
+        memcpy(text,msg,len);
+        (*log_callback)(log_context,ctx,lineno,text);
+    }
+}
+
+FFM_DcaDec* __cdecl ffm_dcadec_context_create(void* logctx,int native_layout)
+{
+    struct dcadec_context *dca =
+        dcadec_context_create(
+            DCADEC_FLAG_STRICT |
+            (native_layout?DCADEC_FLAG_NATIVE_LAYOUT:0));
+
+#ifdef DCADEC_HAVE_LOG
+    dcadec_context_set_log(dca,logctx,ffabi_dca_log);
+#endif
+
+    return (FFM_DcaDec*)dca;
+}
+
+void __cdecl ffm_dcadec_context_destroy(FFM_DcaDec* dca)
+{
+    dcadec_context_destroy((struct dcadec_context *)dca);
+}
+
+int __cdecl ffm_dcadec_put_data(FFM_DcaDec* dca, const uint8_t *data, size_t size)
+{
+    return dcadec_context_parse((struct dcadec_context *)dca, (uint8_t*)data, size);
+}
+
+int __cdecl ffm_dcadec_get_frame(FFM_DcaDec* dca, int ***data, FFM_AudioInfo* info)
+{
+    int err,nsamples,channel_mask,sample_rate,bits_per_sample,profile;
+
+    err = dcadec_context_filter((struct dcadec_context *)dca,
+        data,
+        &nsamples,
+        &channel_mask,
+        &sample_rate,
+        &bits_per_sample,
+        &profile);
+
+    if (info && !err)
+    {
+        info->frame_size = nsamples;
+        info->channel_layout = channel_mask;
+        info->sample_rate = sample_rate;
+        info->bits_per_sample = bits_per_sample;
+        info->profile = profile;
+    }
+
+    return err;
+}
+

makemkv-oss-1.9.0.tar.gz/libffabi/src/ffabicfg.h.in -> makemkv-oss-1.9.5.tar.xz/libffabi/src/ffabicfg.h.in Changed

makemkv-oss-1.9.0.tar.gz/libffabi/src/internal.h -> makemkv-oss-1.9.5.tar.xz/libffabi/src/internal.h Changed

makemkv-oss-1.9.0.tar.gz/libmakemkv/inc/lgpl/cassert -> makemkv-oss-1.9.5.tar.xz/libmakemkv/inc/lgpl/cassert Changed

makemkv-oss-1.9.0.tar.gz/libmakemkv/inc/lgpl/smem.h -> makemkv-oss-1.9.5.tar.xz/libmakemkv/inc/lgpl/smem.h Changed

makemkv-oss-1.9.0.tar.gz/libmakemkv/inc/lgpl/stdstring.h -> makemkv-oss-1.9.5.tar.xz/libmakemkv/inc/lgpl/stdstring.h Changed

makemkv-oss-1.9.0.tar.gz/libmakemkv/inc/lgpl/world.h -> makemkv-oss-1.9.5.tar.xz/libmakemkv/inc/lgpl/world.h Changed

makemkv-oss-1.9.0.tar.gz/libmakemkv/inc/libmkv/ebmlwrite.h -> makemkv-oss-1.9.5.tar.xz/libmakemkv/inc/libmkv/ebmlwrite.h Changed

makemkv-oss-1.9.0.tar.gz/libmakemkv/inc/libmkv/internal.h -> makemkv-oss-1.9.5.tar.xz/libmakemkv/inc/libmkv/internal.h Changed

makemkv-oss-1.9.0.tar.gz/libmakemkv/inc/libmkv/libmkv.h -> makemkv-oss-1.9.5.tar.xz/libmakemkv/inc/libmkv/libmkv.h Changed

makemkv-oss-1.9.0.tar.gz/libmakemkv/src/ebmlwrite.cpp -> makemkv-oss-1.9.5.tar.xz/libmakemkv/src/ebmlwrite.cpp Changed

makemkv-oss-1.9.0.tar.gz/libmakemkv/src/libmakemkv.vers -> makemkv-oss-1.9.5.tar.xz/libmakemkv/src/libmakemkv.vers Changed

makemkv-oss-1.9.0.tar.gz/libmakemkv/src/libmkv.cpp -> makemkv-oss-1.9.5.tar.xz/libmakemkv/src/libmkv.cpp Changed

makemkv-oss-1.9.0.tar.gz/libmakemkv/src/stdstring.cpp -> makemkv-oss-1.9.5.tar.xz/libmakemkv/src/stdstring.cpp Changed

makemkv-oss-1.9.0.tar.gz/libmakemkv/src/version.cpp -> makemkv-oss-1.9.5.tar.xz/libmakemkv/src/version.cpp Changed

makemkv-oss-1.9.0.tar.gz/libmakemkv/src/world.cpp -> makemkv-oss-1.9.5.tar.xz/libmakemkv/src/world.cpp Changed

makemkv-oss-1.9.0.tar.gz/libmmbd/inc/libmmbd/mmbd.h -> makemkv-oss-1.9.5.tar.xz/libmmbd/inc/libmmbd/mmbd.h Changed

makemkv-oss-1.9.0.tar.gz/libmmbd/src/aacs.cpp -> makemkv-oss-1.9.5.tar.xz/libmmbd/src/aacs.cpp Changed

makemkv-oss-1.9.0.tar.gz/libmmbd/src/bdplus.cpp -> makemkv-oss-1.9.5.tar.xz/libmmbd/src/bdplus.cpp Changed

makemkv-oss-1.9.0.tar.gz/libmmbd/src/bdplus.h -> makemkv-oss-1.9.5.tar.xz/libmmbd/src/bdplus.h Changed

makemkv-oss-1.9.0.tar.gz/libmmbd/src/crypto.h -> makemkv-oss-1.9.5.tar.xz/libmmbd/src/crypto.h Changed

makemkv-oss-1.9.0.tar.gz/libmmbd/src/crypto_ossl.cpp -> makemkv-oss-1.9.5.tar.xz/libmmbd/src/crypto_ossl.cpp Changed

makemkv-oss-1.9.0.tar.gz/libmmbd/src/marmmbd.cpp -> makemkv-oss-1.9.5.tar.xz/libmmbd/src/marmmbd.cpp Changed

makemkv-oss-1.9.0.tar.gz/libmmbd/src/mmbd.cpp -> makemkv-oss-1.9.5.tar.xz/libmmbd/src/mmbd.cpp Changed

makemkv-oss-1.9.0.tar.gz/libmmbd/src/mmbdipc.cpp -> makemkv-oss-1.9.5.tar.xz/libmmbd/src/mmbdipc.cpp Changed

makemkv-oss-1.9.0.tar.gz/libmmbd/src/mmbdipc.h -> makemkv-oss-1.9.5.tar.xz/libmmbd/src/mmbdipc.h Changed

makemkv-oss-1.9.0.tar.gz/libmmbd/src/mmconn.cpp -> makemkv-oss-1.9.5.tar.xz/libmmbd/src/mmconn.cpp Changed

makemkv-oss-1.9.0.tar.gz/libmmbd/src/mmconn.h -> makemkv-oss-1.9.5.tar.xz/libmmbd/src/mmconn.h Changed

makemkv-oss-1.9.0.tar.gz/libmmbd/src/nstring.cpp -> makemkv-oss-1.9.5.tar.xz/libmmbd/src/nstring.cpp Changed

makemkv-oss-1.9.0.tar.gz/libmmbd/src/utf8.cpp -> makemkv-oss-1.9.5.tar.xz/libmmbd/src/utf8.cpp Changed

makemkv-oss-1.9.0.tar.gz/libmmbd/src/utf8.h -> makemkv-oss-1.9.5.tar.xz/libmmbd/src/utf8.h Changed

makemkv-oss-1.9.0.tar.gz/makefile.common -> makemkv-oss-1.9.5.tar.xz/makefile.common Changed

@@ -40,6 +40,13 @@
 LIBFFABI_SRC=libffabi/src/ffabi.c libffabi/src/mlp.c libffabi/src/log.c libffabi/src/audio_convert.c \
     libffabi/src/audio_mix.c libffabi/src/audio_mix_matrix.c
 
+LIBDCADEC_SRC=libffabi/src/dcadec/bitstream.cpp libffabi/src/dcadec/core_decoder.cpp libffabi/src/dcadec/dca_context.cpp \
+    libffabi/src/dcadec/dmix_tables.cpp libffabi/src/dcadec/exss_parser.cpp libffabi/src/dcadec/idct_fixed.cpp \
+    libffabi/src/dcadec/interpolator.cpp libffabi/src/dcadec/interpolator_fixed.cpp libffabi/src/dcadec/interpolator_float.cpp \
+    libffabi/src/dcadec/ta.cpp libffabi/src/dcadec/xll_decoder.cpp
+
+LIBDCADEC_DEF=-DDCA_LOG -DDCA_FFMALLOC
+
 LIBMAKEMKV_INC=-Ilibmakemkv/inc
 
 LIBMAKEMKV_SRC=libmakemkv/src/ebmlwrite.cpp libmakemkv/src/libmkv.cpp libmakemkv/src/version.cpp libmakemkv/src/world.cpp \
@@ -52,11 +59,12 @@
   makemkvgui/src/mainwnd.cpp makemkvgui/src/marshall.cpp makemkvgui/src/progress.cpp makemkvgui/src/scsiinfo.cpp \
   makemkvgui/src/settingdlg.cpp makemkvgui/src/uisync.cpp makemkvgui/src/viteminfo.cpp makemkvgui/src/margui.cpp \
   makemkvgui/src/backupdlg.cpp makemkvgui/src/lstring.cpp makemkvgui/src/notify.cpp makemkvgui/src/str/en_utf16.cpp \
-  makemkvgui/src/image.cpp makemkvgui/src/abutton.cpp makemkvgui/src/lineeditk.cpp makemkvgui/src/dvdbox.cpp
+  makemkvgui/src/image.cpp makemkvgui/src/abutton.cpp makemkvgui/src/lineeditk.cpp makemkvgui/src/dvdbox.cpp \
+  makemkvgui/src/drivebox.cpp
 
 MAKEMKVGUI_GEN=\
   tmp/moc_mainwnd.cpp tmp/moc_logtext.cpp tmp/moc_dirselectbox.cpp tmp/moc_aboutbox.cpp tmp/moc_settingdlg.cpp \
-  tmp/moc_backupdlg.cpp tmp/moc_lineeditk.cpp tmp/moc_dvdbox.cpp
+  tmp/moc_backupdlg.cpp tmp/moc_lineeditk.cpp tmp/moc_dvdbox.cpp tmp/moc_drivebox.cpp
 
 MAKEMKVGUI_SRC_LINUX=makemkvgui/src/api_posix.cpp makemkvgui/src/api_linux.cpp makemkvgui/src/sem_posix.cpp \
   makemkvgui/src/spawn_posix.cpp makemkvgui/src/logic_posix.cpp \

makemkv-oss-1.9.0.tar.gz/makemkvgui/inc/QtExt/NativeFileDialog.h -> makemkv-oss-1.9.5.tar.xz/makemkvgui/inc/QtExt/NativeFileDialog.h Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/inc/lgpl/apdefs.h -> makemkv-oss-1.9.5.tar.xz/makemkvgui/inc/lgpl/apdefs.h Changed

@@ -250,6 +250,7 @@
 static const unsigned long APP_IFACE_SETTINGS_IO_READ_BUFFER=6083;
 static const unsigned long APP_IFACE_SETTINGS_IO_NO_DIRECT_ACCESS=6150;
 static const unsigned long APP_IFACE_SETTINGS_IO_DARWIN_K2_WORKAROUND=6151;
+static const unsigned long APP_IFACE_SETTINGS_IO_SINGLE_DRIVE=6168;
 static const unsigned long APP_IFACE_SETTINGS_DVD_AUTO=6085;
 static const unsigned long APP_IFACE_SETTINGS_DVD_MIN_LENGTH=6086;
 static const unsigned long APP_IFACE_SETTINGS_DVD_SP_REMOVE=6087;
@@ -332,6 +333,10 @@
 static const unsigned long APP_DVD_COUNT_CELLS=6222;
 static const unsigned long APP_DVD_COUNT_PGC=6223;
 static const unsigned long APP_DVD_BROKEN_TITLE_ENTRY=6224;
+static const unsigned long APP_SINGLE_DRIVE_TITLE=6226;
+static const unsigned long APP_SINGLE_DRIVE_TEXT=6227;
+static const unsigned long APP_SINGLE_DRIVE_ALL=6228;
+static const unsigned long APP_SINGLE_DRIVE_CAPTION=6229;
 static const unsigned long APP_SI_DRIVEINFO=6300;
 static const unsigned long APP_SI_PROFILE=6301;
 static const unsigned long APP_SI_MANUFACTURER=6302;
@@ -394,6 +399,7 @@
   apset_old_app_ffmpeg ,
   apset_app_dtshddec ,
   apset_app_SiteInfoString ,
+  apset_path_OpenFile ,
   apset_MaxValue
 } ApSettingId;

makemkv-oss-1.9.0.tar.gz/makemkvgui/inc/ver_num.h -> makemkv-oss-1.9.5.tar.xz/makemkvgui/inc/ver_num.h Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/aboutbox.cpp -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/aboutbox.cpp Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/aboutbox.h -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/aboutbox.h Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/abutton.cpp -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/abutton.cpp Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/abutton.h -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/abutton.h Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/api_linux.cpp -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/api_linux.cpp Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/api_posix.cpp -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/api_posix.cpp Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/backupdlg.cpp -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/backupdlg.cpp Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/backupdlg.h -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/backupdlg.h Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/client.cpp -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/client.cpp Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/dirselectbox.cpp -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/dirselectbox.cpp Changed

@@ -1,7 +1,7 @@
 /*
     MakeMKV GUI - Graphics user interface application for MakeMKV
 
-    Copyright (C) 2007-2014 GuinpinSoft inc <makemkvgui@makemkv.com>
+    Copyright (C) 2007-2015 GuinpinSoft inc <makemkvgui@makemkv.com>
 
     You may use this file in accordance with the end user license
     agreement provided with the Software. For licensing terms and
@@ -12,10 +12,9 @@
     the specific language governing rights and limitations.
 
 */
-#include <QtGui/QtGui>
+#include "qtgui.h"
 #include "dirselectbox.h"
 #include "qtapp.h"
-#include <QtExt/NativeFileDialog.h>
 #include "image_defs.h"
 
 CDirSelectBox::CDirSelectBox(CDirSelectBox::Style BoxStyle,const QString &Name, QWidgetList widgets , QWidget *parent) : QGroupBox(Name,parent)
@@ -104,14 +103,14 @@
     {
     case DirBoxDir:
     case DirBoxOutDir:
-        dir = QNativeFileDialog::getExistingDirectory(
+        dir = QFileDialog::getExistingDirectory(
             this,
             UI_QSTRING(APP_IFACE_OPENFOLDER_TITLE),
             lineEditDir->text());
         break;
     case DirBoxFile:
-        dir = QNativeFileDialog::getOpenFileName(
-            this);
+        dir = QFileDialog::getOpenFileName(
+            this,QString(),lineEditDir->text());
         break;
     }

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/dirselectbox.h -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/dirselectbox.h Changed

makemkv-oss-1.9.5.tar.xz/makemkvgui/src/drivebox.cpp Added

@@ -0,0 +1,61 @@
+/*
+    MakeMKV GUI - Graphics user interface application for MakeMKV
+
+    Copyright (C) 2007-2015 GuinpinSoft inc <makemkvgui@makemkv.com>
+
+    You may use this file in accordance with the end user license
+    agreement provided with the Software. For licensing terms and
+    conditions see License.txt
+
+    This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY
+    OF ANY KIND, either express or implied. See the License.txt for
+    the specific language governing rights and limitations.
+
+*/
+#include "drivebox.h"
+#include "qtapp.h"
+
+CDriveBox::CDriveBox(MainWnd *MainWnd,QIcon* icon,unsigned int Count,const utf16_t* Text[]) : QDialog(MainWnd)
+{
+    setWindowIcon(*icon);
+    setWindowTitle(UI_QSTRING(APP_SINGLE_DRIVE_TITLE));
+    m_MainWnd = MainWnd;
+
+    QLabel *text = new QLabel();
+    text->setTextFormat(Qt::PlainText);
+    text->setText(UI_QSTRING(APP_SINGLE_DRIVE_TEXT));
+    text->setWordWrap(true);
+
+    QGroupBox* box = new QGroupBox(UI_QSTRING(APP_SINGLE_DRIVE_CAPTION));
+    QBoxLayout *lay1 = new QVBoxLayout();
+    m_Box = new QComboBox();
+    lay1->addWidget(m_Box);
+    box->setLayout(lay1);
+
+    QDialogButtonBox* btn_box = new QDialogButtonBox(QDialogButtonBox::Ok/*|QDialogButtonBox::Cancel*/,Qt::Horizontal);
+
+    QBoxLayout *lay = new QVBoxLayout();
+    lay->addWidget(text);
+    //lay->addSpacing(12);
+    lay->addStretch(1);
+    lay->addWidget(box);
+    lay->addWidget(btn_box);
+    setLayout(lay);
+
+    connect(btn_box, SIGNAL(rejected()), this, SLOT(reject()));
+    connect(btn_box, SIGNAL(accepted()), this, SLOT(accept()));
+
+    m_Box->addItem(UI_QSTRING(APP_SINGLE_DRIVE_ALL));
+    for (unsigned int i=0;i<Count;i++)
+    {
+        m_Box->addItem(QStringFromUtf16(Text[i]));
+    }
+    m_Box->setCurrentIndex(0);
+}
+
+unsigned int CDriveBox::result()
+{
+    int r = m_Box->currentIndex();
+    return (r>0)?r:0;
+}
+

makemkv-oss-1.9.5.tar.xz/makemkvgui/src/drivebox.h Added

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/dvdbox.cpp -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/dvdbox.cpp Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/dvdbox.h -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/dvdbox.h Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/image.cpp -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/image.cpp Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/image_data.h -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/image_data.h Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/image_defs.h -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/image_defs.h Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/image_linux.cpp -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/image_linux.cpp Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/lineeditk.cpp -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/lineeditk.cpp Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/lineeditk.h -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/lineeditk.h Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/logic.cpp -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/logic.cpp Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/logic_posix.cpp -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/logic_posix.cpp Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/logtext.cpp -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/logtext.cpp Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/logtext.h -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/logtext.h Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/lstring.cpp -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/lstring.cpp Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/main.cpp -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/main.cpp Changed

@@ -1,7 +1,7 @@
 /*
     MakeMKV GUI - Graphics user interface application for MakeMKV
 
-    Copyright (C) 2007-2014 GuinpinSoft inc <makemkvgui@makemkv.com>
+    Copyright (C) 2007-2015 GuinpinSoft inc <makemkvgui@makemkv.com>
 
     You may use this file in accordance with the end user license
     agreement provided with the Software. For licensing terms and
@@ -12,8 +12,7 @@
     the specific language governing rights and limitations.
 
 */
-#include <QtGui/QApplication>
-#include <QtGui/QMessageBox>
+#include "qtgui.h"
 #include <lgpl/aproxy.h>
 
 #include "mainwnd.h"
@@ -44,19 +43,7 @@
         }
     }
 
-#ifdef Q_WS_WIN
-    QFont& txt_font = app.font("QMessageBox");
-    app.setFont(txt_font,"QLabel");
-    app.setFont(txt_font,"QComboBox");
-    app.setFont(txt_font,"QTextEdit");
-    app.setFont(txt_font,"QLineEdit");
-    app.setFont(txt_font,"QDialogButtonBox");
-    app.setFont(txt_font,"QAbstractItemView");
-    QFont& menu_font = app.font("QMenu");
-    app.setFont(menu_font,"QGroupBox");
-#endif
-
-#ifdef Q_WS_MAC
+#if (QT_VERSION > 0x050000)
     QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
 #endif

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/mainwnd.cpp -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/mainwnd.cpp Changed

@@ -1,7 +1,7 @@
 /*
     MakeMKV GUI - Graphics user interface application for MakeMKV
 
-    Copyright (C) 2007-2014 GuinpinSoft inc <makemkvgui@makemkv.com>
+    Copyright (C) 2007-2015 GuinpinSoft inc <makemkvgui@makemkv.com>
 
     You may use this file in accordance with the end user license
     agreement provided with the Software. For licensing terms and
@@ -12,8 +12,7 @@
     the specific language governing rights and limitations.
 
 */
-#include <QtGui/QtGui>
-#include <QtExt/NativeFileDialog.h>
+#include "qtgui.h"
 #include "mainwnd.h"
 #include "logtext.h"
 #include "settingdlg.h"
@@ -23,6 +22,7 @@
 #include "abutton.h"
 #include "lineeditk.h"
 #include "dvdbox.h"
+#include "drivebox.h"
 #include "image_defs.h"
 
 #define AP_KEY_STRING_LEN 68
@@ -30,7 +30,7 @@
 MainWnd* MainWnd::m_myself_static=NULL;
 
 static const Qt::WindowFlags mainWindowFlags =
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     Qt::CustomizeWindowHint |
     Qt::WindowTitleHint |
     Qt::MacWindowToolBarButtonHint |
@@ -45,7 +45,7 @@
     , m_app_dir(AppDir)
     , logtext_cursor(&logtext_document)
 {
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     setUnifiedTitleAndToolBarOnMac(true);
 #endif
 
@@ -169,6 +169,7 @@
     if (m_started)
     {
         m_disable_onidle++;
+        m_uisync_disabled++;
         close();
     }
 }
@@ -227,7 +228,9 @@
         m_entered_onidle--;
     }
 
+    if (m_disable_onidle) return;
     UpdateTitleCollection(true);
+    if (m_disable_onidle) return;
 
     if (m_job_active)
     {
@@ -277,10 +280,11 @@
     unsigned int id = qobject_cast<QAction *>(sender())->data().toUInt();
 
     QString filter = QStringFromUtf16(m_app->GetAppString((id==0)?AP_vastr_OpenFileFilter:AP_vastr_OpenDVDFileFilter));
+    QString dir = QStringFromUtf16(m_app->GetSettingString(apset_path_OpenFile));
 
-    QString fileName = QNativeFileDialog::getOpenFileName(this,
+    QString fileName = QFileDialog::getOpenFileName(this,
         UI_QSTRING(APP_IFACE_OPENFILE_TITLE),
-        QString(),
+        dir,
         filter);
 
     if (fileName.isEmpty())
@@ -288,6 +292,14 @@
         return;
     }
 
+    int index;
+    dir = QDir(fileName).absolutePath();
+    if ((index=dir.lastIndexOf(QLatin1Char('/')))>0)
+    {
+        dir.truncate(index+1);
+    }
+    m_app->SetSettingString(apset_path_OpenFile,Utf16FromQString(dir));
+
     m_CurrentlyOpenedDisk=-1;
 
     m_app->OpenFile(Utf16FromQString(fileName),(id==0)?0:1);
@@ -577,7 +589,7 @@
     aboutQtAct = NULL;
 #endif
 
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     newInstanceAct = new QAction(UI_QSTRING(APP_IFACE_ACT_NEWINSTANCE_NAME), this);
     newInstanceAct->setStatusTip(UI_QSTRING(APP_IFACE_ACT_NEWINSTANCE_STIP));
     newInstanceAct->setShortcut(Qt::CTRL + Qt::Key_N);
@@ -590,7 +602,7 @@
 void MainWnd::createMenus()
 {
     fileMenu = menuBar()->addMenu(UI_QSTRING(APP_IFACE_MENU_FILE));
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     fileMenu->addAction(newInstanceAct);
 #endif
     fileMenu->addAction(openFilesAct);
@@ -973,13 +985,13 @@
 {
     if (Message.indexOf(QLatin1String("http://"))<0)
     {
-        logtext_buf.append(Qt::escape(Message));
+        logtext_buf.append(qt_html_escape(Message));
     } else {
         QString logline,new_logline;
         int http_index;
 
         logline.reserve(Message.length()+30);
-        logline.append(Qt::escape(Message));
+        logline.append(qt_html_escape(Message));
 
         http_index=logline.indexOf(QLatin1String("http://"));
 
@@ -1197,7 +1209,7 @@
     }
 
     m_disable_onidle++;
-    QDesktopServices::openUrl(real_url);
+    QDesktopServices::openUrl(QUrl(real_url));
     m_disable_onidle--;
 }
 
@@ -1320,7 +1332,7 @@
 
 void MainWnd::SlotNewInstance()
 {
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     ApSpawnNewInstance();
 #endif
 }
@@ -1346,5 +1358,17 @@
         return AP_UIMSG_YES;
     }
 
+    if (Code==APP_SINGLE_DRIVE_TITLE)
+    {
+        CDriveBox dbox(this,mainIcon,Count,Text);
+
+        m_disable_onidle++;
+        int r = dbox.exec();
+        m_disable_onidle--;
+        if (r!=QDialog::Accepted) return -1;
+
+        return dbox.result();
+    }
+
     return -1;
 }

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/mainwnd.h -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/mainwnd.h Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/margui.cpp -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/margui.cpp Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/marshall.cpp -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/marshall.cpp Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/nativefiledialog.cpp -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/nativefiledialog.cpp Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/notify.cpp -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/notify.cpp Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/notify.h -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/notify.h Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/notify_linux.cpp -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/notify_linux.cpp Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/notify_none.cpp -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/notify_none.cpp Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/progress.cpp -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/progress.cpp Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/qtapp.h -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/qtapp.h Changed

makemkv-oss-1.9.5.tar.xz/makemkvgui/src/qtgui.h Added

@@ -0,0 +1,110 @@
+/*
+    MakeMKV GUI - Graphics user interface application for MakeMKV
+
+    Copyright (C) 2007-2015 GuinpinSoft inc <makemkvgui@makemkv.com>
+
+    You may use this file in accordance with the end user license
+    agreement provided with the Software. For licensing terms and
+    conditions see License.txt
+
+    This Software is distributed on an "AS IS" basis, WITHOUT WARRANTY
+    OF ANY KIND, either express or implied. See the License.txt for
+    the specific language governing rights and limitations.
+
+*/
+#ifndef APP_QTGUI_H
+#define APP_QTGUI_H
+
+#include <QtCore/qglobal.h>
+#include <QtCore/QFileInfo>
+#include <QtCore/QTime>
+#include <QtCore/QBitArray>
+#include <QtCore/QTimer>
+#include <QtCore/QUrl>
+
+#include <QtGui/QImage>
+#include <QtGui/QPixmap>
+#include <QtGui/QIcon>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QDesktopServices>
+
+#if (QT_VERSION < 0x050000)
+
+#include <QtGui/QApplication>
+#include <QtGui/QMessageBox>
+#include <QtGui/QDialog>
+#include <QtGui/QInputDialog>
+#include <QtGui/QLabel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QTextEdit>
+#include <QtGui/QGroupBox>
+#include <QtGui/QMainWindow>
+#include <QtGui/QTreeWidgetItem>
+#include <QtGui/QToolButton>
+#include <QtGui/QProgressBar>
+#include <QtGui/QStackedWidget>
+#include <QtGui/QComboBox>
+#include <QtGui/QAction>
+#include <QtGui/QCheckBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QBoxLayout>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QDialogButtonBox>
+#include <QtGui/QSpinBox>
+#include <QtGui/QRadioButton>
+#include <QtGui/QPushButton>
+#include <QtGui/QScrollBar>
+#include <QtGui/QMenu>
+#include <QtGui/QMenuBar>
+#include <QtGui/QToolBar>
+#include <QtGui/QStatusBar>
+#include <QtGui/QSplitter>
+#include <QtGui/QFileDialog>
+
+inline static QString qt_html_escape(const QString &plain)
+{
+    return Qt::escape(plain);
+}
+
+#else
+
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QDialog>
+#include <QtWidgets/QInputDialog>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QTextEdit>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QMainWindow>
+#include <QtWidgets/QTreeWidgetItem>
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QProgressBar>
+#include <QtWidgets/QStackedWidget>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QBoxLayout>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QDialogButtonBox>
+#include <QtWidgets/QSpinBox>
+#include <QtWidgets/QRadioButton>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QScrollBar>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QMenuBar>
+#include <QtWidgets/QToolBar>
+#include <QtWidgets/QStatusBar>
+#include <QtWidgets/QSplitter>
+#include <QtWidgets/QFileDialog>
+
+inline static QString qt_html_escape(const QString &plain)
+{
+    return plain.toHtmlEscaped();
+}
+
+#endif
+
+#endif // APP_QTGUI_H
+

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/qtstr.h -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/qtstr.h Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/scsiinfo.cpp -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/scsiinfo.cpp Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/sem_posix.cpp -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/sem_posix.cpp Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/settingdlg.cpp -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/settingdlg.cpp Changed

@@ -1,7 +1,7 @@
 /*
     MakeMKV GUI - Graphics user interface application for MakeMKV
 
-    Copyright (C) 2007-2014 GuinpinSoft inc <makemkvgui@makemkv.com>
+    Copyright (C) 2007-2015 GuinpinSoft inc <makemkvgui@makemkv.com>
 
     You may use this file in accordance with the end user license
     agreement provided with the Software. For licensing terms and
@@ -12,7 +12,7 @@
     the specific language governing rights and limitations.
 
 */
-#include <QtGui/QtGui>
+#include "qtgui.h"
 #include "settingdlg.h"
 #include "mainwnd.h"
 #include <lgpl/sstring.h>
@@ -125,6 +125,7 @@
     ioTab->spinBoxRetryCount->setValue(retry_count);
     int buf_size = client->GetSettingInt(apset_io_RBufSizeMB);
     int darwin_workaround = client->GetSettingInt(apset_io_DarwinK2Workaround);
+    int single_drive = client->GetSettingInt(apset_io_SingleDrive);
 
     if (0==buf_size)
     {
@@ -140,6 +141,7 @@
         ioTab->comboBoxRBufSize->setCurrentIndex(ioTab->comboBoxRBufSize->findText(sstr));
     }
     ioTab->comboBoxDarwinK2Workaround->setCurrentIndex(darwin_workaround);
+    ioTab->checkSingleDrive->setCheckState( (single_drive==0) ? Qt::Unchecked : Qt::Checked );
 
     // dvd
     const utf16_t *dest_path = client->GetSettingString(apset_app_DestinationDir);
@@ -236,6 +238,7 @@
     }
     client->SetSettingInt(apset_io_RBufSizeMB,rbuf_size);
     client->SetSettingInt(apset_io_DarwinK2Workaround,ioTab->comboBoxDarwinK2Workaround->currentIndex());
+    client->SetSettingInt(apset_io_SingleDrive,(ioTab->checkSingleDrive->checkState() == Qt::Checked) ? 1 : 0 );
 
     // dvd
     client->SetSettingString(apset_app_DestinationDir,Utf16FromQString(dvdTab->destinationDir->text()));
@@ -295,6 +298,7 @@
     comboBoxDarwinK2Workaround->addItem(QLatin1String("0"));
     comboBoxDarwinK2Workaround->addItem(QLatin1String("1"));
     comboBoxDarwinK2Workaround->addItem(QLatin1String("2"));
+    checkSingleDrive = new QCheckBox();
 
     QGridLayout *b_lay = new QGridLayout();
     b_lay->setColumnStretch(0,2);
@@ -309,6 +313,8 @@
     b_lay->addWidget(spinBoxRetryCount,0,1);
     b_lay->addWidget(createLabel(UI_QSTRING(APP_IFACE_SETTINGS_IO_READ_BUFFER)),1,0,Qt::AlignRight);
     b_lay->addWidget(comboBoxRBufSize,1,1);
+    b_lay->addWidget(createLabel(UI_QSTRING(APP_IFACE_SETTINGS_IO_SINGLE_DRIVE)),2,0,Qt::AlignRight);
+    b_lay->addWidget(checkSingleDrive,2,1);
     if (osx_k2bug_affected)
     {
         b_lay->addWidget(createLabel(UI_QSTRING(APP_IFACE_SETTINGS_IO_DARWIN_K2_WORKAROUND)),3,0,Qt::AlignRight);

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/settingdlg.h -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/settingdlg.h Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/spawn_posix.cpp -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/spawn_posix.cpp Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/str/en_utf16.cpp -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/str/en_utf16.cpp Changed

@@ -1,7 +1,7 @@
 /*
     MakeMKV GUI - Graphics user interface application for MakeMKV
 
-    Copyright (C) 2007-2014 GuinpinSoft inc <makemkvgui@makemkv.com>
+    Copyright (C) 2007-2015 GuinpinSoft inc <makemkvgui@makemkv.com>
 
     You may use this file in accordance with the end user license
     agreement provided with the Software. For licensing terms and
@@ -13,7 +13,7 @@
 
 */
 
-static const unsigned short en_po_str[20794]={
+static const unsigned short en_po_str[21356]={
 'e','n','g',':','E','n','g','l','i','s','h',0,
 'D','B','G',' ','A','S','S','E','R','T',':',' ','%','1',' ','a','t',' ','%','2',':','%','3',0,
 'L','I','B','M','K','V','_','T','R','A','C','E',':',' ','%','1',0,
@@ -25,6 +25,8 @@
 'F','a','i','l','e','d',' ','t','o',' ','l','o','a','d',' ','c','o','n','v','e','r','s','i','o','n',' ','p','r','o','f','i','l','e',' ','f','r','o','m',' ','f','i','l','e',' ',0x27,'%','1',0x27,0,
 'P','r','o','f','i','l','e',' ','p','a','r','s','i','n','g',' ','e','r','r','o','r',':',' ','%','1',0,
 'I','n','t','e','r','n','a','l',' ','e','r','r','o','r',':',' ','%','1',0,
+'%','1',0,
+'%','1',' ','%','2',0,
 'F','i','l','e',' ','s','y','s','t','e','m',' ','n','o','t',' ','r','e','c','o','g','n','i','z','e','d',',',' ','d','i','s','c',' ','c','a','n',0x27,'t',' ','b','e',' ','o','p','e','n','e','d',0,
 'S','c','s','i',' ','o','p',' ','w','i','t','h',' ','b','u','f','f','e','r',' ','s','i','z','e','=','%','1',' ','.',' ','T','h','i','s',' ','i','s',' ','a',' ','p','e','r','f',' ','w','a','r','n','i','n','g',',',' ','y','o','u',' ','s','h','o','u','l','d','n',0x27,'t',' ','s','e','e',' ','m','a','n','y',' ','o','f',' ','t','h','e','s','e',0,
 'E','r','r','o','r',' ',0x27,'%','1',0x27,' ','o','c','c','u','r','r','e','d',' ','w','h','i','l','e',' ','r','e','a','d','i','n','g',' ',0x27,'%','2',0x27,' ','a','t',' ','o','f','f','s','e','t',' ',0x27,'%','3',0x27,0,
@@ -208,6 +210,10 @@
 'v','i','d','e','o',' ','s','t','r','e','a','m',' ','h','a','s',' ','%','1',' ','f','r','a','m','e','s',' ','w','i','t','h',' ','i','n','v','a','l','i','d',' ','t','i','m','e','c','o','d','e','s',0,
 'c','o','n','v','e','r','t','i','n','g',' ','a','u','d','i','o',' ','f','r','o','m',' ','%','1',' ','t','o',' ','%','2',0,
 'a','u','d','i','o',' ','c','h','a','n','g','e','s',' ','f','r','o','m',' ','%','1',' ','t','o',' ','%','2',',',' ','y','o','u',' ','w','o','n',0x27,'t',' ','b','e',' ','a','b','l','e',' ','t','o',' ','c','o','n','v','e','r','t',' ','t','h','i','s',' ','t','r','a','c','k',' ','t','o',' ','a','n','y',' ','o','t','h','e','r',' ','f','o','r','m','a','t',' ','l','a','t','e','r',',',' ','p','l','e','a','s','e',' ','u','s','e',' ','a',' ','c','o','n','v','e','r','s','i','o','n',' ','p','r','o','f','i','l','e',' ','w','i','t','h',' ','a','u','d','i','o',' ','t','r','a','n','s','c','o','d','i','n','g',0,
+'F','F','M','P','E','G','_','E','R','R','O','R',':',' ','%','1',0,
+'S','t','r','e','a','m','s',' ','w','i','t','h',' ','w','i','d','e',' ','l','e','f','t','/','r','i','g','h','t',' ','c','h','a','n','n','e','l','s',' ','a','r','e',' ','n','o','t',' ','s','u','p','p','o','r','t','e','d','.',0,
+'S','t','r','e','a','m','s',' ','w','i','t','h',' ','s','i','d','e',' ','h','i','g','h',' ','l','e','f','t','/','r','i','g','h','t',' ','c','h','a','n','n','e','l','s',' ','a','r','e',' ','n','o','t',' ','s','u','p','p','o','r','t','e','d','.',0,
+'T','h','i','s',' ','s','t','r','e','a','m',' ','c','a','n',0x27,'t',' ','b','e',' ','p','r','o','p','e','r','l','y',' ','d','e','c','o','d','e','d',' ','b','y',' ','t','h','i','s',' ','D','L','L',',',' ','p','l','e','a','s','e',' ','u','s','e',' ','d','t','s','d','e','c','o','d','e','r','d','l','l',' ','v','1','.','1','.','0','.','5',' ','o','r',' ','l','a','t','e','r','.',0,
 'S','t','r','e','a','m','i','n','g',' ','s','e','r','v','e','r',' ','s','t','a','r','t','e','d',',',' ','w','e','b',' ','s','e','r','v','e','r',' ','a','d','d','r','e','s','s',' ','i','s',' ','h','t','t','p',':','/','/','%','1',' ','o','r',' ','h','t','t','p',':','/','/','l','o','c','a','l','h','o','s','t',':','%','2',0,
 'S','t','r','e','a','m','i','n','g',' ','s','e','r','v','e','r',' ','s','t','o','p','p','e','d',0,
 'S','t','r','e','a','m','i','n','g',' ','s','e','r','v','e','r',' ','f','a','i','l','e','d',' ','t','o',' ','s','t','a','r','t',0,
@@ -267,6 +273,7 @@
 'E','v','a','l','u','a','t','i','o','n',' ','p','e','r','i','o','d',' ','h','a','s',' ','e','x','p','i','r','e','d',',',' ','s','h','a','r','e','w','a','r','e',' ','f','u','n','c','t','i','o','n','a','l','i','t','y',' ','u','n','a','v','a','i','l','a','b','l','e','.',0,
 'E','v','a','l','u','a','t','i','o','n',' ','p','e','r','i','o','d',' ','n','o','t',' ','s','t','a','r','t','e','d',',',' ','s','h','a','r','e','w','a','r','e',' ','f','u','n','c','t','i','o','n','a','l','i','t','y',' ','u','n','a','v','a','i','l','a','b','l','e','.',0,
 'A','n','a','l','y','z','i','n','g',' ','s','e','a','m','l','e','s','s',' ','s','e','g','m','e','n','t','s',0,
+'Y','o','u',' ','a','r','e',' ','t','r','y','i','n','g',' ','t','o',' ','s','t','a','r','t',' ','M','a','k','e','M','K','V',' ','e','v','a','l','u','a','t','i','o','n',' ','f','r','o','m',' ','a',' ','t','h','i','r','d','-','p','a','r','t','y',' ','a','p','p','l','i','c','a','t','i','o','n','.',' ','P','l','e','a','s','e',' ','l','a','u','n','c','h',' ','M','a','k','e','M','K','V',' ','i','f',' ','y','o','u',' ','w','o','u','l','d',' ','l','i','k','e',' ','t','o',' ','s','t','a','r','t',' ','t','h','e',' ','e','v','a','l','u','a','t','i','o','n',' ','p','e','r','i','o','d','.',0,
 'F','r','e','e','w','a','r','e',0,
 'T','i','m','e','-','l','i','m','i','t','e','d',0,
 'R','e','g','i','s','t','e','r','e','d',0,
@@ -491,6 +498,7 @@
 'S','t','r','e','a','m','i','n','g',0,
 'P','r','o','t','e','c','t','i','o','n',0,
 'M','a','k','e','M','K','V',' ','d','a','t','a',' ','d','i','r','e','c','t','o','r','y',0,
+'A','s','k',' ','f','o','r',' ','s','i','n','g','l','e',' ','d','r','i','v','e',' ','m','o','d','e',' ',':',0,
 'E','x','p','e','r','t',' ','m','o','d','e',' ',':',0,
 'S','h','o','w',' ','A','V',' ','s','y','n','c','h','r','o','n','i','z','a','t','i','o','n',' ','m','e','s','s','a','g','e','s',' ',':',0,
 'P','r','o','f','i','l','e','-','d','e','f','i','n','e','d',' ','s','e','c','o','n','d','a','r','y',' ','s','t','r','e','a','m',0,
@@ -523,6 +531,10 @@
 '%','1',' ','P','G','C','(','s',')',0,
 'b','r','o','k','e','n',' ','e','n','t','r','y',0,
 'Y','o','u',' ','a','r','e',' ','o','p','e','n','i','n','g',' ','t','h','i','s',' ','D','V','D',' ','d','i','s','c',' ','i','n',' ','m','a','n','u','a','l',' ','m','o','d','e','.',0xa,'T','h','i','s',' ','m','o','d','e',' ','r','e','q','u','i','r','e','s',' ','a','d','v','a','n','c','e','d',' ','k','n','o','w','l','e','d','g','e',' ','a','b','o','u','t',' ','D','V','D',' ','l','a','y','o','u','t',',',0xa,'b','u','t',' ','a','l','l','o','w','s',' ','p','r','e','c','i','e','s','e',' ','s','e','l','e','c','t','i','o','n',' ','f','o','r',' ','v','i','d','e','o',' ','d','a','t','a','.',0xa,'Y','o','u',' ','c','a','n',' ','s','p','e','c','i','f','y',' ','e','x','a','c','t',' ','t','i','t','l','e',' ','o','r','d','e','r',',',' ','s','p','l','i','t',' ','t','i','t','l','e','s',' ','b','y',' ','c','h','a','p','t','e','r','s','/','c','e','l','l','s',',',' ','a','n','d',0xa,'f','o','r','c','e',' ','a','n','y',' ','t','i','t','l','e',' ','t','o',' ','b','e',' ','r','e','t','a','i','n','e','d','.',0xa,0xa,'E','n','t','e','r',' ','t','h','e',' ','s','t','r','i','n','g',' ','d','e','s','c','r','i','b','i','n','g',' ','t','i','t','l','e','s',' ','a','n','d','/','o','r',' ','c','h','a','p','t','e','r','s','(','c','e','l','l','s',')',' ','y','o','u',' ','w','o','u','l','d',' ','l','i','k','e',' ','t','o',' ','o','p','e','n','.',0xa,'P','l','e','a','s','e',' ','s','e','e',' ','%','1',' ','f','o','r',' ','d','e','t','a','i','l','e','d',' ','s','y','n','t','a','x','.',0,
+'S','i','n','g','l','e',' ','d','r','i','v','e',' ','m','o','d','e',0,
+'Y','o','u',' ','h','a','v','e',' ','m','o','r','e',' ','t','h','a','n',' ','o','n','e',' ','o','p','t','i','c','a','l',' ','d','r','i','v','e','.',' ','W','h','i','c','h',' ','d','r','i','v','e',' ','d','o',' ','y','o','u',' ','w','a','n','t',' ','t','h','i','s',' ','i','n','s','t','a','n','c','e',' ','o','f',' ','M','a','k','e','M','K','V',' ','t','o',' ','w','o','r','k',' ','w','i','t','h','?',0,
+'A','l','l',' ','d','r','i','v','e','s',0,
+'S','e','l','e','c','t',' ','t','h','e',' ','d','r','i','v','e',0,
 '<','b','>','D','r','i','v','e',' ','I','n','f','o','r','m','a','t','i','o','n','<','/','b','>','<','b','r','>',0,
 'C','u','r','r','e','n','t',' ','p','r','o','f','i','l','e',':',' ',0,
 'M','a','n','u','f','a','c','t','u','r','e','r',':',' ',0,
@@ -547,56 +559,57 @@
 'O','S',' ','d','e','v','i','c','e',' ','n','a','m','e',':',' ',0,
 0};
 
-static const unsigned int en_po_off[1063]={
+static const unsigned int en_po_off[1087]={
 1000,0,1001,12,1002,36,1003,53,1004,77,1005,124,1006,135,1007,136,1008,226,1009,275,1010,301,
-2001,320,2002,369,2003,455,2004,509,2006,577,2007,694,2008,849,2009,972,2010,1100,2011,1145,2012,1289,
-2013,1373,2014,1459,2015,1507,2016,1589,2017,1752,2018,1867,2019,1929,2020,1969,2021,2136,2022,2259,2200,2393,
-2201,2411,2202,2435,2203,2464,2204,2494,2205,2523,2206,2546,2207,2563,2208,2583,2209,2604,2210,2627,2300,2652,
-2301,2666,2302,2683,2303,2699,2304,2718,3000,2743,3001,2765,3002,2856,3003,2924,3004,2957,3005,3005,3006,3031,
-3007,3064,3008,3094,3009,3152,3010,3200,3011,3253,3012,3288,3013,3328,3014,3374,3015,3415,3016,3466,3017,3488,
-3018,3515,3019,3555,3020,3625,3021,3701,3022,3762,3023,3796,3024,3870,3025,4010,3026,4125,3027,4207,3028,4263,
-3029,4300,3030,4360,3031,4423,3032,4573,3033,4682,3034,4728,3035,4773,3036,4863,3037,4922,3038,4963,3039,5003,
-3040,5061,3041,5095,3042,5133,3043,5241,3100,5324,3101,5341,3102,5374,3103,5396,3104,5414,3105,5430,3106,5437,
-3107,5450,3108,5459,3109,5472,3110,5485,3111,5497,3200,5517,3201,5546,3202,5564,3203,5575,3204,5593,3210,5690,
-3220,5707,3221,5775,3300,5825,3301,5881,3302,5933,3303,5980,3304,6047,3305,6068,3306,6122,3307,6221,3308,6252,
-3309,6294,3310,6340,3311,6432,3312,6499,3313,6576,3314,6644,3315,6693,3316,6716,3317,6739,3318,6761,3319,6814,
-3320,6876,3321,6936,3322,7014,3323,7066,3324,7125,3325,7171,3326,7224,3327,7297,3328,7361,3329,7410,3330,7503,
-3331,7560,3332,7594,3333,7620,3334,7685,3335,8084,3336,8452,3337,8835,3338,8914,3339,8950,3340,8999,3341,9072,
-3342,9118,3343,9291,3400,9365,3401,9385,3402,9412,3403,9423,3404,9441,3405,9462,3406,9470,3407,9490,4001,9503,
-4002,9586,4003,9652,4004,9717,4007,9800,4008,9862,4009,9920,4020,10031,4021,10066,4022,10118,4023,10150,4024,10214,
-4025,10248,4026,10294,4027,10341,4028,10389,4040,10432,4041,10510,4042,10569,4043,10621,4044,10718,4045,10789,4046,10887,
-4047,10930,4048,10968,4049,11003,4050,11055,4051,11136,4052,11186,4053,11217,4500,11368,4501,11449,4502,11474,4503,11507,
-4504,11541,5000,11593,5001,11618,5002,11670,5003,11687,5004,11722,5005,11749,5006,11765,5007,11788,5008,11811,5009,11852,
-5010,11885,5011,11905,5012,11938,5013,11977,5014,12032,5015,12067,5016,12136,5017,12160,5018,12179,5019,12203,5020,12228,
-5021,12383,5022,12529,5024,12612,5025,12643,5026,12659,5027,12666,5028,12678,5029,12690,5030,12700,5031,12712,5033,12724,
-5036,12735,5037,12767,5038,12810,5039,12975,5040,13156,5041,13382,5042,13529,5043,13579,5044,13675,5045,13688,5046,13702,
-5047,13715,5048,13733,5049,13748,5050,13755,5051,13805,5052,13963,5053,14136,5054,14332,5055,14392,5056,14460,5057,14528,
-5060,14556,5061,14565,5062,14578,5063,14589,5064,14601,5065,14607,5066,14615,5067,14630,5068,14636,5069,14702,5070,14716,
-5071,14728,5072,14905,5073,14938,5074,15018,5075,15144,5076,15195,5077,15256,5078,15295,5079,15357,5080,15400,5081,15415,
-5082,15428,5083,15472,5084,15542,5085,15619,5086,15683,5087,15691,5088,15712,5089,15736,5090,15747,5091,15752,5092,15759,
-5093,15768,5100,15798,5201,15812,5202,15817,5203,15822,5204,15831,5207,15840,5208,15846,5209,15861,5210,15870,5214,15875,
-5215,15884,5216,15890,5217,15907,5218,15919,5219,15935,5220,15946,5221,15959,5222,15970,5223,15976,5224,15986,5225,16002,
-5226,16016,5227,16028,5228,16038,5233,16056,5234,16069,5235,16083,5238,16102,5239,16112,5240,16122,5248,16137,5301,16147,
-5302,16158,5303,16212,5304,16276,5305,16287,5306,16304,5307,16314,5380,16324,5381,16332,6000,16339,6001,16352,6002,16371,
-6003,16390,6005,16424,6006,16445,6007,16459,6008,16541,6010,16555,6011,16567,6012,16574,6013,16618,6014,16625,6015,16650,
-6016,16668,6017,16715,6018,16736,6019,16757,6020,16763,6021,16770,6022,16787,6023,16794,6024,16827,6026,16851,6030,16908,
-6031,16914,6032,16920,6034,16926,6035,16934,6036,16944,6037,16952,6038,16977,6039,16989,6040,17001,6041,17030,6042,17085,
-6043,17098,6044,17126,6045,17139,6046,17152,6047,17174,6048,17184,6050,17208,6051,17253,6052,17346,6053,17358,6054,17374,
-6055,17390,6056,17405,6057,17418,6058,17439,6059,17445,6060,17452,6061,17459,6062,17472,6063,17486,6064,17503,6065,17521,
-6066,17537,6067,17550,6068,17562,6069,17576,6070,17581,6071,17590,6072,17597,6073,17604,6074,17612,6075,17625,6076,17630,
-6077,17654,6078,17685,6079,17740,6080,17810,6081,17818,6082,17823,6083,17842,6084,17866,6085,17886,6086,17891,6087,17924,
-6088,17966,6089,17986,6090,17991,6091,17996,6092,18005,6093,18012,6094,18032,6095,18046,6096,18067,6097,18075,6098,18099,
-6099,18161,6100,18182,6101,18193,6102,18205,6103,18213,6104,18218,6105,18243,6106,18250,6107,18275,6108,18296,6109,18337,
-6110,18354,6111,18365,6112,18382,6119,18396,6120,18426,6121,18455,6122,18484,6123,18518,6124,18549,6125,18581,6126,18601,
-6127,18631,6128,18659,6129,18681,6130,18695,6131,18721,6132,18729,6133,18752,6134,18763,6135,18775,6136,18795,6137,18815,
-6138,18827,6139,19092,6142,19124,6143,19147,6144,19158,6145,19175,6146,19185,6147,19210,6148,19218,6149,19238,6150,19280,
-6151,19304,6152,19344,6153,19353,6154,19374,6156,19395,6157,19400,6158,19405,6159,19431,6161,19444,6162,19458,6163,19484,
-6164,19502,6165,19505,6166,19515,6167,19526,6169,19549,6170,19563,6171,19598,6172,19631,6173,19640,6174,19658,6175,19683,
-6176,19699,6180,19726,6181,19734,6200,19745,6201,19751,6202,19757,6203,19763,6204,19773,6205,19778,6206,19790,6207,19799,
-6209,19813,6210,19826,6211,19837,6212,19852,6213,19864,6214,19873,6215,19884,6216,19893,6220,19901,6221,19925,6222,19938,
-6223,19949,6224,19959,6225,19972,6300,20341,6301,20370,6302,20388,6303,20403,6304,20413,6305,20424,6306,20440,6307,20459,
-6308,20475,6309,20498,6320,20521,6321,20553,6322,20585,6323,20610,6324,20626,6325,20638,6326,20650,6327,20670,6329,20689,
-6330,20710,6331,20743,6332,20776,0};
+1011,320,1012,323,2001,329,2002,378,2003,464,2004,518,2006,586,2007,703,2008,858,2009,981,2010,1109,
+2011,1154,2012,1298,2013,1382,2014,1468,2015,1516,2016,1598,2017,1761,2018,1876,2019,1938,2020,1978,2021,2145,
+2022,2268,2200,2402,2201,2420,2202,2444,2203,2473,2204,2503,2205,2532,2206,2555,2207,2572,2208,2592,2209,2613,
+2210,2636,2300,2661,2301,2675,2302,2692,2303,2708,2304,2727,3000,2752,3001,2774,3002,2865,3003,2933,3004,2966,
+3005,3014,3006,3040,3007,3073,3008,3103,3009,3161,3010,3209,3011,3262,3012,3297,3013,3337,3014,3383,3015,3424,
+3016,3475,3017,3497,3018,3524,3019,3564,3020,3634,3021,3710,3022,3771,3023,3805,3024,3879,3025,4019,3026,4134,
+3027,4216,3028,4272,3029,4309,3030,4369,3031,4432,3032,4582,3033,4691,3034,4737,3035,4782,3036,4872,3037,4931,
+3038,4972,3039,5012,3040,5070,3041,5104,3042,5142,3043,5250,3100,5333,3101,5350,3102,5383,3103,5405,3104,5423,
+3105,5439,3106,5446,3107,5459,3108,5468,3109,5481,3110,5494,3111,5506,3200,5526,3201,5555,3202,5573,3203,5584,
+3204,5602,3210,5699,3220,5716,3221,5784,3300,5834,3301,5890,3302,5942,3303,5989,3304,6056,3305,6077,3306,6131,
+3307,6230,3308,6261,3309,6303,3310,6349,3311,6441,3312,6508,3313,6585,3314,6653,3315,6702,3316,6725,3317,6748,
+3318,6770,3319,6823,3320,6885,3321,6945,3322,7023,3323,7075,3324,7134,3325,7180,3326,7233,3327,7306,3328,7370,
+3329,7419,3330,7512,3331,7569,3332,7603,3333,7629,3334,7694,3335,8093,3336,8461,3337,8844,3338,8923,3339,8959,
+3340,9008,3341,9081,3342,9127,3343,9300,3400,9374,3401,9394,3402,9421,3403,9432,3404,9450,3405,9471,3406,9479,
+3407,9499,4001,9512,4002,9595,4003,9661,4004,9726,4007,9809,4008,9871,4009,9929,4020,10040,4021,10075,4022,10127,
+4023,10159,4024,10223,4025,10257,4026,10303,4027,10350,4028,10398,4040,10441,4041,10519,4042,10578,4043,10630,4044,10727,
+4045,10798,4046,10896,4047,10939,4048,10977,4049,11012,4050,11064,4051,11145,4052,11195,4053,11226,4054,11377,4060,11394,
+4061,11451,4062,11513,4500,11608,4501,11689,4502,11714,4503,11747,4504,11781,5000,11833,5001,11858,5002,11910,5003,11927,
+5004,11962,5005,11989,5006,12005,5007,12028,5008,12051,5009,12092,5010,12125,5011,12145,5012,12178,5013,12217,5014,12272,
+5015,12307,5016,12376,5017,12400,5018,12419,5019,12443,5020,12468,5021,12623,5022,12769,5024,12852,5025,12883,5026,12899,
+5027,12906,5028,12918,5029,12930,5030,12940,5031,12952,5033,12964,5036,12975,5037,13007,5038,13050,5039,13215,5040,13396,
+5041,13622,5042,13769,5043,13819,5044,13915,5045,13928,5046,13942,5047,13955,5048,13973,5049,13988,5050,13995,5051,14045,
+5052,14203,5053,14376,5054,14572,5055,14632,5056,14700,5057,14768,5058,14796,5060,14943,5061,14952,5062,14965,5063,14976,
+5064,14988,5065,14994,5066,15002,5067,15017,5068,15023,5069,15089,5070,15103,5071,15115,5072,15292,5073,15325,5074,15405,
+5075,15531,5076,15582,5077,15643,5078,15682,5079,15744,5080,15787,5081,15802,5082,15815,5083,15859,5084,15929,5085,16006,
+5086,16070,5087,16078,5088,16099,5089,16123,5090,16134,5091,16139,5092,16146,5093,16155,5100,16185,5201,16199,5202,16204,
+5203,16209,5204,16218,5207,16227,5208,16233,5209,16248,5210,16257,5214,16262,5215,16271,5216,16277,5217,16294,5218,16306,
+5219,16322,5220,16333,5221,16346,5222,16357,5223,16363,5224,16373,5225,16389,5226,16403,5227,16415,5228,16425,5233,16443,
+5234,16456,5235,16470,5238,16489,5239,16499,5240,16509,5248,16524,5301,16534,5302,16545,5303,16599,5304,16663,5305,16674,
+5306,16691,5307,16701,5380,16711,5381,16719,6000,16726,6001,16739,6002,16758,6003,16777,6005,16811,6006,16832,6007,16846,
+6008,16928,6010,16942,6011,16954,6012,16961,6013,17005,6014,17012,6015,17037,6016,17055,6017,17102,6018,17123,6019,17144,
+6020,17150,6021,17157,6022,17174,6023,17181,6024,17214,6026,17238,6030,17295,6031,17301,6032,17307,6034,17313,6035,17321,
+6036,17331,6037,17339,6038,17364,6039,17376,6040,17388,6041,17417,6042,17472,6043,17485,6044,17513,6045,17526,6046,17539,
+6047,17561,6048,17571,6050,17595,6051,17640,6052,17733,6053,17745,6054,17761,6055,17777,6056,17792,6057,17805,6058,17826,
+6059,17832,6060,17839,6061,17846,6062,17859,6063,17873,6064,17890,6065,17908,6066,17924,6067,17937,6068,17949,6069,17963,
+6070,17968,6071,17977,6072,17984,6073,17991,6074,17999,6075,18012,6076,18017,6077,18041,6078,18072,6079,18127,6080,18197,
+6081,18205,6082,18210,6083,18229,6084,18253,6085,18273,6086,18278,6087,18311,6088,18353,6089,18373,6090,18378,6091,18383,
+6092,18392,6093,18399,6094,18419,6095,18433,6096,18454,6097,18462,6098,18486,6099,18548,6100,18569,6101,18580,6102,18592,
+6103,18600,6104,18605,6105,18630,6106,18637,6107,18662,6108,18683,6109,18724,6110,18741,6111,18752,6112,18769,6119,18783,
+6120,18813,6121,18842,6122,18871,6123,18905,6124,18936,6125,18968,6126,18988,6127,19018,6128,19046,6129,19068,6130,19082,
+6131,19108,6132,19116,6133,19139,6134,19150,6135,19162,6136,19182,6137,19202,6138,19214,6139,19479,6142,19511,6143,19534,
+6144,19545,6145,19562,6146,19572,6147,19597,6148,19605,6149,19625,6150,19667,6151,19691,6152,19731,6153,19740,6154,19761,
+6156,19782,6157,19787,6158,19792,6159,19818,6161,19831,6162,19845,6163,19871,6164,19889,6165,19892,6166,19902,6167,19913,
+6168,19936,6169,19964,6170,19978,6171,20013,6172,20046,6173,20055,6174,20073,6175,20098,6176,20114,6180,20141,6181,20149,
+6200,20160,6201,20166,6202,20172,6203,20178,6204,20188,6205,20193,6206,20205,6207,20214,6209,20228,6210,20241,6211,20252,
+6212,20267,6213,20279,6214,20288,6215,20299,6216,20308,6220,20316,6221,20340,6222,20353,6223,20364,6224,20374,6225,20387,
+6226,20756,6227,20774,6228,20875,6229,20886,6300,20903,6301,20932,6302,20950,6303,20965,6304,20975,6305,20986,6306,21002,
+6307,21021,6308,21037,6309,21060,6320,21083,6321,21115,6322,21147,6323,21172,6324,21188,6325,21200,6326,21212,6327,21232,
+6329,21251,6330,21272,6331,21305,6332,21338,0};
 
 extern "C" const unsigned short * en_po_getstr_utf16(unsigned int code)
 {

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/uisync.cpp -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/uisync.cpp Changed

makemkv-oss-1.9.0.tar.gz/makemkvgui/src/viteminfo.cpp -> makemkv-oss-1.9.5.tar.xz/makemkvgui/src/viteminfo.cpp Changed

Changes of Revision 34