Packman Build Service PMBS

makemkv.changes Changed

makemkv.spec Changed

makemkv-bin-1.9.5.tar.xz/Makefile -> makemkv-bin-1.10.2.tar.xz/Makefile Changed

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

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

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

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

@@ -1,4 +1,4 @@
-Copyright (C) 2007-2015 GuinpinSoft inc
+Copyright (C) 2007-2016 GuinpinSoft inc
 
 IMPORTANT NOTE
 
@@ -64,9 +64,352 @@
 Any variation to the terms of this Agreement shall only be valid if made in writing by GuinpinSoft inc.
 
 Appendix A
-This installation package does not contain any Open-source Software components.
+List of Open-source Software components
+
+The java application in file blues.jar is licensed under GNU GPL. All other files and files without explicit license information are licensed under terms of this Agreement.
 
 Appendix B
-There are no open-source licenses applicable to this package.
+Full text of open-source licenses:
+
+-------------------------------------------------------------------------------
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not

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

makemkv-bin-1.10.2.tar.xz/src/share/blues.jar Added

makemkv-bin-1.9.5.tar.xz/src/share/makemkv_chi.mo.gz -> makemkv-bin-1.10.2.tar.xz/src/share/makemkv_chi.mo.gz Changed

makemkv-bin-1.9.5.tar.xz/src/share/makemkv_dan.mo.gz -> makemkv-bin-1.10.2.tar.xz/src/share/makemkv_dan.mo.gz Changed

makemkv-bin-1.9.5.tar.xz/src/share/makemkv_deu.mo.gz -> makemkv-bin-1.10.2.tar.xz/src/share/makemkv_deu.mo.gz Changed

makemkv-bin-1.9.5.tar.xz/src/share/makemkv_dut.mo.gz -> makemkv-bin-1.10.2.tar.xz/src/share/makemkv_dut.mo.gz Changed

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

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

makemkv-bin-1.9.5.tar.xz/src/share/makemkv_jpn.mo.gz -> makemkv-bin-1.10.2.tar.xz/src/share/makemkv_jpn.mo.gz Changed

makemkv-bin-1.9.5.tar.xz/src/share/makemkv_nor.mo.gz -> makemkv-bin-1.10.2.tar.xz/src/share/makemkv_nor.mo.gz Changed

makemkv-bin-1.10.2.tar.xz/src/share/makemkv_per.mo.gz Added

makemkv-bin-1.9.5.tar.xz/src/share/makemkv_pol.mo.gz -> makemkv-bin-1.10.2.tar.xz/src/share/makemkv_pol.mo.gz Changed

makemkv-bin-1.9.5.tar.xz/src/share/makemkv_ptb.mo.gz -> makemkv-bin-1.10.2.tar.xz/src/share/makemkv_ptb.mo.gz Changed

makemkv-bin-1.9.5.tar.xz/src/share/makemkv_spa.mo.gz -> makemkv-bin-1.10.2.tar.xz/src/share/makemkv_spa.mo.gz Changed

makemkv-bin-1.9.5.tar.xz/src/share/makemkv_swe.mo.gz -> makemkv-bin-1.10.2.tar.xz/src/share/makemkv_swe.mo.gz Changed

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

makemkv-oss-1.9.5.tar.xz/libebml/inc/ebml/Debug.h -> makemkv-oss-1.10.2.tar.xz/libebml/inc/ebml/Debug.h Changed

@@ -11,17 +11,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -29,10 +29,10 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: Debug.h 639 2004-07-09 20:59:14Z mosu $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-	\author Moritz Bunkus <moritz @ bunkus.org>
+  \file
+  \version \$Id: Debug.h 639 2004-07-09 20:59:14Z mosu $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
+  \author Moritz Bunkus <moritz @ bunkus.org>
 */
 #ifndef LIBEBML_DEBUG_H
 #define LIBEBML_DEBUG_H
@@ -55,50 +55,50 @@
 #if defined(LIBEBML_DEBUG_TRACE)
 // define the working debugging class
 
-class EBML_DLL_API ADbg  
+class EBML_DLL_API ADbg
 {
 public:
-	ADbg(int level = 0);
-	virtual ~ADbg();
+  ADbg(int level = 0);
+  virtual ~ADbg();
 
-	/// \todo make an inline function to test the level first and the process
-	int OutPut(int level, const char * format,...) const;
+  /// \todo make an inline function to test the level first and the process
+  int OutPut(int level, const char * format,...) const;
 
-	int OutPut(const char * format,...) const;
+  int OutPut(const char * format,...) const;
 
-	inline int setLevel(const int level) {
-		return my_level = level;
-	}
+  inline int setLevel(const int level) {
+    return my_level = level;
+  }
 
-	inline bool setIncludeTime(const bool included = true) {
-		return my_time_included = included;
-	}
+  inline bool setIncludeTime(const bool included = true) {
+    return my_time_included = included;
+  }
 
-	bool setDebugFile(const char * NewFilename);
-	bool unsetDebugFile();
+  bool setDebugFile(const char * NewFilename);
+  bool unsetDebugFile();
 
-	inline bool setUseFile(const bool usefile = true) {
-		return my_use_file = usefile;
-	}
+  inline bool setUseFile(const bool usefile = true) {
+    return my_use_file = usefile;
+  }
 
-	inline const char * setPrefix(const char * string) {
-		return strncpy(prefix, string, MAX_PREFIX_LENGTH);
-	}
+  inline const char * setPrefix(const char * string) {
+    return strncpy(prefix, string, MAX_PREFIX_LENGTH);
+  }
 
 private:
-	int my_level;
-	bool my_time_included;
-	bool my_use_file;
-	bool my_debug_output;
+  int my_level;
+  bool my_time_included;
+  bool my_use_file;
+  bool my_debug_output;
 
-	int _OutPut(const char * format,va_list params) const;
+  int _OutPut(const char * format,va_list params) const;
 
-	char prefix[MAX_PREFIX_LENGTH];
+  char prefix[MAX_PREFIX_LENGTH];
 
 #ifdef WIN32
-	HANDLE hFile;
+  HANDLE hFile;
 #else
-	FILE *hFile;
+  FILE *hFile;
 #endif // WIN32
 };
 
@@ -109,40 +109,40 @@
 class EBML_DLL_API ADbg
 {
 public:
-	ADbg(int /* level */ = 0){}
-	virtual ~ADbg() {}
+  ADbg(int /* level */ = 0){}
+  virtual ~ADbg() {}
 
-	inline int OutPut(int /* level */, const char * /* format */,...) const {
-		return 0;
-	}
+  inline int OutPut(int /* level */, const char * /* format */,...) const {
+    return 0;
+  }
 
-	inline int OutPut(const char * /* format */,...) const {
-		return 0;
-	}
+  inline int OutPut(const char * /* format */,...) const {
+    return 0;
+  }
 
-	inline int setLevel(const int level) {
-		return level;
-	}
+  inline int setLevel(const int level) {
+    return level;
+  }
 
-	inline bool setIncludeTime(const bool /* included */ = true) {
-		return true;
-	}
+  inline bool setIncludeTime(const bool /* included */ = true) {
+    return true;
+  }
 
-	inline bool setDebugFile(const char * /* NewFilename */) {
-		return true;
-	}
+  inline bool setDebugFile(const char * /* NewFilename */) {
+    return true;
+  }
 
-	inline bool unsetDebugFile() {
-		return true;
-	}
+  inline bool unsetDebugFile() {
+    return true;
+  }
 
-	inline bool setUseFile(const bool /* usefile */ = true) {
-		return true;
-	}
+  inline bool setUseFile(const bool /* usefile */ = true) {
+    return true;
+  }
 
-	inline const char * setPrefix(const char * string) {
-		return string;
-	}
+  inline const char * setPrefix(const char * string) {
+    return string;
+  }
 };
 
 #endif // defined(LIBEBML_DEBUG_TRACE)

makemkv-oss-1.9.5.tar.xz/libebml/inc/ebml/EbmlBinary.h -> makemkv-oss-1.10.2.tar.xz/libebml/inc/ebml/EbmlBinary.h Changed

@@ -11,17 +11,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -29,10 +29,10 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id$
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-	\author Julien Coloos	<suiryc @ users.sf.net>
+  \file
+  \version \$Id$
+  \author Steve Lhomme     <robux4 @ users.sf.net>
+  \author Julien Coloos  <suiryc @ users.sf.net>
 */
 #ifndef LIBEBML_BINARY_H
 #define LIBEBML_BINARY_H
@@ -54,51 +54,51 @@
     \class EbmlBinary
     \brief Handle all operations on an EBML element that contains "unknown" binary data
 
-	\todo handle fix sized elements (like UID of CodecID)
+  \todo handle fix sized elements (like UID of CodecID)
 */
 class EBML_DLL_API EbmlBinary : public EbmlElement {
-	public:
-		EbmlBinary();
-		EbmlBinary(const EbmlBinary & ElementToClone);
-		virtual ~EbmlBinary(void);
-	
-		virtual bool ValidateSize() const {return IsFiniteSize() && GetSize() < 0x7FFFFFFF;} // we don't mind about what's inside
-
-		filepos_t RenderData(IOCallback & output, bool bForceRender, bool bWithDefault = false);
-		filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA);
-		filepos_t UpdateSize(bool bWithDefault = false, bool bForceRender = false);
-	
-		void SetBuffer(const binary *Buffer, const uint32 BufferSize) {
-			Data = (binary *) Buffer;
-			SetSize_(BufferSize);
-			SetValueIsSet();
-		}
-
-		binary *GetBuffer() const {return Data;}
-		
-		void CopyBuffer(const binary *Buffer, size_t BufferSize) {
-			if (Data != NULL)
-				free(Data);
-			Data = (binary *)malloc(BufferSize * sizeof(binary));
-			memcpy(Data, Buffer, BufferSize);
-			SetSize_(BufferSize);
-			SetValueIsSet();
-		}
-		
-		operator const binary &() const;
-	
-		bool IsDefaultValue() const {
-			return false;
-		}
-
-		bool operator==(const EbmlBinary & ElementToCompare) const;
+  public:
+    EbmlBinary();
+    EbmlBinary(const EbmlBinary & ElementToClone);
+    virtual ~EbmlBinary(void);
+
+    virtual bool ValidateSize() const {return IsFiniteSize() && GetSize() < 0x7FFFFFFF;} // we don't mind about what's inside
+
+    filepos_t RenderData(IOCallback & output, bool bForceRender, bool bWithDefault = false);
+    filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA);
+    filepos_t UpdateSize(bool bWithDefault = false, bool bForceRender = false);
+
+    void SetBuffer(const binary *Buffer, const uint32 BufferSize) {
+      Data = (binary *) Buffer;
+      SetSize_(BufferSize);
+      SetValueIsSet();
+    }
+
+    binary *GetBuffer() const {return Data;}
+
+    void CopyBuffer(const binary *Buffer, const uint32 BufferSize) {
+      if (Data != NULL)
+        free(Data);
+      Data = (binary *)malloc(BufferSize * sizeof(binary));
+      memcpy(Data, Buffer, BufferSize);
+      SetSize_(BufferSize);
+      SetValueIsSet();
+    }
+
+    operator const binary &() const;
+
+    bool IsDefaultValue() const {
+      return false;
+    }
+
+    bool operator==(const EbmlBinary & ElementToCompare) const;
 
 #if defined(EBML_STRICT_API)
-	private:
+  private:
 #else
-	protected:
+  protected:
 #endif
-		binary *Data; // the binary data inside the element
+    binary *Data; // the binary data inside the element
 };
 
 END_LIBEBML_NAMESPACE

makemkv-oss-1.9.5.tar.xz/libebml/inc/ebml/EbmlConfig.h -> makemkv-oss-1.10.2.tar.xz/libebml/inc/ebml/EbmlConfig.h Changed

@@ -9,17 +9,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -27,15 +27,19 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: EbmlConfig.h 1241 2006-01-25 00:59:45Z robux4 $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-	\author Moritz Bunkus <moritz @ bunkus.org>
+  \file
+  \version \$Id: EbmlConfig.h 1241 2006-01-25 00:59:45Z robux4 $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
+  \author Moritz Bunkus <moritz @ bunkus.org>
 */
 
 #ifndef LIBEBML_CONFIG_H
 #define LIBEBML_CONFIG_H
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #if defined(__linux__)
 #include <endian.h>
 #if __BYTE_ORDER == __LITTLE_ENDIAN
@@ -100,6 +104,13 @@
 #define LIBEBML_DEBUG
 #endif
 
+#ifdef HAVE_WINAPIFAMILY_H
+# include <winapifamily.h>
+# if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+#  undef LIBEBML_DEBUG
+# endif
+#endif
+
 // For compilers that don't define __TIMESTAMP__ (e.g. gcc 2.95, gcc 3.2)
 #ifndef __TIMESTAMP__
 #define __TIMESTAMP__ __DATE__ " " __TIME__

makemkv-oss-1.9.5.tar.xz/libebml/inc/ebml/EbmlContexts.h -> makemkv-oss-1.10.2.tar.xz/libebml/inc/ebml/EbmlContexts.h Changed

@@ -11,17 +11,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -29,9 +29,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: EbmlContexts.h 736 2004-08-28 14:05:09Z robux4 $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: EbmlContexts.h 736 2004-08-28 14:05:09Z robux4 $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBEBML_CONTEXTS_H
 #define LIBEBML_CONTEXTS_H
@@ -51,10 +51,10 @@
 extern const EbmlSemanticContext EBML_DLL_API EDocTypeReadVersion_Context;
 
 #define Context_EbmlHead EbmlHead_Context
-	
+
 // global elements
 extern const EbmlSemanticContext EBML_DLL_API & GetEbmlGlobal_Context();
-	
+
 END_LIBEBML_NAMESPACE
 
 #endif // LIBEBML_CONTEXTS_H

makemkv-oss-1.9.5.tar.xz/libebml/inc/ebml/EbmlCrc32.h -> makemkv-oss-1.10.2.tar.xz/libebml/inc/ebml/EbmlCrc32.h Changed

@@ -11,17 +11,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -29,10 +29,10 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id$
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-	\author Jory Stone       <jcsston @ toughguy.net>
+  \file
+  \version \$Id$
+  \author Steve Lhomme     <robux4 @ users.sf.net>
+  \author Jory Stone       <jcsston @ toughguy.net>
 */
 #ifndef LIBEBML_CRC32_H
 #define LIBEBML_CRC32_H
@@ -45,58 +45,58 @@
 START_LIBEBML_NAMESPACE
 
 DECLARE_EBML_BINARY(EbmlCrc32)
-	public:
-		EbmlCrc32(const EbmlCrc32 & ElementToClone);
-		virtual bool ValidateSize() const {return IsFiniteSize() && (GetSize() == 4);}
-		filepos_t RenderData(IOCallback & output, bool bForceRender, bool bWithDefault = false);
-		filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA);
-//		filepos_t UpdateSize(bool bWithDefault = false);
-		
-		bool IsDefaultValue() const {
-			return false;
-		}
-
-		void AddElementCRC32(EbmlElement &ElementToCRC);
-		bool CheckElementCRC32(EbmlElement &ElementToCRC);
-		
-		/*!
-			Use this to quickly check a CRC32 with some data
-			\return True if inputCRC matches CRC32 generated from input data
-		*/
-		static bool CheckCRC(uint32 inputCRC, const binary *input, uint32 length);
-		/*!
-			Calls Update() and Finalize(), use to create a CRC32 in one go
-		*/
-		void FillCRC32(const binary *input, uint32 length);
-		/*!
-			Add data to the CRC table, in other words process some data bit by bit
-		*/
-		void Update(const binary *input, uint32 length);
-		/*!
-			Use this with Update() to Finalize() or Complete the CRC32
-		*/
-		void Finalize();
-		/*!
-			Returns a uint32 that has the value of the CRC32
-		*/
-		uint32 GetCrc32() const {
-			return m_crc_final;
-		};
-	
-		void ForceCrc32(uint32 NewValue) { m_crc_final = NewValue; SetValueIsSet();}
+  public:
+    EbmlCrc32(const EbmlCrc32 & ElementToClone);
+    virtual bool ValidateSize() const {return IsFiniteSize() && (GetSize() == 4);}
+    filepos_t RenderData(IOCallback & output, bool bForceRender, bool bWithDefault = false);
+    filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA);
+//    filepos_t UpdateSize(bool bWithDefault = false);
+
+    bool IsDefaultValue() const {
+      return false;
+    }
+
+    void AddElementCRC32(EbmlElement &ElementToCRC);
+    bool CheckElementCRC32(EbmlElement &ElementToCRC);
+
+    /*!
+      Use this to quickly check a CRC32 with some data
+      \return True if inputCRC matches CRC32 generated from input data
+    */
+    static bool CheckCRC(uint32 inputCRC, const binary *input, uint32 length);
+    /*!
+      Calls Update() and Finalize(), use to create a CRC32 in one go
+    */
+    void FillCRC32(const binary *input, uint32 length);
+    /*!
+      Add data to the CRC table, in other words process some data bit by bit
+    */
+    void Update(const binary *input, uint32 length);
+    /*!
+      Use this with Update() to Finalize() or Complete the CRC32
+    */
+    void Finalize();
+    /*!
+      Returns a uint32 that has the value of the CRC32
+    */
+    uint32 GetCrc32() const {
+      return m_crc_final;
+    };
+
+    void ForceCrc32(uint32 NewValue) { m_crc_final = NewValue; SetValueIsSet();}
 
 #if defined(EBML_STRICT_API)
     private:
 #else
     protected:
 #endif
-		void ResetCRC();
-		void UpdateByte(binary b);
+    void ResetCRC();
+    void UpdateByte(binary b);
+
+    static const uint32 m_tab[256];
+    uint32 m_crc;
+    uint32 m_crc_final;
 
-		static const uint32 m_tab[256];
-		uint32 m_crc;
-		uint32 m_crc_final;
-        
         EBML_CONCRETE_CLASS(EbmlCrc32)
 };
 
@@ -104,36 +104,36 @@
 inline unsigned int GetAlignment(T * /* dummy */=NULL) // VC60 workaround
 {
 #if defined(_MSC_VER) && (_MSC_VER >= 1300)
-	return __alignof(T);
+  return __alignof(T);
 #elif defined(__GNUC__)
-	return __alignof__(T);
+  return __alignof__(T);
 #else
-	return sizeof(T);
+  return sizeof(T);
 #endif
 }
 
 template <class T>
 inline bool IsPowerOf2(T n)
 {
-	return n > 0 && (n & (n-1)) == 0;
+  return n > 0 && (n & (n-1)) == 0;
 }
 
 template <class T1, class T2>
 inline T2 ModPowerOf2(T1 a, T2 b)
 {
-	assert(IsPowerOf2(b));
-	return T2(a) & (b-1);
+  assert(IsPowerOf2(b));
+  return T2(a) & (b-1);
 }
 
 inline bool IsAlignedOn(const void *p, unsigned int alignment)
 {
-	return IsPowerOf2(alignment) ? ModPowerOf2((unsigned long)(uintptr_t)p, alignment) == 0 : (unsigned long)(uintptr_t)p % alignment == 0;
+  return IsPowerOf2(alignment) ? ModPowerOf2((unsigned long)(uintptr_t)p, alignment) == 0 : (unsigned long)(uintptr_t)p % alignment == 0;
 }
 
 template <class T>
 inline bool IsAligned(const void *p, T * /* dummy */=NULL)	// VC60 workaround
 {
-	return IsAlignedOn(p, GetAlignment<T>());
+  return IsAlignedOn(p, GetAlignment<T>());
 }
 
 END_LIBEBML_NAMESPACE

makemkv-oss-1.9.5.tar.xz/libebml/inc/ebml/EbmlDate.h -> makemkv-oss-1.10.2.tar.xz/libebml/inc/ebml/EbmlDate.h Changed

@@ -17,9 +17,9 @@
 **
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -27,9 +27,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id$
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id$
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBEBML_DATE_H
 #define LIBEBML_DATE_H
@@ -44,55 +44,55 @@
     \brief Handle all operations related to an EBML date
 */
 class EBML_DLL_API EbmlDate : public EbmlElement {
-	public:
-		EbmlDate() :EbmlElement(8, false), myDate(0) {}
-		EbmlDate(const EbmlDate & ElementToClone);
-
-		/*!
-			\brief set the date with a UNIX/C/EPOCH form
-			\param NewDate UNIX/C date in UTC (no timezone)
-		*/
-		void SetEpochDate(int64 NewDate) {myDate = (NewDate - UnixEpochDelay) * 1000000000; SetValueIsSet();}
+  public:
+    EbmlDate() :EbmlElement(8, false), myDate(0) {}
+    EbmlDate(const EbmlDate & ElementToClone);
+
+    /*!
+      \brief set the date with a UNIX/C/EPOCH form
+      \param NewDate UNIX/C date in UTC (no timezone)
+    */
+    void SetEpochDate(int64 NewDate) {myDate = (NewDate - UnixEpochDelay) * 1000000000; SetValueIsSet();}
     EbmlDate &SetValue(int64 NewValue) {SetEpochDate(NewValue); return *this;}
 
-		/*!
-			\brief get the date with a UNIX/C/EPOCH form
-			\note the date is in UTC (no timezone)
-		*/
-		int64 GetEpochDate() const {return int64(myDate/1000000000 + UnixEpochDelay);}
+    /*!
+      \brief get the date with a UNIX/C/EPOCH form
+      \note the date is in UTC (no timezone)
+    */
+    int64 GetEpochDate() const {return int64(myDate/1000000000 + UnixEpochDelay);}
     int64 GetValue() const {return GetEpochDate();}
 
-		virtual bool ValidateSize() const {return IsFiniteSize() && ((GetSize() == 8) || (GetSize() == 0));}
+    virtual bool ValidateSize() const {return IsFiniteSize() && ((GetSize() == 8) || (GetSize() == 0));}
 
-		/*!
-			\note no Default date handled
-		*/
-		filepos_t UpdateSize(bool /* bWithDefault = false */, bool /* bForceRender = false */) {
-			if(!ValueIsSet())
-				SetSize_(0);
-			else
-				SetSize_(8);
-			return GetSize();
-		}
+    /*!
+      \note no Default date handled
+    */
+    filepos_t UpdateSize(bool /* bWithDefault = false */, bool /* bForceRender = false */) {
+      if(!ValueIsSet())
+        SetSize_(0);
+      else
+        SetSize_(8);
+      return GetSize();
+    }
 
-		virtual bool IsSmallerThan(const EbmlElement *Cmp) const;
+    virtual bool IsSmallerThan(const EbmlElement *Cmp) const;
 
-		filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA);
+    filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA);
 
-		bool IsDefaultValue() const {
-			return false;
-		}
+    bool IsDefaultValue() const {
+      return false;
+    }
 
 #if defined(EBML_STRICT_API)
     private:
 #else
     protected:
 #endif
-		filepos_t RenderData(IOCallback & output, bool bForceRender, bool bWithDefault = false);
+    filepos_t RenderData(IOCallback & output, bool bForceRender, bool bWithDefault = false);
 
-		int64 myDate; ///< internal format of the date
+    int64 myDate; ///< internal format of the date
 
-		static const uint64 UnixEpochDelay;
+    static const uint64 UnixEpochDelay;
 };
 
 END_LIBEBML_NAMESPACE

makemkv-oss-1.9.5.tar.xz/libebml/inc/ebml/EbmlDummy.h -> makemkv-oss-1.10.2.tar.xz/libebml/inc/ebml/EbmlDummy.h Changed

@@ -11,17 +11,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -29,9 +29,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id$
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id$
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBEBML_DUMMY_H
 #define LIBEBML_DUMMY_H
@@ -41,13 +41,13 @@
 START_LIBEBML_NAMESPACE
 
 class EBML_DLL_API EbmlDummy : public EbmlBinary {
-	public:
-		EbmlDummy() :DummyId(DummyRawId) {}
-		EbmlDummy(const EbmlId & aId) :EbmlBinary(), DummyId(aId) {}
-		EbmlDummy(const EbmlDummy & ElementToClone):EbmlBinary(ElementToClone), DummyId(ElementToClone.DummyId) {}
+  public:
+    EbmlDummy() :DummyId(DummyRawId) {}
+    EbmlDummy(const EbmlId & aId) :EbmlBinary(), DummyId(aId) {}
+    EbmlDummy(const EbmlDummy & ElementToClone):EbmlBinary(ElementToClone), DummyId(ElementToClone.DummyId) {}
 
-		bool IsDummy() const {return true;}
-		bool IsDefaultValue() const {return true;}
+    bool IsDummy() const {return true;}
+    bool IsDefaultValue() const {return true;}
 
         virtual operator const EbmlId &() const {
             return DummyId;
@@ -58,8 +58,8 @@
 #else
     protected:
 #endif
-		const EbmlId DummyId;
-		static const EbmlId DummyRawId;
+    const EbmlId DummyId;
+    static const EbmlId DummyRawId;
 
         EBML_CONCRETE_DUMMY_CLASS(EbmlDummy)
 };

makemkv-oss-1.9.5.tar.xz/libebml/inc/ebml/EbmlElement.h -> makemkv-oss-1.10.2.tar.xz/libebml/inc/ebml/EbmlElement.h Changed

@@ -17,9 +17,9 @@
 **
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -27,9 +27,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id$
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id$
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBEBML_ELEMENT_H
 #define LIBEBML_ELEMENT_H
@@ -41,36 +41,36 @@
 START_LIBEBML_NAMESPACE
 
 /*!
-	\brief The size of the EBML-coded length
+  \brief The size of the EBML-coded length
 */
 int EBML_DLL_API CodedSizeLength(uint64 Length, unsigned int SizeLength, bool bSizeIsFinite = true);
 
 /*!
-	\brief The coded value of the EBML-coded length
-	\note The size of OutBuffer must be 8 octets at least
+  \brief The coded value of the EBML-coded length
+  \note The size of OutBuffer must be 8 octets at least
 */
 int EBML_DLL_API CodedValueLength(uint64 Length, int CodedSize, binary * OutBuffer);
 
 /*!
-	\brief Read an EBML-coded value from a buffer
-	\return the value read
+  \brief Read an EBML-coded value from a buffer
+  \return the value read
 */
 uint64 EBML_DLL_API ReadCodedSizeValue(const binary * InBuffer, uint32 & BufferSize, uint64 & SizeUnknown);
 
 /*!
-	\brief The size of the EBML-coded signed length
+  \brief The size of the EBML-coded signed length
 */
 int EBML_DLL_API CodedSizeLengthSigned(int64 Length, unsigned int SizeLength);
 
 /*!
-	\brief The coded value of the EBML-coded signed length
-	\note the size of OutBuffer must be 8 octets at least
+  \brief The coded value of the EBML-coded signed length
+  \note the size of OutBuffer must be 8 octets at least
 */
 int EBML_DLL_API CodedValueLengthSigned(int64 Length, int CodedSize, binary * OutBuffer);
 
 /*!
-	\brief Read a signed EBML-coded value from a buffer
-	\return the value read
+  \brief Read a signed EBML-coded value from a buffer
+  \return the value read
 */
 int64 EBML_DLL_API ReadCodedSizeSignedValue(const binary * InBuffer, uint32 & BufferSize, uint64 & SizeUnknown);
 
@@ -176,25 +176,25 @@
     public: \
         virtual const EbmlSemanticContext &Context() const {return ClassInfos.GetContext();} \
         virtual const char *DebugName() const {return ClassInfos.GetName();} \
-		virtual operator const EbmlId &() const {return ClassInfos.ClassId();} \
+    virtual operator const EbmlId &() const {return ClassInfos.ClassId();} \
         virtual EbmlElement & CreateElement() const {return Create();} \
         virtual EbmlElement * Clone() const { return new Type(*this); } \
-		static EbmlElement & Create() {return *(new Type);} \
+    static EbmlElement & Create() {return *(new Type);} \
         static const EbmlCallbacks & ClassInfo() {return ClassInfos;} \
         static const EbmlId & ClassId() {return ClassInfos.ClassId();} \
     private: \
-		static const EbmlCallbacks ClassInfos; \
+    static const EbmlCallbacks ClassInfos; \
 
 #define EBML_CONCRETE_DUMMY_CLASS(Type) \
     public: \
         virtual const EbmlSemanticContext &Context() const {return *static_cast<EbmlSemanticContext*>(NULL);} \
         virtual const char *DebugName() const {return "DummyElement";} \
-		virtual operator const EbmlId &(); \
+    virtual operator const EbmlId &(); \
         virtual EbmlElement & CreateElement() const {return Create();} \
         virtual EbmlElement * Clone() const { return new Type(*this); } \
-		static EbmlElement & Create() {return *(new Type);} \
+    static EbmlElement & Create() {return *(new Type);} \
         static const EbmlId & ClassId(); \
-		static const EbmlCallbacks ClassInfos; \
+    static const EbmlCallbacks ClassInfos; \
 
 
 #define EBML_INFO(ref)             ref::ClassInfo()
@@ -223,21 +223,21 @@
 #else
 #define EBML_CONCRETE_CLASS(Type) \
     public: \
-		virtual const EbmlCallbacks & Generic() const {return ClassInfos;} \
-		virtual operator const EbmlId &() const {return ClassInfos.GlobalId;} \
+    virtual const EbmlCallbacks & Generic() const {return ClassInfos;} \
+    virtual operator const EbmlId &() const {return ClassInfos.GlobalId;} \
         virtual EbmlElement & CreateElement() const {return Create();} \
         virtual EbmlElement * Clone() const { return new Type(*this); } \
-		static EbmlElement & Create() {return *(new Type);} \
-		static const EbmlCallbacks ClassInfos; \
+    static EbmlElement & Create() {return *(new Type);} \
+    static const EbmlCallbacks ClassInfos; \
 
 #define EBML_CONCRETE_DUMMY_CLASS(Type) \
     public: \
-		virtual const EbmlCallbacks & Generic() const {return ClassInfos;} \
-		virtual operator const EbmlId &(); \
+    virtual const EbmlCallbacks & Generic() const {return ClassInfos;} \
+    virtual operator const EbmlId &(); \
         virtual EbmlElement & CreateElement() const {return Create();} \
         virtual EbmlElement * Clone() const { return new Type(*this); } \
-		static EbmlElement & Create() {return *(new Type);} \
-		static const EbmlCallbacks ClassInfos; \
+    static EbmlElement & Create() {return *(new Type);} \
+    static const EbmlCallbacks ClassInfos; \
 
 
 #define EBML_INFO(ref)             ref::ClassInfos
@@ -282,11 +282,11 @@
 
 // functions for generic handling of data (should be static to all classes)
 /*!
-	\todo Handle default value
+  \todo Handle default value
 */
 class EBML_DLL_API EbmlCallbacks {
-	public:
-		EbmlCallbacks(EbmlElement & (*Creator)(), const EbmlId & aGlobalId, const char * aDebugName, const EbmlSemanticContext & aContext);
+  public:
+    EbmlCallbacks(EbmlElement & (*Creator)(), const EbmlId & aGlobalId, const char * aDebugName, const EbmlSemanticContext & aContext);
 
         inline const EbmlId & ClassId() const { return GlobalId; }
         inline const EbmlSemanticContext & GetContext() const { return Context; }
@@ -296,20 +296,20 @@
 #if defined(EBML_STRICT_API)
     private:
 #endif
-		EbmlElement & (*Create)();
-		const EbmlId & GlobalId;
-		const char * DebugName;
-		const EbmlSemanticContext & Context;
+    EbmlElement & (*Create)();
+    const EbmlId & GlobalId;
+    const char * DebugName;
+    const EbmlSemanticContext & Context;
 };
 
 /*!
-	\brief contains the semantic informations for a given level and all sublevels
-	\todo move the ID in the element class
+  \brief contains the semantic informations for a given level and all sublevels
+  \todo move the ID in the element class
 */
 class EBML_DLL_API EbmlSemantic {
-	public:
-		EbmlSemantic(bool aMandatory, bool aUnique, const EbmlCallbacks & aGetCallbacks)
-			:Mandatory(aMandatory), Unique(aUnique), GetCallbacks(aGetCallbacks) {}
+  public:
+    EbmlSemantic(bool aMandatory, bool aUnique, const EbmlCallbacks & aGetCallbacks)
+      :Mandatory(aMandatory), Unique(aUnique), GetCallbacks(aGetCallbacks) {}
 
         inline bool IsMandatory() const { return Mandatory; }
         inline bool IsUnique() const { return Unique; }
@@ -319,176 +319,176 @@
 #if defined(EBML_STRICT_API)
     private:
 #endif
-		bool Mandatory; ///< wether the element is mandatory in the context or not
-		bool Unique;
-		const EbmlCallbacks & GetCallbacks;
+    bool Mandatory; ///< wether the element is mandatory in the context or not
+    bool Unique;
+    const EbmlCallbacks & GetCallbacks;
 };
 
 typedef const class EbmlSemanticContext & (*_GetSemanticContext)();
 
 /*!
-	Context of the element
-	\todo allow more than one parent ?
+  Context of the element
+  \todo allow more than one parent ?
 */
 class EBML_DLL_API EbmlSemanticContext {

makemkv-oss-1.9.5.tar.xz/libebml/inc/ebml/EbmlEndian.h -> makemkv-oss-1.10.2.tar.xz/libebml/inc/ebml/EbmlEndian.h Changed

@@ -11,17 +11,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -58,63 +58,63 @@
 template<class TYPE, endianess ENDIAN> class Endian
 {
     public:
-	    Endian() {}
+      Endian() {}
 
-	    Endian(const TYPE value)
-	    {
-		    memcpy(&platform_value, &value, sizeof(TYPE));
-		    process_endian();
-	    }
+      Endian(const TYPE value)
+      {
+        memcpy(&platform_value, &value, sizeof(TYPE));
+        process_endian();
+      }
 
-	    inline Endian & Eval(const binary *endian_buffer)
-	    {
-	        //endian_value = *(TYPE *)(endian_buffer);
-	        memcpy(&endian_value, endian_buffer, sizeof(TYPE));	// Some (all?) RISC processors do not allow reading objects bigger than 1 byte from non-aligned addresses, and endian_buffer may point to a non-aligned address.
-	        process_platform();
-	        return *this;
-	    }
+      inline Endian & Eval(const binary *endian_buffer)
+      {
+          //endian_value = *(TYPE *)(endian_buffer);
+          memcpy(&endian_value, endian_buffer, sizeof(TYPE));  // Some (all?) RISC processors do not allow reading objects bigger than 1 byte from non-aligned addresses, and endian_buffer may point to a non-aligned address.
+          process_platform();
+          return *this;
+      }
 
-	    inline void Fill(binary *endian_buffer) const
-	    {
-	        //*(TYPE*)endian_buffer = endian_value;
-	        memcpy(endian_buffer, &endian_value, sizeof(TYPE)); // See above.
-	    }
+      inline void Fill(binary *endian_buffer) const
+      {
+          //*(TYPE*)endian_buffer = endian_value;
+          memcpy(endian_buffer, &endian_value, sizeof(TYPE)); // See above.
+      }
 
-	    inline operator const TYPE&() const { return platform_value; }
-    //	inline TYPE endian() const   { return endian_value; }
-	    inline const TYPE &endian() const       { return endian_value; }
-	    inline size_t size() const   { return sizeof(TYPE); }
-	    inline bool operator!=(const binary *buffer) const {return *((TYPE*)buffer) == platform_value;}
+      inline operator const TYPE&() const { return platform_value; }
+    //  inline TYPE endian() const   { return endian_value; }
+      inline const TYPE &endian() const       { return endian_value; }
+      inline size_t size() const   { return sizeof(TYPE); }
+      inline bool operator!=(const binary *buffer) const {return *((TYPE*)buffer) == platform_value;}
 
 #if defined(EBML_STRICT_API)
     private:
 #else
     protected:
 #endif
-	    TYPE platform_value;
-	    TYPE endian_value;
+      TYPE platform_value;
+      TYPE endian_value;
 
-	    inline void process_endian()
-	    {
-	        endian_value = platform_value;
+      inline void process_endian()
+      {
+          endian_value = platform_value;
 #ifdef WORDS_BIGENDIAN
-	        if (ENDIAN == little_endian)
+          if (ENDIAN == little_endian)
 #else  // _ENDIANESS_
-	        if (ENDIAN == big_endian)
+          if (ENDIAN == big_endian)
 #endif // _ENDIANESS_
-    		    std::reverse(reinterpret_cast<uint8*>(&endian_value),reinterpret_cast<uint8*>(&endian_value+1));
-	    }
+            std::reverse(reinterpret_cast<uint8*>(&endian_value),reinterpret_cast<uint8*>(&endian_value+1));
+      }
 
-	    inline void process_platform()
-	    {
-	        platform_value = endian_value;
+      inline void process_platform()
+      {
+          platform_value = endian_value;
 #ifdef WORDS_BIGENDIAN
-	        if (ENDIAN == little_endian)
+          if (ENDIAN == little_endian)
 #else  // _ENDIANESS_
-	        if (ENDIAN == big_endian)
+          if (ENDIAN == big_endian)
 #endif // _ENDIANESS_
-    		    std::reverse(reinterpret_cast<uint8*>(&platform_value),reinterpret_cast<uint8*>(&platform_value+1));
-	    }
+            std::reverse(reinterpret_cast<uint8*>(&platform_value),reinterpret_cast<uint8*>(&platform_value+1));
+      }
 };
 
 END_LIBEBML_NAMESPACE

makemkv-oss-1.9.5.tar.xz/libebml/inc/ebml/EbmlFloat.h -> makemkv-oss-1.10.2.tar.xz/libebml/inc/ebml/EbmlFloat.h Changed

@@ -11,17 +11,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -29,9 +29,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id$
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id$
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBEBML_FLOAT_H
 #define LIBEBML_FLOAT_H
@@ -46,60 +46,60 @@
     \brief Handle all operations on a float EBML element
 */
 class EBML_DLL_API EbmlFloat : public EbmlElement {
-	public:
-		enum Precision {
-			 FLOAT_32
-			,FLOAT_64
-		};
-
-		EbmlFloat(const Precision prec = FLOAT_32);
-		EbmlFloat(const double DefaultValue, const Precision prec = FLOAT_32);
-		EbmlFloat(const EbmlFloat & ElementToClone);
-
-		virtual bool ValidateSize() const 
-		{
-			return (GetSize() == 4 || GetSize() == 8);
-		}
-	
-		filepos_t RenderData(IOCallback & output, bool bForceRender, bool bWithDefault = false);
-		filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA);
-		filepos_t UpdateSize(bool bWithDefault = false, bool bForceRender = false);
-
-		void SetPrecision(const EbmlFloat::Precision prec = FLOAT_32) 
-		{
-			if (prec == FLOAT_64)
-				SetSize_(8);
-			else
-				SetSize_(4); // default size
-		}
-
-	
-//		EbmlFloat & operator=(const float NewValue) { Value = NewValue; return *this;}
-		EbmlFloat & operator=(const double NewValue) { Value = NewValue; SetValueIsSet(); return *this;}
-
-		virtual bool IsSmallerThan(const EbmlElement *Cmp) const;
-		
-		operator float() const;
-		operator double() const;
-
-		EbmlFloat &SetValue(double NewValue);
-		double GetValue() const;
-
-		void SetDefaultValue(double);
-    
-		double DefaultVal() const;
-
-		bool IsDefaultValue() const {
-			return (DefaultISset() && Value == DefaultValue);
-		}
-		
+  public:
+    enum Precision {
+       FLOAT_32
+      ,FLOAT_64
+    };
+
+    EbmlFloat(const Precision prec = FLOAT_32);
+    EbmlFloat(const double DefaultValue, const Precision prec = FLOAT_32);
+    EbmlFloat(const EbmlFloat & ElementToClone);
+
+    virtual bool ValidateSize() const
+    {
+      return (GetSize() == 4 || GetSize() == 8);
+    }
+
+    filepos_t RenderData(IOCallback & output, bool bForceRender, bool bWithDefault = false);
+    filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA);
+    filepos_t UpdateSize(bool bWithDefault = false, bool bForceRender = false);
+
+    void SetPrecision(const EbmlFloat::Precision prec = FLOAT_32)
+    {
+      if (prec == FLOAT_64)
+        SetSize_(8);
+      else
+        SetSize_(4); // default size
+    }
+
+
+//    EbmlFloat & operator=(const float NewValue) { Value = NewValue; return *this;}
+    EbmlFloat & operator=(const double NewValue) { Value = NewValue; SetValueIsSet(); return *this;}
+
+    virtual bool IsSmallerThan(const EbmlElement *Cmp) const;
+
+    operator float() const;
+    operator double() const;
+
+    EbmlFloat &SetValue(double NewValue);
+    double GetValue() const;
+
+    void SetDefaultValue(double);
+
+    double DefaultVal() const;
+
+    bool IsDefaultValue() const {
+      return (DefaultISset() && Value == DefaultValue);
+    }
+
 #if defined(EBML_STRICT_API)
     private:
 #else
     protected:
 #endif
-		double Value; /// The actual value of the element
-		double DefaultValue;
+    double Value; /// The actual value of the element
+    double DefaultValue;
 };
 
 END_LIBEBML_NAMESPACE

makemkv-oss-1.9.5.tar.xz/libebml/inc/ebml/EbmlHead.h -> makemkv-oss-1.10.2.tar.xz/libebml/inc/ebml/EbmlHead.h Changed

@@ -11,17 +11,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -29,9 +29,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: EbmlHead.h 639 2004-07-09 20:59:14Z mosu $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: EbmlHead.h 639 2004-07-09 20:59:14Z mosu $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBEBML_HEAD_H
 #define LIBEBML_HEAD_H
@@ -42,8 +42,8 @@
 START_LIBEBML_NAMESPACE
 
 DECLARE_EBML_MASTER(EbmlHead)
-	public:
-		EbmlHead(const EbmlHead & ElementToClone) : EbmlMaster(ElementToClone) {}
+  public:
+    EbmlHead(const EbmlHead & ElementToClone) : EbmlMaster(ElementToClone) {}
 
         EBML_CONCRETE_CLASS(EbmlHead)
 };

makemkv-oss-1.9.5.tar.xz/libebml/inc/ebml/EbmlId.h -> makemkv-oss-1.10.2.tar.xz/libebml/inc/ebml/EbmlId.h Changed

@@ -11,17 +11,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -29,9 +29,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: EbmlId.h 936 2004-11-10 20:46:28Z mosu $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: EbmlId.h 936 2004-11-10 20:46:28Z mosu $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBEBML_ID_H
 #define LIBEBML_ID_H
@@ -50,48 +50,48 @@
 #endif
 
 /*!
-	\class EbmlId
+  \class EbmlId
 */
 class EBML_DLL_API EbmlId {
-	public:
-		EbmlId(const binary aValue[4], const unsigned int aLength)
-			:Length(aLength)
-		{
-			Value = 0;
-			unsigned int i;
-			for (i=0; i<aLength; i++) {
-				Value <<= 8;
-				Value += aValue[i];
-			}
-		}
+  public:
+    EbmlId(const binary aValue[4], const unsigned int aLength)
+      :Length(aLength)
+    {
+      Value = 0;
+      unsigned int i;
+      for (i=0; i<aLength; i++) {
+        Value <<= 8;
+        Value += aValue[i];
+      }
+    }
 
-		EbmlId(const uint32 aValue, const unsigned int aLength)
-			:Value(aValue), Length(aLength) {}
+    EbmlId(const uint32 aValue, const unsigned int aLength)
+      :Value(aValue), Length(aLength) {}
 
-		inline bool operator==(const EbmlId & TestId) const
-		{
-			return ((TestId.Length == Length) && (TestId.Value == Value));
-		}
-		inline bool operator!=(const EbmlId & TestId) const
-		{
-			return !(*this == TestId);
-		}
+    inline bool operator==(const EbmlId & TestId) const
+    {
+      return ((TestId.Length == Length) && (TestId.Value == Value));
+    }
+    inline bool operator!=(const EbmlId & TestId) const
+    {
+      return !(*this == TestId);
+    }
 
-		inline void Fill(binary * Buffer) const {
-			unsigned int i;
-			for (i = 0; i<Length; i++) {
-				Buffer[i] = (Value >> (8*(Length-i-1))) & 0xFF;
-			}
-		}
+    inline void Fill(binary * Buffer) const {
+      unsigned int i;
+      for (i = 0; i<Length; i++) {
+        Buffer[i] = (Value >> (8*(Length-i-1))) & 0xFF;
+      }
+    }
 
-        inline size_t GetLength() const { return Length; }
-        inline uint32 GetValue() const { return Value; }
+    inline unsigned int GetLength() const { return (unsigned int)Length; }
+    inline uint32 GetValue() const { return Value; }
 
 #if defined(EBML_STRICT_API)
     private:
 #endif
-		uint32 Value;
-		size_t Length;
+    uint32 Value;
+    size_t Length;
 };
 
 END_LIBEBML_NAMESPACE

makemkv-oss-1.9.5.tar.xz/libebml/inc/ebml/EbmlMaster.h -> makemkv-oss-1.10.2.tar.xz/libebml/inc/ebml/EbmlMaster.h Changed

@@ -11,17 +11,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -29,9 +29,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: EbmlMaster.h 1232 2005-10-15 15:56:52Z robux4 $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: EbmlMaster.h 1232 2005-10-15 15:56:52Z robux4 $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBEBML_MASTER_H
 #define LIBEBML_MASTER_H
@@ -57,73 +57,74 @@
     \brief Handle all operations on an EBML element that contains other EBML elements
 */
 class EBML_DLL_API EbmlMaster : public EbmlElement {
-	public:
-		EbmlMaster(const EbmlSemanticContext & aContext, bool bSizeIsKnown = true);
-		EbmlMaster(const EbmlMaster & ElementToClone);
-		virtual bool ValidateSize() const {return true;}
-		/*!
-			\warning be carefull to clear the memory allocated in the ElementList elsewhere
-		*/
-		virtual ~EbmlMaster();
-	
-		filepos_t RenderData(IOCallback & output, bool bForceRender, bool bWithDefault = false);
+  public:
+    EbmlMaster(const EbmlSemanticContext & aContext, bool bSizeIsKnown = true);
+    EbmlMaster(const EbmlMaster & ElementToClone);
+    virtual bool ValidateSize() const {return true;}
+    /*!
+      \warning be carefull to clear the memory allocated in the ElementList elsewhere
+    */
+    virtual ~EbmlMaster();
+
+    filepos_t RenderData(IOCallback & output, bool bForceRender, bool bWithDefault = false);
 #ifndef EBML_NO_READ
-		filepos_t ReadData(IOCallback & input, ScopeMode ReadFully);
+    filepos_t ReadData(IOCallback & input, ScopeMode ReadFully);
 #endif
-		filepos_t UpdateSize(bool bWithDefault = false, bool bForceRender = false);
-		
-		/*!
-			\brief Set wether the size is finite (size is known in advance when writing, or infinite size is not known on writing)
-		*/
-		bool SetSizeInfinite(bool aIsInfinite = true) {SetSizeIsFinite(!aIsInfinite); return true;}
-	
-		bool PushElement(EbmlElement & element);
-		uint64 GetSize() const { 
-			if (IsFiniteSize())
+    filepos_t UpdateSize(bool bWithDefault = false, bool bForceRender = false);
+
+    /*!
+      \brief Set wether the size is finite (size is known in advance when writing, or infinite size is not known on writing)
+    */
+    bool SetSizeInfinite(bool aIsInfinite = true) {SetSizeIsFinite(!aIsInfinite); return true;}
+
+    bool PushElement(EbmlElement & element);
+    uint64 GetSize() const {
+      if (IsFiniteSize())
                 return EbmlElement::GetSize();
-			else
-				return (0-1);
-		}
-		
-		uint64 GetDataStart() const {
-			return GetElementPosition() + EBML_ID_LENGTH((const EbmlId&)*this) + CodedSizeLength(GetSize(), GetSizeLength(), IsFiniteSize());
-		}
-
-		/*!
-			\brief find the element corresponding to the ID of the element, NULL if not found
-		*/
-		EbmlElement *FindElt(const EbmlCallbacks & Callbacks) const;
-		/*!
-			\brief find the first element corresponding to the ID of the element
-		*/
-		EbmlElement *FindFirstElt(const EbmlCallbacks & Callbacks, bool bCreateIfNull);
-		EbmlElement *FindFirstElt(const EbmlCallbacks & Callbacks) const;
-
-		/*!
-			\brief find the element of the same type of PasElt following in the list of elements
-		*/
-		EbmlElement *FindNextElt(const EbmlElement & PastElt, bool bCreateIfNull);
-		EbmlElement *FindNextElt(const EbmlElement & PastElt) const;
-		EbmlElement *AddNewElt(const EbmlCallbacks & Callbacks);
-
-		/*!
-			\brief add an element at a specified location
-		*/
-		bool InsertElement(EbmlElement & element, size_t position = 0);
-		bool InsertElement(EbmlElement & element, const EbmlElement & before);
-
-		/*!
-			\brief Read the data and keep the known children
-		*/
+      else
+        return (0-1);
+    }
+
+    uint64 GetDataStart() const {
+      return GetElementPosition() + EBML_ID_LENGTH((const EbmlId&)*this) + CodedSizeLength(GetSize(), GetSizeLength(), IsFiniteSize());
+    }
+
+    /*!
+      \brief find the element corresponding to the ID of the element, NULL if not found
+    */
+    EbmlElement *FindElt(const EbmlCallbacks & Callbacks) const;
+    /*!
+      \brief find the first element corresponding to the ID of the element
+    */
+    EbmlElement *FindFirstElt(const EbmlCallbacks & Callbacks, bool bCreateIfNull);
+    EbmlElement *FindFirstElt(const EbmlCallbacks & Callbacks) const;
+
+    /*!
+      \brief find the element of the same type of PasElt following in the list of elements
+    */
+    EbmlElement *FindNextElt(const EbmlElement & PastElt, bool bCreateIfNull);
+    EbmlElement *FindNextElt(const EbmlElement & PastElt) const;
+    EbmlElement *AddNewElt(const EbmlCallbacks & Callbacks);
+
+    /*!
+      \brief add an element at a specified location
+    */
+    bool InsertElement(EbmlElement & element, size_t position = 0);
+    bool InsertElement(EbmlElement & element, const EbmlElement & before);
+
+    /*!
+      \brief Read the data and keep the known children
+    */
 #ifndef EBML_NO_READ
-		void Read(EbmlStream & inDataStream, const EbmlSemanticContext & Context, int & UpperEltFound, EbmlElement * & FoundElt, bool AllowDummyElt, ScopeMode ReadFully = SCOPE_ALL_DATA);
+    void Read(EbmlStream & inDataStream, const EbmlSemanticContext & Context, int & UpperEltFound, EbmlElement * & FoundElt, bool AllowDummyElt, ScopeMode ReadFully = SCOPE_ALL_DATA);
 #endif
-		/*!
-			\brief sort Data when they can
-		*/
-		void Sort();
 
-		size_t ListSize() const {return ElementList.size();}
+    /*!
+      \brief sort Data when they can
+    */
+    void Sort();
+
+    size_t ListSize() const {return ElementList.size();}
     std::vector<EbmlElement *> const &GetElementList() const {return ElementList;}
     std::vector<EbmlElement *> &GetElementList() {return ElementList;}
 
@@ -136,76 +137,76 @@
         inline EBML_MASTER_CONST_RITERATOR rbegin() const {return ElementList.rbegin();}
         inline EBML_MASTER_CONST_RITERATOR rend() const {return ElementList.rend();}
 
-		EbmlElement * operator[](unsigned int position) {return ElementList[position];}
-		const EbmlElement * operator[](unsigned int position) const {return ElementList[position];}
-
-		bool IsDefaultValue() const {
-			return (ElementList.size() == 0);
-		}
-		virtual bool IsMaster() const {return true;}
-
-		/*!
-			\brief verify that all mandatory elements are present
-			\note usefull after reading or before writing
-		*/
-		bool CheckMandatory() const;
-
-		/*!
-			\brief Remove an element from the list of the master
-		*/
-		void Remove(size_t Index);
-		void Remove(EBML_MASTER_ITERATOR & Itr);
-		void Remove(EBML_MASTER_RITERATOR & Itr);
-
-		/*!
-			\brief remove all elements, even the mandatory ones
-		*/
-		void RemoveAll() {ElementList.clear();}

makemkv-oss-1.9.5.tar.xz/libebml/inc/ebml/EbmlSInteger.h -> makemkv-oss-1.10.2.tar.xz/libebml/inc/ebml/EbmlSInteger.h Changed

@@ -19,9 +19,9 @@
 **
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -29,11 +29,11 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id$
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-	\author Julien Coloos    <suiryc @ users.sf.net>
-	\author Moritz Bunkus    <moritz @ bunkus.org>
+  \file
+  \version \$Id$
+  \author Steve Lhomme     <robux4 @ users.sf.net>
+  \author Julien Coloos    <suiryc @ users.sf.net>
+  \author Moritz Bunkus    <moritz @ bunkus.org>
 */
 #ifndef LIBEBML_SINTEGER_H
 #define LIBEBML_SINTEGER_H
@@ -52,48 +52,48 @@
     \brief Handle all operations on a signed integer EBML element
 */
 class EBML_DLL_API EbmlSInteger : public EbmlElement {
-	public:
-		EbmlSInteger();
-		EbmlSInteger(int64 DefaultValue);
-		EbmlSInteger(const EbmlSInteger & ElementToClone);
+  public:
+    EbmlSInteger();
+    EbmlSInteger(int64 DefaultValue);
+    EbmlSInteger(const EbmlSInteger & ElementToClone);
 
-		EbmlSInteger & operator = (int64 NewValue) {Value = NewValue; SetValueIsSet(); return *this;}
+    EbmlSInteger & operator = (int64 NewValue) {Value = NewValue; SetValueIsSet(); return *this;}
 
-		/*!
-			Set the default size of the integer (usually 1,2,4 or 8)
-		*/
+    /*!
+      Set the default size of the integer (usually 1,2,4 or 8)
+    */
         virtual void SetDefaultSize(uint64 nDefaultSize = DEFAULT_INT_SIZE) {EbmlElement::SetDefaultSize(nDefaultSize); SetSize_(nDefaultSize);}
 
-		virtual bool ValidateSize() const {return IsFiniteSize() && (GetSize() <= 8);}
-		filepos_t RenderData(IOCallback & output, bool bForceRender, bool bWithDefault = false);
-		filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA);
-		filepos_t UpdateSize(bool bWithDefault = false, bool bForceRender = false);
+    virtual bool ValidateSize() const {return IsFiniteSize() && (GetSize() <= 8);}
+    filepos_t RenderData(IOCallback & output, bool bForceRender, bool bWithDefault = false);
+    filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA);
+    filepos_t UpdateSize(bool bWithDefault = false, bool bForceRender = false);
 
-		virtual bool IsSmallerThan(const EbmlElement *Cmp) const;
+    virtual bool IsSmallerThan(const EbmlElement *Cmp) const;
 
-		operator int8() const;
-		operator int16() const;
-		operator int32() const;
-		operator int64() const;
+    operator int8() const;
+    operator int16() const;
+    operator int32() const;
+    operator int64() const;
 
-		EbmlSInteger &SetValue(int64 NewValue);
-		int64 GetValue() const;
+    EbmlSInteger &SetValue(int64 NewValue);
+    int64 GetValue() const;
 
-		void SetDefaultValue(int64 aValue) {assert(!DefaultISset()); DefaultValue = aValue; SetDefaultIsSet();}
+    void SetDefaultValue(int64 aValue) {assert(!DefaultISset()); DefaultValue = aValue; SetDefaultIsSet();}
 
-		int64 DefaultVal() const {assert(DefaultISset()); return DefaultValue;}
+    int64 DefaultVal() const {assert(DefaultISset()); return DefaultValue;}
 
-		bool IsDefaultValue() const {
-			return (DefaultISset() && Value == DefaultValue);
-		}
+    bool IsDefaultValue() const {
+      return (DefaultISset() && Value == DefaultValue);
+    }
 
 #if defined(EBML_STRICT_API)
     private:
 #else
     protected:
 #endif
-		int64 Value; /// The actual value of the element
-		int64 DefaultValue;
+    int64 Value; /// The actual value of the element
+    int64 DefaultValue;
 };
 
 END_LIBEBML_NAMESPACE

makemkv-oss-1.9.5.tar.xz/libebml/inc/ebml/EbmlStream.h -> makemkv-oss-1.10.2.tar.xz/libebml/inc/ebml/EbmlStream.h Changed

@@ -11,17 +11,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -29,9 +29,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id$
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id$
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBEBML_STREAM_H
 #define LIBEBML_STREAM_H
@@ -47,20 +47,20 @@
     \brief Handle an input/output stream of EBML elements
 */
 class EBML_DLL_API EbmlStream {
-	public:
-		EbmlStream(IOCallback & output);
-		~EbmlStream();
-	
-		/*!
-			\brief Find a possible next ID in the data stream
-			\param MaxDataSize The maximum possible of the data in the element (for sanity checks)
-			\note the user will have to delete that element later
-		*/
-		EbmlElement * FindNextID(const EbmlCallbacks & ClassInfos, uint64 MaxDataSize);
+  public:
+    EbmlStream(IOCallback & output);
+    ~EbmlStream();
+
+    /*!
+      \brief Find a possible next ID in the data stream
+      \param MaxDataSize The maximum possible of the data in the element (for sanity checks)
+      \note the user will have to delete that element later
+    */
+    EbmlElement * FindNextID(const EbmlCallbacks & ClassInfos, uint64 MaxDataSize);
 
-		EbmlElement * FindNextElement(const EbmlSemanticContext & Context, int & UpperLevel, uint64 MaxDataSize, bool AllowDummyElt, unsigned int MaxLowerLevel = 1);
+    EbmlElement * FindNextElement(const EbmlSemanticContext & Context, int & UpperLevel, uint64 MaxDataSize, bool AllowDummyElt, unsigned int MaxLowerLevel = 1);
 
-		inline IOCallback & I_O() {return Stream;}
+    inline IOCallback & I_O() {return Stream;}
         operator IOCallback &() {return Stream;}
 
 #if defined(EBML_STRICT_API)
@@ -68,7 +68,7 @@
 #else
     protected:
 #endif
-		IOCallback & Stream;
+    IOCallback & Stream;
 };
 
 END_LIBEBML_NAMESPACE

makemkv-oss-1.9.5.tar.xz/libebml/inc/ebml/EbmlString.h -> makemkv-oss-1.10.2.tar.xz/libebml/inc/ebml/EbmlString.h Changed

@@ -11,17 +11,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -29,9 +29,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id$
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id$
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBEBML_STRING_H
 #define LIBEBML_STRING_H
@@ -48,39 +48,39 @@
     \brief Handle all operations on a printable string EBML element
 */
 class EBML_DLL_API EbmlString : public EbmlElement {
-	public:
-		EbmlString();
-		EbmlString(const ccc::string & aDefaultValue);
-		EbmlString(const EbmlString & ElementToClone);
-	
-		virtual ~EbmlString() {}
-	
-		virtual bool ValidateSize() const {return IsFiniteSize();} // any size is possible
-		filepos_t RenderData(IOCallback & output, bool bForceRender, bool bWithDefault = false);
-		filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA);
-		filepos_t UpdateSize(bool bWithDefault = false, bool bForceRender = false);
-	
-		EbmlString & operator=(const ccc::string &);
-		operator const ref::string &() const;
-	
+  public:
+    EbmlString();
+    EbmlString(const ccc::string & aDefaultValue);
+    EbmlString(const EbmlString & ElementToClone);
+
+    virtual ~EbmlString() {}
+
+    virtual bool ValidateSize() const {return IsFiniteSize() && GetSize() < 0x7FFFFFFF;} // any size is possible
+    filepos_t RenderData(IOCallback & output, bool bForceRender, bool bWithDefault = false);
+    filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA);
+    filepos_t UpdateSize(bool bWithDefault = false, bool bForceRender = false);
+
+    EbmlString & operator=(const ccc::string &);
+    operator const ref::string &() const;
+
     EbmlString &SetValue(ccc::string const &NewValue);
     ref::string GetValue() const;
 
-		void SetDefaultValue(ccc::string &);
-    
-		const ref::string & DefaultVal() const;
+    void SetDefaultValue(ccc::string &);
+
+    const ref::string & DefaultVal() const;
 
-		bool IsDefaultValue() const {
-			return (DefaultISset() && Value == DefaultValue);
-		}
+    bool IsDefaultValue() const {
+      return (DefaultISset() && Value == DefaultValue);
+    }
 
 #if defined(EBML_STRICT_API)
     private:
 #else
     protected:
 #endif
-		buf::string Value;  /// The actual value of the element
-		buf::string DefaultValue;
+    buf::string Value;  /// The actual value of the element
+    buf::string DefaultValue;
 };
 
 END_LIBEBML_NAMESPACE

makemkv-oss-1.9.5.tar.xz/libebml/inc/ebml/EbmlSubHead.h -> makemkv-oss-1.10.2.tar.xz/libebml/inc/ebml/EbmlSubHead.h Changed

@@ -11,17 +11,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -29,9 +29,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: EbmlSubHead.h 639 2004-07-09 20:59:14Z mosu $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: EbmlSubHead.h 639 2004-07-09 20:59:14Z mosu $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBEBML_SUBHEAD_H
 #define LIBEBML_SUBHEAD_H
@@ -44,50 +44,50 @@
 START_LIBEBML_NAMESPACE
 
 DECLARE_EBML_UINTEGER(EVersion)
-	public:
-		EVersion(const EVersion & ElementToClone) : EbmlUInteger(ElementToClone) {}
+  public:
+    EVersion(const EVersion & ElementToClone) : EbmlUInteger(ElementToClone) {}
 
         EBML_CONCRETE_CLASS(EVersion)
 };
 
 DECLARE_EBML_UINTEGER(EReadVersion)
-	public:
-		EReadVersion(const EReadVersion & ElementToClone) : EbmlUInteger(ElementToClone) {}
+  public:
+    EReadVersion(const EReadVersion & ElementToClone) : EbmlUInteger(ElementToClone) {}
 
         EBML_CONCRETE_CLASS(EReadVersion)
 };
 
 DECLARE_EBML_UINTEGER(EMaxIdLength)
-	public:
-		EMaxIdLength(const EMaxIdLength & ElementToClone) : EbmlUInteger(ElementToClone) {}
+  public:
+    EMaxIdLength(const EMaxIdLength & ElementToClone) : EbmlUInteger(ElementToClone) {}
 
         EBML_CONCRETE_CLASS(EMaxIdLength)
 };
 
 DECLARE_EBML_UINTEGER(EMaxSizeLength)
-	public:
-		EMaxSizeLength(const EMaxSizeLength & ElementToClone) : EbmlUInteger(ElementToClone) {}
+  public:
+    EMaxSizeLength(const EMaxSizeLength & ElementToClone) : EbmlUInteger(ElementToClone) {}
 
         EBML_CONCRETE_CLASS(EMaxSizeLength)
 };
 
 DECLARE_EBML_STRING(EDocType)
-	public:
-		EDocType(const EDocType & ElementToClone) : EbmlString(ElementToClone) {}
+  public:
+    EDocType(const EDocType & ElementToClone) : EbmlString(ElementToClone) {}
 
         EBML_CONCRETE_CLASS(EDocType)
 };
 
 DECLARE_EBML_UINTEGER(EDocTypeVersion)
-	public:
-		EDocTypeVersion(const EDocTypeVersion & ElementToClone) : EbmlUInteger(ElementToClone) {}
+  public:
+    EDocTypeVersion(const EDocTypeVersion & ElementToClone) : EbmlUInteger(ElementToClone) {}
 
         EBML_CONCRETE_CLASS(EDocTypeVersion)
 };
 
 DECLARE_EBML_UINTEGER(EDocTypeReadVersion)
-	public:
-		EDocTypeReadVersion(const EDocTypeReadVersion & ElementToClone) : EbmlUInteger(ElementToClone) {}
+  public:
+    EDocTypeReadVersion(const EDocTypeReadVersion & ElementToClone) : EbmlUInteger(ElementToClone) {}
 
         EBML_CONCRETE_CLASS(EDocTypeReadVersion)
 };

makemkv-oss-1.9.5.tar.xz/libebml/inc/ebml/EbmlTypes.h -> makemkv-oss-1.10.2.tar.xz/libebml/inc/ebml/EbmlTypes.h Changed

@@ -9,17 +9,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -27,8 +27,8 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: EbmlTypes.h 639 2004-07-09 20:59:14Z mosu $
+  \file
+  \version \$Id: EbmlTypes.h 639 2004-07-09 20:59:14Z mosu $
 */
 #ifndef LIBEBML_TYPES_H
 #define LIBEBML_TYPES_H
@@ -62,9 +62,9 @@
 
 
 enum ScopeMode {
-	SCOPE_PARTIAL_DATA = 0,
-	SCOPE_ALL_DATA,
-	SCOPE_NO_DATA
+  SCOPE_PARTIAL_DATA = 0,
+  SCOPE_ALL_DATA,
+  SCOPE_NO_DATA
 };
 
 END_LIBEBML_NAMESPACE

makemkv-oss-1.9.5.tar.xz/libebml/inc/ebml/EbmlUInteger.h -> makemkv-oss-1.10.2.tar.xz/libebml/inc/ebml/EbmlUInteger.h Changed

@@ -11,17 +11,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -29,11 +29,11 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id$
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-	\author Julien Coloos    <suiryc @ users.sf.net>
-	\author Moritz Bunkus    <moritz @ bunkus.org>
+  \file
+  \version \$Id$
+  \author Steve Lhomme     <robux4 @ users.sf.net>
+  \author Julien Coloos    <suiryc @ users.sf.net>
+  \author Moritz Bunkus    <moritz @ bunkus.org>
 */
 #ifndef LIBEBML_UINTEGER_H
 #define LIBEBML_UINTEGER_H
@@ -50,48 +50,48 @@
     \brief Handle all operations on an unsigned integer EBML element
 */
 class EBML_DLL_API EbmlUInteger : public EbmlElement {
-	public:
-		EbmlUInteger();
-		EbmlUInteger(uint64 DefaultValue);
-		EbmlUInteger(const EbmlUInteger & ElementToClone);
-	
-		EbmlUInteger & operator=(uint64 NewValue) {Value = NewValue; SetValueIsSet(); return *this;}
-
-		/*!
-			Set the default size of the integer (usually 1,2,4 or 8)
-		*/
-		virtual void SetDefaultSize(uint64 nDefaultSize = DEFAULT_UINT_SIZE) {EbmlElement::SetDefaultSize(nDefaultSize); SetSize_(nDefaultSize);}
-
-		virtual bool ValidateSize() const {return IsFiniteSize() && (GetSize() <= 8);}
-		filepos_t RenderData(IOCallback & output, bool bForceRender, bool bWithDefault = false);
-		filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA);
-		filepos_t UpdateSize(bool bWithDefault = false, bool bForceRender = false);
-		
-		virtual bool IsSmallerThan(const EbmlElement *Cmp) const;
-		
-		operator uint8()  const;
-		operator uint16() const;
-		operator uint32() const;
-		operator uint64() const;
-
-		EbmlUInteger &SetValue(uint64 NewValue);
-		uint64 GetValue() const;
-
-		void SetDefaultValue(uint64);
-    
-		uint64 DefaultVal() const;
-
-		bool IsDefaultValue() const {
-			return (DefaultISset() && Value == DefaultValue);
-		}
+  public:
+    EbmlUInteger();
+    EbmlUInteger(uint64 DefaultValue);
+    EbmlUInteger(const EbmlUInteger & ElementToClone);
+
+    EbmlUInteger & operator=(uint64 NewValue) {Value = NewValue; SetValueIsSet(); return *this;}
+
+    /*!
+      Set the default size of the integer (usually 1,2,4 or 8)
+    */
+    virtual void SetDefaultSize(uint64 nDefaultSize = DEFAULT_UINT_SIZE) {EbmlElement::SetDefaultSize(nDefaultSize); SetSize_(nDefaultSize);}
+
+    virtual bool ValidateSize() const {return IsFiniteSize() && (GetSize() <= 8);}
+    filepos_t RenderData(IOCallback & output, bool bForceRender, bool bWithDefault = false);
+    filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA);
+    filepos_t UpdateSize(bool bWithDefault = false, bool bForceRender = false);
+
+    virtual bool IsSmallerThan(const EbmlElement *Cmp) const;
+
+    operator uint8()  const;
+    operator uint16() const;
+    operator uint32() const;
+    operator uint64() const;
+
+    EbmlUInteger &SetValue(uint64 NewValue);
+    uint64 GetValue() const;
+
+    void SetDefaultValue(uint64);
+
+    uint64 DefaultVal() const;
+
+    bool IsDefaultValue() const {
+      return (DefaultISset() && Value == DefaultValue);
+    }
 
 #if defined(EBML_STRICT_API)
     private:
 #else
     protected:
 #endif
-		uint64 Value; /// The actual value of the element
-		uint64 DefaultValue;
+    uint64 Value; /// The actual value of the element
+    uint64 DefaultValue;
 };
 
 END_LIBEBML_NAMESPACE

makemkv-oss-1.9.5.tar.xz/libebml/inc/ebml/EbmlUnicodeString.h -> makemkv-oss-1.10.2.tar.xz/libebml/inc/ebml/EbmlUnicodeString.h Changed

@@ -11,17 +11,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -29,11 +29,11 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id$
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-	\author Moritz Bunkus <moritz @ bunkus.org>
-	\author Jory Stone       <jcsston @ toughguy.net>
+  \file
+  \version \$Id$
+  \author Steve Lhomme     <robux4 @ users.sf.net>
+  \author Moritz Bunkus <moritz @ bunkus.org>
+  \author Jory Stone       <jcsston @ toughguy.net>
 */
 #ifndef LIBEBML_UNICODE_STRING_H
 #define LIBEBML_UNICODE_STRING_H
@@ -52,87 +52,87 @@
 */
 class EBML_DLL_API UTFstring {
 public:
-	typedef wchar_t value_type;
-
-	UTFstring();
-	UTFstring(const wchar_t *); // should be NULL terminated
-	UTFstring(const UTFstring &);
-	//UTFstring(std::wstring const &);
-	
-	virtual ~UTFstring();
-	bool operator==(const UTFstring&) const;
-	inline bool operator!=(const UTFstring &cmp) const
-	{
-		return !(*this == cmp);
-	}
-	UTFstring & operator=(const UTFstring &);
-	UTFstring & operator=(const wchar_t *);
-	UTFstring & operator=(wchar_t);
-
-	/// Return length of string
-	size_t length() const {return _Length;}
-
-	operator const wchar_t*() const;
-	const wchar_t* c_str() const {return _Data;}
-
-	const ref::string & GetUTF8() const {return UTF8string;}
-	void SetUTF8(const ccc::string &);
+  typedef wchar_t value_type;
+
+  UTFstring();
+  UTFstring(const wchar_t *); // should be NULL terminated
+  UTFstring(const UTFstring &);
+  //UTFstring(std::wstring const &);
+
+  virtual ~UTFstring();
+  bool operator==(const UTFstring&) const;
+  inline bool operator!=(const UTFstring &cmp) const
+  {
+    return !(*this == cmp);
+  }
+  UTFstring & operator=(const UTFstring &);
+  UTFstring & operator=(const wchar_t *);
+  UTFstring & operator=(wchar_t);
+
+  /// Return length of string
+  size_t length() const {return _Length;}
+
+  operator const wchar_t*() const;
+  const wchar_t* c_str() const {return _Data;}
+
+  const ref::string & GetUTF8() const {return UTF8string;}
+  void SetUTF8(const ccc::string &);
 
 #if defined(EBML_STRICT_API)
     private:
 #else
     protected:
 #endif
-	size_t _Length; ///< length of the UCS string excluding the \0
-	wchar_t* _Data; ///< internal UCS representation	
-	buf::string UTF8string;
-	static bool wcscmp_internal(const wchar_t *str1, const wchar_t *str2);
-	void UpdateFromUTF8();
-	void UpdateFromUCS2();
+  size_t _Length; ///< length of the UCS string excluding the \0
+  wchar_t* _Data; ///< internal UCS representation
+  buf::string UTF8string;
+  static bool wcscmp_internal(const wchar_t *str1, const wchar_t *str2);
+  void UpdateFromUTF8();
+  void UpdateFromUCS2();
 };
 
 
 /*!
     \class EbmlUnicodeString
     \brief Handle all operations on a Unicode string EBML element
-	\note internally treated as a string made of wide characters (ie UCS-2 or UCS-4 depending on the machine)
+  \note internally treated as a string made of wide characters (ie UCS-2 or UCS-4 depending on the machine)
 */
 class EBML_DLL_API EbmlUnicodeString : public EbmlElement {
-	public:
-		EbmlUnicodeString();
-		EbmlUnicodeString(const UTFstring & DefaultValue);
-		EbmlUnicodeString(const EbmlUnicodeString & ElementToClone);
-	
-		virtual ~EbmlUnicodeString() {}
-	
-		virtual bool ValidateSize() const {return IsFiniteSize();} // any size is possible
-		filepos_t RenderData(IOCallback & output, bool bForceRender, bool bWithDefault = false);
-		filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA);
-		filepos_t UpdateSize(bool bWithDefault = false, bool bForceRender = false);
-	
-		EbmlUnicodeString & operator=(const UTFstring &); ///< platform dependant code
-		operator const UTFstring &() const;
-	
+  public:
+    EbmlUnicodeString();
+    EbmlUnicodeString(const UTFstring & DefaultValue);
+    EbmlUnicodeString(const EbmlUnicodeString & ElementToClone);
+
+    virtual ~EbmlUnicodeString() {}
+
+    virtual bool ValidateSize() const {return IsFiniteSize();} // any size is possible
+    filepos_t RenderData(IOCallback & output, bool bForceRender, bool bWithDefault = false);
+    filepos_t ReadData(IOCallback & input, ScopeMode ReadFully = SCOPE_ALL_DATA);
+    filepos_t UpdateSize(bool bWithDefault = false, bool bForceRender = false);
+
+    EbmlUnicodeString & operator=(const UTFstring &); ///< platform dependant code
+    operator const UTFstring &() const;
+
     EbmlUnicodeString &SetValue(UTFstring const &NewValue);
     EbmlUnicodeString &SetValueUTF8(ccc::string const &NewValue);
     UTFstring GetValue() const;
     ref::string GetValueUTF8() const;
 
-		void SetDefaultValue(UTFstring &);
-    
-		const UTFstring & DefaultVal() const;
+    void SetDefaultValue(UTFstring &);
+
+    const UTFstring & DefaultVal() const;
 
-		bool IsDefaultValue() const {
-			return (DefaultISset() && Value == DefaultValue);
-		}
+    bool IsDefaultValue() const {
+      return (DefaultISset() && Value == DefaultValue);
+    }
 
 #if defined(EBML_STRICT_API)
     private:
 #else
     protected:
 #endif
-		UTFstring Value; /// The actual value of the element
-		UTFstring DefaultValue;
+    UTFstring Value; /// The actual value of the element
+    UTFstring DefaultValue;
 };
 
 END_LIBEBML_NAMESPACE

makemkv-oss-1.9.5.tar.xz/libebml/inc/ebml/EbmlVersion.h -> makemkv-oss-1.10.2.tar.xz/libebml/inc/ebml/EbmlVersion.h Changed

@@ -19,9 +19,9 @@
 **
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -29,9 +29,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id$
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id$
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBEBML_VERSION_H
 #define LIBEBML_VERSION_H
@@ -42,13 +42,13 @@
 
 START_LIBEBML_NAMESPACE
 
-#define LIBEBML_VERSION 0x010300
+#define LIBEBML_VERSION 0x010303
 
 extern const ccc::string EbmlCodeVersion;
 extern const ccc::string EbmlCodeDate;
 
 /*!
-	\todo Closer relation between an element and the context it comes from (context is an element attribute ?)
+  \todo Closer relation between an element and the context it comes from (context is an element attribute ?)
 */
 
 END_LIBEBML_NAMESPACE

makemkv-oss-1.9.5.tar.xz/libebml/inc/ebml/EbmlVoid.h -> makemkv-oss-1.10.2.tar.xz/libebml/inc/ebml/EbmlVoid.h Changed

@@ -11,17 +11,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -29,9 +29,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: EbmlVoid.h 1079 2005-03-03 13:18:14Z robux4 $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: EbmlVoid.h 1079 2005-03-03 13:18:14Z robux4 $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBEBML_VOID_H
 #define LIBEBML_VOID_H
@@ -42,28 +42,28 @@
 START_LIBEBML_NAMESPACE
 
 DECLARE_EBML_BINARY(EbmlVoid)
-	public:
-		EbmlVoid(const EbmlVoid & ElementToClone) :EbmlBinary(ElementToClone){}
+  public:
+    EbmlVoid(const EbmlVoid & ElementToClone) :EbmlBinary(ElementToClone){}
 
-		/*!
-			\brief Set the size of the data (not the complete size of the element)
-		*/
-		void SetSize(uint64 aSize) {SetSize_(aSize);}
+    /*!
+      \brief Set the size of the data (not the complete size of the element)
+    */
+    void SetSize(uint64 aSize) {SetSize_(aSize);}
 
-		/*!
-			\note overwrite to write fake data 
-		*/
-		filepos_t RenderData(IOCallback & output, bool bForceRender, bool bWithDefault = false);
+    /*!
+      \note overwrite to write fake data
+    */
+    filepos_t RenderData(IOCallback & output, bool bForceRender, bool bWithDefault = false);
 
-		/*!
-			\brief Replace the void element content (written) with this one
-		*/
-		uint64 ReplaceWith(EbmlElement & EltToReplaceWith, IOCallback & output, bool ComeBackAfterward = true, bool bWithDefault = false);
+    /*!
+      \brief Replace the void element content (written) with this one
+    */
+    uint64 ReplaceWith(EbmlElement & EltToReplaceWith, IOCallback & output, bool ComeBackAfterward = true, bool bWithDefault = false);
 
-		/*!
-			\brief Void the content of an element
-		*/
-		uint64 Overwrite(const EbmlElement & EltToVoid, IOCallback & output, bool ComeBackAfterward = true, bool bWithDefault = false);
+    /*!
+      \brief Void the content of an element
+    */
+    uint64 Overwrite(const EbmlElement & EltToVoid, IOCallback & output, bool ComeBackAfterward = true, bool bWithDefault = false);
 
         EBML_CONCRETE_CLASS(EbmlVoid)
 };

makemkv-oss-1.9.5.tar.xz/libebml/inc/ebml/IOCallback.h -> makemkv-oss-1.10.2.tar.xz/libebml/inc/ebml/IOCallback.h Changed

@@ -17,9 +17,9 @@
 **
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -27,8 +27,8 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: IOCallback.h 639 2004-07-09 20:59:14Z mosu $
+  \file
+  \version \$Id: IOCallback.h 639 2004-07-09 20:59:14Z mosu $
 */
 #ifndef MATROSKA_IOCALLBACK_H
 #define MATROSKA_IOCALLBACK_H
@@ -45,74 +45,74 @@
 
 enum seek_mode
 {
-	seek_beginning=SEEK_SET
-	,seek_end=SEEK_END
-	,seek_current=SEEK_CUR
+  seek_beginning=SEEK_SET
+  ,seek_end=SEEK_END
+  ,seek_current=SEEK_CUR
 };
 
 class EBML_DLL_API IOCallback
 {
 public:
-	virtual ~IOCallback(){}
+  virtual ~IOCallback(){}
 
-	// The read callback works like most other read functions. You specify the
-	// file, the buffer and the size and the function returns the bytes read.
-	// If an error occurs or the file pointer points to the end of the file 0 is returned.
-	// Users are encouraged to throw a descriptive exception, when an error occurs.
+  // The read callback works like most other read functions. You specify the
+  // file, the buffer and the size and the function returns the bytes read.
+  // If an error occurs or the file pointer points to the end of the file 0 is returned.
+  // Users are encouraged to throw a descriptive exception, when an error occurs.
 #ifndef EBML_NO_READ
-	virtual uint32 read(void*Buffer,size_t Size)=0;
+  virtual uint32 read(void*Buffer,size_t Size)=0;
 #endif
 
-	// Seek to the specified position. The mode can have either SEEK_SET, SEEK_CUR
-	// or SEEK_END. The callback should return true(1) if the seek operation succeeded
-	// or false (0), when the seek fails.
-	virtual void setFilePointer(int64 Offset,seek_mode Mode=seek_beginning)=0;
+  // Seek to the specified position. The mode can have either SEEK_SET, SEEK_CUR
+  // or SEEK_END. The callback should return true(1) if the seek operation succeeded
+  // or false (0), when the seek fails.
+  virtual void setFilePointer(int64 Offset,seek_mode Mode=seek_beginning)=0;
 
-	// This callback just works like its read pendant. It returns the number of bytes written.
-	virtual size_t write(const void*Buffer,size_t Size)=0;
+  // This callback just works like its read pendant. It returns the number of bytes written.
+  virtual size_t write(const void*Buffer,size_t Size)=0;
 
-	// Although the position is always positive, the return value of this callback is signed to
-	// easily allow negative values for returning errors. When an error occurs, the implementor
-	// should return -1 and the file pointer otherwise.
-	//
-	// If an error occurs, an exception should be thrown.
-	virtual uint64 getFilePointer()=0;
+  // Although the position is always positive, the return value of this callback is signed to
+  // easily allow negative values for returning errors. When an error occurs, the implementor
+  // should return -1 and the file pointer otherwise.
+  //
+  // If an error occurs, an exception should be thrown.
+  virtual uint64 getFilePointer()=0;
 
-	// The close callback flushes the file buffers to disk and closes the file. When using the stdio
-	// library, this is equivalent to calling fclose. When the close is not successful, an exception
-	// should be thrown.
-	virtual void close()=0;
+  // The close callback flushes the file buffers to disk and closes the file. When using the stdio
+  // library, this is equivalent to calling fclose. When the close is not successful, an exception
+  // should be thrown.
+  virtual void close()=0;
 
 
-	// The readFully is made virtual to allow derived classes to use another
-	// implementation for this method, which e.g. does not read any data
-	// unlike this does
+  // The readFully is made virtual to allow derived classes to use another
+  // implementation for this method, which e.g. does not read any data
+  // unlike this does
 #ifndef EBML_NO_READ
-	void readFully(void*Buffer,size_t Size);
+  void readFully(void*Buffer,size_t Size);
 
-	template<class STRUCT> void readStruct(STRUCT&Struct){readFully(&Struct,sizeof(Struct));}
+  template<class STRUCT> void readStruct(STRUCT&Struct){readFully(&Struct,sizeof(Struct));}
 #endif
 
-	void writeFully(const void*Buffer,size_t Size);
+  void writeFully(const void*Buffer,size_t Size);
 
-	template<class STRUCT> void writeStruct(const STRUCT&Struct){writeFully(&Struct,sizeof(Struct));}
+  template<class STRUCT> void writeStruct(const STRUCT&Struct){writeFully(&Struct,sizeof(Struct));}
 };
 
 /* cygwin incompatible
 template<class TRAITS> std::basic_ostream<char,TRAITS>&operator<<(std::basic_ostream<char,TRAITS>&Stream,seek_mode Mode)
 {
-	switch(Mode)
-	{
+  switch(Mode)
+  {
 #define x(y) case seek_##y: Stream<<"seek_" #y; break
-		x(beginning);
-		x(current);
-		x(end);
+    x(beginning);
+    x(current);
+    x(end);
 #undef x
-	default:
-		assert(false);
-	}
+  default:
+    assert(false);
+  }
 
-	return Stream;
+  return Stream;
 }
 */

makemkv-oss-1.9.5.tar.xz/libebml/inc/ebml/MemIOCallback.h -> makemkv-oss-1.10.2.tar.xz/libebml/inc/ebml/MemIOCallback.h Changed

@@ -9,17 +9,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -27,9 +27,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: MemIOCallback.h 1298 2008-02-21 22:14:18Z mosu $
-	\author Jory Stone <jcsston @ toughguy.net>
+  \file
+  \version \$Id: MemIOCallback.h 1298 2008-02-21 22:14:18Z mosu $
+  \author Jory Stone <jcsston @ toughguy.net>
 */
 #ifndef LIBEBML_MEMIOCALLBACK_H
 #define LIBEBML_MEMIOCALLBACK_H
@@ -50,71 +50,71 @@
 class EBML_DLL_API MemIOCallback : public IOCallback
 {
 public:
-	MemIOCallback(uint64 DefaultSize = 128);
-	~MemIOCallback();
+  MemIOCallback(uint64 DefaultSize = 128);
+  ~MemIOCallback();
 
-	/*!
-		Use this to copy some data to the Buffer from this classes data
-	*/
-	uint32 read(void *Buffer, size_t Size);
+  /*!
+    Use this to copy some data to the Buffer from this classes data
+  */
+  uint32 read(void *Buffer, size_t Size);
 
-	/*!
-		Seek to the specified position. The mode can have either SEEK_SET, SEEK_CUR
-		or SEEK_END. The callback should return true(1) if the seek operation succeeded
-		or false (0), when the seek fails.
-	*/
-	void setFilePointer(int64 Offset, seek_mode Mode=seek_beginning);
+  /*!
+    Seek to the specified position. The mode can have either SEEK_SET, SEEK_CUR
+    or SEEK_END. The callback should return true(1) if the seek operation succeeded
+    or false (0), when the seek fails.
+  */
+  void setFilePointer(int64 Offset, seek_mode Mode=seek_beginning);
 
-	/*!
-		This callback just works like its read pendant. It returns the number of bytes written.
-	*/
-	size_t write(const void *Buffer, size_t Size);
+  /*!
+    This callback just works like its read pendant. It returns the number of bytes written.
+  */
+  size_t write(const void *Buffer, size_t Size);
 
-	/*!
-		Although the position is always positive, the return value of this callback is signed to
-		easily allow negative values for returning errors. When an error occurs, the implementor
-		should return -1 and the file pointer otherwise.
+  /*!
+    Although the position is always positive, the return value of this callback is signed to
+    easily allow negative values for returning errors. When an error occurs, the implementor
+    should return -1 and the file pointer otherwise.
 
-		If an error occurs, an exception should be thrown.
-	*/
-	virtual uint64 getFilePointer() {return dataBufferPos;};
+    If an error occurs, an exception should be thrown.
+  */
+  virtual uint64 getFilePointer() {return dataBufferPos;};
 
-	/*!
-		The close callback flushes the file buffers to disk and closes the file. When using the stdio
-		library, this is equivalent to calling fclose. When the close is not successful, an exception
-		should be thrown.
-	*/
-	void close() {};
+  /*!
+    The close callback flushes the file buffers to disk and closes the file. When using the stdio
+    library, this is equivalent to calling fclose. When the close is not successful, an exception
+    should be thrown.
+  */
+  void close() {};
 
-	binary *GetDataBuffer() const {return dataBuffer;};
-	uint64 GetDataBufferSize() {return dataBufferTotalSize;};
-	void SetDataBufferSize(uint64 newDataBufferSize) {dataBufferTotalSize = newDataBufferSize;};
-	/*!
-		Use this to write some data from another IOCallback
-	*/
+  binary *GetDataBuffer() const {return dataBuffer;};
+  uint64 GetDataBufferSize() {return dataBufferTotalSize;};
+  void SetDataBufferSize(uint64 newDataBufferSize) {dataBufferTotalSize = newDataBufferSize;};
+  /*!
+    Use this to write some data from another IOCallback
+  */
 #ifndef EBML_NO_READ
-	uint32 write(IOCallback & IOToRead, size_t Size);
+  uint32 write(IOCallback & IOToRead, size_t Size);
 #endif
 
-	bool IsOk() { return mOk; };	
-	const ref::string &GetLastErrorStr() { return mLastErrorStr; };
+  bool IsOk() { return mOk; };
+  const ref::string &GetLastErrorStr() { return mLastErrorStr; };
 protected:
-	bool mOk;
-	buf::string mLastErrorStr;
+  bool mOk;
+  buf::string mLastErrorStr;
 
-	binary *dataBuffer;
-	/*!
-		Postion where we start 'writing' to the dataBuffer
-	*/
-	uint64 dataBufferPos;
-	/*!
-		Size of the data in the dataBuffer
-	*/
-	uint64 dataBufferTotalSize;
-	/*!
-		Size of the memory malloc()/realloc()
-	*/
-	uint64 dataBufferMemorySize;
+  binary *dataBuffer;
+  /*!
+    Postion where we start 'writing' to the dataBuffer
+  */
+  uint64 dataBufferPos;
+  /*!
+    Size of the data in the dataBuffer
+  */
+  uint64 dataBufferTotalSize;
+  /*!
+    Size of the memory malloc()/realloc()
+  */
+  uint64 dataBufferMemorySize;
 };
 
 END_LIBEBML_NAMESPACE

makemkv-oss-1.10.2.tar.xz/libebml/inc/ebml/MemReadIOCallback.h Added

@@ -0,0 +1,66 @@
+/****************************************************************************
+** libebml : parse EBML files, see http://embl.sourceforge.net/
+**
+** <file/class description>
+**
+** Copyright (C) 2014 Moritz Bunkus.  All rights reserved.
+**
+** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+**
+** Contact license@matroska.org if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
+/*!
+  \file
+  \author Moritz Bunkus <moritz@bunkus.org>
+*/
+#ifndef LIBEBML_MEMREADIOCALLBACK_H
+#define LIBEBML_MEMREADIOCALLBACK_H
+
+#include "IOCallback.h"
+
+START_LIBEBML_NAMESPACE
+
+class EBML_DLL_API EbmlBinary;
+
+class EBML_DLL_API MemReadIOCallback : public IOCallback {
+protected:
+  uint8 const *mStart, *mEnd, *mPtr;
+
+public:
+  MemReadIOCallback(void const *Ptr, size_t Size);
+  MemReadIOCallback(EbmlBinary const &Binary);
+  MemReadIOCallback(MemReadIOCallback const &Mem);
+  virtual ~MemReadIOCallback();
+
+  uint32 read(void *Buffer, size_t Size);
+  void setFilePointer(int64 Offset, seek_mode Mode = seek_beginning);
+  size_t write(void const *, size_t) { return 0; }
+  virtual uint64 getFilePointer() { return mPtr - mStart; }
+  void close() {}
+  binary const *GetDataBuffer() const { return mPtr; }
+  uint64 GetDataBufferSize() const { return mEnd - mStart; }
+
+protected:
+  void Init(void const *Ptr, size_t Size);
+};
+
+END_LIBEBML_NAMESPACE
+
+#endif // LIBEBML_MEMREADIOCALLBACK_H

makemkv-oss-1.10.2.tar.xz/libebml/inc/ebml/SafeReadIOCallback.h Added

@@ -0,0 +1,91 @@
+/****************************************************************************
+** libebml : parse EBML files, see http://embl.sourceforge.net/
+**
+** <file/class description>
+**
+** Copyright (C) 2002-2014 Moritz Bunkus.  All rights reserved.
+**
+** This file is part of libebml.
+**
+** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+**
+** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+**
+** Contact license@matroska.org if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
+/*!
+  \file
+  \version \$Id$
+  \author Moritz Bunkus <moritz@bunkus.org>
+*/
+#ifndef LIBEBML_SAFEREADIOCALLBACK_H
+#define LIBEBML_SAFEREADIOCALLBACK_H
+
+#include "EbmlTypes.h"
+
+START_LIBEBML_NAMESPACE
+
+class EBML_DLL_API IOCallback;
+class EBML_DLL_API EbmlBinary;
+
+class EBML_DLL_API SafeReadIOCallback {
+public:
+  class EndOfStreamX {
+  public:
+    size_t mMissingBytes;
+    EndOfStreamX(std::size_t MissingBytes);
+  };
+
+private:
+  IOCallback *mIO;
+  bool mDeleteIO;
+  size_t mSize;
+
+public:
+  SafeReadIOCallback(IOCallback *IO, bool DeleteIO);
+  SafeReadIOCallback(void const *Mem, size_t Size);
+  SafeReadIOCallback(EbmlBinary const &Binary);
+  ~SafeReadIOCallback();
+
+  size_t GetPosition() const;
+  size_t GetSize() const;
+  size_t GetRemainingBytes() const;
+  bool IsEmpty() const;
+
+  uint8  GetUInt8();
+  uint64 GetUIntBE(size_t NumBytes);
+  uint16 GetUInt16BE();
+  uint32 GetUInt24BE();
+  uint32 GetUInt32BE();
+  uint64 GetUInt64BE();
+
+  void Read(void *Dst, size_t Count);
+
+  void Skip(size_t Count);
+  void Seek(size_t Position);
+
+private:
+  SafeReadIOCallback(SafeReadIOCallback const &) { }
+
+protected:
+  void Init(IOCallback *IO, bool DeleteIO);
+};
+
+END_LIBEBML_NAMESPACE
+
+#endif  // LIBEBML_SAFEREADIOCALLBACK_H

makemkv-oss-1.9.5.tar.xz/libebml/inc/ebml/StdIOCallback.h -> makemkv-oss-1.10.2.tar.xz/libebml/inc/ebml/StdIOCallback.h Changed

@@ -9,17 +9,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -27,8 +27,8 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: StdIOCallback.h 1090 2005-03-16 12:47:59Z robux4 $
+  \file
+  \version \$Id: StdIOCallback.h 1090 2005-03-16 12:47:59Z robux4 $
 */
 #ifndef LIBEBML_STDIOCALLBACK_H
 #define LIBEBML_STDIOCALLBACK_H
@@ -51,49 +51,49 @@
 {
 // Variablen...
 private:
-	int Error;
+  int Error;
 
 // Methoden...
 public:
-	CRTError(int Error,const std::string&Description);
-	CRTError(const std::string&Description,int Error=errno);
+  CRTError(int Error,const std::string&Description);
+  CRTError(const std::string&Description,int Error=errno);
 
-	int getError()const throw(){return Error;}
+  int getError()const throw(){return Error;}
 };
 
 // This class is currently private to the library, so there's no MATROSKA_EXPORT.
 class EBML_DLL_API StdIOCallback:public IOCallback
 {
     private:
-    	FILE*File;
-		uint64 mCurrentPosition;
+      FILE*File;
+    uint64 mCurrentPosition;
 
     public:
-//	StdIOCallback(const char*Path,const char*Mode);
-	StdIOCallback(const char*Path, const open_mode Mode);
-	virtual ~StdIOCallback()throw();
-
-	virtual uint32 read(void*Buffer,size_t Size);
-
-	// Seek to the specified position. The mode can have either SEEK_SET, SEEK_CUR
-	// or SEEK_END. The callback should return true(1) if the seek operation succeeded
-	// or false (0), when the seek fails.
-	virtual void setFilePointer(int64 Offset,seek_mode Mode=seek_beginning);
-
-	// This callback just works like its read pendant. It returns the number of bytes written.
-	virtual size_t write(const void*Buffer,size_t Size);
-
-	// Although the position is always positive, the return value of this callback is signed to
-	// easily allow negative values for returning errors. When an error occurs, the implementor
-	// should return -1 and the file pointer otherwise.
-	//
-	// If an error occurs, an exception should be thrown.
-	virtual uint64 getFilePointer();
-
-	// The close callback flushes the file buffers to disk and closes the file. When using the stdio
-	// library, this is equivalent to calling fclose. When the close is not successful, an exception
-	// should be thrown.
-	virtual void close();
+//  StdIOCallback(const char*Path,const char*Mode);
+  StdIOCallback(const char*Path, const open_mode Mode);
+  virtual ~StdIOCallback()throw();
+
+  virtual uint32 read(void*Buffer,size_t Size);
+
+  // Seek to the specified position. The mode can have either SEEK_SET, SEEK_CUR
+  // or SEEK_END. The callback should return true(1) if the seek operation succeeded
+  // or false (0), when the seek fails.
+  virtual void setFilePointer(int64 Offset,seek_mode Mode=seek_beginning);
+
+  // This callback just works like its read pendant. It returns the number of bytes written.
+  virtual size_t write(const void*Buffer,size_t Size);
+
+  // Although the position is always positive, the return value of this callback is signed to
+  // easily allow negative values for returning errors. When an error occurs, the implementor
+  // should return -1 and the file pointer otherwise.
+  //
+  // If an error occurs, an exception should be thrown.
+  virtual uint64 getFilePointer();
+
+  // The close callback flushes the file buffers to disk and closes the file. When using the stdio
+  // library, this is equivalent to calling fclose. When the close is not successful, an exception
+  // should be thrown.
+  virtual void close();
 };
 
 END_LIBEBML_NAMESPACE

makemkv-oss-1.9.5.tar.xz/libebml/inc/ebml/c/libebml_t.h -> makemkv-oss-1.10.2.tar.xz/libebml/inc/ebml/c/libebml_t.h Changed

@@ -19,9 +19,9 @@
 **
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -50,7 +50,7 @@
 
 // Changed char is unsigned now (signedness was causing trouble in endil)
 #if defined(_WIN32)
-# if !defined(__GNUC__)		// Microsoft Visual C++
+# if !defined(__GNUC__)    // Microsoft Visual C++
     typedef signed __int64 int64;
     typedef signed __int32 int32;
     typedef signed __int16 int16;
@@ -74,7 +74,7 @@
 # endif // __GNUC__
 #elif defined(__BEOS__)
 #include <SupportDefs.h>
-#elif defined(DJGPP)				/* SL : DJGPP doesn't support POSIX types ???? */
+#elif defined(DJGPP)        /* SL : DJGPP doesn't support POSIX types ???? */
     typedef signed long long int64;
     typedef signed long int32;
     typedef signed short int16;

makemkv-oss-1.9.5.tar.xz/libebml/src/Debug.cpp -> makemkv-oss-1.10.2.tar.xz/libebml/src/Debug.cpp Changed

@@ -11,17 +11,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -29,10 +29,10 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: Debug.cpp 1268 2007-01-19 10:15:08Z robux4 $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-	\author Moritz Bunkus <moritz @ bunkus.org>
+  \file
+  \version \$Id: Debug.cpp 1268 2007-01-19 10:15:08Z robux4 $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
+  \author Moritz Bunkus <moritz @ bunkus.org>
 */
 #include <stdio.h>
 
@@ -56,180 +56,183 @@
 //////////////////////////////////////////////////////////////////////
 
 ADbg::ADbg(int level)
-:my_level(level)
-,my_time_included(false)
-,my_use_file(false)
-,my_debug_output(true)
-,hFile(NULL)
+  :my_level(level)
+  ,my_time_included(false)
+  ,my_use_file(false)
+  ,my_debug_output(true)
+  ,hFile(NULL)
 {
-	prefix[0] = '\0';
-	OutPut(-1,"ADbg Creation at debug level = %d (0x%08X)",my_level,this);
+  prefix[0] = '\0';
+  OutPut(-1,"ADbg Creation at debug level = %d (0x%08X)",my_level,this);
 }
 
 ADbg::~ADbg()
 {
-	unsetDebugFile();
-	OutPut(-1,"ADbg Deletion (0x%08X)",this);
+  unsetDebugFile();
+  OutPut(-1,"ADbg Deletion (0x%08X)",this);
 }
 
 inline int ADbg::_OutPut(const char * format,va_list params) const
 {
-	int result;
+  int result;
 
-	char tst[1000];
-	char myformat[256];
+  char tst[1000];
+  char myformat[256];
 
 #ifdef WIN32
-	if (my_time_included) {
-		SYSTEMTIME time;
-		GetSystemTime(&time);
-		if (prefix[0] == '\0')
-			wsprintfA(myformat,"%04d/%02d/%02d %02d:%02d:%02d.%03d UTC : %s\r\n",
-							time.wYear,
-							time.wMonth,
-							time.wDay,
-							time.wHour,
-							time.wMinute,
-							time.wSecond,
-							time.wMilliseconds,
-							format);
-		else
-			wsprintfA(myformat,"%04d/%02d/%02d %02d:%02d:%02d.%03d UTC : %s - %s\r\n",
-							time.wYear,
-							time.wMonth,
-							time.wDay,
-							time.wHour,
-							time.wMinute,
-							time.wSecond,
-							time.wMilliseconds,
-							prefix,
-							format);
-	} else {
-		if (prefix[0] == '\0')
-			wsprintfA( myformat, "%s\r\n", format);
-		else
-			wsprintfA( myformat, "%s - %s\r\n", prefix, format);
-	}
-	result = vsprintf(tst,myformat,params);
-	
-	if (my_debug_output)
-		OutputDebugStringA(tst);
-
-	if (my_use_file && (hFile != NULL)) {
-		SetFilePointer( hFile, 0, 0, FILE_END );
-		DWORD written;
-		WriteFile( hFile, tst, lstrlenA(tst), &written, NULL );
-	}
+  if (my_time_included) {
+    SYSTEMTIME time;
+    GetSystemTime(&time);
+    if (prefix[0] == '\0')
+      wsprintfA(myformat,"%04d/%02d/%02d %02d:%02d:%02d.%03d UTC : %s\r\n",
+                time.wYear,
+                time.wMonth,
+                time.wDay,
+                time.wHour,
+                time.wMinute,
+                time.wSecond,
+                time.wMilliseconds,
+                format);
+    else
+      wsprintfA(myformat,"%04d/%02d/%02d %02d:%02d:%02d.%03d UTC : %s - %s\r\n",
+                time.wYear,
+                time.wMonth,
+                time.wDay,
+                time.wHour,
+                time.wMinute,
+                time.wSecond,
+                time.wMilliseconds,
+                prefix,
+                format);
+  } else {
+    if (prefix[0] == '\0')
+      wsprintfA( myformat, "%s\r\n", format);
+    else
+      wsprintfA( myformat, "%s - %s\r\n", prefix, format);
+  }
+  result = vsprintf(tst,myformat,params);
+
+  if (my_debug_output)
+    OutputDebugStringA(tst);
+
+  if (my_use_file && (hFile != NULL)) {
+    SetFilePointer( hFile, 0, 0, FILE_END );
+    DWORD written;
+    WriteFile( hFile, tst, lstrlenA(tst), &written, NULL );
+  }
 #else
-	if (my_time_included) {
-		time_t nowSecs;
-		struct tm *now;
-		struct timeval tv;
-		
-		nowSecs = time(NULL);
-		gettimeofday(&tv, NULL);
-		now = gmtime(&nowSecs);
-		if (prefix[0] == '\0')
-			sprintf(myformat,"%04d/%02d/%02d %02d:%02d:%02ld.%03ld UTC : %s\r\n",
-					now->tm_year, now->tm_mon, now->tm_mday,
-					now->tm_hour, now->tm_min, tv.tv_sec,
-					(long)tv.tv_usec / 1000, format);
-		else
-			sprintf(myformat,"%04d/%02d/%02d %02d:%02d:%02ld.%03ld UTC : %s - %s\r\n",
-					now->tm_year, now->tm_mon, now->tm_mday,
-					now->tm_hour, now->tm_min, tv.tv_sec,
-					(long)tv.tv_usec / 1000, prefix, format);
-		
-	} else {
-		if (prefix[0] == '\0')
-			sprintf( myformat, "%s\r\n", format);
-		else
-			sprintf( myformat, "%s - %s\r\n", prefix, format);
-	}
-
-	result = vsprintf(tst,myformat,params);
-	
-	if (my_debug_output)
-		fputs(tst, stderr);
-
-	if (my_use_file && (hFile != NULL))
-		fputs(tst, hFile);
+  if (my_time_included) {
+    time_t nowSecs;
+    struct tm *now;
+    struct timeval tv;
+
+    nowSecs = time(NULL);
+    gettimeofday(&tv, NULL);
+    now = gmtime(&nowSecs);
+    if (prefix[0] == '\0')

makemkv-oss-1.9.5.tar.xz/libebml/src/EbmlBinary.cpp -> makemkv-oss-1.10.2.tar.xz/libebml/src/EbmlBinary.cpp Changed

@@ -11,17 +11,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -29,10 +29,10 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id$
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-	\author Julien Coloos	<suiryc @ users.sf.net>
+  \file
+  \version \$Id$
+  \author Steve Lhomme     <robux4 @ users.sf.net>
+  \author Julien Coloos  <suiryc @ users.sf.net>
 */
 #include <lgpl/stdstring.h>
 #include <lgpl/cassert>
@@ -43,24 +43,24 @@
 START_LIBEBML_NAMESPACE
 
 EbmlBinary::EbmlBinary()
- :EbmlElement(0, false), Data(NULL)
+  :EbmlElement(0, false), Data(NULL)
 {}
 
 EbmlBinary::EbmlBinary(const EbmlBinary & ElementToClone)
- :EbmlElement(ElementToClone)
+  :EbmlElement(ElementToClone)
 {
-	if (ElementToClone.Data == NULL)
-		Data = NULL;
-	else {
-		Data = (binary *)malloc(GetSize() * sizeof(binary));
-		assert(Data != NULL);
-		memcpy(Data, ElementToClone.Data, GetSize());
-	}
+  if (ElementToClone.Data == NULL)
+    Data = NULL;
+  else {
+    Data = (binary *)malloc(GetSize() * sizeof(binary));
+    assert(Data != NULL);
+    memcpy(Data, ElementToClone.Data, GetSize());
+  }
 }
 
 EbmlBinary::~EbmlBinary(void) {
-	if(Data)
-		free(Data);
+  if(Data)
+    free(Data);
 }
 
 EbmlBinary::operator const binary &() const {return *Data;}
@@ -68,42 +68,41 @@
 
 filepos_t EbmlBinary::RenderData(IOCallback & output, bool /* bForceRender */, bool /* bWithDefault */)
 {
-	output.writeFully(Data,GetSize());
+  output.writeFully(Data,GetSize());
 
-	return GetSize();
+  return GetSize();
 }
-	
+
 /*!
-	\note no Default binary value handled
+  \note no Default binary value handled
 */
 uint64 EbmlBinary::UpdateSize(bool /* bWithDefault */, bool /* bForceRender */)
 {
-	return GetSize();
+  return GetSize();
 }
 
 #ifndef EBML_NO_READ
 filepos_t EbmlBinary::ReadData(IOCallback & input, ScopeMode ReadFully)
 {
-	if (Data != NULL)
-		free(Data);
-	
-    if (ReadFully == SCOPE_NO_DATA || !GetSize())
-	{
-		Data = NULL;
-		return GetSize();
-	}
-
-	Data = (binary *)malloc(GetSize());
-    if (Data == NULL)
-		throw CRTError(std::string("Error allocating data"));
-	SetValueIsSet();
-	return input.read(Data, GetSize());
+  if (Data != NULL)
+    free(Data);
+
+  if (ReadFully == SCOPE_NO_DATA || !GetSize()) {
+    Data = NULL;
+    return GetSize();
+  }
+
+  Data = (binary *)malloc(GetSize());
+  if (Data == NULL)
+    throw CRTError(std::string("Error allocating data"));
+  SetValueIsSet();
+  return input.read(Data, GetSize());
 }
 #endif
 
 bool EbmlBinary::operator==(const EbmlBinary & ElementToCompare) const
 {
-	return ((GetSize() == ElementToCompare.GetSize()) && !memcmp(Data, ElementToCompare.Data, GetSize()));
+  return ((GetSize() == ElementToCompare.GetSize()) && !memcmp(Data, ElementToCompare.Data, GetSize()));
 }
 
 END_LIBEBML_NAMESPACE

makemkv-oss-1.9.5.tar.xz/libebml/src/EbmlContexts.cpp -> makemkv-oss-1.10.2.tar.xz/libebml/src/EbmlContexts.cpp Changed

@@ -11,17 +11,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -29,9 +29,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: EbmlContexts.cpp 639 2004-07-09 20:59:14Z mosu $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: EbmlContexts.cpp 639 2004-07-09 20:59:14Z mosu $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #include "ebml/EbmlContexts.h"
 #include "ebml/EbmlCrc32.h"
@@ -41,8 +41,8 @@
 
 static const EbmlSemantic EbmlGlobal_ContextList[2] =
 {
-	EbmlSemantic(false, false, EBML_INFO(EbmlCrc32)),   ///< EbmlCrc32
-	EbmlSemantic(false, false, EBML_INFO(EbmlVoid)),    ///< EbmlVoid
+  EbmlSemantic(false, false, EBML_INFO(EbmlCrc32)),   ///< EbmlCrc32
+  EbmlSemantic(false, false, EBML_INFO(EbmlVoid)),    ///< EbmlVoid
 };
 
 const EbmlSemanticContext Context_EbmlGlobal = EbmlSemanticContext(0, NULL, NULL, *GetEbmlGlobal_Context, NULL);
@@ -51,7 +51,7 @@
 
 const EbmlSemanticContext & GetEbmlGlobal_Context()
 {
-	return EbmlGlobal_Context;
+  return EbmlGlobal_Context;
 }
 
 END_LIBEBML_NAMESPACE

makemkv-oss-1.9.5.tar.xz/libebml/src/EbmlCrc32.cpp -> makemkv-oss-1.10.2.tar.xz/libebml/src/EbmlCrc32.cpp Changed

@@ -11,17 +11,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -29,10 +29,10 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: EbmlCrc32.cpp 1155 2005-05-06 11:43:38Z robux4 $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-	\author Jory Stone       <jcsston @ toughguy.net>
+  \file
+  \version \$Id: EbmlCrc32.cpp 1155 2005-05-06 11:43:38Z robux4 $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
+  \author Jory Stone       <jcsston @ toughguy.net>
 */
 #include "ebml/EbmlCrc32.h"
 #include "ebml/EbmlContexts.h"
@@ -54,302 +54,299 @@
 
 const uint32 EbmlCrc32::m_tab[] = {
 #ifdef WORDS_BIGENDIAN
-	0x00000000L, 0x96300777L, 0x2c610eeeL, 0xba510999L, 0x19c46d07L,
-	0x8ff46a70L, 0x35a563e9L, 0xa395649eL, 0x3288db0eL, 0xa4b8dc79L,
-	0x1ee9d5e0L, 0x88d9d297L, 0x2b4cb609L, 0xbd7cb17eL, 0x072db8e7L,
-	0x911dbf90L, 0x6410b71dL, 0xf220b06aL, 0x4871b9f3L, 0xde41be84L,
-	0x7dd4da1aL, 0xebe4dd6dL, 0x51b5d4f4L, 0xc785d383L, 0x56986c13L,
-	0xc0a86b64L, 0x7af962fdL, 0xecc9658aL, 0x4f5c0114L, 0xd96c0663L,
-	0x633d0ffaL, 0xf50d088dL, 0xc8206e3bL, 0x5e10694cL, 0xe44160d5L,
-	0x727167a2L, 0xd1e4033cL, 0x47d4044bL, 0xfd850dd2L, 0x6bb50aa5L,
-	0xfaa8b535L, 0x6c98b242L, 0xd6c9bbdbL, 0x40f9bcacL, 0xe36cd832L,
-	0x755cdf45L, 0xcf0dd6dcL, 0x593dd1abL, 0xac30d926L, 0x3a00de51L,
-	0x8051d7c8L, 0x1661d0bfL, 0xb5f4b421L, 0x23c4b356L, 0x9995bacfL,
-	0x0fa5bdb8L, 0x9eb80228L, 0x0888055fL, 0xb2d90cc6L, 0x24e90bb1L,
-	0x877c6f2fL, 0x114c6858L, 0xab1d61c1L, 0x3d2d66b6L, 0x9041dc76L,
-	0x0671db01L, 0xbc20d298L, 0x2a10d5efL, 0x8985b171L, 0x1fb5b606L,
-	0xa5e4bf9fL, 0x33d4b8e8L, 0xa2c90778L, 0x34f9000fL, 0x8ea80996L,
-	0x18980ee1L, 0xbb0d6a7fL, 0x2d3d6d08L, 0x976c6491L, 0x015c63e6L,
-	0xf4516b6bL, 0x62616c1cL, 0xd8306585L, 0x4e0062f2L, 0xed95066cL,
-	0x7ba5011bL, 0xc1f40882L, 0x57c40ff5L, 0xc6d9b065L, 0x50e9b712L,
-	0xeab8be8bL, 0x7c88b9fcL, 0xdf1ddd62L, 0x492dda15L, 0xf37cd38cL,
-	0x654cd4fbL, 0x5861b24dL, 0xce51b53aL, 0x7400bca3L, 0xe230bbd4L,
-	0x41a5df4aL, 0xd795d83dL, 0x6dc4d1a4L, 0xfbf4d6d3L, 0x6ae96943L,
-	0xfcd96e34L, 0x468867adL, 0xd0b860daL, 0x732d0444L, 0xe51d0333L,
-	0x5f4c0aaaL, 0xc97c0dddL, 0x3c710550L, 0xaa410227L, 0x10100bbeL,
-	0x86200cc9L, 0x25b56857L, 0xb3856f20L, 0x09d466b9L, 0x9fe461ceL,
-	0x0ef9de5eL, 0x98c9d929L, 0x2298d0b0L, 0xb4a8d7c7L, 0x173db359L,
-	0x810db42eL, 0x3b5cbdb7L, 0xad6cbac0L, 0x2083b8edL, 0xb6b3bf9aL,
-	0x0ce2b603L, 0x9ad2b174L, 0x3947d5eaL, 0xaf77d29dL, 0x1526db04L,
-	0x8316dc73L, 0x120b63e3L, 0x843b6494L, 0x3e6a6d0dL, 0xa85a6a7aL,
-	0x0bcf0ee4L, 0x9dff0993L, 0x27ae000aL, 0xb19e077dL, 0x44930ff0L,
-	0xd2a30887L, 0x68f2011eL, 0xfec20669L, 0x5d5762f7L, 0xcb676580L,
-	0x71366c19L, 0xe7066b6eL, 0x761bd4feL, 0xe02bd389L, 0x5a7ada10L,
-	0xcc4add67L, 0x6fdfb9f9L, 0xf9efbe8eL, 0x43beb717L, 0xd58eb060L,
-	0xe8a3d6d6L, 0x7e93d1a1L, 0xc4c2d838L, 0x52f2df4fL, 0xf167bbd1L,
-	0x6757bca6L, 0xdd06b53fL, 0x4b36b248L, 0xda2b0dd8L, 0x4c1b0aafL,
-	0xf64a0336L, 0x607a0441L, 0xc3ef60dfL, 0x55df67a8L, 0xef8e6e31L,
-	0x79be6946L, 0x8cb361cbL, 0x1a8366bcL, 0xa0d26f25L, 0x36e26852L,
-	0x95770cccL, 0x03470bbbL, 0xb9160222L, 0x2f260555L, 0xbe3bbac5L,
-	0x280bbdb2L, 0x925ab42bL, 0x046ab35cL, 0xa7ffd7c2L, 0x31cfd0b5L,
-	0x8b9ed92cL, 0x1daede5bL, 0xb0c2649bL, 0x26f263ecL, 0x9ca36a75L,
-	0x0a936d02L, 0xa906099cL, 0x3f360eebL, 0x85670772L, 0x13570005L,
-	0x824abf95L, 0x147ab8e2L, 0xae2bb17bL, 0x381bb60cL, 0x9b8ed292L,
-	0x0dbed5e5L, 0xb7efdc7cL, 0x21dfdb0bL, 0xd4d2d386L, 0x42e2d4f1L,
-	0xf8b3dd68L, 0x6e83da1fL, 0xcd16be81L, 0x5b26b9f6L, 0xe177b06fL,
-	0x7747b718L, 0xe65a0888L, 0x706a0fffL, 0xca3b0666L, 0x5c0b0111L,
-	0xff9e658fL, 0x69ae62f8L, 0xd3ff6b61L, 0x45cf6c16L, 0x78e20aa0L,
-	0xeed20dd7L, 0x5483044eL, 0xc2b30339L, 0x612667a7L, 0xf71660d0L,
-	0x4d476949L, 0xdb776e3eL, 0x4a6ad1aeL, 0xdc5ad6d9L, 0x660bdf40L,
-	0xf03bd837L, 0x53aebca9L, 0xc59ebbdeL, 0x7fcfb247L, 0xe9ffb530L,
-	0x1cf2bdbdL, 0x8ac2bacaL, 0x3093b353L, 0xa6a3b424L, 0x0536d0baL,
-	0x9306d7cdL, 0x2957de54L, 0xbf67d923L, 0x2e7a66b3L, 0xb84a61c4L,
-	0x021b685dL, 0x942b6f2aL, 0x37be0bb4L, 0xa18e0cc3L, 0x1bdf055aL,
-	0x8def022dL
+  0x00000000L, 0x96300777L, 0x2c610eeeL, 0xba510999L, 0x19c46d07L,
+  0x8ff46a70L, 0x35a563e9L, 0xa395649eL, 0x3288db0eL, 0xa4b8dc79L,
+  0x1ee9d5e0L, 0x88d9d297L, 0x2b4cb609L, 0xbd7cb17eL, 0x072db8e7L,
+  0x911dbf90L, 0x6410b71dL, 0xf220b06aL, 0x4871b9f3L, 0xde41be84L,
+  0x7dd4da1aL, 0xebe4dd6dL, 0x51b5d4f4L, 0xc785d383L, 0x56986c13L,
+  0xc0a86b64L, 0x7af962fdL, 0xecc9658aL, 0x4f5c0114L, 0xd96c0663L,
+  0x633d0ffaL, 0xf50d088dL, 0xc8206e3bL, 0x5e10694cL, 0xe44160d5L,
+  0x727167a2L, 0xd1e4033cL, 0x47d4044bL, 0xfd850dd2L, 0x6bb50aa5L,
+  0xfaa8b535L, 0x6c98b242L, 0xd6c9bbdbL, 0x40f9bcacL, 0xe36cd832L,
+  0x755cdf45L, 0xcf0dd6dcL, 0x593dd1abL, 0xac30d926L, 0x3a00de51L,
+  0x8051d7c8L, 0x1661d0bfL, 0xb5f4b421L, 0x23c4b356L, 0x9995bacfL,
+  0x0fa5bdb8L, 0x9eb80228L, 0x0888055fL, 0xb2d90cc6L, 0x24e90bb1L,
+  0x877c6f2fL, 0x114c6858L, 0xab1d61c1L, 0x3d2d66b6L, 0x9041dc76L,
+  0x0671db01L, 0xbc20d298L, 0x2a10d5efL, 0x8985b171L, 0x1fb5b606L,
+  0xa5e4bf9fL, 0x33d4b8e8L, 0xa2c90778L, 0x34f9000fL, 0x8ea80996L,
+  0x18980ee1L, 0xbb0d6a7fL, 0x2d3d6d08L, 0x976c6491L, 0x015c63e6L,
+  0xf4516b6bL, 0x62616c1cL, 0xd8306585L, 0x4e0062f2L, 0xed95066cL,
+  0x7ba5011bL, 0xc1f40882L, 0x57c40ff5L, 0xc6d9b065L, 0x50e9b712L,
+  0xeab8be8bL, 0x7c88b9fcL, 0xdf1ddd62L, 0x492dda15L, 0xf37cd38cL,
+  0x654cd4fbL, 0x5861b24dL, 0xce51b53aL, 0x7400bca3L, 0xe230bbd4L,
+  0x41a5df4aL, 0xd795d83dL, 0x6dc4d1a4L, 0xfbf4d6d3L, 0x6ae96943L,
+  0xfcd96e34L, 0x468867adL, 0xd0b860daL, 0x732d0444L, 0xe51d0333L,
+  0x5f4c0aaaL, 0xc97c0dddL, 0x3c710550L, 0xaa410227L, 0x10100bbeL,
+  0x86200cc9L, 0x25b56857L, 0xb3856f20L, 0x09d466b9L, 0x9fe461ceL,
+  0x0ef9de5eL, 0x98c9d929L, 0x2298d0b0L, 0xb4a8d7c7L, 0x173db359L,
+  0x810db42eL, 0x3b5cbdb7L, 0xad6cbac0L, 0x2083b8edL, 0xb6b3bf9aL,
+  0x0ce2b603L, 0x9ad2b174L, 0x3947d5eaL, 0xaf77d29dL, 0x1526db04L,
+  0x8316dc73L, 0x120b63e3L, 0x843b6494L, 0x3e6a6d0dL, 0xa85a6a7aL,
+  0x0bcf0ee4L, 0x9dff0993L, 0x27ae000aL, 0xb19e077dL, 0x44930ff0L,
+  0xd2a30887L, 0x68f2011eL, 0xfec20669L, 0x5d5762f7L, 0xcb676580L,
+  0x71366c19L, 0xe7066b6eL, 0x761bd4feL, 0xe02bd389L, 0x5a7ada10L,
+  0xcc4add67L, 0x6fdfb9f9L, 0xf9efbe8eL, 0x43beb717L, 0xd58eb060L,
+  0xe8a3d6d6L, 0x7e93d1a1L, 0xc4c2d838L, 0x52f2df4fL, 0xf167bbd1L,
+  0x6757bca6L, 0xdd06b53fL, 0x4b36b248L, 0xda2b0dd8L, 0x4c1b0aafL,
+  0xf64a0336L, 0x607a0441L, 0xc3ef60dfL, 0x55df67a8L, 0xef8e6e31L,
+  0x79be6946L, 0x8cb361cbL, 0x1a8366bcL, 0xa0d26f25L, 0x36e26852L,
+  0x95770cccL, 0x03470bbbL, 0xb9160222L, 0x2f260555L, 0xbe3bbac5L,
+  0x280bbdb2L, 0x925ab42bL, 0x046ab35cL, 0xa7ffd7c2L, 0x31cfd0b5L,
+  0x8b9ed92cL, 0x1daede5bL, 0xb0c2649bL, 0x26f263ecL, 0x9ca36a75L,
+  0x0a936d02L, 0xa906099cL, 0x3f360eebL, 0x85670772L, 0x13570005L,
+  0x824abf95L, 0x147ab8e2L, 0xae2bb17bL, 0x381bb60cL, 0x9b8ed292L,
+  0x0dbed5e5L, 0xb7efdc7cL, 0x21dfdb0bL, 0xd4d2d386L, 0x42e2d4f1L,
+  0xf8b3dd68L, 0x6e83da1fL, 0xcd16be81L, 0x5b26b9f6L, 0xe177b06fL,
+  0x7747b718L, 0xe65a0888L, 0x706a0fffL, 0xca3b0666L, 0x5c0b0111L,
+  0xff9e658fL, 0x69ae62f8L, 0xd3ff6b61L, 0x45cf6c16L, 0x78e20aa0L,
+  0xeed20dd7L, 0x5483044eL, 0xc2b30339L, 0x612667a7L, 0xf71660d0L,
+  0x4d476949L, 0xdb776e3eL, 0x4a6ad1aeL, 0xdc5ad6d9L, 0x660bdf40L,
+  0xf03bd837L, 0x53aebca9L, 0xc59ebbdeL, 0x7fcfb247L, 0xe9ffb530L,
+  0x1cf2bdbdL, 0x8ac2bacaL, 0x3093b353L, 0xa6a3b424L, 0x0536d0baL,
+  0x9306d7cdL, 0x2957de54L, 0xbf67d923L, 0x2e7a66b3L, 0xb84a61c4L,
+  0x021b685dL, 0x942b6f2aL, 0x37be0bb4L, 0xa18e0cc3L, 0x1bdf055aL,
+  0x8def022dL
 #else
-	0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
-	0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
-	0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
-	0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL,
-	0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L,
-	0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L,
-	0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L,
-	0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL,
-	0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L,
-	0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL,
-	0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L,
-	0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L,
-	0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L,
-	0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL,
-	0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL,
-	0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L,
-	0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL,
-	0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L,
-	0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L,
-	0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L,
-	0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL,
-	0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L,
-	0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L,
-	0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL,
-	0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L,
-	0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L,
-	0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L,
-	0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L,
-	0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L,
-	0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL,
-	0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL,
-	0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L,
-	0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L,
-	0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL,
-	0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL,
-	0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L,
-	0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL,
-	0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L,
-	0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL,
-	0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L,
-	0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL,
-	0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L,
-	0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L,
-	0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL,
-	0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L,
-	0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L,
-	0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L,
-	0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L,
-	0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L,
-	0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L,
-	0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,
-	0x2d02ef8dL
+  0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
+  0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,

makemkv-oss-1.9.5.tar.xz/libebml/src/EbmlDate.cpp -> makemkv-oss-1.10.2.tar.xz/libebml/src/EbmlDate.cpp Changed

@@ -17,9 +17,9 @@
 **
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -27,9 +27,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: EbmlDate.cpp 1079 2005-03-03 13:18:14Z robux4 $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: EbmlDate.cpp 1079 2005-03-03 13:18:14Z robux4 $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #include <lgpl/cassert>
 
@@ -42,49 +42,47 @@
 EbmlDate::EbmlDate(const EbmlDate & ElementToClone)
 :EbmlElement(ElementToClone)
 {
-	myDate = ElementToClone.myDate;
+  myDate = ElementToClone.myDate;
 }
 
 #ifndef EBML_NO_READ
 filepos_t EbmlDate::ReadData(IOCallback & input, ScopeMode ReadFully)
 {
-	if (ReadFully != SCOPE_NO_DATA)
-	{
-		if (GetSize() != 0) {
-			assert(GetSize() == 8);
-			binary Buffer[8];
-			input.readFully(Buffer, GetSize());
+  if ((ReadFully == SCOPE_NO_DATA) || (GetSize() == 0))
+    return GetSize();
 
-			big_int64 b64;
-			b64.Eval(Buffer);
+  assert(GetSize() == 8);
+  binary Buffer[8];
+  input.readFully(Buffer, GetSize());
 
-			myDate = b64;
-			SetValueIsSet();
-		}
-	}
+  big_int64 b64;
+  b64.Eval(Buffer);
 
-	return GetSize();
+  myDate = b64;
+  SetValueIsSet();
+
+  return GetSize();
 }
 #endif
 
 filepos_t EbmlDate::RenderData(IOCallback & output, bool /* bForceRender */, bool  /* bWithDefault */)
 {
-	if (GetSize() != 0) {
-		assert(GetSize() == 8);
-		big_int64 b64(myDate);
+  if (GetSize() != 0) {
+    assert(GetSize() == 8);
+    big_int64 b64(myDate);
 
-		output.writeFully(&b64.endian(),GetSize());
-	}
+    output.writeFully(&b64.endian(),GetSize());
+  }
 
-	return GetSize();
+  return GetSize();
 }
 
 bool EbmlDate::IsSmallerThan(const EbmlElement *Cmp) const
 {
-	if (EbmlId(*this) == EbmlId(*Cmp))
-		return this->myDate < static_cast<const EbmlDate *>(Cmp)->myDate;
-	else
-		return false;
+  if (EbmlId(*this) == EbmlId(*Cmp))
+    return this->myDate < static_cast<const EbmlDate *>(Cmp)->myDate;
+  else
+    return false;
 }
 
 END_LIBEBML_NAMESPACE

makemkv-oss-1.9.5.tar.xz/libebml/src/EbmlDummy.cpp -> makemkv-oss-1.10.2.tar.xz/libebml/src/EbmlDummy.cpp Changed

@@ -11,17 +11,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -29,9 +29,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id$
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id$
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #include "ebml/EbmlDummy.h"
 #include "ebml/EbmlContexts.h"
@@ -44,7 +44,7 @@
 
 EbmlDummy::operator const EbmlId &()
 {
-    return DummyId;
+  return DummyId;
 }
 
 END_LIBEBML_NAMESPACE

makemkv-oss-1.9.5.tar.xz/libebml/src/EbmlElement.cpp -> makemkv-oss-1.10.2.tar.xz/libebml/src/EbmlElement.cpp Changed

@@ -17,9 +17,9 @@
 **
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -27,9 +27,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id$
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id$
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 
 #include <cstring>
@@ -45,658 +45,659 @@
 START_LIBEBML_NAMESPACE
 
 /*!
-	\todo handle more than CodedSize of 5
+  \todo handle more than CodedSize of 5
 */
 int CodedSizeLength(uint64 Length, unsigned int SizeLength, bool bSizeFinite)
 {
-	unsigned int CodedSize;
-	if (bSizeFinite) {
-		// prepare the head of the size (000...01xxxxxx)
-		// optimal size
-		if (Length < 127) // 2^7 - 1
-			CodedSize = 1;
-		else if (Length < 16383) // 2^14 - 1
-			CodedSize = 2;
-		else if (Length < 2097151L) // 2^21 - 1
-			CodedSize = 3;
-		else if (Length < 268435455L) // 2^28 - 1
-			CodedSize = 4;
-		else CodedSize = 5;
-	} else {
-		if (Length <= 127) // 2^7 - 1
-			CodedSize = 1;
-		else if (Length <= 16383) // 2^14 - 1
-			CodedSize = 2;
-		else if (Length <= 2097151L) // 2^21 - 1
-			CodedSize = 3;
-		else if (Length <= 268435455L) // 2^28 - 1
-			CodedSize = 4;
-		else CodedSize = 5;
-	}
-
-	if ((SizeLength > 0) && (CodedSize < SizeLength)) {
-		// defined size
-		CodedSize = SizeLength;
-	}
-
-	return CodedSize;
+  unsigned int CodedSize;
+  if (bSizeFinite) {
+    // prepare the head of the size (000...01xxxxxx)
+    // optimal size
+    if (Length < 127) // 2^7 - 1
+      CodedSize = 1;
+    else if (Length < 16383) // 2^14 - 1
+      CodedSize = 2;
+    else if (Length < 2097151L) // 2^21 - 1
+      CodedSize = 3;
+    else if (Length < 268435455L) // 2^28 - 1
+      CodedSize = 4;
+    else CodedSize = 5;
+  } else {
+    if (Length <= 127) // 2^7 - 1
+      CodedSize = 1;
+    else if (Length <= 16383) // 2^14 - 1
+      CodedSize = 2;
+    else if (Length <= 2097151L) // 2^21 - 1
+      CodedSize = 3;
+    else if (Length <= 268435455L) // 2^28 - 1
+      CodedSize = 4;
+    else CodedSize = 5;
+  }
+
+  if ((SizeLength > 0) && (CodedSize < SizeLength)) {
+    // defined size
+    CodedSize = SizeLength;
+  }
+
+  return CodedSize;
 }
 
 /*!
-	\todo handle more than CodedSize of 5
+  \todo handle more than CodedSize of 5
 */
 int CodedSizeLengthSigned(int64 Length, unsigned int SizeLength)
 {
-	unsigned int CodedSize;
-	// prepare the head of the size (000...01xxxxxx)
-	// optimal size
-	if (Length > -64 && Length < 64) // 2^6
-		CodedSize = 1;
-	else if (Length > -8192 && Length < 8192) // 2^13
-		CodedSize = 2;
-	else if (Length > -1048576L && Length < 1048576L) // 2^20
-		CodedSize = 3;
-	else if (Length > -134217728L && Length < 134217728L) // 2^27
-		CodedSize = 4;
-	else CodedSize = 5;
-
-	if (SizeLength > 0 && CodedSize < SizeLength) {
-		// defined size
-		CodedSize = SizeLength;
-	}
-
-	return CodedSize;
+  unsigned int CodedSize;
+  // prepare the head of the size (000...01xxxxxx)
+  // optimal size
+  if (Length > -64 && Length < 64) // 2^6
+    CodedSize = 1;
+  else if (Length > -8192 && Length < 8192) // 2^13
+    CodedSize = 2;
+  else if (Length > -1048576L && Length < 1048576L) // 2^20
+    CodedSize = 3;
+  else if (Length > -134217728L && Length < 134217728L) // 2^27
+    CodedSize = 4;
+  else CodedSize = 5;
+
+  if (SizeLength > 0 && CodedSize < SizeLength) {
+    // defined size
+    CodedSize = SizeLength;
+  }
+
+  return CodedSize;
 }
 
 int CodedValueLength(uint64 Length, int CodedSize, binary * OutBuffer)
 {
-	int _SizeMask = 0xFF;
-	OutBuffer[0] = 1 << (8 - CodedSize);
-	for (int i=1; i<CodedSize; i++) {
-		OutBuffer[CodedSize-i] = Length & 0xFF;
-		Length >>= 8;
-		_SizeMask >>= 1;
-	}
-	// first one use a OR with the "EBML size head"
-	OutBuffer[0] |= Length & 0xFF & _SizeMask;
-	return CodedSize;
+  int _SizeMask = 0xFF;
+  OutBuffer[0] = 1 << (8 - CodedSize);
+  for (int i=1; i<CodedSize; i++) {
+    OutBuffer[CodedSize-i] = Length & 0xFF;
+    Length >>= 8;
+    _SizeMask >>= 1;
+  }
+  // first one use a OR with the "EBML size head"
+  OutBuffer[0] |= Length & 0xFF & _SizeMask;
+  return CodedSize;
 }
 
 int CodedValueLengthSigned(int64 Length, int CodedSize, binary * OutBuffer)
 {
-	if (Length > -64 && Length < 64) // 2^6
-		Length += 63;
-	else if (Length > -8192 && Length < 8192) // 2^13
-		Length += 8191;
-	else if (Length > -1048576L && Length < 1048576L) // 2^20
-		Length += 1048575L;
-	else if (Length > -134217728L && Length < 134217728L) // 2^27
-		Length += 134217727L;
-
-	return CodedValueLength(Length, CodedSize, OutBuffer);
+  if (Length > -64 && Length < 64) // 2^6
+    Length += 63;
+  else if (Length > -8192 && Length < 8192) // 2^13
+    Length += 8191;
+  else if (Length > -1048576L && Length < 1048576L) // 2^20
+    Length += 1048575L;
+  else if (Length > -134217728L && Length < 134217728L) // 2^27
+    Length += 134217727L;
+
+  return CodedValueLength(Length, CodedSize, OutBuffer);
 }
 
 uint64 ReadCodedSizeValue(const binary * InBuffer, uint32 & BufferSize, uint64 & SizeUnknown)
 {
-	binary SizeBitMask = 1 << 7;
-	uint64 Result = 0x7F;
-	unsigned int SizeIdx, PossibleSizeLength = 0;
-	binary PossibleSize[8];
-
-	SizeUnknown = 0x7F; // the last bit is discarded when computing the size

makemkv-oss-1.9.5.tar.xz/libebml/src/EbmlFloat.cpp -> makemkv-oss-1.10.2.tar.xz/libebml/src/EbmlFloat.cpp Changed

@@ -19,9 +19,9 @@
 **
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -29,9 +29,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id$
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id$
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 
 #include <lgpl/cassert>
@@ -41,36 +41,36 @@
 START_LIBEBML_NAMESPACE
 
 EbmlFloat::EbmlFloat(const EbmlFloat::Precision prec)
- :EbmlElement(0, false)
+  :EbmlElement(0, false)
 {
-	SetPrecision(prec);
+  SetPrecision(prec);
 }
 
 EbmlFloat::EbmlFloat(const double aDefaultValue, const EbmlFloat::Precision prec)
- :EbmlElement(0, true), Value(aDefaultValue), DefaultValue(aDefaultValue)
+  :EbmlElement(0, true), Value(aDefaultValue), DefaultValue(aDefaultValue)
 {
-	SetDefaultIsSet();
-	SetPrecision(prec);
+  SetDefaultIsSet();
+  SetPrecision(prec);
 }
 
 EbmlFloat::EbmlFloat(const EbmlFloat & ElementToClone)
- :EbmlElement(ElementToClone)
- ,Value(ElementToClone.Value)
- ,DefaultValue(ElementToClone.DefaultValue)
+  :EbmlElement(ElementToClone)
+  ,Value(ElementToClone.Value)
+  ,DefaultValue(ElementToClone.DefaultValue)
 {
 }
 
 void EbmlFloat::SetDefaultValue(double aValue)
 {
-    assert(!DefaultISset());
-    DefaultValue = aValue;
-    SetDefaultIsSet();
+  assert(!DefaultISset());
+  DefaultValue = aValue;
+  SetDefaultIsSet();
 }
 
 double EbmlFloat::DefaultVal() const
 {
-    assert(DefaultISset());
-    return DefaultValue;
+  assert(DefaultISset());
+  return DefaultValue;
 }
 
 EbmlFloat::operator float() const {return float(Value);}
@@ -83,78 +83,77 @@
 }
 
 /*!
-	\todo handle exception on errors
-	\todo handle 10 bits precision
+  \todo handle exception on errors
+  \todo handle 10 bits precision
 */
 filepos_t EbmlFloat::RenderData(IOCallback & output, bool /* bForceRender */, bool /* bWithDefault */)
 {
-	assert(GetSize() == 4 || GetSize() == 8);
-
-	if (GetSize() == 4) {
-		float val = Value;
-		int Tmp;
-		memcpy(&Tmp, &val, 4);
-		big_int32 TmpToWrite(Tmp);
-		output.writeFully(&TmpToWrite.endian(), GetSize());
-	} else if (GetSize() == 8) {
-		double val = Value;
-		int64 Tmp;
-		memcpy(&Tmp, &val, 8);
-		big_int64 TmpToWrite(Tmp);
-		output.writeFully(&TmpToWrite.endian(), GetSize());
-	}
-
-	return GetSize();
+  assert(GetSize() == 4 || GetSize() == 8);
+
+  if (GetSize() == 4) {
+    float val = Value;
+    int Tmp;
+    memcpy(&Tmp, &val, 4);
+    big_int32 TmpToWrite(Tmp);
+    output.writeFully(&TmpToWrite.endian(), GetSize());
+  } else if (GetSize() == 8) {
+    double val = Value;
+    int64 Tmp;
+    memcpy(&Tmp, &val, 8);
+    big_int64 TmpToWrite(Tmp);
+    output.writeFully(&TmpToWrite.endian(), GetSize());
+  }
+
+  return GetSize();
 }
 
 uint64 EbmlFloat::UpdateSize(bool bWithDefault, bool  /* bForceRender */)
 {
-	if (!bWithDefault && IsDefaultValue())
-		return 0;
-	return GetSize();
+  if (!bWithDefault && IsDefaultValue())
+    return 0;
+  return GetSize();
 }
 
 /*!
-	\todo remove the hack for possible endianess pb (test on little & big endian)
+  \todo remove the hack for possible endianess pb (test on little & big endian)
 */
 #ifndef EBML_NO_READ
 filepos_t EbmlFloat::ReadData(IOCallback & input, ScopeMode ReadFully)
 {
-	if (ReadFully != SCOPE_NO_DATA)
-	{
-		binary Buffer[20];
-		assert(GetSize() <= 20);
-		input.readFully(Buffer, GetSize());
-
-		if (GetSize() == 4) {
-			big_int32 TmpRead;
-			TmpRead.Eval(Buffer);
-			int32 tmpp = int32(TmpRead);
-			float val;
-			memcpy(&val, &tmpp, 4);
-			Value = val;
-			SetValueIsSet();
-		} else if (GetSize() == 8) {
-			big_int64 TmpRead;
-			TmpRead.Eval(Buffer);
-			int64 tmpp = int64(TmpRead);
-			double val;
-			memcpy(&val, &tmpp, 8);
-			Value = val;
-			SetValueIsSet();
-		}
-	}
-
-	return GetSize();
+  if (ReadFully != SCOPE_NO_DATA) {
+    binary Buffer[20];
+    assert(GetSize() <= 20);
+    input.readFully(Buffer, GetSize());
+
+    if (GetSize() == 4) {
+      big_int32 TmpRead;
+      TmpRead.Eval(Buffer);
+      int32 tmpp = int32(TmpRead);
+      float val;
+      memcpy(&val, &tmpp, 4);
+      Value = val;
+      SetValueIsSet();
+    } else if (GetSize() == 8) {
+      big_int64 TmpRead;
+      TmpRead.Eval(Buffer);
+      int64 tmpp = int64(TmpRead);
+      double val;
+      memcpy(&val, &tmpp, 8);
+      Value = val;
+      SetValueIsSet();
+    }
+  }
+
+  return GetSize();
 }
 #endif
 
 bool EbmlFloat::IsSmallerThan(const EbmlElement *Cmp) const
 {
-	if (EbmlId(*this) == EbmlId(*Cmp))
-		return this->Value < static_cast<const EbmlFloat *>(Cmp)->Value;
-	else
-		return false;
+  if (EbmlId(*this) == EbmlId(*Cmp))

makemkv-oss-1.9.5.tar.xz/libebml/src/EbmlHead.cpp -> makemkv-oss-1.10.2.tar.xz/libebml/src/EbmlHead.cpp Changed

@@ -11,17 +11,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -29,9 +29,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: EbmlHead.cpp 1096 2005-03-17 09:14:52Z robux4 $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: EbmlHead.cpp 1096 2005-03-17 09:14:52Z robux4 $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #include "ebml/EbmlHead.h"
 #include "ebml/EbmlSubHead.h"
@@ -52,7 +52,7 @@
 DEFINE_EBML_MASTER_ORPHAN(EbmlHead, 0x1A45DFA3, 4, "EBMLHead\0ratamapaga");
 
 EbmlHead::EbmlHead()
- :EbmlMaster(EbmlHead_Context)
+  :EbmlMaster(EbmlHead_Context)
 {}
 
 END_LIBEBML_NAMESPACE

makemkv-oss-1.9.5.tar.xz/libebml/src/EbmlMaster.cpp -> makemkv-oss-1.10.2.tar.xz/libebml/src/EbmlMaster.cpp Changed

@@ -11,17 +11,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -29,9 +29,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id$
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id$
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 
 #include <lgpl/cassert>
@@ -47,9 +47,9 @@
 EbmlMaster::EbmlMaster(const EbmlSemanticContext & aContext, bool bSizeIsknown)
  :EbmlElement(0), Context(aContext), bChecksumUsed(bChecksumUsedByDefault)
 {
-	SetSizeIsFinite(bSizeIsknown);
-	SetValueIsSet();
-	ProcessMandatory();
+  SetSizeIsFinite(bSizeIsknown);
+  SetValueIsSet();
+  ProcessMandatory();
 }
 
 EbmlMaster::EbmlMaster(const EbmlMaster & ElementToClone)
@@ -59,498 +59,529 @@
  ,bChecksumUsed(ElementToClone.bChecksumUsed)
  ,Checksum(ElementToClone.Checksum)
 {
-	// add a clone of the list
-	std::vector<EbmlElement *>::const_iterator Itr = ElementToClone.ElementList.begin();
-	std::vector<EbmlElement *>::iterator myItr = ElementList.begin();
-	while (Itr != ElementToClone.ElementList.end())
-	{
-		*myItr = (*Itr)->Clone();
-		Itr++; myItr++;
-	}
+  // add a clone of the list
+  std::vector<EbmlElement *>::const_iterator Itr = ElementToClone.ElementList.begin();
+  std::vector<EbmlElement *>::iterator myItr = ElementList.begin();
+  while (Itr != ElementToClone.ElementList.end())
+  {
+    *myItr = (*Itr)->Clone();
+    ++Itr; ++myItr;
+  }
 
 }
 
 EbmlMaster::~EbmlMaster()
 {
-	assert(!IsLocked()); // you're trying to delete a locked element !!!
-
-	size_t Index;
-	
-	for (Index = 0; Index < ElementList.size(); Index++) {
-		if (!(*ElementList[Index]).IsLocked())	{
-			delete ElementList[Index];
-		}
-	}
+  assert(!IsLocked()); // you're trying to delete a locked element !!!
+
+  size_t Index;
+
+  for (Index = 0; Index < ElementList.size(); Index++) {
+    if (!(*ElementList[Index]).IsLocked())  {
+      delete ElementList[Index];
+    }
+  }
 }
 
 /*!
-	\todo handle exception on errors
-	\todo write all the Mandatory elements in the Context, otherwise assert
+  \todo handle exception on errors
+  \todo write all the Mandatory elements in the Context, otherwise assert
 */
 filepos_t EbmlMaster::RenderData(IOCallback & output, bool bForceRender, bool bWithDefault)
 {
-	filepos_t Result = 0;
-	size_t Index;
-
-	if (!bForceRender) {
-		assert(CheckMandatory());
-	}
-
-	if (!bChecksumUsed) { // old school
-		for (Index = 0; Index < ElementList.size(); Index++) {
-			if (!bWithDefault && (ElementList[Index])->IsDefaultValue())
-				continue;
-			Result += (ElementList[Index])->Render(output, bWithDefault, false ,bForceRender);
-		}
-	} else { // new school
-		MemIOCallback TmpBuf(GetSize() - 6);
-		for (Index = 0; Index < ElementList.size(); Index++) {
-			if (!bWithDefault && (ElementList[Index])->IsDefaultValue())
-				continue;
-			(ElementList[Index])->Render(TmpBuf, bWithDefault, false ,bForceRender);
-		}
-		Checksum.FillCRC32(TmpBuf.GetDataBuffer(), TmpBuf.GetDataBufferSize());
-		Result += Checksum.Render(output, true, false ,bForceRender);
-		output.writeFully(TmpBuf.GetDataBuffer(), TmpBuf.GetDataBufferSize());
-		Result += TmpBuf.GetDataBufferSize();
-	}
-
-	return Result;
+  filepos_t Result = 0;
+  size_t Index;
+
+  if (!bForceRender) {
+    assert(CheckMandatory());
+  }
+
+  if (!bChecksumUsed) { // old school
+    for (Index = 0; Index < ElementList.size(); Index++) {
+      if (!bWithDefault && (ElementList[Index])->IsDefaultValue())
+        continue;
+      Result += (ElementList[Index])->Render(output, bWithDefault, false ,bForceRender);
+    }
+  } else { // new school
+    MemIOCallback TmpBuf(GetSize() - 6);
+    for (Index = 0; Index < ElementList.size(); Index++) {
+      if (!bWithDefault && (ElementList[Index])->IsDefaultValue())
+        continue;
+      (ElementList[Index])->Render(TmpBuf, bWithDefault, false ,bForceRender);
+    }
+    Checksum.FillCRC32(TmpBuf.GetDataBuffer(), TmpBuf.GetDataBufferSize());
+    Result += Checksum.Render(output, true, false ,bForceRender);
+    output.writeFully(TmpBuf.GetDataBuffer(), TmpBuf.GetDataBufferSize());
+    Result += TmpBuf.GetDataBufferSize();
+  }
+
+  return Result;
 }
 
 /*!
-	\todo We might be able to forbid elements that don't exist in the context
+  \todo We might be able to forbid elements that don't exist in the context
 */
 bool EbmlMaster::PushElement(EbmlElement & element)
 {
-	ElementList.push_back(&element);
-	return true;
+  ElementList.push_back(&element);
+  return true;
 }
 
 uint64 EbmlMaster::UpdateSize(bool bWithDefault, bool bForceRender)
 {
-	SetSize_(0);
+  SetSize_(0);
 
-	if (!IsFiniteSize())
-		return (0-1);
+  if (!IsFiniteSize())
+    return (0-1);
 
-	if (!bForceRender) {
-		assert(CheckMandatory());
+  if (!bForceRender) {
+    assert(CheckMandatory());
     }
-	
-	size_t Index;
-	
-	for (Index = 0; Index < ElementList.size(); Index++) {
-		if (!bWithDefault && (ElementList[Index])->IsDefaultValue())
-			continue;
-		(ElementList[Index])->UpdateSize(bWithDefault, bForceRender);
-		uint64 SizeToAdd = (ElementList[Index])->ElementSize(bWithDefault);
+
+  size_t Index;
+
+  for (Index = 0; Index < ElementList.size(); Index++) {
+    if (!bWithDefault && (ElementList[Index])->IsDefaultValue())
+      continue;
+    (ElementList[Index])->UpdateSize(bWithDefault, bForceRender);
+    uint64 SizeToAdd = (ElementList[Index])->ElementSize(bWithDefault);

makemkv-oss-1.9.5.tar.xz/libebml/src/EbmlSInteger.cpp -> makemkv-oss-1.10.2.tar.xz/libebml/src/EbmlSInteger.cpp Changed

@@ -9,17 +9,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -27,10 +27,10 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id$
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-	\author Moritz Bunkus <moritz @ bunkus.org>
+  \file
+  \version \$Id$
+  \author Steve Lhomme     <robux4 @ users.sf.net>
+  \author Moritz Bunkus <moritz @ bunkus.org>
 */
 #include <lgpl/cassert>
 
@@ -39,19 +39,19 @@
 START_LIBEBML_NAMESPACE
 
 EbmlSInteger::EbmlSInteger()
- :EbmlElement(DEFAULT_INT_SIZE, false)
+  :EbmlElement(DEFAULT_INT_SIZE, false)
 {}
 
 EbmlSInteger::EbmlSInteger(int64 aDefaultValue)
- :EbmlElement(DEFAULT_INT_SIZE, true), Value(aDefaultValue)
+  :EbmlElement(DEFAULT_INT_SIZE, true), Value(aDefaultValue)
 {
-	SetDefaultIsSet();
+  SetDefaultIsSet();
 }
 
 EbmlSInteger::EbmlSInteger(const EbmlSInteger & ElementToClone)
- :EbmlElement(ElementToClone)
- ,Value(ElementToClone.Value)
- ,DefaultValue(ElementToClone.DefaultValue)
+  :EbmlElement(ElementToClone)
+  ,Value(ElementToClone.Value)
+  ,DefaultValue(ElementToClone.DefaultValue)
 {
 }
 
@@ -67,91 +67,89 @@
 }
 
 /*!
-	\todo handle exception on errors
+  \todo handle exception on errors
 */
 filepos_t EbmlSInteger::RenderData(IOCallback & output, bool /* bForceRender */, bool /* bWithDefault */)
 {
-	binary FinalData[8]; // we don't handle more than 64 bits integers
-	unsigned int i;
-	
-	if (GetSizeLength() > 8)
-		return 0; // integer bigger coded on more than 64 bits are not supported
-	
-	int64 TempValue = Value;
-	for (i=0; i<GetSize();i++) {
-		FinalData[GetSize()-i-1] = binary(TempValue & 0xFF);
-		TempValue >>= 8;
-	}
-	
-	output.writeFully(FinalData,GetSize());
-
-	return GetSize();
+  binary FinalData[8]; // we don't handle more than 64 bits integers
+  unsigned int i;
+
+  if (GetSizeLength() > 8)
+    return 0; // integer bigger coded on more than 64 bits are not supported
+
+  int64 TempValue = Value;
+  for (i=0; i<GetSize();i++) {
+    FinalData[GetSize()-i-1] = binary(TempValue & 0xFF);
+    TempValue >>= 8;
+  }
+
+  output.writeFully(FinalData,GetSize());
+
+  return GetSize();
 }
 
 uint64 EbmlSInteger::UpdateSize(bool bWithDefault, bool /* bForceRender */)
 {
-	if (!bWithDefault && IsDefaultValue())
-		return 0;
-
-	if (Value <= 0x7F && Value >= (-0x80)) {
-		SetSize_(1);
-	} else if (Value <= 0x7FFF && Value >= (-0x8000)) {
-		SetSize_(2);
-	} else if (Value <= 0x7FFFFF && Value >= (-0x800000)) {
-		SetSize_(3);
-	} else if (Value <= 0x7FFFFFFF && Value >= (-0x80000000)) {
-		SetSize_(4);
-	} else if (Value <= EBML_PRETTYLONGINT(0x7FFFFFFFFF) &&
-		   Value >= EBML_PRETTYLONGINT(-0x8000000000)) {
-		SetSize_(5);
-	} else if (Value <= EBML_PRETTYLONGINT(0x7FFFFFFFFFFF) &&
-		   Value >= EBML_PRETTYLONGINT(-0x800000000000)) {
-		SetSize_(6);
-	} else if (Value <= EBML_PRETTYLONGINT(0x7FFFFFFFFFFFFF) &&
-		   Value >= EBML_PRETTYLONGINT(-0x80000000000000)) {
-		SetSize_(7);
-	} else {
-		SetSize_(8);
-	}
-
-	if (GetDefaultSize() > GetSize()) {
-		SetSize_(GetDefaultSize());
-	}
-
-	return GetSize();
+  if (!bWithDefault && IsDefaultValue())
+    return 0;
+
+  if (Value <= 0x7F && Value >= (-0x80)) {
+    SetSize_(1);
+  } else if (Value <= 0x7FFF && Value >= (-0x8000)) {
+    SetSize_(2);
+  } else if (Value <= 0x7FFFFF && Value >= (-0x800000)) {
+    SetSize_(3);
+  } else if (Value <= EBML_PRETTYLONGINT(0x7FFFFFFF) && Value >= (EBML_PRETTYLONGINT(-0x80000000))) {
+    SetSize_(4);
+  } else if (Value <= EBML_PRETTYLONGINT(0x7FFFFFFFFF) &&
+             Value >= EBML_PRETTYLONGINT(-0x8000000000)) {
+    SetSize_(5);
+  } else if (Value <= EBML_PRETTYLONGINT(0x7FFFFFFFFFFF) &&
+             Value >= EBML_PRETTYLONGINT(-0x800000000000)) {
+    SetSize_(6);
+  } else if (Value <= EBML_PRETTYLONGINT(0x7FFFFFFFFFFFFF) &&
+             Value >= EBML_PRETTYLONGINT(-0x80000000000000)) {
+    SetSize_(7);
+  } else {
+    SetSize_(8);
+  }
+
+  if (GetDefaultSize() > GetSize()) {
+    SetSize_(GetDefaultSize());
+  }
+
+  return GetSize();
 }
 
 #ifndef EBML_NO_READ
 filepos_t EbmlSInteger::ReadData(IOCallback & input, ScopeMode ReadFully)
 {
-	if (ReadFully != SCOPE_NO_DATA)
-	{
-		binary Buffer[8];
-		input.readFully(Buffer, GetSize());
-		
-		if (Buffer[0] & 0x80)
-			Value = -1; // this is a negative value
-		else
-			Value = 0; // this is a positive value
-		
-		for (unsigned int i=0; i<GetSize(); i++)
-		{
-			Value <<= 8;
-			Value |= Buffer[i];
-		}
-		SetValueIsSet();
-	}
-
-	return GetSize();
+  if (ReadFully != SCOPE_NO_DATA) {
+    binary Buffer[8];
+    input.readFully(Buffer, GetSize());
+
+    if (Buffer[0] & 0x80)
+      Value = -1; // this is a negative value
+    else
+      Value = 0; // this is a positive value
+
+    for (unsigned int i=0; i<GetSize(); i++) {
+      Value <<= 8;
+      Value |= Buffer[i];

makemkv-oss-1.9.5.tar.xz/libebml/src/EbmlStream.cpp -> makemkv-oss-1.10.2.tar.xz/libebml/src/EbmlStream.cpp Changed

@@ -11,17 +11,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -29,16 +29,16 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id$
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id$
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #include "ebml/EbmlStream.h"
 
 START_LIBEBML_NAMESPACE
 
 EbmlStream::EbmlStream(IOCallback & DataStream)
- :Stream(DataStream)
+  :Stream(DataStream)
 {}
 
 EbmlStream::~EbmlStream()
@@ -46,12 +46,12 @@
 
 EbmlElement * EbmlStream::FindNextID(const EbmlCallbacks & ClassInfos, uint64 MaxDataSize)
 {
-	return EbmlElement::FindNextID(Stream, ClassInfos, MaxDataSize);
+  return EbmlElement::FindNextID(Stream, ClassInfos, MaxDataSize);
 }
 
 EbmlElement * EbmlStream::FindNextElement(const EbmlSemanticContext & Context, int & UpperLevel, uint64 MaxDataSize, bool AllowDummyElt, unsigned int MaxLowerLevel)
 {
-	return EbmlElement::FindNextElement(Stream, Context, UpperLevel, MaxDataSize, AllowDummyElt, MaxLowerLevel);
+  return EbmlElement::FindNextElement(Stream, Context, UpperLevel, MaxDataSize, AllowDummyElt, MaxLowerLevel);
 }
 
 END_LIBEBML_NAMESPACE

makemkv-oss-1.9.5.tar.xz/libebml/src/EbmlString.cpp -> makemkv-oss-1.10.2.tar.xz/libebml/src/EbmlString.cpp Changed

@@ -11,17 +11,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -29,9 +29,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id$
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id$
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #include <lgpl/cassert>
 
@@ -40,86 +40,85 @@
 START_LIBEBML_NAMESPACE
 
 EbmlString::EbmlString()
- :EbmlElement(0, false)
+  :EbmlElement(0, false)
 {
-	SetDefaultSize(0);
-/* done automatically	
-	SetSize_(Value.length());
-	if (GetDefaultSize() > GetSize())
-		SetSize_(GetDefaultSize());*/
+  SetDefaultSize(0);
+/* done automatically
+  SetSize_(Value.length());
+  if (GetDefaultSize() > GetSize())
+    SetSize_(GetDefaultSize());*/
 }
 
 EbmlString::EbmlString(const ccc::string & aDefaultValue)
- :EbmlElement(0, true), Value(aDefaultValue), DefaultValue(aDefaultValue)
+  :EbmlElement(0, true), Value(aDefaultValue), DefaultValue(aDefaultValue)
 {
-	SetDefaultSize(0);
-	SetDefaultIsSet();
-/* done automatically	
-	SetSize_(Value.length());
-	if (GetDefaultSize() > GetSize())
-		SetSize_(GetDefaultSize());*/
+  SetDefaultSize(0);
+  SetDefaultIsSet();
+/* done automatically
+  SetSize_(Value.length());
+  if (GetDefaultSize() > GetSize())
+    SetSize_(GetDefaultSize());*/
 }
 
 /*!
-	\todo Cloning should be on the same exact type !
+  \todo Cloning should be on the same exact type !
 */
 EbmlString::EbmlString(const EbmlString & ElementToClone)
- :EbmlElement(ElementToClone)
- ,Value(ElementToClone.Value)
- ,DefaultValue(ElementToClone.DefaultValue)
+  :EbmlElement(ElementToClone)
+  ,Value(ElementToClone.Value)
+  ,DefaultValue(ElementToClone.DefaultValue)
 {
 }
 
 void EbmlString::SetDefaultValue(ccc::string & aValue)
 {
-    assert(!DefaultISset());
-    DefaultValue = aValue;
-    SetDefaultIsSet();
+  assert(!DefaultISset());
+  DefaultValue = aValue;
+  SetDefaultIsSet();
 }
 
 const ref::string & EbmlString::DefaultVal() const
 {
-    assert(DefaultISset());
-    return DefaultValue;
+  assert(DefaultISset());
+  return DefaultValue;
 }
 
 
 /*!
-	\todo handle exception on errors
+  \todo handle exception on errors
 */
 filepos_t EbmlString::RenderData(IOCallback & output, bool /* bForceRender */, bool /* bWithDefault */)
 {
-	filepos_t Result;
-	output.writeFully(Value.c_str(), Value.length());
-	Result = Value.length();
-	
-	if (Result < GetDefaultSize()) {
-		// pad the rest with 0
-		binary *Pad = new binary[GetDefaultSize() - Result];
-		if (Pad == NULL)
-		{
-			return Result;
-		}
-		memset(Pad, 0x00, GetDefaultSize() - Result);
-		output.writeFully(Pad, GetDefaultSize() - Result);
-		Result = GetDefaultSize();
-		delete [] Pad;
-	}
-	
-	return Result;
+  filepos_t Result;
+  output.writeFully(Value.c_str(), Value.length());
+  Result = Value.length();
+
+  if (Result < GetDefaultSize()) {
+    // pad the rest with 0
+    binary *Pad = new (std::nothrow) binary[GetDefaultSize() - Result];
+    if (Pad == NULL) {
+      return Result;
+    }
+    memset(Pad, 0x00, GetDefaultSize() - Result);
+    output.writeFully(Pad, GetDefaultSize() - Result);
+    Result = GetDefaultSize();
+    delete [] Pad;
+  }
+
+  return Result;
 }
 
 EbmlString::operator const ref::string &() const {return Value;}
 
 EbmlString & EbmlString::operator=(const ccc::string & NewString)
 {
-	Value = NewString;
-	SetValueIsSet();
-/* done automatically	
-	SetSize_(Value.length());
-	if (GetDefaultSize() > GetSize())
-		SetSize_(GetDefaultSize());*/
-	return *this;
+  Value = NewString;
+  SetValueIsSet();
+/* done automatically
+  SetSize_(Value.length());
+  if (GetDefaultSize() > GetSize())
+    SetSize_(GetDefaultSize());*/
+  return *this;
 }
 
 EbmlString &EbmlString::SetValue(ccc::string const &NewValue) {
@@ -132,43 +131,42 @@
 
 uint64 EbmlString::UpdateSize(bool bWithDefault, bool /* bForceRender */)
 {
-	if (!bWithDefault && IsDefaultValue())
-		return 0;
-
-	if (Value.length() < GetDefaultSize()) {
-		SetSize_(GetDefaultSize());
-	} else {
-		SetSize_(Value.length());
-	}
-	return GetSize();
+  if (!bWithDefault && IsDefaultValue())
+    return 0;
+
+  if (Value.length() < GetDefaultSize()) {
+    SetSize_(GetDefaultSize());
+  } else {
+    SetSize_(Value.length());
+  }
+  return GetSize();
 }
 
 #ifndef EBML_NO_READ
 filepos_t EbmlString::ReadData(IOCallback & input, ScopeMode ReadFully)
 {
-	if (ReadFully != SCOPE_NO_DATA)
-	{
-		if (GetSize() == 0) {
-			Value = "";

makemkv-oss-1.9.5.tar.xz/libebml/src/EbmlSubHead.cpp -> makemkv-oss-1.10.2.tar.xz/libebml/src/EbmlSubHead.cpp Changed

@@ -11,17 +11,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -29,9 +29,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: EbmlSubHead.cpp 639 2004-07-09 20:59:14Z mosu $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: EbmlSubHead.cpp 639 2004-07-09 20:59:14Z mosu $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #include "ebml/EbmlSubHead.h"
 #include "ebml/EbmlContexts.h"

makemkv-oss-1.9.5.tar.xz/libebml/src/EbmlUInteger.cpp -> makemkv-oss-1.10.2.tar.xz/libebml/src/EbmlUInteger.cpp Changed

@@ -11,17 +11,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -29,10 +29,10 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id$
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-	\author Moritz Bunkus <moritz @ bunkus.org>
+  \file
+  \version \$Id$
+  \author Steve Lhomme     <robux4 @ users.sf.net>
+  \author Moritz Bunkus <moritz @ bunkus.org>
 */
 #include <lgpl/cassert>
 
@@ -41,33 +41,33 @@
 START_LIBEBML_NAMESPACE
 
 EbmlUInteger::EbmlUInteger()
- :EbmlElement(DEFAULT_UINT_SIZE, false)
+  :EbmlElement(DEFAULT_UINT_SIZE, false)
 {}
 
 EbmlUInteger::EbmlUInteger(uint64 aDefaultValue)
- :EbmlElement(DEFAULT_UINT_SIZE, true), Value(aDefaultValue), DefaultValue(aDefaultValue)
+  :EbmlElement(DEFAULT_UINT_SIZE, true), Value(aDefaultValue), DefaultValue(aDefaultValue)
 {
-	SetDefaultIsSet();
+  SetDefaultIsSet();
 }
 
 EbmlUInteger::EbmlUInteger(const EbmlUInteger & ElementToClone)
- :EbmlElement(ElementToClone)
- ,Value(ElementToClone.Value)
- ,DefaultValue(ElementToClone.DefaultValue)
+  :EbmlElement(ElementToClone)
+  ,Value(ElementToClone.Value)
+  ,DefaultValue(ElementToClone.DefaultValue)
 {
 }
 
 void EbmlUInteger::SetDefaultValue(uint64 aValue)
 {
-    assert(!DefaultISset());
-    DefaultValue = aValue;
-    SetDefaultIsSet();
+  assert(!DefaultISset());
+  DefaultValue = aValue;
+  SetDefaultIsSet();
 }
 
 uint64 EbmlUInteger::DefaultVal() const
 {
-    assert(DefaultISset());
-    return DefaultValue;
+  assert(DefaultISset());
+  return DefaultValue;
 }
 
 EbmlUInteger::operator uint8()  const {return uint8(Value); }
@@ -82,83 +82,81 @@
 }
 
 /*!
-	\todo handle exception on errors
+  \todo handle exception on errors
 */
 filepos_t EbmlUInteger::RenderData(IOCallback & output, bool /* bForceRender */, bool /* bWithDefault */)
 {
-	binary FinalData[8]; // we don't handle more than 64 bits integers
-	
-	if (GetSizeLength() > 8)
-		return 0; // integer bigger coded on more than 64 bits are not supported
-	
-	uint64 TempValue = Value;
-	for (unsigned int i=0; i<GetSize();i++) {
-		FinalData[GetSize()-i-1] = TempValue & 0xFF;
-		TempValue >>= 8;
-	}
-	
-	output.writeFully(FinalData,GetSize());
-
-	return GetSize();
+  binary FinalData[8]; // we don't handle more than 64 bits integers
+
+  if (GetSizeLength() > 8)
+    return 0; // integer bigger coded on more than 64 bits are not supported
+
+  uint64 TempValue = Value;
+  for (unsigned int i=0; i<GetSize();i++) {
+    FinalData[GetSize()-i-1] = TempValue & 0xFF;
+    TempValue >>= 8;
+  }
+
+  output.writeFully(FinalData,GetSize());
+
+  return GetSize();
 }
 
 uint64 EbmlUInteger::UpdateSize(bool bWithDefault, bool /* bForceRender */)
 {
-	if (!bWithDefault && IsDefaultValue())
-		return 0;
-
-	if (Value <= 0xFF) {
-		SetSize_(1);
-	} else if (Value <= 0xFFFF) {
-		SetSize_(2);
-	} else if (Value <= 0xFFFFFF) {
-		SetSize_(3);
-	} else if (Value <= 0xFFFFFFFF) {
-		SetSize_(4);
-	} else if (Value <= EBML_PRETTYLONGINT(0xFFFFFFFFFF)) {
-		SetSize_(5);
-	} else if (Value <= EBML_PRETTYLONGINT(0xFFFFFFFFFFFF)) {
-		SetSize_(6);
-	} else if (Value <= EBML_PRETTYLONGINT(0xFFFFFFFFFFFFFF)) {
-		SetSize_(7);
-	} else {
-		SetSize_(8);
-	}
-
-	if (GetDefaultSize() > GetSize()) {
-		SetSize_(GetDefaultSize());
-	}
-
-	return GetSize();
+  if (!bWithDefault && IsDefaultValue())
+    return 0;
+
+  if (Value <= 0xFF) {
+    SetSize_(1);
+  } else if (Value <= 0xFFFF) {
+    SetSize_(2);
+  } else if (Value <= 0xFFFFFF) {
+    SetSize_(3);
+  } else if (Value <= 0xFFFFFFFF) {
+    SetSize_(4);
+  } else if (Value <= EBML_PRETTYLONGINT(0xFFFFFFFFFF)) {
+    SetSize_(5);
+  } else if (Value <= EBML_PRETTYLONGINT(0xFFFFFFFFFFFF)) {
+    SetSize_(6);
+  } else if (Value <= EBML_PRETTYLONGINT(0xFFFFFFFFFFFFFF)) {
+    SetSize_(7);
+  } else {
+    SetSize_(8);
+  }
+
+  if (GetDefaultSize() > GetSize()) {
+    SetSize_(GetDefaultSize());
+  }
+
+  return GetSize();
 }
 
 #ifndef EBML_NO_READ
 filepos_t EbmlUInteger::ReadData(IOCallback & input, ScopeMode ReadFully)
 {
-	if (ReadFully != SCOPE_NO_DATA)
-	{
-		binary Buffer[8];
-		input.readFully(Buffer, GetSize());
-		Value = 0;
-		
-		for (unsigned int i=0; i<GetSize(); i++)
-		{
-			Value <<= 8;
-			Value |= Buffer[i];
-		}
-		SetValueIsSet();
-	}
-
-	return GetSize();
+  if (ReadFully != SCOPE_NO_DATA) {
+    binary Buffer[8];
+    input.readFully(Buffer, GetSize());
+    Value = 0;
+

makemkv-oss-1.9.5.tar.xz/libebml/src/EbmlUnicodeString.cpp -> makemkv-oss-1.10.2.tar.xz/libebml/src/EbmlUnicodeString.cpp Changed

@@ -11,17 +11,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -29,10 +29,10 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id$
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-	\author Jory Stone       <jcsston @ toughguy.net>
+  \file
+  \version \$Id$
+  \author Steve Lhomme     <robux4 @ users.sf.net>
+  \author Jory Stone       <jcsston @ toughguy.net>
 */
 
 #include <lgpl/cassert>
@@ -47,43 +47,58 @@
 
 // ===================== UTFstring class ===================
 
+static unsigned int UTFCharLength(uint8 lead)
+{
+  if (lead < 0x80)
+    return 1;
+  else if ((lead >> 5) == 0x6)
+    return 2;
+  else if ((lead >> 4) == 0xe)
+    return 3;
+  else if ((lead >> 3) == 0x1e)
+    return 4;
+  else
+    // Invalid size?
+    return 0;
+}
+
 UTFstring::UTFstring()
-	:_Length(0)
-	,_Data(NULL)
+  :_Length(0)
+  ,_Data(NULL)
 {}
 
 UTFstring::UTFstring(const wchar_t * _aBuf)
-	:_Length(0)
-	,_Data(NULL)
+  :_Length(0)
+  ,_Data(NULL)
 {
-	*this = _aBuf;
+  *this = _aBuf;
 }
 
 #if 0
 UTFstring::UTFstring(std::wstring const &_aBuf)
-	:_Length(0)
-	,_Data(NULL)
+  :_Length(0)
+  ,_Data(NULL)
 {
-	*this = _aBuf.c_str();
+  *this = _aBuf.c_str();
 }
 #endif
 
 UTFstring::~UTFstring()
 {
-	delete [] _Data;
+  delete [] _Data;
 }
 
 UTFstring::UTFstring(const UTFstring & _aBuf)
-	:_Length(0)
-	,_Data(NULL)
+  :_Length(0)
+  ,_Data(NULL)
 {
-	*this = _aBuf.c_str();
+  *this = _aBuf.c_str();
 }
 
 UTFstring & UTFstring::operator=(const UTFstring & _aBuf)
 {
-	*this = _aBuf.c_str();
-	return *this;
+  *this = _aBuf.c_str();
+  return *this;
 }
 
 UTFstring::operator const wchar_t*() const {return _Data;}
@@ -91,173 +106,171 @@
 
 UTFstring & UTFstring::operator=(const wchar_t * _aBuf)
 {
-	delete [] _Data;
-	if (_aBuf == NULL) {
-		_Data = new wchar_t[1];
-		_Data[0] = 0;
-		UpdateFromUCS2();
-		return *this;
-	}
-
-	size_t aLen;
-	for (aLen=0; _aBuf[aLen] != 0; aLen++);
-	_Length = aLen;
-	_Data = new wchar_t[_Length+1];
-	for (aLen=0; _aBuf[aLen] != 0; aLen++) {
-		_Data[aLen] = _aBuf[aLen];
-	}
-	_Data[aLen] = 0;
-	UpdateFromUCS2();
-	return *this;
+  delete [] _Data;
+  if (_aBuf == NULL) {
+    _Data = new wchar_t[1];
+    _Data[0] = 0;
+    UpdateFromUCS2();
+    return *this;
+  }
+
+  size_t aLen;
+  for (aLen=0; _aBuf[aLen] != 0; aLen++);
+  _Length = aLen;
+  _Data = new wchar_t[_Length+1];
+  for (aLen=0; _aBuf[aLen] != 0; aLen++) {
+    _Data[aLen] = _aBuf[aLen];
+  }
+  _Data[aLen] = 0;
+  UpdateFromUCS2();
+  return *this;
 }
 
 UTFstring & UTFstring::operator=(wchar_t _aChar)
 {
-	delete [] _Data;
-	_Data = new wchar_t[2];
-	_Length = 1;
-	_Data[0] = _aChar;
-	_Data[1] = 0;
-	UpdateFromUCS2();
-	return *this;
+  delete [] _Data;
+  _Data = new wchar_t[2];
+  _Length = 1;
+  _Data[0] = _aChar;
+  _Data[1] = 0;
+  UpdateFromUCS2();
+  return *this;
 }
 
 bool UTFstring::operator==(const UTFstring& _aStr) const
 {
-	if ((_Data == NULL) && (_aStr._Data == NULL))
-		return true;
-	if ((_Data == NULL) || (_aStr._Data == NULL))
-		return false;
-	return wcscmp_internal(_Data, _aStr._Data);
+  if ((_Data == NULL) && (_aStr._Data == NULL))
+    return true;
+  if ((_Data == NULL) || (_aStr._Data == NULL))
+    return false;
+  return wcscmp_internal(_Data, _aStr._Data);
 }
 
 void UTFstring::SetUTF8(const ccc::string & _aStr)
 {
-	UTF8string = _aStr;
-	UpdateFromUTF8();
+  UTF8string = _aStr;
+  UpdateFromUTF8();
 }
 
 /*!
-	\see RFC 2279
+  \see RFC 2279
 */
 void UTFstring::UpdateFromUTF8()
 {
-	delete [] _Data;
-	// find the size of the final UCS-2 string

makemkv-oss-1.9.5.tar.xz/libebml/src/EbmlVersion.cpp -> makemkv-oss-1.10.2.tar.xz/libebml/src/EbmlVersion.cpp Changed

@@ -19,9 +19,9 @@
 **
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -29,15 +29,15 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: EbmlVersion.cpp 639 2004-07-09 20:59:14Z mosu $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: EbmlVersion.cpp 639 2004-07-09 20:59:14Z mosu $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 
 #include "ebml/EbmlVersion.h"
 
 START_LIBEBML_NAMESPACE
 
-const ccc::string EbmlCodeVersion = "1.3.0";
+const ccc::string EbmlCodeVersion = "1.3.3";
 
 END_LIBEBML_NAMESPACE

makemkv-oss-1.9.5.tar.xz/libebml/src/EbmlVoid.cpp -> makemkv-oss-1.10.2.tar.xz/libebml/src/EbmlVoid.cpp Changed

@@ -11,17 +11,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -29,9 +29,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: EbmlVoid.cpp 1232 2005-10-15 15:56:52Z robux4 $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: EbmlVoid.cpp 1232 2005-10-15 15:56:52Z robux4 $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #include "ebml/EbmlVoid.h"
 #include "ebml/EbmlContexts.h"
@@ -42,97 +42,96 @@
 
 EbmlVoid::EbmlVoid()
 {
-	SetValueIsSet();
+  SetValueIsSet();
 }
 
 filepos_t EbmlVoid::RenderData(IOCallback & output, bool /* bForceRender */, bool /* bWithDefault */)
 {
-	// write dummy data by 4KB chunks
-	static binary DummyBuf[4*1024];
-
-	uint64 SizeToWrite = GetSize();
-	while (SizeToWrite > 4*1024)
-	{
-		output.writeFully(DummyBuf, 4*1024);
-		SizeToWrite -= 4*1024;
-	}
-	output.writeFully(DummyBuf, SizeToWrite);
-	return GetSize();
+  // write dummy data by 4KB chunks
+  static binary DummyBuf[4*1024];
+
+  uint64 SizeToWrite = GetSize();
+  while (SizeToWrite > 4*1024) {
+    output.writeFully(DummyBuf, 4*1024);
+    SizeToWrite -= 4*1024;
+  }
+  output.writeFully(DummyBuf, SizeToWrite);
+  return GetSize();
 }
 
 uint64 EbmlVoid::ReplaceWith(EbmlElement & EltToReplaceWith, IOCallback & output, bool ComeBackAfterward, bool bWithDefault)
 {
-	EltToReplaceWith.UpdateSize(bWithDefault);
-	if (HeadSize() + GetSize() < EltToReplaceWith.GetSize() + EltToReplaceWith.HeadSize()) {
-		// the element can't be written here !
-		return INVALID_FILEPOS_T;
-	}
-	if (HeadSize() + GetSize() - EltToReplaceWith.GetSize() - EltToReplaceWith.HeadSize() == 1) {
-		// there is not enough space to put a filling element
-		return INVALID_FILEPOS_T;
-	}
-
-	uint64 CurrentPosition = output.getFilePointer();
-
-	output.setFilePointer(GetElementPosition());
-	EltToReplaceWith.Render(output, bWithDefault);
-
-	if (HeadSize() + GetSize() - EltToReplaceWith.GetSize() - EltToReplaceWith.HeadSize() > 1) {
-	  // fill the rest with another void element
-	  EbmlVoid aTmp;
-	  aTmp.SetSize_(HeadSize() + GetSize() - EltToReplaceWith.GetSize() - EltToReplaceWith.HeadSize() - 1); // 1 is the length of the Void ID
-	  int HeadBefore = aTmp.HeadSize();
-	  aTmp.SetSize_(aTmp.GetSize() - CodedSizeLength(aTmp.GetSize(), aTmp.GetSizeLength(), aTmp.IsFiniteSize()));
-	  int HeadAfter = aTmp.HeadSize();
-	  if (HeadBefore != HeadAfter) {
-		  aTmp.SetSizeLength(CodedSizeLength(aTmp.GetSize(), aTmp.GetSizeLength(), aTmp.IsFiniteSize()) - (HeadAfter - HeadBefore));
-	  }
-	  aTmp.RenderHead(output, false, bWithDefault); // the rest of the data is not rewritten
-	}
-
-	if (ComeBackAfterward) {
-		output.setFilePointer(CurrentPosition);
-	}
-
-	return GetSize() + HeadSize();
+  EltToReplaceWith.UpdateSize(bWithDefault);
+  if (HeadSize() + GetSize() < EltToReplaceWith.GetSize() + EltToReplaceWith.HeadSize()) {
+    // the element can't be written here !
+    return INVALID_FILEPOS_T;
+  }
+  if (HeadSize() + GetSize() - EltToReplaceWith.GetSize() - EltToReplaceWith.HeadSize() == 1) {
+    // there is not enough space to put a filling element
+    return INVALID_FILEPOS_T;
+  }
+
+  uint64 CurrentPosition = output.getFilePointer();
+
+  output.setFilePointer(GetElementPosition());
+  EltToReplaceWith.Render(output, bWithDefault);
+
+  if (HeadSize() + GetSize() - EltToReplaceWith.GetSize() - EltToReplaceWith.HeadSize() > 1) {
+    // fill the rest with another void element
+    EbmlVoid aTmp;
+    aTmp.SetSize_(HeadSize() + GetSize() - EltToReplaceWith.GetSize() - EltToReplaceWith.HeadSize() - 1); // 1 is the length of the Void ID
+    int HeadBefore = aTmp.HeadSize();
+    aTmp.SetSize_(aTmp.GetSize() - CodedSizeLength(aTmp.GetSize(), aTmp.GetSizeLength(), aTmp.IsFiniteSize()));
+    int HeadAfter = aTmp.HeadSize();
+    if (HeadBefore != HeadAfter) {
+      aTmp.SetSizeLength(CodedSizeLength(aTmp.GetSize(), aTmp.GetSizeLength(), aTmp.IsFiniteSize()) - (HeadAfter - HeadBefore));
+    }
+    aTmp.RenderHead(output, false, bWithDefault); // the rest of the data is not rewritten
+  }
+
+  if (ComeBackAfterward) {
+    output.setFilePointer(CurrentPosition);
+  }
+
+  return GetSize() + HeadSize();
 }
 
 uint64 EbmlVoid::Overwrite(const EbmlElement & EltToVoid, IOCallback & output, bool ComeBackAfterward, bool bWithDefault)
 {
-//	EltToVoid.UpdateSize(bWithDefault);
-	if (EltToVoid.GetElementPosition() == 0) {
-		// this element has never been written
-		return 0;
-	}
-	if (EltToVoid.GetSize() + EltToVoid.HeadSize() <2) {
-		// the element can't be written here !
-		return 0;
-	}
-
-	uint64 CurrentPosition = output.getFilePointer();
-
-	output.setFilePointer(EltToVoid.GetElementPosition());
-
-	// compute the size of the voided data based on the original one
-	SetSize(EltToVoid.GetSize() + EltToVoid.HeadSize() - 1); // 1 for the ID
-	SetSize(GetSize() - CodedSizeLength(GetSize(), GetSizeLength(), IsFiniteSize()));
-	// make sure we handle even the strange cases
-	//uint32 A1 = GetSize() + HeadSize();
-	//uint32 A2 = EltToVoid.GetSize() + EltToVoid.HeadSize();
-	if (GetSize() + HeadSize() != EltToVoid.GetSize() + EltToVoid.HeadSize()) {
-		SetSize(GetSize()-1);
-		SetSizeLength(CodedSizeLength(GetSize(), GetSizeLength(), IsFiniteSize()) + 1);
-	}
-
-	if (GetSize() != 0) {
-		RenderHead(output, false, bWithDefault); // the rest of the data is not rewritten
-	}
-
-	if (ComeBackAfterward) {
-		output.setFilePointer(CurrentPosition);
-	}
-
-	return EltToVoid.GetSize() + EltToVoid.HeadSize();
+  //  EltToVoid.UpdateSize(bWithDefault);
+  if (EltToVoid.GetElementPosition() == 0) {
+    // this element has never been written
+    return 0;
+  }
+  if (EltToVoid.GetSize() + EltToVoid.HeadSize() <2) {
+    // the element can't be written here !
+    return 0;
+  }
+
+  uint64 CurrentPosition = output.getFilePointer();
+
+  output.setFilePointer(EltToVoid.GetElementPosition());
+
+  // compute the size of the voided data based on the original one
+  SetSize(EltToVoid.GetSize() + EltToVoid.HeadSize() - 1); // 1 for the ID
+  SetSize(GetSize() - CodedSizeLength(GetSize(), GetSizeLength(), IsFiniteSize()));
+  // make sure we handle even the strange cases
+  //uint32 A1 = GetSize() + HeadSize();
+  //uint32 A2 = EltToVoid.GetSize() + EltToVoid.HeadSize();
+  if (GetSize() + HeadSize() != EltToVoid.GetSize() + EltToVoid.HeadSize()) {
+    SetSize(GetSize()-1);
+    SetSizeLength(CodedSizeLength(GetSize(), GetSizeLength(), IsFiniteSize()) + 1);
+  }
+
+  if (GetSize() != 0) {

makemkv-oss-1.9.5.tar.xz/libebml/src/IOCallback.cpp -> makemkv-oss-1.10.2.tar.xz/libebml/src/IOCallback.cpp Changed

@@ -9,17 +9,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -27,10 +27,10 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: IOCallback.cpp 639 2004-07-09 20:59:14Z mosu $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-	\author Moritz Bunkus <moritz @ bunkus.org>
+  \file
+  \version \$Id: IOCallback.cpp 639 2004-07-09 20:59:14Z mosu $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
+  \author Moritz Bunkus <moritz @ bunkus.org>
 */
 
 #if !defined(__GNUC__) || (__GNUC__ > 2)
@@ -48,37 +48,35 @@
 
 void IOCallback::writeFully(const void*Buffer,size_t Size)
 {
-	if (Size == 0)
-		return;
+  if (Size == 0)
+    return;
 
-	if (Buffer == NULL)
-		throw;
+  if (Buffer == NULL)
+    throw;
 
-	if(write(Buffer,Size) != Size)
-	{
-#if 1 //!defined(__GNUC__) || (__GNUC__ > 2)
-		//stringstream Msg;
-		//Msg<<"EOF in writeFully("<<Buffer<<","<<Size<<")";
-		throw mkv_error_exception("$EOF in writeFully");
+  if(write(Buffer,Size) != Size) {
+#if !defined(__GNUC__) || (__GNUC__ > 2)
+    //stringstream Msg;
+    //Msg<<"EOF in writeFully("<<Buffer<<","<<Size<<")";
+    throw mkv_error_exception("$EOF in writeFully");
 #endif // GCC2
-	}
+  }
 }
 
 
 #ifndef EBML_NO_READ
 void IOCallback::readFully(void*Buffer,size_t Size)
 {
-	if(Buffer == NULL)
-		throw;
+  if(Buffer == NULL)
+    throw;
 
-	if(read(Buffer,Size) != Size)
-	{
+  if(read(Buffer,Size) != Size) {
 #if !defined(__GNUC__) || (__GNUC__ > 2)
-		//stringstream Msg;
-		//Msg<<"EOF in readFully("<<Buffer<<","<<Size<<")";
-		throw runtime_error("EOF in readFully");
+    //stringstream Msg;
+    //Msg<<"EOF in readFully("<<Buffer<<","<<Size<<")";
+    throw runtime_error("EOF in readFully");
 #endif // GCC2
-	}
+  }
 }
 #endif

makemkv-oss-1.9.5.tar.xz/libebml/src/MemIOCallback.cpp -> makemkv-oss-1.10.2.tar.xz/libebml/src/MemIOCallback.cpp Changed

@@ -9,17 +9,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -27,9 +27,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: MemIOCallback.cpp 693 2004-07-31 08:56:28Z robux4 $
-	\author Jory Stone <jcsston @ toughguy.net>
+  \file
+  \version \$Id: MemIOCallback.cpp 693 2004-07-31 08:56:28Z robux4 $
+  \author Jory Stone <jcsston @ toughguy.net>
 */
 
 #include "ebml/MemIOCallback.h"
@@ -40,86 +40,83 @@
 
 MemIOCallback::MemIOCallback(uint64 DefaultSize)
 {
-	//The default size of the buffer is 128 bytes
-	dataBuffer = (binary *)malloc(DefaultSize);
-	if (dataBuffer == NULL) {
-		mOk = false;
-		//std::stringstream Msg;
-		//Msg << "Failed to alloc memory block of size ";
-// not working with VC6		Msg << DefaultSize;
-		mLastErrorStr = "Failed to alloc memory block";
-		return;
-	}
-	
-	dataBufferMemorySize = DefaultSize;
-	dataBufferPos = 0;
-	dataBufferTotalSize = 0;
-	mOk = true;
+  //The default size of the buffer is 128 bytes
+  dataBuffer = (binary *)malloc(DefaultSize);
+  if (dataBuffer == NULL) {
+    mOk = false;
+    //std::stringstream Msg;
+    //Msg << "Failed to alloc memory block of size ";
+    // not working with VC6    Msg << DefaultSize;
+    mLastErrorStr = "Failed to alloc memory block";
+    return;
+  }
+
+  dataBufferMemorySize = DefaultSize;
+  dataBufferPos = 0;
+  dataBufferTotalSize = 0;
+  mOk = true;
 }
 
 MemIOCallback::~MemIOCallback()
 {
-	if (dataBuffer != NULL)
-		free(dataBuffer);
+  if (dataBuffer != NULL)
+    free(dataBuffer);
 }
 
 uint32 MemIOCallback::read(void *Buffer, size_t Size)
 {
-	if (Buffer == NULL || Size < 1)
-		return 0;
-	//If the size is larger than than the amount left in the buffer
-	if (Size + dataBufferPos > dataBufferTotalSize)
-	{
-		//We will only return the remaining data
-		memcpy(Buffer, dataBuffer + dataBufferPos, dataBufferTotalSize - dataBufferPos);
-        uint64 oldDataPos = dataBufferPos;
-		dataBufferPos = dataBufferTotalSize;
-		return dataBufferTotalSize - oldDataPos;
-	}
-		
-	//Well... We made it here, so do a quick and simple copy
-	memcpy(Buffer, dataBuffer+dataBufferPos, Size);
-	dataBufferPos += Size;
+  if (Buffer == NULL || Size < 1)
+    return 0;
+  //If the size is larger than than the amount left in the buffer
+  if (Size + dataBufferPos > dataBufferTotalSize) {
+    //We will only return the remaining data
+    memcpy(Buffer, dataBuffer + dataBufferPos, dataBufferTotalSize - dataBufferPos);
+    uint64 oldDataPos = dataBufferPos;
+    dataBufferPos = dataBufferTotalSize;
+    return dataBufferTotalSize - oldDataPos;
+  }
+
+  //Well... We made it here, so do a quick and simple copy
+  memcpy(Buffer, dataBuffer+dataBufferPos, Size);
+  dataBufferPos += Size;
 
-	return Size;
+  return Size;
 }
 
 void MemIOCallback::setFilePointer(int64 Offset, seek_mode Mode)
 {
-	if (Mode == seek_beginning)
-		dataBufferPos = Offset;
-	else if (Mode == seek_current)
-		dataBufferPos = dataBufferPos + Offset;
-	else if (Mode == seek_end)
-		dataBufferPos = dataBufferTotalSize + Offset;
+  if (Mode == seek_beginning)
+    dataBufferPos = Offset;
+  else if (Mode == seek_current)
+    dataBufferPos = dataBufferPos + Offset;
+  else if (Mode == seek_end)
+    dataBufferPos = dataBufferTotalSize + Offset;
 }
 
 size_t MemIOCallback::write(const void *Buffer, size_t Size)
 {
-	if (dataBufferMemorySize < dataBufferPos + Size)
-	{
-		//We need more memory!
-		dataBuffer = (binary *)realloc((void *)dataBuffer, dataBufferPos + Size);		
-	}
-	memcpy(dataBuffer+dataBufferPos, Buffer, Size);
-	dataBufferPos += Size;
-	if (dataBufferPos > dataBufferTotalSize)
-		dataBufferTotalSize = dataBufferPos;
+  if (dataBufferMemorySize < dataBufferPos + Size) {
+    //We need more memory!
+    dataBuffer = (binary *)realloc((void *)dataBuffer, dataBufferPos + Size);
+  }
+  memcpy(dataBuffer+dataBufferPos, Buffer, Size);
+  dataBufferPos += Size;
+  if (dataBufferPos > dataBufferTotalSize)
+    dataBufferTotalSize = dataBufferPos;
 
-	return Size;
+  return Size;
 }
 
 #ifndef EBML_NO_READ
 uint32 MemIOCallback::write(IOCallback & IOToRead, size_t Size)
 {
-	if (dataBufferMemorySize < dataBufferPos + Size)
-	{
-		//We need more memory!
-		dataBuffer = (binary *)realloc((void *)dataBuffer, dataBufferPos + Size);		
-	}
-	IOToRead.readFully(&dataBuffer[dataBufferPos], Size);
-	dataBufferTotalSize = Size;
-	return Size;
+  if (dataBufferMemorySize < dataBufferPos + Size) {
+    //We need more memory!
+    dataBuffer = (binary *)realloc((void *)dataBuffer, dataBufferPos + Size);
+  }
+  IOToRead.readFully(&dataBuffer[dataBufferPos], Size);
+  dataBufferTotalSize = Size;
+  return Size;
 }
 #endif

makemkv-oss-1.9.5.tar.xz/libebml/src/StdIOCallback.cpp -> makemkv-oss-1.10.2.tar.xz/libebml/src/StdIOCallback.cpp Changed

@@ -9,17 +9,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -27,10 +27,10 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: StdIOCallback.cpp 1298 2008-02-21 22:14:18Z mosu $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-	\author Moritz Bunkus <moritz @ bunkus.org>
+  \file
+  \version \$Id: StdIOCallback.cpp 1298 2008-02-21 22:14:18Z mosu $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
+  \author Moritz Bunkus <moritz @ bunkus.org>
 */
 
 #include <lgpl/cassert>
@@ -48,154 +48,146 @@
 START_LIBEBML_NAMESPACE
 
 CRTError::CRTError(int nError, const std::string & Description)
-	:std::runtime_error(Description+": "+strerror(nError))
-	,Error(nError)
+  :std::runtime_error(Description+": "+strerror(nError))
+  ,Error(nError)
 {
 }
 
 CRTError::CRTError(const std::string & Description,int nError)
-	:std::runtime_error(Description+": "+strerror(nError))
-	,Error(nError)
+  :std::runtime_error(Description+": "+strerror(nError))
+  ,Error(nError)
 {
 }
 
 
 StdIOCallback::StdIOCallback(const char*Path, const open_mode aMode)
 {
-	assert(Path!=0);
-
-	const char *Mode;
-	switch (aMode)
-	{
-	case MODE_READ:
-		Mode = "rb";
-		break;
-	case MODE_SAFE:
-		Mode = "rb+";
-		break;
-	case MODE_WRITE:
-		Mode = "wb";
-		break;
-	case MODE_CREATE:
-		Mode = "wb+";
-		break;
-	default:
-		throw 0;
-	}
-
-	File=fopen(Path,Mode);
-	if(File==0)
-	{
+  assert(Path!=0);
+
+  const char *Mode;
+  switch (aMode) {
+    case MODE_READ:
+      Mode = "rb";
+      break;
+    case MODE_SAFE:
+      Mode = "rb+";
+      break;
+    case MODE_WRITE:
+      Mode = "wb";
+      break;
+    case MODE_CREATE:
+      Mode = "wb+";
+      break;
+    default:
+      throw 0;
+  }
+
+  File=fopen(Path,Mode);
+  if(File==0) {
 #if !defined(__GNUC__) || (__GNUC__ > 2)
-		stringstream Msg;
-		Msg<<"Can't open stdio file \""<<Path<<"\" in mode \""<<Mode<<"\"";
-		throw CRTError(Msg.str());
+    stringstream Msg;
+    Msg<<"Can't open stdio file \""<<Path<<"\" in mode \""<<Mode<<"\"";
+    throw CRTError(Msg.str());
 #endif // GCC2
-	}
-	mCurrentPosition = 0;
+  }
+  mCurrentPosition = 0;
 }
 
 
 StdIOCallback::~StdIOCallback()throw()
 {
-	close();
+  close();
 }
 
 
 
 uint32 StdIOCallback::read(void*Buffer,size_t Size)
 {
-	assert(File!=0);
-	
-	size_t result = fread(Buffer, 1, Size, File);
-	mCurrentPosition += result;
-	return result;
+  assert(File!=0);
+
+  size_t result = fread(Buffer, 1, Size, File);
+  mCurrentPosition += result;
+  return result;
 }
 
 void StdIOCallback::setFilePointer(int64 Offset,seek_mode Mode)
 {
-	assert(File!=0);
+  assert(File!=0);
 
-	// There is a numeric cast in the boost library, which would be quite nice for this checking
-/* 
-	SL : replaced because unknown class in cygwin
-	assert(Offset <= numeric_limits<long>::max());
-	assert(Offset >= numeric_limits<long>::min());
-*/
+  // There is a numeric cast in the boost library, which would be quite nice for this checking
+  /*
+    SL : replaced because unknown class in cygwin
+    assert(Offset <= numeric_limits<long>::max());
+    assert(Offset >= numeric_limits<long>::min());
+  */
 
-	assert(Offset <= LONG_MAX);
-	assert(Offset >= LONG_MIN);
+  assert(Offset <= LONG_MAX);
+  assert(Offset >= LONG_MIN);
 
-	assert(Mode==SEEK_CUR||Mode==SEEK_END||Mode==SEEK_SET);
+  assert(Mode==SEEK_CUR||Mode==SEEK_END||Mode==SEEK_SET);
 
-	if(fseek(File,Offset,Mode)!=0)
-	{
+  if(fseek(File,Offset,Mode)!=0) {
 #if !defined(__GNUC__) || (__GNUC__ > 2)
-		ostringstream Msg;
-		Msg<<"Failed to seek file "<<File<<" to offset "<<(unsigned long)Offset<<" in mode "<<Mode;
-		throw CRTError(Msg.str());
+    ostringstream Msg;
+    Msg<<"Failed to seek file "<<File<<" to offset "<<(unsigned long)Offset<<" in mode "<<Mode;
+    throw CRTError(Msg.str());
 #endif // GCC2
-		mCurrentPosition = ftell(File);
-	}
-	else
-	{
-		switch ( Mode )
-		{
-			case SEEK_CUR:
-				mCurrentPosition += Offset;
-				break;
-			case SEEK_END:
-				mCurrentPosition = ftell(File);
-				break;
-			case SEEK_SET:
-				mCurrentPosition = Offset;
-				break;
-		}
-	}
+    mCurrentPosition = ftell(File);
+  } else {
+    switch ( Mode ) {
+      case SEEK_CUR:

makemkv-oss-1.9.5.tar.xz/libebml/src/platform/win32/WinIOCallback.cpp -> makemkv-oss-1.10.2.tar.xz/libebml/src/platform/win32/WinIOCallback.cpp Changed

@@ -9,17 +9,17 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
@@ -27,11 +27,11 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: WinIOCallback.cpp 1092 2005-03-16 13:01:15Z robux4 $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-	\author Jory Stone       <jcsston @ toughguy.net>
-	\author Cyrius           <suiryc @ users.sf.net>
+  \file
+  \version \$Id: WinIOCallback.cpp 1092 2005-03-16 13:01:15Z robux4 $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
+  \author Jory Stone       <jcsston @ toughguy.net>
+  \author Cyrius           <suiryc @ users.sf.net>
 */
 
 #include <lgpl/cassert>
@@ -47,237 +47,230 @@
 START_LIBEBML_NAMESPACE
 
 WinIOCallback::WinIOCallback(const char* Path, const open_mode aMode, DWORD dwFlags)
-	:mFile(NULL), mOk(false)
+  :mFile(NULL), mOk(false)
 {
-	mOk = open(Path, aMode, dwFlags);	
+  mOk = open(Path, aMode, dwFlags);
 }
 
 WinIOCallback::WinIOCallback(const wchar_t* Path, const open_mode aMode, DWORD dwFlags)
-	:mFile(NULL), mOk(false)
+  :mFile(NULL), mOk(false)
 {
-	mOk = open(Path, aMode, dwFlags);
+  mOk = open(Path, aMode, dwFlags);
 }
 
 WinIOCallback::~WinIOCallback()
 {
-	close();
+  close();
 }
 
-bool WinIOCallback::open(const char* Path, const open_mode aMode, DWORD dwFlags) 
+bool WinIOCallback::open(const char* Path, const open_mode aMode, DWORD dwFlags)
 {
-	assert(Path!=0);
+  assert(Path!=0);
 
-	DWORD AccessMode, ShareMode, Disposition;
+  DWORD AccessMode, ShareMode, Disposition;
 
-	switch (aMode)
-	{
-	case MODE_READ:
-		AccessMode = GENERIC_READ;
-		ShareMode = FILE_SHARE_READ|FILE_SHARE_WRITE;
-		Disposition = OPEN_EXISTING;
-		break;
-	case MODE_WRITE:
-		AccessMode = GENERIC_WRITE;
-		ShareMode = 0;
-		Disposition = OPEN_ALWAYS;
-		break;
-	case MODE_SAFE:
-		AccessMode = GENERIC_WRITE|GENERIC_READ;
-		ShareMode = FILE_SHARE_READ|FILE_SHARE_WRITE;
-		Disposition = OPEN_ALWAYS;
-		break;
-	case MODE_CREATE:
-		AccessMode = GENERIC_WRITE;
-		ShareMode = 0;
-		Disposition = CREATE_ALWAYS;
-		break;
-	default:
-		assert(false);
-	}
+  switch (aMode) {
+    case MODE_READ:
+      AccessMode = GENERIC_READ;
+      ShareMode = FILE_SHARE_READ|FILE_SHARE_WRITE;
+      Disposition = OPEN_EXISTING;
+      break;
+    case MODE_WRITE:
+      AccessMode = GENERIC_WRITE;
+      ShareMode = 0;
+      Disposition = OPEN_ALWAYS;
+      break;
+    case MODE_SAFE:
+      AccessMode = GENERIC_WRITE|GENERIC_READ;
+      ShareMode = FILE_SHARE_READ|FILE_SHARE_WRITE;
+      Disposition = OPEN_ALWAYS;
+      break;
+    case MODE_CREATE:
+      AccessMode = GENERIC_WRITE;
+      ShareMode = 0;
+      Disposition = CREATE_ALWAYS;
+      break;
+    default:
+      assert(false);
+  }
 
-	mFile = CreateFileA(Path, AccessMode, ShareMode, NULL, Disposition, dwFlags, NULL);
-	if ((mFile == INVALID_HANDLE_VALUE) || ((long)mFile == 0xffffffff))
-	{
-		//File was not opened
-		char err_msg[256];
-		DWORD error_code = GetLastError();
-		// An error message about the file already existing is not really an error message :P
-		if (error_code != ERROR_ALREADY_EXISTS) {
-			FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, 0, error_code, 0, err_msg, 255, NULL);
-			EBML_TRACE("Failed to open file \"%hs\" in mode %d.", Path, aMode);						
+  mFile = CreateFileA(Path, AccessMode, ShareMode, NULL, Disposition, dwFlags, NULL);
+  if ((mFile == INVALID_HANDLE_VALUE) || ((long)mFile == 0xffffffff)) {
+    //File was not opened
+    char err_msg[256];
+    DWORD error_code = GetLastError();
+    // An error message about the file already existing is not really an error message :P
+    if (error_code != ERROR_ALREADY_EXISTS) {
+      FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, 0, error_code, 0, err_msg, 255, NULL);
+      EBML_TRACE("Failed to open file \"%hs\" in mode %d.", Path, aMode);
 
-			mLastErrorStr = err_msg;
-			return mOk = false;
-		}
-	}
-	mCurrentPosition = 0;
+      mLastErrorStr = err_msg;
+      return mOk = false;
+    }
+  }
+  mCurrentPosition = 0;
 
-	EBML_TRACE("Successfully opened file \"%hs\" in mode %d. The handle is %p\n", Path, aMode, mFile);
+  EBML_TRACE("Successfully opened file \"%hs\" in mode %d. The handle is %p\n", Path, aMode, mFile);
 
-	return mOk = true;
+  return mOk = true;
 };
 
-bool WinIOCallback::open(const wchar_t* Path, const open_mode aMode, DWORD dwFlags) 
+bool WinIOCallback::open(const wchar_t* Path, const open_mode aMode, DWORD dwFlags)
 {
-	assert(Path!=0);
+  assert(Path!=0);
 
-	DWORD AccessMode, ShareMode, Disposition;
+  DWORD AccessMode, ShareMode, Disposition;
 
-	switch (aMode)
-	{
-	case MODE_READ:
-		AccessMode = GENERIC_READ;
-		ShareMode = FILE_SHARE_READ|FILE_SHARE_WRITE;
-		Disposition = OPEN_EXISTING;
-		break;
-	case MODE_WRITE:
-		AccessMode = GENERIC_WRITE;
-		ShareMode = 0;
-		Disposition = OPEN_ALWAYS;
-		break;
-	case MODE_SAFE:
-		AccessMode = GENERIC_WRITE|GENERIC_READ;
-		ShareMode = FILE_SHARE_READ|FILE_SHARE_WRITE;
-		Disposition = OPEN_ALWAYS;
-		break;
-	case MODE_CREATE:
-		AccessMode = GENERIC_WRITE;
-		ShareMode = 0;
-		Disposition = CREATE_ALWAYS;
-		break;
-	default:
-		assert(false);
-	}
+  switch (aMode) {
+    case MODE_READ:
+      AccessMode = GENERIC_READ;
+      ShareMode = FILE_SHARE_READ|FILE_SHARE_WRITE;
+      Disposition = OPEN_EXISTING;

makemkv-oss-1.9.5.tar.xz/libebml/src/platform/win32/WinIOCallback.h -> makemkv-oss-1.10.2.tar.xz/libebml/src/platform/win32/WinIOCallback.h Changed

@@ -9,28 +9,28 @@
 ** 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 **
-** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
+** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
 **
 ** Contact license@matroska.org if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 /*!
-	\file
-	\version \$Id: WinIOCallback.h 1090 2005-03-16 12:47:59Z robux4 $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-	\author Jory Stone       <jcsston @ toughguy.net>
-	\author Cyrius           <suiryc @ users.sf.net>
+  \file
+  \version \$Id: WinIOCallback.h 1090 2005-03-16 12:47:59Z robux4 $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
+  \author Jory Stone       <jcsston @ toughguy.net>
+  \author Cyrius           <suiryc @ users.sf.net>
 */
 
 #ifndef LIBEBML_WINIOCALLBACK_H
@@ -44,30 +44,30 @@
 START_LIBEBML_NAMESPACE
 
 class WinIOCallback: public IOCallback
-{	
+{
 public:
-	WinIOCallback(const wchar_t* Path, const open_mode aMode, DWORD dwFlags=0);
-	WinIOCallback(const char* Path, const open_mode aMode, DWORD dwFlags=0);
-	virtual ~WinIOCallback();
+  WinIOCallback(const wchar_t* Path, const open_mode aMode, DWORD dwFlags=0);
+  WinIOCallback(const char* Path, const open_mode aMode, DWORD dwFlags=0);
+  virtual ~WinIOCallback();
+
+  bool open(const wchar_t* Path, const open_mode Mode, DWORD dwFlags=0);
+  bool open(const char* Path, const open_mode Mode, DWORD dwFlags=0);
 
-	bool open(const wchar_t* Path, const open_mode Mode, DWORD dwFlags=0);
-	bool open(const char* Path, const open_mode Mode, DWORD dwFlags=0);
+  virtual uint32 read(void*Buffer,size_t Size);
+  virtual size_t write(const void*Buffer,size_t Size);
+  virtual void setFilePointer(int64 Offset,seek_mode Mode=seek_beginning);
+  virtual uint64 getFilePointer();
+  virtual void close();
 
-	virtual uint32 read(void*Buffer,size_t Size);
-	virtual size_t write(const void*Buffer,size_t Size);
-	virtual void setFilePointer(int64 Offset,seek_mode Mode=seek_beginning);
-	virtual uint64 getFilePointer();
-	virtual void close();
-	
-	bool IsOk() { return mOk; };	
-	const std::string &GetLastErrorStr() { return mLastErrorStr; };
-	bool SetEOF();
+  bool IsOk() { return mOk; };
+  const std::string &GetLastErrorStr() { return mLastErrorStr; };
+  bool SetEOF();
 protected:
-	bool mOk;
-	std::string mLastErrorStr;
-	uint64 mCurrentPosition;
+  bool mOk;
+  std::string mLastErrorStr;
+  uint64 mCurrentPosition;
 
-	HANDLE mFile;
+  HANDLE mFile;
 };
 
 END_LIBEBML_NAMESPACE

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

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/bitstream.cpp -> makemkv-oss-1.10.2.tar.xz/libffabi/src/dcadec/bitstream.cpp Changed

@@ -155,14 +155,16 @@
     return 0;
 }
 
-void bits_align1(struct bitstream *bits)
+size_t bits_align1(struct bitstream *bits)
 {
-    bits->index = (bits->index + 7) & ~7;
+    bits->index = DCA_ALIGN(bits->index, 8);
+    return bits->index;
 }
 
-void bits_align4(struct bitstream *bits)
+size_t bits_align4(struct bitstream *bits)
 {
-    bits->index = (bits->index + 31) & ~31;
+    bits->index = DCA_ALIGN(bits->index, 32);
+    return bits->index;
 }
 
 static uint16_t crc16(const uint8_t *data, size_t size)
@@ -188,3 +190,39 @@
         return -DCADEC_EBADCRC;
     return 0;
 }
+
+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);
+}
+
+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);
+}
+
+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);
+    }
+}
+
+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);
+}
+
+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;
+}

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/bitstream.h -> makemkv-oss-1.10.2.tar.xz/libffabi/src/dcadec/bitstream.h Changed

@@ -45,51 +45,13 @@
 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);
+size_t bits_align1(struct bitstream *bits);
+size_t 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;
-}
+void bits_get_array(struct bitstream *bits, int *array, int size, int n);
+void bits_get_signed_array(struct bitstream *bits, int *array, int size, int n);
+void bits_get_signed_linear_array(struct bitstream *bits, int *array, int size, int n);
+void bits_get_signed_rice_array(struct bitstream *bits, int *array, int size, int k);
+int bits_get_signed_vlc_array(struct bitstream *bits, int *array, int size, const struct huffman *h);
 
 #endif

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/common.h -> makemkv-oss-1.10.2.tar.xz/libffabi/src/dcadec/common.h Changed

@@ -26,53 +26,177 @@
 #include <math.h>
 #include <errno.h>
 
+#include "compiler.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);
+#if AT_LEAST_GCC(3, 4)
+#define dca_clz32(x)    __builtin_clz(x)
+#define dca_clz64(x)    __builtin_clzll(x)
+#elif COMPILER_MSVC
+#define dca_clz32(x)    (31-msvc_bsr32((x)))
+#define dca_clz64(x)    (63-msvc_bsr64((x)))
+#else
+static inline int dca_clz32(uint32_t x)
+{
+    int r = 0;
 
-#ifdef NDEBUG
+    assert(x);
+    if (x & 0xffff0000) { x >>= 16; r |= 16; }
+    if (x & 0x0000ff00) { x >>=  8; r |=  8; }
+    if (x & 0x000000f0) { x >>=  4; r |=  4; }
+    if (x & 0x0000000c) { x >>=  2; r |=  2; }
+    if (x & 0x00000002) { x >>=  1; r |=  1; }
 
-#define DCA_DEBUG(m)
+    return 31 - r;
+}
 
-#elif defined(DCA_LOG)
+static inline int dca_clz64(uint64_t x)
+{
+    int r = 0;
 
-#define DCA_DEBUG(m) \
-    dca_log(DCA_LOGCTX,m,__LINE__)
+    assert(x);
+    if (x & 0xffffffff00000000) { x >>= 32; r |= 32; }
+    if (x & 0x00000000ffff0000) { x >>= 16; r |= 16; }
+    if (x & 0x000000000000ff00) { x >>=  8; r |=  8; }
+    if (x & 0x00000000000000f0) { x >>=  4; r |=  4; }
+    if (x & 0x000000000000000c) { x >>=  2; r |=  2; }
+    if (x & 0x0000000000000002) { x >>=  1; r |=  1; }
 
+    return 63 - r;
+}
+#endif
+
+#if (defined __GNUC__) && (defined __POPCNT__)
+#define dca_popcount(x) __builtin_popcount(x)
 #else
+static inline int dca_popcount(uint32_t x)
+{
+    x -= (x >> 1) & 0x55555555;
+    x = (x & 0x33333333) + ((x >> 2) & 0x33333333);
+    x = (x + (x >> 4)) & 0x0f0f0f0f;
+    x += x >> 8;
+    return (x + (x >> 16)) & 0x3f;
+}
+#endif
 
-#define DCA_DEBUG(m) \
-    fprintf(stderr, "%s+%d: %s\n", __FILE__, __LINE__, m)
+#define dca_countof(x)  (sizeof(x) / sizeof((x)[0]))
 
+#if AT_LEAST_GCC(4, 8)
+#define dca_bswap16(x)  __builtin_bswap16(x)
+#elif COMPILER_MSVC
+#define dca_bswap16(x)  _byteswap_ushort((x))
+#else
+static inline uint16_t dca_bswap16(uint16_t x)
+{
+    return (x << 8) | (x >> 8);
+}
 #endif
 
-#define enforce(x, m) \
-    do {                                \
-        if (!(x)) {                     \
-            DCA_DEBUG(m);               \
-            return -DCADEC_EBADDATA;    \
-        }                               \
-    } while (false)
+#if AT_LEAST_GCC(4, 3)
+#define dca_bswap32(x)  __builtin_bswap32(x)
+#define dca_bswap64(x)  __builtin_bswap64(x)
+#elif COMPILER_MSVC
+#define dca_bswap32(x)  _byteswap_ulong((x))
+#define dca_bswap64(x)  _byteswap_uint64((x))
+#else
+static inline uint32_t dca_bswap32(uint32_t x)
+{
+    x = ((x & 0x00ff00ff) << 8) | ((x & 0xff00ff00) >> 8);
+    return (x << 16) | (x >> 16);
+}
 
-#define require(x, m) \
-    do {                            \
-        if (!(x)) {                 \
-            DCA_DEBUG(m);           \
-            return -DCADEC_ENOSUP;  \
-        }                           \
-    } while (false)
+static inline uint64_t dca_bswap64(uint64_t x)
+{
+    x = ((x & 0x00ff00ff00ff00ff) <<  8) | ((x & 0xff00ff00ff00ff00) >>  8);
+    x = ((x & 0x0000ffff0000ffff) << 16) | ((x & 0xffff0000ffff0000) >> 16);
+    return (x << 32) | (x >> 32);
+}
+#endif
 
-#define dca_assert(x) \
-    do {                                  \
-        if (!(x)) {                       \
-            DCA_DEBUG("dca_assert: " #x); \
-            return -DCADEC_EINVAL;        \
-        }                                 \
+#define DCA_BSWAP16_C(x)    ((((x) & 0x00ff)   <<  8) | (((x) & 0xff00)  >>  8))
+#define DCA_BSWAP32_C(x)    ((DCA_BSWAP16_C(x) << 16) | (DCA_BSWAP16_C(x >> 16)))
+#define DCA_BSWAP64_C(x)    ((DCA_BSWAP32_C(x) << 32) | (DCA_BSWAP32_C(x >> 32)))
+
+#if HAVE_BIGENDIAN
+#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))
+#define DCA_16LE_C(x)   DCA_BSWAP16_C(x)
+#define DCA_32LE_C(x)   DCA_BSWAP32_C(x)
+#define DCA_64LE_C(x)   DCA_BSWAP64_C(x)
+#define DCA_16BE_C(x)   (x)
+#define DCA_32BE_C(x)   (x)
+#define DCA_64BE_C(x)   (x)
+#else
+#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)
+#define DCA_16LE_C(x)   (x)
+#define DCA_32LE_C(x)   (x)
+#define DCA_64LE_C(x)   (x)
+#define DCA_16BE_C(x)   DCA_BSWAP16_C(x)
+#define DCA_32BE_C(x)   DCA_BSWAP32_C(x)
+#define DCA_64BE_C(x)   DCA_BSWAP64_C(x)
+#endif
+
+#define DCA_MIN(a, b)   ((a) < (b) ? (a) : (b))
+#define DCA_MAX(a, b)   ((a) > (b) ? (a) : (b))
+
+#define DCA_ALIGN(value, align) \
+    (((value) + (align) - 1) & ~((align) - 1))
+
+#define DCA_MEM16BE(data) \
+    (((uint32_t)(data)[0] <<  8) | (data)[1])
+
+#define DCA_MEM24BE(data) \
+    (((uint32_t)(data)[0] << 16) | DCA_MEM16BE(&(data)[1]))
+
+#define DCA_MEM32BE(data) \
+    (((uint32_t)(data)[0] << 24) | DCA_MEM24BE(&(data)[1]))
+
+#define DCA_MEM40BE(data) \
+    (((uint64_t)(data)[0] << 32) | DCA_MEM32BE(&(data)[1]))
+
+static inline uint32_t DCA_MEM32NE(const void *data)
+{
+    uint32_t res;
+    memcpy(&res, data, sizeof(res));
+    return res;
+}
+
+struct dcadec_log_context;
+void dca_log(struct dcadec_log_context *context,const char* msg,unsigned int line);
+
+#ifdef _DEBUG
+#define DCA_DEBUG(m) \
+    fprintf(stderr, "%s+%d: %s\n", __FILE__, __LINE__, m)
+#elif defined(DCA_LOG)
+#define DCA_DEBUG(m) \
+    dca_log(DCA_LOGCTX,m,__LINE__)
+#else
+#define DCA_DEBUG(m)
+#endif
+
+#define enforce3(x, m, e) \
+    do {                        \
+        if (!(x)) {             \
+            DCA_DEBUG(m);       \
+            return -(e);        \
+        }                       \
     } while (false)

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/compiler.h -> makemkv-oss-1.10.2.tar.xz/libffabi/src/dcadec/compiler.h Changed

@@ -19,35 +19,23 @@
 #ifndef COMPILER_H
 #define COMPILER_H
 
-#ifdef __GNUC__
+#if defined(_MSC_VER) && defined(WIN32)
+#define inline      __inline
+#define restrict    __restrict
 
-#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)
+#define fseeko  _fseeki64
+#define ftello  _ftelli64
+#define STDIN_FILENO    0
+#define STDOUT_FILENO   1
 
-#elif (defined(_MSC_VER) && defined(WIN32))
-
-#define __ORDER_LITTLE_ENDIAN__ 0x1234
-#define __ORDER_BIG_ENDIAN__    0x4321
-#define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__
+typedef __int64 off_t;
 
 #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))
+#pragma intrinsic(_BitScanReverse)
 
 static unsigned int inline __forceinline msvc_bsr32(uint32_t value)
 {
@@ -57,15 +45,30 @@
 }
 
 #ifdef _WIN64
+
+typedef struct __declspec(intrin_type) __declspec(align(16)) __m128d {
+    double              m128d_f64[2];
+} __m128d;
+
 extern "C" unsigned char _BitScanReverse64 (unsigned int *Index,uint64_t Mask);
-#pragma intrinsic(_BitScanReverse64)
+extern "C" __int64 _mm_cvtsd_si64x(__m128d a);
+extern "C" __m128d _mm_loadu_pd(double const*);
+#pragma intrinsic(_BitScanReverse64,_mm_cvtsd_si64x,_mm_loadu_pd)
+
 static unsigned int inline __forceinline msvc_bsr64(uint64_t value)
 {
     unsigned int r;
     _BitScanReverse64(&r,value);
     return r;
 }
+
+static long int inline __forceinline msvc_lrint(double x)
+{
+    return (long int)_mm_cvtsd_si64x(_mm_loadu_pd(&x));
+}
+
 #else
+
 static uint32_t inline __forceinline msvc_bsr64(uint64_t value)
 {
     uint32_t top = (uint32_t)(value>>32);
@@ -76,29 +79,47 @@
         return 32+msvc_bsr32(top);
     }
 }
-#endif
 
-#else
-#error Unsupported compiler
+static long int __declspec(noinline) msvc_lrint(double x)
+{
+    long int ival;
+
+    __asm { fld x };
+    __asm { fistp ival };
+
+    return ival;
+}
+
+#endif // _WIN64
+
+#define lrint(x) msvc_lrint(x)
+
 #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
+#define COMPILER_MSVC  \
+    (defined _MSC_VER) && (defined WIN32)
+
+#define AT_LEAST_GCC(major, minor)  \
+    (defined __GNUC__) && ((__GNUC__ > (major)) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
+
+#ifndef HAVE_BIGENDIAN
+# if (defined __GNUC__)
+#  if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+#   define HAVE_BIGENDIAN   0
+#  elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+#   define HAVE_BIGENDIAN   1
+#  else
+#   error Unsupported byte order
+#  endif
+# elif (defined _MSC_VER)
+#  define HAVE_BIGENDIAN    0
+# else
+#  error Unsupported compiler. Define HAVE_BIGENDIAN macro to specify endianness.
+# endif
 #endif
 
+#if !defined(restrict) && defined(__cplusplus)
+#define restrict __restrict
+#endif
 
 #endif

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/core_decoder.cpp -> makemkv-oss-1.10.2.tar.xz/libffabi/src/dcadec/core_decoder.cpp Changed

@@ -19,6 +19,7 @@
 #include "common.h"
 #include "bitstream.h"
 #include "interpolator.h"
+#include "idct.h"
 #include "fixed_math.h"
 #include "core_decoder.h"
 #include "exss_parser.h"
@@ -28,31 +29,41 @@
 #include "core_huffman.h"
 #include "core_vectors.h"
 
-enum sample_type {
+enum SampleType {
     NO_BITS_ALLOCATED,
     HUFFMAN_CODE,
     BLOCK_CODE,
     NO_FURTHER_ENCODING
 };
 
-enum header_type {
+enum HeaderType {
     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] = {
+enum AudioMode {
+    AMODE_MONO,             // Mode 0: A (mono)
+    AMODE_MONO_DUAL,        // Mode 1: A + B (dual mono)
+    AMODE_STEREO,           // Mode 2: L + R (stereo)
+    AMODE_STEREO_SUMDIFF,   // Mode 3: (L+R) + (L-R) (sum-diff)
+    AMODE_STEREO_TOTAL,     // Mode 4: LT + RT (left and right total)
+    AMODE_3F,               // Mode 5: C + L + R
+    AMODE_2F1R,             // Mode 6: L + R + S
+    AMODE_3F1R,             // Mode 7: C + L + R + S
+    AMODE_2F2R,             // Mode 8: L + R + SL + SR
+    AMODE_3F2R,             // Mode 9: C + L + R + SL + SR
+
+    AMODE_COUNT
+};
+
+enum ExtAudioType {
+    EXT_AUDIO_XCH   = 0,
+    EXT_AUDIO_X96   = 2,
+    EXT_AUDIO_XXCH  = 6
+};
+
+static const int8_t prm_ch_to_spkr_map[AMODE_COUNT][5] = {
     { SPEAKER_C,        -1,         -1,         -1,         -1 },
     { SPEAKER_L, SPEAKER_R,         -1,         -1,         -1 },
     { SPEAKER_L, SPEAKER_R,         -1,         -1,         -1 },
@@ -65,7 +76,7 @@
     { SPEAKER_C, SPEAKER_L, SPEAKER_R,  SPEAKER_Ls, SPEAKER_Rs }
 };
 
-static const uint8_t audio_mode_ch_mask[10] = {
+static const uint8_t audio_mode_ch_mask[AMODE_COUNT] = {
     SPEAKER_MASK_C,
     SPEAKER_MASK_L | SPEAKER_MASK_R,
     SPEAKER_MASK_L | SPEAKER_MASK_R,
@@ -104,7 +115,7 @@
 
     // Audio channel arrangement
     core->audio_mode = bits_get(&core->bits, 6);
-    require(core->audio_mode < 10, "Unsupported audio channel arrangement");
+    require(core->audio_mode < AMODE_COUNT, "Unsupported audio channel arrangement");
 
     // Core audio sampling frequency
     core->sample_rate = sample_rates[bits_get(&core->bits, 4)];
@@ -130,9 +141,6 @@
     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
@@ -168,10 +176,10 @@
     core->es_format = !!(pcmr_index & 1);
 
     // Front sum/difference flag
-    require(bits_get1(&core->bits) == false, "Front sum/difference not supported");
+    core->sumdiff_front = bits_get1(&core->bits);
 
     // Surround sum/difference flag
-    require(bits_get1(&core->bits) == false, "Surround sum/difference not supported");
+    core->sumdiff_surround = bits_get1(&core->bits);
 
     // Dialog normalization / unspecified
     bits_skip(&core->bits, 4);
@@ -180,7 +188,7 @@
 }
 
 // 5.3.2 - Primary audio coding header
-static int parse_coding_header(struct core_decoder *core, enum header_type header, int xch_base)
+static int parse_coding_header(struct core_decoder *core, enum HeaderType header, int xch_base)
 {
     int ch, n, ret;
 
@@ -200,6 +208,10 @@
 
         core->ch_mask = audio_mode_ch_mask[core->audio_mode];
 
+        // Add LFE channel if present
+        if (core->lfe_present)
+            core->ch_mask |= SPEAKER_MASK_LFE1;
+
         core->dmix_coeffs_present = core->dmix_embedded = false;
         break;
 
@@ -224,8 +236,18 @@
         core->nchannels = audio_mode_nch[core->audio_mode] + n;
         dca_assert(core->nchannels <= MAX_CHANNELS);
 
-        // Loudspeaker activity mask
-        core->ch_mask |= bits_get(&core->bits, core->xxch_mask_nbits - 6) << 6;
+        // Loudspeaker layout mask
+        unsigned int mask = bits_get(&core->bits, core->xxch_mask_nbits - SPEAKER_Cs);
+        core->xxch_spkr_mask = mask << SPEAKER_Cs;
+
+        enforce(dca_popcount(core->xxch_spkr_mask) == n,
+                "Invalid XXCH speaker layout mask");
+
+        enforce(!(core->xxch_core_mask & core->xxch_spkr_mask),
+                "XXCH speaker layout mask overlaps with core");
+
+        // Combine core and XXCH masks together
+        core->ch_mask = core->xxch_core_mask | core->xxch_spkr_mask;
 
         // Downmix coefficients present in stream
         core->dmix_coeffs_present = bits_get1(&core->bits);
@@ -235,7 +257,15 @@
             core->dmix_embedded = bits_get1(&core->bits);
 
             // Downmix scale factor
-            core->dmix_scale = bits_get(&core->bits, 6);
+            int code = bits_get(&core->bits, 6);
+            if (code) {
+                unsigned int index = code * 4 - 44;
+                enforce(index < dca_countof(dmix_table_inv),
+                        "Invalid downmix scale index");
+                core->dmix_scale_inv = dmix_table_inv[index];
+            } else {
+                core->dmix_scale_inv = 0;
+            }
 
             // Downmix channel mapping mask
             for (ch = xch_base; ch < core->nchannels; ch++)
@@ -243,39 +273,46 @@
 
             // Downmix coefficients
             int *coeff_ptr = core->dmix_coeff;
-            for (ch = xch_base; ch < core->nchannels; ch++)
-                for (n = 0; n < core->xxch_mask_nbits; n++)
-                    if (core->dmix_mask[ch] & (1 << n))
-                        *coeff_ptr++ = bits_get(&core->bits, 7);
+            for (ch = xch_base; ch < core->nchannels; ch++) {
+                for (n = 0; n < core->xxch_mask_nbits; n++) {
+                    if (core->dmix_mask[ch] & (1U << n)) {
+                        int code = bits_get(&core->bits, 7);
+                        int sign = (code >> 6) - 1; code &= 63;
+                        if (code) {
+                            unsigned int index = code * 4 - 4;
+                            enforce(index < dca_countof(dmix_table),
+                                    "Invalid downmix coefficient index");
+                            *coeff_ptr++ = (dmix_table[index] ^ sign) - sign;
+                        } else {
+                            *coeff_ptr++ = 0;
+                        }
+                    }
+                }
+            }
         } else {
             core->dmix_embedded = false;
         }
 
-        /*
-        printf("nchannels %d\n", core->nchannels);
-        printf("ch_mask %#x\n", core->ch_mask);
-        printf("dmix_coeffs_present %d\n", core->dmix_coeffs_present);
-        if (core->dmix_coeffs_present) {
-            printf("dmix_embedded %d\n", core->dmix_embedded);
-            printf("dmix_scale %d\n", core->dmix_scale);
-            for (ch = xch_base; ch < core->nchannels; ch++)
-                printf("dmix_mask[%d] %#x\n", ch, core->dmix_mask[ch]);

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/core_decoder.h -> makemkv-oss-1.10.2.tar.xz/libffabi/src/dcadec/core_decoder.h Changed

@@ -70,7 +70,7 @@
     int     deficit_samples;
     bool    crc_present;
     int     npcmblocks;
-    int     frame_size;
+    size_t  frame_size;
     int     audio_mode;
     int     sample_rate;
     int     bit_rate;
@@ -85,6 +85,8 @@
     bool    filter_perfect;
     int     source_pcm_res;
     bool    es_format;
+    bool    sumdiff_front;
+    bool    sumdiff_surround;
 
     int     nsubframes;
     int     nsubsubframes[MAX_SUBFRAMES];
@@ -94,7 +96,7 @@
 
     bool    dmix_coeffs_present;
     bool    dmix_embedded;
-    int     dmix_scale;
+    int     dmix_scale_inv;
     int     dmix_mask[MAX_CHANNELS];
     int     dmix_coeff[64];
 
@@ -118,21 +120,26 @@
     int                 *subband_buffer;
     int                 *subband_samples[MAX_CHANNELS][MAX_SUBBANDS];
     struct interpolator *subband_dsp[MAX_CHANNELS];
-    struct interpolator_data    *subband_dsp_data;
+    struct idct_context *subband_dsp_idct;
 
     int     *lfe_samples;
 
-    bool    xch_present;
+    bool    prim_dmix_embedded;
+    int     prim_dmix_type;
+    int     prim_dmix_coeff[4 * 6];
+
+    int     ext_audio_mask;
+
+    size_t  xch_pos;
 
-    bool    xxch_present;
     bool    xxch_crc_present;
     int     xxch_mask_nbits;
     int     xxch_core_mask;
+    int     xxch_spkr_mask;
+    size_t  xxch_pos;
 
-    bool    xbr_present;
-
-    bool                x96_present;
     struct x96_decoder  *x96_decoder;
+    size_t              x96_pos;
 
     int     *output_buffer;
     int     *output_samples[SPEAKER_COUNT];
@@ -140,7 +147,6 @@
 
     int     npcmsamples;
     int     output_rate;
-    int     bits_per_sample;
 
     int     filter_flags;
 };
@@ -152,5 +158,6 @@
 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);
+struct dcadec_exss_info *core_get_info_exss(struct core_decoder *core);
 
 #endif

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/dca_context.cpp -> makemkv-oss-1.10.2.tar.xz/libffabi/src/dcadec/dca_context.cpp Changed

@@ -21,12 +21,14 @@
 #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 DCADEC_PACKET_FILTERED  0x100
+#define DCADEC_PACKET_RECOVERY  0x200
+
 #define DCA_LOGCTX (&dca->logctx)
 
 struct dcadec_log_context {
@@ -37,6 +39,7 @@
 struct dcadec_context {
     int flags;
     int packet;
+    int status;
 
     struct core_decoder *core;
     struct exss_parser *exss;
@@ -44,7 +47,10 @@
 
     struct dcadec_log_context logctx;
 
-    unsigned int ncoreframes;
+    bool has_residual_encoded;
+    bool core_residual_valid;
+
+    int *dmix_sample_buffer;
 
     int nframesamples;
     int sample_rate;
@@ -88,7 +94,7 @@
 
     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_mask & (1U << dca_ch)) {
                 if (!dca_samples[dca_ch])
                     return -DCADEC_EINVAL;
                 dca->samples[nchannels++] = dca_samples[dca_ch];
@@ -126,38 +132,172 @@
     return nchannels;
 }
 
+static int clip_vector(int *samples, int nsamples, int bits_per_sample)
+{
+    int limit = 1 << (bits_per_sample - 1);
+    int mask = ~((1 << bits_per_sample) - 1);
+    int nclipped = 0;
+
+    while (nsamples-- > 0) {
+        if ((*samples + limit) & mask) {
+            *samples = (*samples >> 31) ^ (limit - 1);
+            nclipped++;
+        }
+        samples++;
+    }
+
+    return nclipped;
+}
+
+static int clip_samples(struct dcadec_context *dca, int nchannels)
+{
+    int nsamples = dca->nframesamples;
+    int nclipped = 0;
+
+    if (dca->flags & DCADEC_FLAG_DONT_CLIP)
+        return 0;
+
+    switch (dca->bits_per_sample) {
+    case 24:
+        for (int ch = 0; ch < nchannels; ch++)
+            nclipped += clip_vector(dca->samples[ch], nsamples, 24);
+        break;
+    case 16:
+        for (int ch = 0; ch < nchannels; ch++)
+            nclipped += clip_vector(dca->samples[ch], nsamples, 16);
+        break;
+    default:
+        dbg_assert(0);
+        break;
+    }
+
+    return nclipped;
+}
+
+static int down_mix_prim_chset(struct dcadec_context *dca, int **samples,
+                               int nsamples, int *ch_mask, int *dmix_coeff)
+{
+    // No action if already 2.0. Remove LFE channel if 2.1.
+    if ((*ch_mask & ~SPEAKER_MASK_LFE1) == (SPEAKER_MASK_L | SPEAKER_MASK_R)) {
+        *ch_mask = SPEAKER_MASK_L | SPEAKER_MASK_R;
+        return 0;
+    }
+
+    // Unless both KEEP_DMIX flags are set, perform 2.0 downmix only when
+    // custom matrix is present
+    if (!dmix_coeff && !(dca->flags & DCADEC_FLAG_KEEP_DMIX_6CH))
+        return 0;
+
+    // Reallocate downmix sample buffer
+    if (ta_alloc_fast(dca, &dca->dmix_sample_buffer, 2 * nsamples, sizeof(int)) < 0)
+        return -DCADEC_ENOMEM;
+
+    memset(dca->dmix_sample_buffer, 0, 2 * nsamples * sizeof(int));
+
+    int nchannels = dca_popcount(*ch_mask);
+
+    // Perform downmix
+    for (int spkr = 0, pos = 0; spkr < SPEAKER_COUNT; spkr++) {
+        if (!(*ch_mask & (1U << spkr)))
+            continue;
+
+        for (int ch = 0; ch < 2; ch++) {
+            int coeff;
+
+            // Use custom matrix if present. Otherwise use default matrix that
+            // covers all supported core audio channel arrangements.
+            if (dmix_coeff) {
+                coeff = dmix_coeff[ch * nchannels + pos];
+            } else {
+                switch (spkr) {
+                case SPEAKER_C:
+                case SPEAKER_Cs:
+                    coeff = (nchannels == 1) ? 23170 : 16423;
+                    break;
+                case SPEAKER_L:
+                    coeff = (ch == 0) ? 23170 : 0;
+                    break;
+                case SPEAKER_R:
+                    coeff = (ch == 1) ? 23170 : 0;
+                    break;
+                case SPEAKER_Ls:
+                    coeff = (ch == 0) ? 16423 : 0;
+                    break;
+                case SPEAKER_Rs:
+                    coeff = (ch == 1) ? 16423 : 0;
+                    break;
+                default:
+                    coeff = 0;
+                    break;
+                }
+            }
+
+            if (coeff) {
+                int *src = samples[spkr];
+                int *dst = dca->dmix_sample_buffer + ch * nsamples;
+                for (int n = 0; n < nsamples; n++)
+                    dst[n] += mul15(src[n], coeff);
+            }
+        }
+
+        pos++;
+    }
+
+    samples[SPEAKER_L] = dca->dmix_sample_buffer;
+    samples[SPEAKER_R] = dca->dmix_sample_buffer + nsamples;
+    *ch_mask = SPEAKER_MASK_L | SPEAKER_MASK_R;
+    return 0;
+}
+
 static int filter_core_frame(struct dcadec_context *dca)
 {
     struct core_decoder *core = dca->core;
 
-    dca->ncoreframes = 0;
+    dca->core_residual_valid = false;
 
     // Filter core frame
     int ret;
     if ((ret = core_filter(core, dca->flags)) < 0)
         return ret;
 
+    // Downmix core channels to Lo/Ro
+    if (dca->flags & DCADEC_FLAG_KEEP_DMIX_2CH) {
+        int *coeff = NULL;
+        if (core->prim_dmix_embedded && core->prim_dmix_type == DMIX_TYPE_LoRo)
+            coeff = core->prim_dmix_coeff;
+        if ((ret = down_mix_prim_chset(dca, core->output_samples, core->npcmsamples,
+                                       &core->ch_mask, coeff)) < 0)
+            return ret;
+    }
+
     // Reorder sample buffer pointers
-    if (reorder_samples(dca, core->output_samples, core->ch_mask) <= 0)
+    if ((ret = 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->bits_per_sample = 24;
+
+    // Set profile

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/dca_context.h -> makemkv-oss-1.10.2.tar.xz/libffabi/src/dcadec/dca_context.h Changed

@@ -29,12 +29,37 @@
 #endif
 
 /**@{*/
-#ifdef _WIN32
+/** Make compact version code that can be compared easily */
+#define DCADEC_VERSION_CODE(major, minor, patch) \
+    (((major) << 24) | ((minor) << 12) | (patch) | 0U)
+
+/**
+ * Version of libdcadec. Major number gets bumped at each API change that
+ * breaks backward compatibility. Minor number gets bumped at each API change
+ * that remains compatible. Patch is reserved for non-API related changes.
+ *
+ * THE LIBRARY IS NOT YET RELEASED, DON'T CHECK THESE NUMBERS YET.
+ */
+#define DCADEC_VERSION_MAJOR 0
+#define DCADEC_VERSION_MINOR 0
+#define DCADEC_VERSION_PATCH 0
+
+#define DCADEC_VERSION  \
+    DCADEC_VERSION_CODE(DCADEC_VERSION_MAJOR, \
+                        DCADEC_VERSION_MINOR, \
+                        DCADEC_VERSION_PATCH)
+/**@}*/
+
+/**@{*/
+#if (defined _WIN32)
 #define DCADEC_SHARED_EXPORT    __declspec(dllexport)
 #define DCADEC_SHARED_IMPORT    __declspec(dllimport)
-#else
+#elif (__GNUC__ >= 4)
 #define DCADEC_SHARED_EXPORT    __attribute__((visibility("default")))
 #define DCADEC_SHARED_IMPORT    __attribute__((visibility("default")))
+#else
+#define DCADEC_SHARED_EXPORT
+#define DCADEC_SHARED_IMPORT
 #endif
 
 #ifdef DCADEC_SHARED
@@ -76,23 +101,26 @@
  */
 #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
+/** Reserved flag, don't use */
+#define DCADEC_FLAG_CORE_RESERVED       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) */
+/** Extract embedded 2.0 downmix if present, otherwise extract 5.1 downmix */
 #define DCADEC_FLAG_KEEP_DMIX_2CH       0x20
 
-/** Extract embedded 5.1 downmix (NOT YET IMPLEMENTED) */
+/** Extract embedded 5.1 downmix */
 #define DCADEC_FLAG_KEEP_DMIX_6CH       0x40
 
-/** Output native DTS channel layout, not WAVEFORMATEX layout */
+/** Output native DTS channel layout, not WAVEFORMATEXTENSIBLE layout */
 #define DCADEC_FLAG_NATIVE_LAYOUT       0x80
 
 /** Don't conceal errors */
 #define DCADEC_FLAG_STRICT              0x100
+
+/** Don't clip returned PCM samples to output bit depth */
+#define DCADEC_FLAG_DONT_CLIP           0x200
 /**@}*/
 
 /**@{*/
@@ -100,11 +128,22 @@
 #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_HRA   0x08    /**< High Resolution Audio */
 #define DCADEC_PROFILE_HD_MA    0x10    /**< Master Audio */
 #define DCADEC_PROFILE_EXPRESS  0x20    /**< Express */
 /**@}*/
 
+/**@{*/
+/** Not matrix encoded */
+#define DCADEC_MATRIX_ENCODING_NONE         0
+
+/**< Encoded for matrix surround decoding */
+#define DCADEC_MATRIX_ENCODING_SURROUND     1
+
+/**< Audio processed for headphone playback */
+#define DCADEC_MATRIX_ENCODING_HEADPHONE    2
+/**@}*/
+
 /**
  * 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.
@@ -123,10 +162,9 @@
     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 */
+    bool    ext_audio_present;  /**< Extended audio present */
+    int     ext_audio_type;     /**< Extended audio type (only meaningful
+                                     when ext_audio_present is true) */
 };
 
 struct dcadec_exss_info {
@@ -137,6 +175,8 @@
     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 */
+    int spkr_mask;          /**< Speaker activity mask, zero if unavailable */
+    int matrix_encoding;    /**< Matrix encoding type */
 };
 
 typedef void (*dcadec_log_fn)(void* log_context,const char* message,unsigned int lineno);
@@ -178,8 +218,7 @@
 
 /**
  * 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
+ * packet. When no EXSS is present information about extended audio in core
  * sub-stream is returned.
  *
  * @param dca   Pointer to decoder context.
@@ -199,8 +238,9 @@
 
 /**
  * Filter the parsed packet and return per-channel PCM data. All parameters
- * except decoder context are optional and can be NULL. This function should
- * be called exactly once after successfull call to dcadec_context_parse().
+ * except decoder context are optional and can be NULL. This function should be
+ * called at least once after each successfull call to dcadec_context_parse().
+ * Multiple calls per packet are allowed and return the same data.
  *
  * @param dca       Pointer to decoder context.
  *
@@ -210,9 +250,9 @@
  *                  Returned array is tightly packed, there are no gaps for
  *                  missing channels. Use channel_mask to determine total number
  *                  of channels and size of returned array. By default channels
- *                  are ordered according to WAVEFORMATEX specification, but if
- *                  DCADEC_FLAG_NATIVE_LAYOUT flag was set when creating decoder
- *                  context, returned channels are in native DTS order.
+ *                  are ordered according to WAVEFORMATEXTENSIBLE specification,
+ *                  but if DCADEC_FLAG_NATIVE_LAYOUT flag was set when creating
+ *                  decoder context, returned channels are in native DTS order.
  *
  * @param nsamples  Filled with number of PCM samples in each returned plane.
  *
@@ -231,7 +271,12 @@
  *                          This can be different from encoded profile since
  *                          certain extensions may be not decoded.
  *
- * @return                  0 on success, negative error code on failure.
+ * @return                  0 or positive value on success, negative error code
+ *                          on failure. Return value of 0 indicates that no
+ *                          errors affecting audio integrity were detected.
+ *                          When profile indicates Master Audio, positive return
+ *                          value indicates that audio has not been losslessly
+ *                          reconstructed for at least some part of this frame.
  */
 DCADEC_API int dcadec_context_filter(struct dcadec_context *dca, int ***samples,
                                      int *nsamples, int *channel_mask,
@@ -239,7 +284,9 @@
                                      int *profile);
 
 /**
- * Clear all inter-frame history of the decoder.
+ * Clear all inter-frame history of the decoder. Call this before parsing
+ * packets out of sequence, e.g. after seeking to the arbitrary position within
+ * the DTS stream.
  *
  * @param dca   Pointer to decoder context.
  */
@@ -271,6 +318,13 @@
 DCADEC_API const char *dcadec_strerror(int errnum);
 
 /**
+ * Get libdcadec version.
+ *
+ * @return  Version code of the currently running libdcadec.
+ */
+DCADEC_API unsigned int dcadec_version(void);
+
+/**
  * Set logging function for debug messages.
  *
  * @param dca           Pointer to decoder context.

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/dca_stream.h -> makemkv-oss-1.10.2.tar.xz/libffabi/src/dcadec/dca_stream.h Changed

@@ -23,9 +23,78 @@
 
 struct dcadec_stream;
 
-DCADEC_API struct dcadec_stream *dcadec_stream_open(const char *name);
+struct dcadec_stream_info {
+    uint64_t    stream_size;    /**< Size of encoded DTS stream data, in bytes */
+    uint32_t    sample_rate;    /**< Audio sample rate in Hz */
+    uint32_t    nframes;        /**< Total number of encoded frames */
+    uint32_t    nframesamples;  /**< Number of PCM samples in each encoded frame */
+    uint64_t    npcmsamples;    /**< Total number of PCM samples in original audio */
+    uint32_t    ch_mask;        /**< Channel mask in EXSS format */
+    uint32_t    ndelaysamples;  /**< Codec delay in PCM samples */
+};
+
+/**
+ * Open DTS stream from file or standard input.
+ *
+ * @param name  Name of the file to be opened. Pass NULL to open standard input.
+ *
+ * @param flags Currently unused, should be 0.
+ *
+ * @return      Stream handle on success, NULL on failure.
+ */
+DCADEC_API struct dcadec_stream *dcadec_stream_open(const char *name, int flags);
+
+/**
+ * Close DTS stream.
+ *
+ * @param stream    Stream handle.
+ */
 DCADEC_API void dcadec_stream_close(struct dcadec_stream *stream);
+
+/**
+ * Establish synchronization and read the next packet from DTS stream.
+ *
+ * @param stream    Stream handle.
+ *
+ * @param data  Filled with pointer to packet data. This data is only
+ *              valid until the next call to dcadec_stream_read() or
+ *              dcadec_stream_close() functions. Packet data is padded
+ *              with DCADEC_BUFFER_PADDING bytes at the end and can be
+ *              directly passed to dcadec_context_parse() function.
+ *
+ * @param size  Filled with size of packet data, in bytes.
+ *
+ * @return      Positive value on success, 0 on EOF, negative error code on
+ *              failure.
+ */
 DCADEC_API int dcadec_stream_read(struct dcadec_stream *stream, uint8_t **data, size_t *size);
+
+/**
+ * Return DTS stream progress percentage based on current file position.
+ *
+ * @param stream    Stream handle.
+ *
+ * @return      Progress value in range 0-100 on success, -1 on failure.
+ */
 DCADEC_API int dcadec_stream_progress(struct dcadec_stream *stream);
 
+/**
+ * Get audio properties information from DTS-HD container. For raw DTS streams
+ * this function always fails.
+ *
+ * @param stream    Stream handle.
+ *
+ * @return      Pointer to information structure on success,
+ *              NULL on failure. Returned data should be freed with
+ *              dcadec_stream_free_info() function.
+ */
+DCADEC_API struct dcadec_stream_info *dcadec_stream_get_info(struct dcadec_stream *stream);
+
+/**
+ * Free audio properties information structure.
+ *
+ * @param info  Pointer to information structure.
+ */
+DCADEC_API void dcadec_stream_free_info(struct dcadec_stream_info *info);
+
 #endif

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/dmix_tables.cpp -> makemkv-oss-1.10.2.tar.xz/libffabi/src/dcadec/dmix_tables.cpp Changed

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/dmix_tables.h -> makemkv-oss-1.10.2.tar.xz/libffabi/src/dcadec/dmix_tables.h Changed

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/exss_parser.cpp -> makemkv-oss-1.10.2.tar.xz/libffabi/src/dcadec/exss_parser.cpp Changed

@@ -32,6 +32,8 @@
     return dca_popcount(mask) + dca_popcount(mask & SPEAKER_PAIR_ALL_2);
 }
 
+#define DCA_LOGCTX (asset->parser->bits.logctx)
+
 static void parse_xll_parameters(struct exss_asset *asset)
 {
     struct exss_parser *exss = asset->parser;
@@ -67,74 +69,6 @@
         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;
@@ -191,18 +125,21 @@
             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)) {
+            asset->spkr_mask_enabled = bits_get1(&exss->bits);
+
+            int spkr_mask_nbits = 0;
+            if (asset->spkr_mask_enabled) {
                 // Number of bits for speaker activity mask
                 spkr_mask_nbits = (bits_get(&exss->bits, 2) + 1) << 2;
                 // Loudspeaker activity mask
-                bits_skip(&exss->bits, spkr_mask_nbits);
+                asset->spkr_mask = bits_get(&exss->bits, spkr_mask_nbits);
             }
 
             // Number of speaker remapping sets
             int spkr_remap_nsets = bits_get(&exss->bits, 3);
+            enforce(!spkr_remap_nsets || spkr_mask_nbits,
+                    "Speaker mask disabled yet there are remapping sets");
 
             // Standard loudspeaker layout mask
             int nspeakers[8];
@@ -223,6 +160,9 @@
         } else {
             asset->embedded_stereo = false;
             asset->embedded_6ch = false;
+            asset->spkr_mask_enabled = false;
+            asset->spkr_mask = 0;
+
             // Representation type
             asset->representation_type = bits_get(&exss->bits, 3);
         }
@@ -353,18 +293,76 @@
         // DTS-HD stream ID
         asset->hd_stream_id = bits_get(&exss->bits, 3);
 
-    int ret;
-    if ((ret = set_extension_offsets(asset)) < 0)
-        return ret;
-
+    // One to one mixing flag
+    // Per channel main audio scaling flag
+    // Main audio scaling codes
+    // Decode asset in secondary decoder flag
+    // Revision 2 DRC metadata
     // Reserved
     // Zero pad
     return bits_seek(&exss->bits, descr_pos + descr_size * 8);
 }
 
+static int set_exss_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 || 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 || 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 || 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 || 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 || 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 || asset->xll_size > size)
+            return -DCADEC_EBADREAD;
+        offs += asset->xll_size;
+        size -= asset->xll_size;
+    }
+
+    return 0;
+}
+
+#undef DCA_LOGCTX
 #define DCA_LOGCTX (exss->bits.logctx)
 
-int exss_parse(struct exss_parser *exss, uint8_t *data, size_t size,struct dcadec_log_context *logctx)
+int exss_parse(struct exss_parser *exss, uint8_t *data, size_t size, struct dcadec_log_context *logctx)
 {

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/exss_parser.h -> makemkv-oss-1.10.2.tar.xz/libffabi/src/dcadec/exss_parser.h Changed

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/fir_float.h -> makemkv-oss-1.10.2.tar.xz/libffabi/src/dcadec/fir_float.h Changed

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/fixed_math.h -> makemkv-oss-1.10.2.tar.xz/libffabi/src/dcadec/fixed_math.h Changed

makemkv-oss-1.10.2.tar.xz/libffabi/src/dcadec/idct.h Added

@@ -0,0 +1,47 @@
+/*
+ * 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 IDCT_H
+#define IDCT_H
+
+struct core_decoder;
+
+struct idct_context {
+    double dct_a[8][8];
+    double dct_b[8][7];
+
+    double mod_a[16];
+    double mod_b[ 8];
+    double mod_c[32];
+
+    double mod64_a[32];
+    double mod64_b[16];
+    double mod64_c[64];
+};
+
+struct idct_context *idct_init(struct core_decoder *parent);
+
+void idct_perform32_float(const struct idct_context * restrict idct,
+                          double * restrict input, double * restrict output);
+void idct_perform64_float(const struct idct_context * restrict idct,
+                          double * restrict input, double * restrict output);
+
+void idct_perform32_fixed(int * restrict input, int * restrict output);
+void idct_perform64_fixed(int * restrict input, int * restrict output);
+
+#endif

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/idct_fixed.cpp -> makemkv-oss-1.10.2.tar.xz/libffabi/src/dcadec/idct_fixed.cpp Changed

@@ -18,41 +18,35 @@
 
 #include "common.h"
 #include "fixed_math.h"
-#include "idct_fixed.h"
+#include "idct.h"
 
-static inline void sum_a(const int *input, int *output, int len)
+static void sum_a(const int * restrict input, int * restrict 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)
+static void sum_b(const int * restrict input, int * restrict 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];
-    }
+    output[0] = input[0];
+    for (int i = 1; i < len; i++)
+        output[i] = input[2 * i] + input[2 * i - 1];
 }
 
-static inline void sum_c(const int *input, int *output, int len)
+static void sum_c(const int * restrict input, int * restrict 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)
+static void sum_d(const int * restrict input, int * restrict 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];
-    }
+    output[0] = input[1];
+    for (int i = 1; i < len; i++)
+        output[i] = input[2 * i - 1] + input[2 * i + 1];
 }
 
-static inline void dct_a(const int *input, int *output)
+static void dct_a(const int * restrict input, int * restrict 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
@@ -75,7 +69,7 @@
     }
 }
 
-static inline void dct_b(const int *input, int *output)
+static void dct_b(const int * restrict input, int * restrict output)
 {
     // floor(cos((2 * i + 1) * (j + 1) * PI / 16) * (1 << 23) + 0.5)
     static const int cos_mod[8][7] = {
@@ -90,14 +84,14 @@
     };
 
     for (int i = 0; i < 8; i++) {
-        int64_t res = (int64_t)input[0] << 23;
+        int64_t res = (int64_t)input[0] * (1 << 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)
+static void mod_a(const int * restrict input, int * restrict 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
@@ -115,7 +109,7 @@
         output[i] = mul23(cos_mod[i], input[k] - input[8 + k]);
 }
 
-static inline void mod_b(int *input, int *output)
+static void mod_b(int * restrict input, int * restrict 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
@@ -134,7 +128,7 @@
         output[i] = input[k] - input[8 + k];
 }
 
-static inline void mod_c(const int *input, int *output)
+static void mod_c(const int * restrict input, int * restrict 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
@@ -156,13 +150,13 @@
         output[i] = mul23(cos_mod[i], input[k] - input[16 + k]);
 }
 
-static inline void clp_v(int *input, int len)
+static 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)
+void idct_perform32_fixed(int * restrict input, int * restrict output)
 {
     int mag = 0;
     for (int i = 0; i < 32; i++)
@@ -197,10 +191,10 @@
     mod_c(input, output);
 
     for (int i = 0; i < 32; i++)
-        output[i] = clip23(output[i] << shift);
+        output[i] = clip23(output[i] * (1 << shift));
 }
 
-static inline void mod64_a(const int *input, int *output)
+static void mod64_a(const int * restrict input, int * restrict output)
 {
     //  floor(0.5 / cos((2 * (     i) + 1) * PI / 128) * (1 << 23) + 0.5), i =  0 .. 16
     // -floor(0.5 / sin((2 * (31 - i) + 1) * PI / 128) * (1 << 23) + 0.5), i = 16 .. 32
@@ -222,7 +216,7 @@
         output[i] = mul23(cos_mod[i], input[k] - input[16 + k]);
 }
 
-static inline void mod64_b(int *input, int *output)
+static void mod64_b(int * restrict input, int * restrict 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
@@ -243,7 +237,7 @@
         output[i] = input[k] - input[16 + k];
 }
 
-static inline void mod64_c(const int *input, int *output)
+static void mod64_c(const int * restrict input, int * restrict output)
 {
     //  floor(0.125 / SQRT2 / cos((2 * (     i) + 1) * PI / 256) * (1 << 23) + 0.5), i =  0 .. 32
     // -floor(0.125 / SQRT2 / sin((2 * (63 - i) + 1) * PI / 256) * (1 << 23) + 0.5), i = 32 .. 64
@@ -273,10 +267,10 @@
         output[i] = mul23(cos_mod[i], input[k] - input[32 + k]);
 }
 
-void inverse_dct64_fixed(int *input, int *output)
+void idct_perform64_fixed(int * restrict input, int * restrict output)
 {
     int mag = 0;
-    for (int i = 0; i < 32; i++)
+    for (int i = 0; i < 64; i++)
         mag += abs(input[i]);
 
     int shift = mag > 0x400000 ? 2 : 0;
@@ -328,5 +322,5 @@
     mod64_c(input, output);
 
     for (int i = 0; i < 64; i++)
-        output[i] = clip23(output[i] << shift);
+        output[i] = clip23(output[i] * (1 << shift));
 }

makemkv-oss-1.10.2.tar.xz/libffabi/src/dcadec/idct_float.cpp Added

@@ -0,0 +1,256 @@
+/*
+ * 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 "idct.h"
+
+struct idct_context *idct_init(struct core_decoder *parent)
+{
+    int i, j, k;
+
+    struct idct_context *idct = ta_new(parent, struct idct_context);
+    if (!idct)
+        return NULL;
+
+    for (i = 0; i < 8; i++) {
+        for (j = 0, k = 7; j < 8; j++, k--) {
+            if (i & 1)
+                idct->dct_a[i][j] = -sin((2 * i + 1) * (2 * k + 1) * M_PI / 32);
+            else
+                idct->dct_a[i][j] =  sin((2 * i + 1) * (2 * k + 1) * M_PI / 32);
+        }
+    }
+
+    for (i = 0; i < 8; i++)
+        for (j = 0; j < 7; j++)
+            idct->dct_b[i][j] = cos((2 * i + 1) * (1 + j) * M_PI / 16);
+
+    for (i = 0; i < 8; i++)
+        idct->mod_a[i] =  0.5 / cos((2 * i + 1) * M_PI / 64);
+
+    for (i = 8, k = 7; i < 16; i++, k--)
+        idct->mod_a[i] = -0.5 / sin((2 * k + 1) * M_PI / 64);
+
+    for (i = 0; i < 4; i++)
+        idct->mod_b[i] = 0.5 / cos((2 * i + 1) * M_PI / 32);
+
+    for (i = 4, k = 3; i < 8; i++, k--)
+        idct->mod_b[i] = 0.5 / sin((2 * k + 1) * M_PI / 32);
+
+    for (i = 0; i < 16; i++)
+        idct->mod_c[i] =  0.125 / cos((2 * i + 1) * M_PI / 128);
+
+    for (i = 16, k = 15; i < 32; i++, k--)
+        idct->mod_c[i] = -0.125 / sin((2 * k + 1) * M_PI / 128);
+
+    for (i = 0; i < 16; i++)
+        idct->mod64_a[i] =  0.5 / cos((2 * i + 1) * M_PI / 128);
+
+    for (i = 16, k = 15; i < 32; i++, k--)
+        idct->mod64_a[i] = -0.5 / sin((2 * k + 1) * M_PI / 128);
+
+    for (i = 0; i < 8; i++)
+        idct->mod64_b[i] = 0.5 / cos((2 * i + 1) * M_PI / 64);
+
+    for (i = 8, k = 7; i < 16; i++, k--)
+        idct->mod64_b[i] = 0.5 / sin((2 * k + 1) * M_PI / 64);
+
+    for (i = 0; i < 32; i++)
+        idct->mod64_c[i] =  0.125 / cos((2 * i + 1) * M_PI / 256);
+
+    for (i = 32, k = 31; i < 64; i++, k--)
+        idct->mod64_c[i] = -0.125 / sin((2 * k + 1) * M_PI / 256);
+
+    return idct;
+}
+
+static void sum_a(const double * restrict input, double * restrict output, int len)
+{
+    for (int i = 0; i < len; i++)
+        output[i] = input[2 * i] + input[2 * i + 1];
+}
+
+static void sum_b(const double * restrict input, double * restrict output, int len)
+{
+    output[0] = input[0];
+    for (int i = 1; i < len; i++)
+        output[i] = input[2 * i] + input[2 * i - 1];
+}
+
+static void sum_c(const double * restrict input, double * restrict output, int len)
+{
+    for (int i = 0; i < len; i++)
+        output[i] = input[2 * i];
+}
+
+static void sum_d(const double * restrict input, double * restrict output, int len)
+{
+    output[0] = input[1];
+    for (int i = 1; i < len; i++)
+        output[i] = input[2 * i - 1] + input[2 * i + 1];
+}
+
+static void dct_a(const struct idct_context * restrict idct,
+                  const double * restrict input, double * restrict output)
+{
+    for (int i = 0; i < 8; i++) {
+        double res = 0.0;
+        for (int j = 0; j < 8; j++)
+            res += idct->dct_a[i][j] * input[j];
+        output[i] = res;
+    }
+}
+
+static void dct_b(const struct idct_context * restrict idct,
+                  const double * restrict input, double * restrict output)
+{
+    for (int i = 0; i < 8; i++) {
+        double res = input[0];
+        for (int j = 0; j < 7; j++)
+            res += idct->dct_b[i][j] * input[1 + j];
+        output[i] = res;
+    }
+}
+
+static void mod_a(const struct idct_context * restrict idct,
+                  const double * restrict input, double * restrict output)
+{
+    for (int i = 0; i < 8; i++)
+        output[i] = idct->mod_a[i] * (input[i] + input[8 + i]);
+
+    for (int i = 8, k = 7; i < 16; i++, k--)
+        output[i] = idct->mod_a[i] * (input[k] - input[8 + k]);
+}
+
+static void mod_b(const struct idct_context * restrict idct,
+                  double * restrict input, double * restrict output)
+{
+    for (int i = 0; i < 8; i++)
+        input[8 + i] = idct->mod_b[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 void mod_c(const struct idct_context * restrict idct,
+                  const double * restrict input, double * restrict output)
+{
+    for (int i = 0; i < 16; i++)
+        output[i] = idct->mod_c[i] * (input[i] + input[16 + i]);
+
+    for (int i = 16, k = 15; i < 32; i++, k--)
+        output[i] = idct->mod_c[i] * (input[k] - input[16 + k]);
+}
+
+void idct_perform32_float(const struct idct_context * restrict idct,
+                          double * restrict input, double * restrict output)
+{
+    sum_a(input, output +  0, 16);
+    sum_b(input, output + 16, 16);
+
+    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);
+
+    dct_a(idct, input +  0, output +  0);
+    dct_b(idct, input +  8, output +  8);
+    dct_b(idct, input + 16, output + 16);
+    dct_b(idct, input + 24, output + 24);
+
+    mod_a(idct, output +  0, input +  0);
+    mod_b(idct, output + 16, input + 16);
+
+    mod_c(idct, input, output);
+}
+
+static void mod64_a(const struct idct_context * restrict idct,
+                    const double * restrict input, double * restrict output)
+{
+    for (int i = 0; i < 16; i++)
+        output[i] = idct->mod64_a[i] * (input[i] + input[16 + i]);
+
+    for (int i = 16, k = 15; i < 32; i++, k--)
+        output[i] = idct->mod64_a[i] * (input[k] - input[16 + k]);
+}
+
+static void mod64_b(const struct idct_context * restrict idct,
+                    double * restrict input, double * restrict output)
+{
+    for (int i = 0; i < 16; i++)
+        input[16 + i] = idct->mod64_b[i] * input[16 + i];

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/interpolator.cpp -> makemkv-oss-1.10.2.tar.xz/libffabi/src/dcadec/interpolator.cpp Changed

@@ -19,30 +19,13 @@
 #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 *interpolator_create(struct idct_context *parent, int flags)
 {
     struct interpolator *dsp = ta_new(parent, struct interpolator);
     if (!dsp)
         return NULL;
 
-    dsp->data = parent;
+    dsp->idct = 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);

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/interpolator.h -> makemkv-oss-1.10.2.tar.xz/libffabi/src/dcadec/interpolator.h Changed

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/interpolator_fixed.cpp -> makemkv-oss-1.10.2.tar.xz/libffabi/src/dcadec/interpolator_fixed.cpp Changed

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/interpolator_float.cpp -> makemkv-oss-1.10.2.tar.xz/libffabi/src/dcadec/interpolator_float.cpp Changed

@@ -18,6 +18,8 @@
 
 #include "common.h"
 #include "interpolator.h"
+#include "idct.h"
+#include "fixed_math.h"
 #include "fir_float.h"
 
 #define DCA_LOGCTX (0)
@@ -33,11 +35,7 @@
 
 static inline int convert(double a)
 {
-    if (a > 0x7fffff)
-        return 0x7fffff;
-    if (a < -0x800000)
-        return -0x800000;
-    return (int)floor(a + 0.5);
+    return clip23(lrint(a));
 }
 
 INTERPOLATE_LFE(lfe_float_fir)
@@ -116,9 +114,6 @@
     // 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;
 
@@ -133,12 +128,7 @@
 
         // 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;
-        }
+        idct_perform32_float(dsp->idct, input, output);
 
         // Store history
         for (i = 0, k = 31; i < 16; i++, k--) {
@@ -188,9 +178,6 @@
     // 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;
@@ -213,12 +200,7 @@
 
         // Inverse DCT
         double output[64];
-        for (i = 0, k = 0; i < 64; i++) {
-            double res = 0.0;
-            for (j = 0; j < 64; j++)
-                res += input[j] * cos_mod[k++];
-            output[i] = res;
-        }
+        idct_perform64_float(dsp->idct, input, output);
 
         // Store history
         for (i = 0, k = 63; i < 32; i++, k--) {

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/ta.cpp -> makemkv-oss-1.10.2.tar.xz/libffabi/src/dcadec/ta.cpp Changed

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/ta.h -> makemkv-oss-1.10.2.tar.xz/libffabi/src/dcadec/ta.h Changed

@@ -30,6 +30,7 @@
 bool ta_set_destructor(void *ptr, void (*destructor)(void *));
 bool ta_set_parent(void *ptr, void *ta_parent);
 void *ta_find_parent(void *ptr);
+char *ta_strdup(void *ta_parent, const char *str);
 
 static inline size_t ta_calc_array_size(size_t element_size, size_t count)
 {
@@ -38,6 +39,40 @@
     return element_size * count;
 }
 
+static inline int ta_zalloc_fast(void *ta_parent, void *ptr,
+                                 size_t count, size_t element_size)
+{
+    void **_ptr = (void **)ptr;
+    size_t old_size = ta_get_size(*_ptr);
+    size_t new_size = ta_calc_array_size(element_size, count);
+
+    if (old_size < new_size) {
+        ta_free(*_ptr);
+        if (!(*_ptr = ta_zalloc_size(ta_parent, new_size)))
+            return -1;
+        return 1;
+    }
+
+    return 0;
+}
+
+static inline int ta_alloc_fast(void *ta_parent, void *ptr,
+                                size_t count, size_t element_size)
+{
+    void **_ptr = (void **)ptr;
+    size_t old_size = ta_get_size(*_ptr);
+    size_t new_size = ta_calc_array_size(element_size, count);
+
+    if (old_size < new_size) {
+        ta_free(*_ptr);
+        if (!(*_ptr = ta_alloc_size(ta_parent, new_size)))
+            return -1;
+        return 1;
+    }
+
+    return 0;
+}
+
 #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))
 
@@ -56,16 +91,4 @@
 #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 -> makemkv-oss-1.10.2.tar.xz/libffabi/src/dcadec/xll_decoder.cpp Changed

@@ -21,6 +21,7 @@
 #include "fixed_math.h"
 #include "xll_decoder.h"
 #include "exss_parser.h"
+#include "dmix_tables.h"
 
 #include "xll_tables.h"
 
@@ -34,23 +35,65 @@
     int m, n;
 
     if (chs->primary_chset) {
-        m = prim_dmix_nch[chs->dmix_type];
+        m = dmix_primary_nch[chs->dmix_type];
         n = chs->nchannels;
     } else {
-        m = xll->nchannels;
-        n = chs->nchannels + 1;
+        m = chs->dmix_m;
+        n = chs->nchannels + 2; // Two extra columns for scales
     }
 
     // Reallocate downmix coefficients matrix
-    int ret;
-    if ((ret = dca_realloc(xll->chset, &chs->dmix_coeff, m * n, sizeof(int))) < 0)
-        return ret;
+    if (ta_zalloc_fast(xll->chset, &chs->dmix_coeff, m * n, sizeof(int)) < 0)
+        return -DCADEC_ENOMEM;
+
+    if (chs->primary_chset) {
+        chs->dmix_scale = NULL;
+        chs->dmix_scale_inv = NULL;
+    } else {
+        chs->dmix_scale = chs->dmix_coeff + m * chs->nchannels;
+        chs->dmix_scale_inv = chs->dmix_coeff + m * (chs->nchannels + 1);
+    }
 
-    // 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);
+    for (int i = 0; i < m; i++) {
+        int scale_inv = 0;
+
+        // Downmix scale
+        // Only for non-primary channel sets
+        if (!chs->primary_chset) {
+            int code = bits_get(&xll->bits, 9);
+            int sign = (code >> 8) - 1; code &= 0xff;
+            if (code > 0) {
+                unsigned int index = code - 1;
+                enforce(index >= 40 && index < dca_countof(dmix_table), "Invalid downmix scale index");
+                int scale = dmix_table[index];
+                scale_inv = dmix_table_inv[index - 40];
+                chs->dmix_scale[i] = (scale ^ sign) - sign;
+                chs->dmix_scale_inv[i] = (scale_inv ^ sign) - sign;
+            } else {
+                chs->dmix_scale[i] = 0;
+                chs->dmix_scale_inv[i] = 0;
+            }
+        }
+
+        // Downmix coefficients
+        for (int j = 0; j < chs->nchannels; j++) {
+            int code = bits_get(&xll->bits, 9);
+            int sign = (code >> 8) - 1; code &= 0xff;
+            if (code > 0) {
+                unsigned int index = code - 1;
+                enforce(index < dca_countof(dmix_table), "Invalid downmix coefficient index");
+                int coeff = dmix_table[index];
+                if (!chs->primary_chset)
+                    // Multiply by |InvDmixScale| to get |UndoDmixScale|
+                    coeff = mul16(scale_inv, coeff);
+                // Convert sign
+                *coeff_ptr++ = (coeff ^ sign) - sign;
+            } else {
+                *coeff_ptr++ = 0;
+            }
+        }
+    }
 
     return 0;
 }
@@ -70,6 +113,7 @@
 
     // Number of channels in the channel set
     chs->nchannels = bits_get(&xll->bits, 4) + 1;
+    require(chs->nchannels <= XLL_MAX_CHANNELS, "Too many channels");
 
     // Residual type
     chs->residual_encode = bits_get(&xll->bits, chs->nchannels);
@@ -82,12 +126,14 @@
 
     // Original sampling frequency
     chs->freq = exss_sample_rates[bits_get(&xll->bits, 4)];
+    require(chs->freq <= 192000, "Too high sampling frequency");
 
     // Sampling frequency modifier
-    bits_skip(&xll->bits, 2);
+    chs->interpolate = bits_get(&xll->bits, 2);
 
     // Which replacement set this channel set is member of
     chs->replace_set_index = bits_get(&xll->bits, 2);
+    require(chs->replace_set_index == 0, "Replacement sets are not supported");
 
     // Default replacement set flag
     if (chs->replace_set_index)
@@ -104,11 +150,10 @@
         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");
+            enforce(chs->dmix_type < DMIX_TYPE_COUNT,
+                    "Invalid primary channel set downmix type");
         }
 
         // Whether the channel set is part of a hierarchy
@@ -123,6 +168,7 @@
         if (chs->ch_mask_enabled) {
             // Channel mask for set
             chs->ch_mask = bits_get(&xll->bits, xll->ch_mask_nbits);
+            enforce(dca_popcount(chs->ch_mask) == chs->nchannels, "Invalid channel mask");
         } else {
             chs->ch_mask = 0;
             // Angular speaker position table
@@ -136,7 +182,7 @@
         chs->primary_chset = true;
         chs->dmix_coeffs_present = false;
         chs->dmix_embedded = false;
-        chs->hier_chset = false;
+        chs->hier_chset = true;
         chs->ch_mask_enabled = false;
         chs->ch_mask = 0;
 
@@ -183,114 +229,171 @@
     else
         chs->nfreqbands = 1;
 
+    // Extra frequency bands are not supported
+    require(chs->nfreqbands <= XLL_MAX_BANDS, "Too many frequency bands");
+
+    // Clamp the sampling frequency to 96 kHz. The rest of the code will use
+    // the number of bands to determine maximum frequency.
+    if (chs->freq > 96000)
+        chs->freq = 96000;
+
     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)
+    if ((xll->nchsets > 1 || chs->nfreqbands > 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++)
-            chs->orig_order[i] = bits_get(&xll->bits, ch_nbits[chs->nchannels - 1]);
-        // Pairwise channel coefficients
-        for (i = 0; i < chs->nchannels / 2; i++) {
-            if (bits_get1(&xll->bits))
-                chs->decor_coef[i] = bits_get_signed_linear(&xll->bits, 7);
-            else
-                chs->decor_coef[i] = 0;
+    for (int band = 0; band < chs->nfreqbands; band++) {
+        // Pairwise channel decorrelation
+        chs->decor_enabled[band] = bits_get1(&xll->bits);
+        if (chs->decor_enabled[band] && chs->nchannels > 1) {
+            // Original channel order
+            for (i = 0; i < chs->nchannels; i++) {
+                chs->orig_order[band][i] = bits_get(&xll->bits, ch_nbits[chs->nchannels - 1]);
+                enforce(chs->orig_order[band][i] < chs->nchannels, "Invalid original channel order");
+            }
+            // Pairwise channel coefficients
+            for (i = 0; i < chs->nchannels / 2; i++) {
+                if (bits_get1(&xll->bits))
+                    chs->decor_coeff[band][i] = bits_get_signed_linear(&xll->bits, 7);
+                else
+                    chs->decor_coeff[band][i] = 0;
+            }
+        } else {
+            for (i = 0; i < chs->nchannels; i++)
+                chs->orig_order[band][i] = i;
+            for (i = 0; i < chs->nchannels / 2; i++)
+                chs->decor_coeff[band][i] = 0;
         }
-    } else {
-        for (i = 0; i < chs->nchannels; i++)
-            chs->orig_order[i] = i;
-        for (i = 0; i < chs->nchannels / 2; i++)
-            chs->decor_coef[i] = 0;

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/xll_decoder.h -> makemkv-oss-1.10.2.tar.xz/libffabi/src/dcadec/xll_decoder.h Changed

@@ -21,12 +21,23 @@
 
 #include "bitstream.h"
 
-#define XLL_MAX_CHANNELS    16
+#define XLL_MAX_CHSETS      16
+#define XLL_MAX_CHANNELS    8
+#define XLL_MAX_BANDS       2
+
+#define XLL_DECI_HISTORY    8
+
+#define XLL_BAND_0  0
+#define XLL_BAND_1  1
 
 #define for_each_chset(xll, chs) \
     for (struct xll_chset *(chs) = (xll)->chset; \
          (chs) != &(xll)->chset[(xll)->nchsets]; (chs)++)
 
+#define for_each_active_chset(xll, chs) \
+    for (struct xll_chset *(chs) = (xll)->chset; \
+         (chs) != &(xll)->chset[(xll)->nactivechsets]; (chs)++)
+
 struct xll_decoder;
 struct exss_asset;
 
@@ -38,6 +49,7 @@
     int     pcm_bit_res;
     int     storage_bit_res;
     int     freq;
+    int     interpolate;
     int     replace_set_index;
 
     bool    primary_chset;
@@ -45,25 +57,30 @@
     bool    dmix_embedded;
     int     dmix_type;
     bool    hier_chset;
+    int     dmix_m;
     int     *dmix_coeff;
+    int     *dmix_scale;
+    int     *dmix_scale_inv;
     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];
+    bool    decor_enabled[XLL_MAX_BANDS];
+    int     orig_order[XLL_MAX_BANDS][XLL_MAX_CHANNELS];
+    int     decor_coeff[XLL_MAX_BANDS][XLL_MAX_CHANNELS / 2];
+
+    int     adapt_pred_order[XLL_MAX_BANDS][XLL_MAX_CHANNELS];
+    int     highest_pred_order[XLL_MAX_BANDS];
+    int     fixed_pred_order[XLL_MAX_BANDS][XLL_MAX_CHANNELS];
+    int     adapt_refl_coeff[XLL_MAX_BANDS][XLL_MAX_CHANNELS][16];
 
-    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];
+    bool    band_dmix_embedded[XLL_MAX_BANDS];
 
-    size_t  lsb_section_size;
-    int     nscalablelsbs[XLL_MAX_CHANNELS];
-    int     bit_width_adjust[XLL_MAX_CHANNELS];
+    size_t  lsb_section_size[XLL_MAX_BANDS];
+    int     nscalablelsbs[XLL_MAX_BANDS][XLL_MAX_CHANNELS];
+    int     bit_width_adjust[XLL_MAX_BANDS][XLL_MAX_CHANNELS];
 
     bool    seg_type;
     bool    rice_code_flag[XLL_MAX_CHANNELS];
@@ -71,9 +88,16 @@
     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;
+
+    int     deci_history[XLL_MAX_CHANNELS][XLL_DECI_HISTORY];
+
+    int     *msb_sample_buffer[XLL_MAX_BANDS][XLL_MAX_CHANNELS];
+    int     *lsb_sample_buffer[XLL_MAX_BANDS][XLL_MAX_CHANNELS];
+    int     *out_sample_buffer[XLL_MAX_CHANNELS];
+
+    int     *sample_buffer1;
+    int     *sample_buffer2;
+    int     *sample_buffer3;
 };
 
 struct xll_decoder {
@@ -81,6 +105,8 @@
 
     struct dcadec_log_context *logctx;
 
+    int     flags;
+
     size_t  frame_size;
     int     nchsets;
     int     nframesegs;
@@ -99,6 +125,9 @@
 
     int     nfreqbands;
     int     nchannels;
+    int     nactivechsets;
+
+    int     nfailedsegs;
 
     int     hd_stream_id;
 
@@ -107,10 +136,11 @@
     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);
+void xll_clear_band_data(struct xll_chset *chs, int band);
+void xll_filter_band_data(struct xll_chset *chs, int band);
+int xll_get_lsb_width(struct xll_chset *chs, int band, int ch);
+void xll_assemble_msbs_lsbs(struct xll_chset *chs, int band);
+int xll_assemble_freq_bands(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);

makemkv-oss-1.9.5.tar.xz/libffabi/src/dcadec/xll_tables.h -> makemkv-oss-1.10.2.tar.xz/libffabi/src/dcadec/xll_tables.h Changed

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

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

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

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

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

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

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

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

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

@@ -1,7 +1,7 @@
 /*
     libMakeMKV - MKV multiplexer library
 
-    Copyright (C) 2007-2015 GuinpinSoft inc <libmkv@makemkv.com>
+    Copyright (C) 2007-2016 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
@@ -50,10 +50,43 @@
 #include "matroska/KaxAttachments.h"
 #include "matroska/KaxAttached.h"
 
+#include <time.h>
+
 using namespace LIBEBML_NAMESPACE;
 using namespace LIBMATROSKA_NAMESPACE;
 
 UTFstring GetLibraryVersionString();
 
+#ifdef _MSC_VER
+
+static inline uint64_t libmkv_time()
+{
+    return _time64(NULL);
+};
+
+static inline struct tm *libmkv_gmtime_r(uint64_t atime, struct tm *result)
+{
+    __time64_t t = atime;
+    struct tm *p = _gmtime64(&t);
+    if (!p) return NULL;
+    memcpy(result,p,sizeof(struct tm));
+    return result;
+}
+
+#else
+
+static inline uint64_t libmkv_time()
+{
+    return time(NULL);
+};
+
+static inline struct tm *libmkv_gmtime_r(uint64_t atime, struct tm *result)
+{
+    time_t t = atime;
+    return gmtime_r(&t,result);
+}
+
+#endif
+
 #endif // LIBMKV_INTERNAL_H_INCLUDED

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

@@ -1,7 +1,7 @@
 /*
     libMakeMKV - MKV multiplexer library
 
-    Copyright (C) 2007-2015 GuinpinSoft inc <libmkv@makemkv.com>
+    Copyright (C) 2007-2016 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
@@ -51,6 +51,7 @@
     virtual void*           get_ref()=0;
     virtual bool            compress_start(unsigned int compressionType,unsigned int compressionLevel)=0;
     virtual bool            compress_wait()=0;
+    virtual unsigned int    compress_srcsize()=0;
 public:
     int64_t     timecode;
     int64_t     duration;
@@ -121,6 +122,8 @@
             int     fps_d;
 
             uint64_t priv[2];
+
+            uint8_t stereo_mode;
         } video;
 
         struct _audio
@@ -133,9 +136,12 @@
 
         struct _subtitles
         {
+            uint8_t offset_sequence_id_ref;
         } subtitles;
     } u;
 
+    uint8_t source_id[8];
+
 } MkvTrackInfo;
 
 class IMkvFrameSource

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

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

@@ -1,7 +1,7 @@
 /*
     libMakeMKV - MKV multiplexer library
 
-    Copyright (C) 2007-2015 GuinpinSoft inc <libmkv@makemkv.com>
+    Copyright (C) 2007-2016 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
@@ -23,10 +23,15 @@
 #include <libmkv/ebmlwrite.h>
 #include <lgpl/cassert>
 #include <exception>
-#include <list>
 #include <lgpl/sstring.h>
-#include <time.h>
 #include <lgpl/world.h>
+#include <vector>
+#include <lgpl/apdefs.h>
+
+#ifndef __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS 1
+#endif
+#include <inttypes.h>
 
 #define TIMECODE_SCALE              1000000
 #define MAX_TIMECODE_SIZE_BYTES     6
@@ -314,10 +319,125 @@
     uint64_t        duration_time;
     uint64_t        refs[2];
     unsigned int    duration_size;
-    unsigned int    frame_count;
     unsigned int    compression_type;
     unsigned int    compression_level;
     EbmlBinary*     codec_private;
+    uint64_t        stat_frames;
+    uint64_t        stat_bytes;
+    uint64_t        stat_bytes_out;
+    int64_t         stat_time_start;
+    int64_t         stat_time_end;
+public:
+    void UpdateStat(IMkvChunk*  frame)
+    {
+        int64_t time_end = frame->timecode + frame->duration;
+        if (stat_frames)
+        {
+            if (frame->timecode<stat_time_start) {
+                stat_time_start = frame->timecode;
+            }
+            if (time_end>stat_time_end) {
+                stat_time_end = time_end;
+            }
+        } else {
+            stat_time_start = frame->timecode;
+            stat_time_end = time_end;
+        }
+        stat_frames++;
+        CNZ(frame->compress_wait());
+        stat_bytes += frame->compress_srcsize();
+        stat_bytes_out += frame->get_size();
+    }
+    void RenderStat(KaxTags &tags,unsigned int trackUID,uint64_t mtime,const char* WritingApp)
+    {
+        KaxTag &tag = AddNewChild<KaxTag>(tags);
+        KaxTagTargets &targets = GetChild<KaxTagTargets>(tag);
+        GetChild<EbmlUInteger,KaxTagTrackUID>(targets) = trackUID;
+        GetChild<EbmlUInteger,KaxTagTargetTypeValue>(targets) = 50;
+        GetChild<EbmlString,KaxTagTargetType>(targets) = "MOVIE";
+
+        static const char* names[6]={
+            "BPS","DURATION","NUMBER_OF_FRAMES",
+            "NUMBER_OF_BYTES","NUMBER_OF_BYTES_UNCOMPRESSED","SOURCE_ID"};
+
+        char buffer[256];
+        uint64_t values[4];
+        uint8_t have = 0;
+
+        values[1] = TimecodeFromClock(stat_time_end-stat_time_start);
+        values[0] = (values[1]!=0)?(stat_bytes*8000/(values[1]/1000000)):0;
+        values[2] = stat_frames;
+        values[3] = stat_bytes_out;
+
+        for (unsigned int i=0;i<4;i++)
+        {
+            if (i==1)
+            {
+                unsigned int dec,sec,min,hr;
+                uint64_t t = values[1];
+                dec = (unsigned int)(t % 1000000000); t /= 1000000000;
+                sec = (unsigned int)(t % 60); t /= 60;
+                min = (unsigned int)(t % 60); t /= 60;
+                hr = (unsigned int) t;
+                sprintf_s(buffer,sizeof(buffer),"%02u:%02u:%02u.%09u",hr,min,sec,dec);
+            } else {
+                sprintf_s(buffer,sizeof(buffer),"%" PRIu64,values[i]);
+            }
+            AddSimple(tag,names[i],buffer);
+        }
+
+        if (stat_bytes_out!=stat_bytes)
+        {
+            have |= 1;
+            sprintf_s(buffer,sizeof(buffer),"%" PRIu64,stat_bytes);
+            AddSimple(tag,names[4],buffer);
+        }
+
+        if (info.source_id[0]!=0)
+        {
+            have |= 2;
+            for (unsigned int i=0;i<info.source_id[0];i++)
+            {
+                sprintf(buffer+i*2,"%02X",info.source_id[i+1]);
+            }
+            AddSimple(tag,names[5],buffer);
+        }
+
+        AddSimple(tag,"_STATISTICS_WRITING_APP",WritingApp);
+
+        struct tm t;
+        libmkv_gmtime_r(mtime,&t);
+        sprintf_s(buffer,sizeof(buffer),"%04u-%02u-%02u %02u:%02u:%02u",
+            t.tm_year+1900,t.tm_mon+1,t.tm_mday,
+            t.tm_hour,t.tm_min,t.tm_sec);
+        AddSimple(tag,"_STATISTICS_WRITING_DATE_UTC",buffer);
+
+        sprintf_s(buffer,sizeof(buffer),"%s %s %s %s",
+            names[0],names[1],names[2],names[3]);
+        for (unsigned int i=0;i<2;i++)
+        {
+            if ((have&(1<<i))!=0)
+            {
+                strcat(buffer," ");
+                strcat(buffer,names[i+4]);
+            }
+        }
+        AddSimple(tag,"_STATISTICS_TAGS",buffer);
+
+        if ((info.stream_flags&AP_AVStreamFlag_OffsetSequenceIdPresent)!=0)
+        {
+            sprintf_s(buffer,sizeof(buffer),"%u",(unsigned int)info.u.subtitles.offset_sequence_id_ref);
+            AddSimple(tag,"3d-plane",buffer);
+        }
+    }
+    static void AddSimple(KaxTag &tag,const char* Name,const char* Value)
+    {
+        KaxTagSimple& simple = AddNewChild<KaxTagSimple>(tag);
+        GetChild<EbmlUnicodeString,KaxTagName>(simple) = UTF8string(Name);
+        GetChild<EbmlString,KaxTagLangue>(simple) = "eng";
+        GetChild<EbmlUInteger,KaxTagDefault>(simple) = 1;
+        GetChild<EbmlUnicodeString,KaxTagString>(simple) = UTF8string(Value);
+    }
 };
 
 class MyDataBuffer : public DataBuffer
@@ -415,6 +535,7 @@
     KaxSeek* seek_cues = AddSeekEntry<KaxCues>(MetaSeek);
     KaxSeek* seek_chap = AddSeekEntry<KaxChapters>(MetaSeek);
     KaxSeek* seek_att = AddSeekEntry<KaxAttachments>(MetaSeek);
+    KaxSeek* seek_tags = AddSeekEntry<KaxTags>(MetaSeek);
 
     CNZ(MetaSeek.Render(File));
 
@@ -442,7 +563,8 @@
     {
         SegmentUid[i] = lgpl_get_random_byte();
     }
-    GetChild<EbmlDate,KaxDateUTC>(MyInfos).SetEpochDate((uint32_t)time(NULL));
+    uint64_t mtime = libmkv_time();
+    GetChild<EbmlDate,KaxDateUTC>(MyInfos).SetEpochDate(mtime);
     GetChild<EbmlBinary,KaxSegmentUID>(MyInfos).CopyBuffer(SegmentUid, 16);
 
     RenderVoid(File,FormatInfo->debug.evoid[0]);
@@ -464,10 +586,12 @@
         KaxTrackEntry *cur_track;
 
         ti = & track_info[i].info;
-        track_info[i].frame_count = 0;
         track_info[i].duration_pos=0;
         track_info[i].refs[0]=BAD_TIMECODE;
         track_info[i].refs[1]=BAD_TIMECODE;
+        track_info[i].stat_frames=0;
+        track_info[i].stat_bytes=0;
+        track_info[i].stat_bytes_out=0;
 
         memset(ti,0,sizeof(*ti));
         if (false==Input->MkvGetStream(i)->UpdateTrackInfo(ti))
@@ -567,6 +691,10 @@
 
             GetChild<EbmlUInteger,KaxVideoDisplayUnit>(vid_track) = 0;
 
+            if (ti->u.video.stereo_mode!=0)
+            {
+                GetChild<EbmlUInteger,KaxVideoStereoMode>(vid_track) = ti->u.video.stereo_mode;
+            }
 
             if (ti->u.video.fps_n!=0)
             {
@@ -956,7 +1084,7 @@
 
             DataBuffer* mkv_buffer = GetDataBuffer(frame,&track_info[stream_id]);

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

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

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

makemkv-oss-1.9.5.tar.xz/libmatroska/inc/matroska/FileKax.h -> makemkv-oss-1.10.2.tar.xz/libmatroska/inc/matroska/FileKax.h Changed

@@ -11,12 +11,12 @@
 ** 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
@@ -28,9 +28,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: FileKax.h,v 1.5 2004/04/14 23:26:17 robux4 Exp $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: FileKax.h,v 1.5 2004/04/14 23:26:17 robux4 Exp $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBMATROSKA_FILE_H
 #define LIBMATROSKA_FILE_H
@@ -60,90 +60,90 @@
 */
 class MATROSKA_DLL_API FileMatroska {
     public:
-		FileMatroska(IOCallback & output);
-		~FileMatroska();
+    FileMatroska(IOCallback & output);
+    ~FileMatroska();
 #ifdef OLD
-	filepos_t RenderHead(const std::string & aEncoderApp);
-	uint32 ReadHead();
-	uint32 ReadTracks();
-	uint32 ReadCodec();
-	void Close(const uint32 aTimeLength);
-
-	inline void type_SetInfo(const std::string & aStr) {myMainHeader.type_SetInfo(aStr);}
-	inline void type_SetAds(const std::string & aStr) {myMainHeader.type_SetAds(aStr);}
-	inline void type_SetSize(const std::string & aStr) {myMainHeader.type_SetSize(aStr);}
-	inline void type_SetSize(uint64 aSize) {myMainHeader.type_SetSize(aSize);}
-
-	inline uint8 GetTrackNumber() const { return myTracks.size(); }
-
-	void track_SetName(Track * aTrack, const std::string & aName);
-	void track_SetLaced(Track * aTrack, bool bLaced = true);
-
-	Track * CreateTrack(const track_type aType);
-	inline Track * GetTrack(const uint8 aTrackNb) const
-	{
-	    if (aTrackNb > myTracks.size())
-		return NULL;
-	    else
-		return myTracks[aTrackNb-1];
-	}
-
-	void Track_GetInfo(const Track * aTrack, TrackInfo & aTrackInfo) const;
-	
-	void Track_SetInfo_Audio(Track * aTrack, const TrackInfoAudio & aTrackInfo);
-	void Track_GetInfo_Audio(const Track * aTrack, TrackInfoAudio & aTrackInfo) const;
-
-	void Track_SetInfo_Video(Track * aTrack, const TrackInfoVideo & aTrackInfo);
-	void Track_GetInfo_Video(const Track * aTrack, TrackInfoVideo & aTrackInfo) const;
-
-	void SelectReadingTrack(Track * aTrack, bool select = true);
-
-	/*!
-	    \return wether the frame has been added or not
-	*/
-	bool AddFrame(Track * aTrack, const uint32 aTimecode, const binary *aFrame, const uint32 aFrameSize,
-		     bool aKeyFrame = true, bool aBFrame = false);
-
-	/*!
-	    \return wether the frame has been read or not
-	*/
-	bool ReadFrame(Track * & aTrack, uint32 & aTimecode, const binary * & aFrame, uint32 & aFrameSize,
-		     bool & aKeyFrame, bool & aBFrame);
-
-	/*
-	    Render the pending cluster to file
-	*/
-	void Flush();
-
-	void SetMaxClusterSize(const uint32 value);
-	void SetMinClusterSize(const uint32 value) {myMinClusterSize = value;}
+  filepos_t RenderHead(const std::string & aEncoderApp);
+  uint32 ReadHead();
+  uint32 ReadTracks();
+  uint32 ReadCodec();
+  void Close(const uint32 aTimeLength);
+
+  inline void type_SetInfo(const std::string & aStr) {myMainHeader.type_SetInfo(aStr);}
+  inline void type_SetAds(const std::string & aStr) {myMainHeader.type_SetAds(aStr);}
+  inline void type_SetSize(const std::string & aStr) {myMainHeader.type_SetSize(aStr);}
+  inline void type_SetSize(uint64 aSize) {myMainHeader.type_SetSize(aSize);}
+
+  inline uint8 GetTrackNumber() const { return myTracks.size(); }
+
+  void track_SetName(Track * aTrack, const std::string & aName);
+  void track_SetLaced(Track * aTrack, bool bLaced = true);
+
+  Track * CreateTrack(const track_type aType);
+  inline Track * GetTrack(const uint8 aTrackNb) const
+  {
+      if (aTrackNb > myTracks.size())
+    return NULL;
+      else
+    return myTracks[aTrackNb-1];
+  }
+
+  void Track_GetInfo(const Track * aTrack, TrackInfo & aTrackInfo) const;
+
+  void Track_SetInfo_Audio(Track * aTrack, const TrackInfoAudio & aTrackInfo);
+  void Track_GetInfo_Audio(const Track * aTrack, TrackInfoAudio & aTrackInfo) const;
+
+  void Track_SetInfo_Video(Track * aTrack, const TrackInfoVideo & aTrackInfo);
+  void Track_GetInfo_Video(const Track * aTrack, TrackInfoVideo & aTrackInfo) const;
+
+  void SelectReadingTrack(Track * aTrack, bool select = true);
+
+  /*!
+      \return wether the frame has been added or not
+  */
+  bool AddFrame(Track * aTrack, const uint32 aTimecode, const binary *aFrame, const uint32 aFrameSize,
+         bool aKeyFrame = true, bool aBFrame = false);
+
+  /*!
+      \return wether the frame has been read or not
+  */
+  bool ReadFrame(Track * & aTrack, uint32 & aTimecode, const binary * & aFrame, uint32 & aFrameSize,
+         bool & aKeyFrame, bool & aBFrame);
+
+  /*
+      Render the pending cluster to file
+  */
+  void Flush();
+
+  void SetMaxClusterSize(const uint32 value);
+  void SetMinClusterSize(const uint32 value) {myMinClusterSize = value;}
 
     protected:
-	MainHeader myMainHeader;
+  MainHeader myMainHeader;
 
-	std::vector<Track *> myTracks;
-	std::vector<uint8> mySelectedTracks;
+  std::vector<Track *> myTracks;
+  std::vector<uint8> mySelectedTracks;
 
-//	Track *findTrack(Track * aTrack) const;
+//  Track *findTrack(Track * aTrack) const;
 
-	Cluster  myCurrWriteCluster; /// \todo merge with the write one ?
-	uint32   myReadBlockNumber;
-	Cluster  myCurrReadCluster;
-	binary * myCurrReadBlock;      ///< The buffer containing the current read block
-	uint32   myCurrReadBlockSize;  ///< The size of the buffer containing the current read block
-	uint8    myCurrReadBlockTrack; ///< The track number of the current track to read
+  Cluster  myCurrWriteCluster; /// \todo merge with the write one ?
+  uint32   myReadBlockNumber;
+  Cluster  myCurrReadCluster;
+  binary * myCurrReadBlock;      ///< The buffer containing the current read block
+  uint32   myCurrReadBlockSize;  ///< The size of the buffer containing the current read block
+  uint8    myCurrReadBlockTrack; ///< The track number of the current track to read
 
-	uint32 myMaxClusterSize;
-	uint32 myMinClusterSize;
+  uint32 myMaxClusterSize;
+  uint32 myMinClusterSize;
 
-	StreamInfo myStreamInfo;
+  StreamInfo myStreamInfo;
 
-	CodecHeader myCodecHeader;
+  CodecHeader myCodecHeader;
 
-	inline bool IsMyTrack(const Track * aTrack) const;
-	inline bool IsReadingTrack(const uint8 aTrackNum) const;
+  inline bool IsMyTrack(const Track * aTrack) const;
+  inline bool IsReadingTrack(const uint8 aTrackNum) const;
 #endif // OLD
-	IOCallback & myFile;
+  IOCallback & myFile;
 
 };

makemkv-oss-1.9.5.tar.xz/libmatroska/inc/matroska/KaxAttached.h -> makemkv-oss-1.10.2.tar.xz/libmatroska/inc/matroska/KaxAttached.h Changed

@@ -11,12 +11,12 @@
 ** 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
@@ -28,9 +28,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: KaxAttached.h,v 1.8 2004/04/14 23:26:17 robux4 Exp $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: KaxAttached.h,v 1.8 2004/04/14 23:26:17 robux4 Exp $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBMATROSKA_ATTACHED_H
 #define LIBMATROSKA_ATTACHED_H

makemkv-oss-1.9.5.tar.xz/libmatroska/inc/matroska/KaxAttachments.h -> makemkv-oss-1.10.2.tar.xz/libmatroska/inc/matroska/KaxAttachments.h Changed

@@ -11,12 +11,12 @@
 ** 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
@@ -28,9 +28,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: KaxAttachments.h,v 1.8 2004/04/14 23:26:17 robux4 Exp $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: KaxAttachments.h,v 1.8 2004/04/14 23:26:17 robux4 Exp $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBMATROSKA_ATTACHEMENTS_H
 #define LIBMATROSKA_ATTACHEMENTS_H

makemkv-oss-1.9.5.tar.xz/libmatroska/inc/matroska/KaxBlock.h -> makemkv-oss-1.10.2.tar.xz/libmatroska/inc/matroska/KaxBlock.h Changed

@@ -9,12 +9,12 @@
 ** 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
@@ -26,11 +26,11 @@
 **********************************************************************/
 
 /*!
-	\file
-	\todo add a PureBlock class to group functionalities between Block and BlockVirtual
-	\version \$Id: KaxBlock.h,v 1.24 2004/04/14 23:26:17 robux4 Exp $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-	\author Julien Coloos    <suiryc @ users.sf.net>
+  \file
+  \todo add a PureBlock class to group functionalities between Block and BlockVirtual
+  \version \$Id: KaxBlock.h,v 1.24 2004/04/14 23:26:17 robux4 Exp $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
+  \author Julien Coloos    <suiryc @ users.sf.net>
 */
 #ifndef LIBMATROSKA_BLOCK_H
 #define LIBMATROSKA_BLOCK_H
@@ -53,259 +53,259 @@
 class KaxBlockBlob;
 
 class MATROSKA_DLL_API DataBuffer {
-	protected:
-		binary * myBuffer;
-		uint32   mySize;
-		bool     bValidValue;
-		bool     (*myFreeBuffer)(const DataBuffer & aBuffer); // method to free the internal buffer
-		bool     bInternalBuffer;
-
-	public:
-		DataBuffer(binary * aBuffer, uint32 aSize, bool (*aFreeBuffer)(const DataBuffer & aBuffer) = NULL, bool _bInternalBuffer = false)
-			:myBuffer(NULL)
-			,mySize(aSize)
-			,bValidValue(true)
-			,myFreeBuffer(aFreeBuffer)
-			,bInternalBuffer(_bInternalBuffer)
-		{
-			if (bInternalBuffer)
-			{
-				myBuffer = new (std::nothrow) binary[mySize];
-				if (myBuffer == NULL)
-					bValidValue = false;
-				else
-					memcpy(myBuffer, aBuffer, mySize); 
-			}
-			else
-				myBuffer = aBuffer;
-		}
-
-		virtual ~DataBuffer() {}
-		virtual binary * Buffer() {assert(bValidValue); return myBuffer;}
-		virtual uint32   & Size() {return mySize;};
-		virtual const binary * Buffer() const {assert(bValidValue); return myBuffer;}
-		virtual uint32   Size()   const {return mySize;};
-		bool    FreeBuffer(const DataBuffer & aBuffer) {
-			bool bResult = true;
-			if (myBuffer != NULL && bValidValue) {
-				if (myFreeBuffer != NULL)
-					bResult = myFreeBuffer(aBuffer);
-				if (bInternalBuffer)
-					delete [] myBuffer;
-				myBuffer = NULL;
-				mySize = 0;
-				bValidValue = false;
-			}
-			return bResult;
-		}
-
-		virtual DataBuffer * Clone();
+  protected:
+    binary * myBuffer;
+    uint32   mySize;
+    bool     bValidValue;
+    bool     (*myFreeBuffer)(const DataBuffer & aBuffer); // method to free the internal buffer
+    bool     bInternalBuffer;
+
+  public:
+    DataBuffer(binary * aBuffer, uint32 aSize, bool (*aFreeBuffer)(const DataBuffer & aBuffer) = NULL, bool _bInternalBuffer = false)
+      :myBuffer(NULL)
+      ,mySize(aSize)
+      ,bValidValue(true)
+      ,myFreeBuffer(aFreeBuffer)
+      ,bInternalBuffer(_bInternalBuffer)
+    {
+      if (bInternalBuffer)
+      {
+        myBuffer = new (std::nothrow) binary[mySize];
+        if (myBuffer == NULL)
+          bValidValue = false;
+        else
+          memcpy(myBuffer, aBuffer, mySize);
+      }
+      else
+        myBuffer = aBuffer;
+    }
+
+    virtual ~DataBuffer() {}
+    virtual binary * Buffer() {assert(bValidValue); return myBuffer;}
+    virtual uint32   & Size() {return mySize;};
+    virtual const binary * Buffer() const {assert(bValidValue); return myBuffer;}
+    virtual uint32   Size()   const {return mySize;};
+    bool    FreeBuffer(const DataBuffer & aBuffer) {
+      bool bResult = true;
+      if (myBuffer != NULL && bValidValue) {
+        if (myFreeBuffer != NULL)
+          bResult = myFreeBuffer(aBuffer);
+        if (bInternalBuffer)
+          delete [] myBuffer;
+        myBuffer = NULL;
+        mySize = 0;
+        bValidValue = false;
+      }
+      return bResult;
+    }
+
+    virtual DataBuffer * Clone();
 };
 
 class MATROSKA_DLL_API SimpleDataBuffer : public DataBuffer {
-	public:
-		SimpleDataBuffer(binary * aBuffer, uint32 aSize, uint32 aOffset, bool (*aFreeBuffer)(const DataBuffer & aBuffer) = myFreeBuffer)
-			:DataBuffer(aBuffer + aOffset, aSize, aFreeBuffer)
-			,Offset(aOffset)
-			,BaseBuffer(aBuffer)
-		{}
-		virtual ~SimpleDataBuffer() {}
-
-		DataBuffer * Clone() {return new SimpleDataBuffer(*this);}
-
-	protected:
-		uint32 Offset;
-		binary * BaseBuffer;
-
-		static bool myFreeBuffer(const DataBuffer & aBuffer)
-		{
-			binary *_Buffer = static_cast<const SimpleDataBuffer*>(&aBuffer)->BaseBuffer;
-			if (_Buffer != NULL)
-				free(_Buffer);
-			return true;
-		}
-
-		SimpleDataBuffer(const SimpleDataBuffer & ToClone);
+  public:
+    SimpleDataBuffer(binary * aBuffer, uint32 aSize, uint32 aOffset, bool (*aFreeBuffer)(const DataBuffer & aBuffer) = myFreeBuffer)
+      :DataBuffer(aBuffer + aOffset, aSize, aFreeBuffer)
+      ,Offset(aOffset)
+      ,BaseBuffer(aBuffer)
+    {}
+    virtual ~SimpleDataBuffer() {}
+
+    DataBuffer * Clone() {return new SimpleDataBuffer(*this);}
+
+  protected:
+    uint32 Offset;
+    binary * BaseBuffer;
+
+    static bool myFreeBuffer(const DataBuffer & aBuffer)
+    {
+      binary *_Buffer = static_cast<const SimpleDataBuffer*>(&aBuffer)->BaseBuffer;
+      if (_Buffer != NULL)
+        free(_Buffer);
+      return true;
+    }
+
+    SimpleDataBuffer(const SimpleDataBuffer & ToClone);
 };
 
 /*!
-	\note the data is copied locally, it can be freed right away
+  \note the data is copied locally, it can be freed right away
 * /
 class MATROSKA_DLL_API NotSoSimpleDataBuffer : public SimpleDataBuffer {
-	public:
-		NotSoSimpleDataBuffer(binary * aBuffer, uint32 aSize, uint32 aOffset)
-			:SimpleDataBuffer(new binary[aSize - aOffset], aSize, 0)
-		{
-			memcpy(BaseBuffer, aBuffer + aOffset, aSize - aOffset);
-		}
+  public:
+    NotSoSimpleDataBuffer(binary * aBuffer, uint32 aSize, uint32 aOffset)
+      :SimpleDataBuffer(new binary[aSize - aOffset], aSize, 0)
+    {
+      memcpy(BaseBuffer, aBuffer + aOffset, aSize - aOffset);
+    }
 };
 */

makemkv-oss-1.9.5.tar.xz/libmatroska/inc/matroska/KaxBlockData.h -> makemkv-oss-1.10.2.tar.xz/libmatroska/inc/matroska/KaxBlockData.h Changed

@@ -9,12 +9,12 @@
 ** 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
@@ -26,9 +26,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: KaxBlockData.h,v 1.10 2004/04/14 23:26:17 robux4 Exp $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: KaxBlockData.h,v 1.10 2004/04/14 23:26:17 robux4 Exp $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBMATROSKA_BLOCK_ADDITIONAL_H
 #define LIBMATROSKA_BLOCK_ADDITIONAL_H
@@ -45,27 +45,26 @@
 START_LIBMATROSKA_NAMESPACE
 
 /*!
-	\brief element used for B frame-likes
+  \brief element used for B frame-likes
 */
 DECLARE_MKX_SINTEGER_CONS(KaxReferenceBlock)
-	public:
+  public:
         ~KaxReferenceBlock();
-		/*!
-			\brief override this method to compute the timecode value
-		*/
-		virtual filepos_t UpdateSize(bool bSaveDefault = false, bool bForceRender = false);
+    /*!
+      \brief override this method to compute the timecode value
+    */
+    virtual filepos_t UpdateSize(bool bSaveDefault = false, bool bForceRender = false);
+
+    const KaxBlockBlob & RefBlock() const;
+    void SetReferencedBlock(const KaxBlockBlob * aRefdBlock);
+    void SetReferencedBlock(const KaxBlockGroup & aRefdBlock);
+    void SetParentBlock(const KaxBlockGroup & aParentBlock) {ParentBlock = &aParentBlock;}
+    void SetReferencedTimecode(int64 refTimecode) {*static_cast<EbmlSInteger*>(this) = refTimecode; bTimecodeSet = true;};
 
-		const KaxBlockBlob & RefBlock() const;
-		void SetReferencedBlock(const KaxBlockBlob * aRefdBlock);
-		void SetReferencedBlock(const KaxBlockGroup & aRefdBlock);
-		void SetParentBlock(const KaxBlockGroup & aParentBlock) {ParentBlock = &aParentBlock;}
-		
-	protected:
-		const KaxBlockBlob * RefdBlock;
-		const KaxBlockGroup * ParentBlock;
-		bool bTimecodeSet;
-public:
-		void SetReferencedTimecode(int64 refTimecode) {*static_cast<EbmlSInteger*>(this) = refTimecode; bTimecodeSet = true;};
+  protected:
+    const KaxBlockBlob * RefdBlock;
+    const KaxBlockGroup * ParentBlock;
+    bool bTimecodeSet;
         bool bOurBlob;
         void FreeBlob();
 };

makemkv-oss-1.9.5.tar.xz/libmatroska/inc/matroska/KaxChapters.h -> makemkv-oss-1.10.2.tar.xz/libmatroska/inc/matroska/KaxChapters.h Changed

@@ -11,12 +11,12 @@
 ** 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
@@ -28,9 +28,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id$
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id$
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBMATROSKA_CHAPTERS_H
 #define LIBMATROSKA_CHAPTERS_H

makemkv-oss-1.9.5.tar.xz/libmatroska/inc/matroska/KaxCluster.h -> makemkv-oss-1.10.2.tar.xz/libmatroska/inc/matroska/KaxCluster.h Changed

@@ -9,12 +9,12 @@
 ** 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
@@ -26,10 +26,10 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: KaxCluster.h,v 1.10 2004/04/14 23:26:17 robux4 Exp $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-	\author Julien Coloos    <suiryc @ users.sf.net>
+  \file
+  \version \$Id: KaxCluster.h,v 1.10 2004/04/14 23:26:17 robux4 Exp $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
+  \author Julien Coloos    <suiryc @ users.sf.net>
 
 */
 #ifndef LIBMATROSKA_CLUSTER_H
@@ -49,109 +49,109 @@
 class KaxSegment;
 
 DECLARE_MKX_MASTER_CONS(KaxCluster)
-	public:
-		/*!
-			\brief Addition of a frame without references
-
-			\param the timecode is expressed in nanoseconds, relative to the beggining of the Segment
-		*/
-		bool AddFrame(const KaxTrackEntry & track, uint64 timecode, DataBuffer & buffer, KaxBlockGroup * & MyNewBlock, LacingType lacing = LACING_AUTO);
-		/*!
-			\brief Addition of a frame with a backward reference (P frame)
-			\param the timecode is expressed in nanoseconds, relative to the beggining of the Segment
-
-		*/
-		bool AddFrame(const KaxTrackEntry & track, uint64 timecode, DataBuffer & buffer, KaxBlockGroup * & MyNewBlock, const KaxBlockGroup & PastBlock, LacingType lacing = LACING_AUTO);
-
-		/*!
-			\brief Addition of a frame with a backward+forward reference (B frame)
-			\param the timecode is expressed in nanoseconds, relative to the beggining of the Segment
-
-		*/
-		bool AddFrame(const KaxTrackEntry & track, uint64 timecode, DataBuffer & buffer, KaxBlockGroup * & MyNewBlock, const KaxBlockGroup & PastBlock, const KaxBlockGroup & ForwBlock, LacingType lacing = LACING_AUTO);
-
-		/*!
-			\brief Render the data to the stream and retrieve the position of BlockGroups for later cue entries
-		*/
-		filepos_t Render(IOCallback & output, KaxCues & CueToUpdate, bool bSaveDefault = false);
-
-		/*!
-			\return the global timecode of this Cluster
-		*/
-		uint64 GlobalTimecode() const;
-
-		KaxBlockGroup & GetNewBlock();
-		
-		/*!
-			\brief release all the frames of all Blocks
-			\note this is a convenience to be able to keep Clusters+Blocks in memory (for future reference) withouht being a memory hog
-		*/
-		void ReleaseFrames();
-
-		/*!
-			\brief return the position offset compared to the beggining of the Segment
-		*/
-		uint64 GetPosition() const;
-
-		void SetParent(const KaxSegment & aParentSegment) {ParentSegment = &aParentSegment;}
-
-		void SetPreviousTimecode(uint64 aPreviousTimecode, int64 aTimecodeScale) {
-			bPreviousTimecodeIsSet = true; 
-			PreviousTimecode = aPreviousTimecode;
-			SetGlobalTimecodeScale(aTimecodeScale);
-		}
-
-		/*!
-			\note dirty hack to get the mandatory data back after reading
-			\todo there should be a better way to get mandatory data
-		*/
-		void InitTimecode(uint64 aTimecode, int64 aTimecodeScale) {
-			SetGlobalTimecodeScale(aTimecodeScale);
-			MinTimecode = MaxTimecode = PreviousTimecode = aTimecode * TimecodeScale;
-			bFirstFrameInside = bPreviousTimecodeIsSet = true;
-		}
-
-		int16 GetBlockLocalTimecode(uint64 GlobalTimecode) const;
-
-		uint64 GetBlockGlobalTimecode(int16 LocalTimecode);
-
-		void SetGlobalTimecodeScale(uint64 aGlobalTimecodeScale) {
-			TimecodeScale = aGlobalTimecodeScale;
-			bTimecodeScaleIsSet = true;
-		}
-		uint64 GlobalTimecodeScale() const {
-			assert(bTimecodeScaleIsSet); 
-			return TimecodeScale;
-		}
-
-		bool SetSilentTrackUsed()
-		{
-			bSilentTracksUsed = true;
-			return FindFirstElt(EBML_INFO(KaxClusterSilentTracks), true) != NULL;
-		}
-
-		bool AddBlockBlob(KaxBlockBlob * NewBlob);
-
-		const KaxSegment *GetParentSegment() const { return ParentSegment; }
-
-	protected:
-		KaxBlockBlob     * currentNewBlob;
-		std::vector<KaxBlockBlob*> Blobs;
-		KaxBlockGroup    * currentNewBlock;
-		const KaxSegment * ParentSegment;
-
-		uint64 MinTimecode, MaxTimecode, PreviousTimecode;
-		int64  TimecodeScale;
-
-		bool bFirstFrameInside; // used to speed research
-		bool bPreviousTimecodeIsSet;
-		bool bTimecodeScaleIsSet;
-		bool bSilentTracksUsed;
-
-		/*!
-			\note method used internally
-		*/
-		bool AddFrameInternal(const KaxTrackEntry & track, uint64 timecode, DataBuffer & buffer, KaxBlockGroup * & MyNewBlock, const KaxBlockGroup * PastBlock, const KaxBlockGroup * ForwBlock, LacingType lacing);
+  public:
+    /*!
+      \brief Addition of a frame without references
+
+      \param the timecode is expressed in nanoseconds, relative to the beggining of the Segment
+    */
+    bool AddFrame(const KaxTrackEntry & track, uint64 timecode, DataBuffer & buffer, KaxBlockGroup * & MyNewBlock, LacingType lacing = LACING_AUTO);
+    /*!
+      \brief Addition of a frame with a backward reference (P frame)
+      \param the timecode is expressed in nanoseconds, relative to the beggining of the Segment
+
+    */
+    bool AddFrame(const KaxTrackEntry & track, uint64 timecode, DataBuffer & buffer, KaxBlockGroup * & MyNewBlock, const KaxBlockGroup & PastBlock, LacingType lacing = LACING_AUTO);
+
+    /*!
+      \brief Addition of a frame with a backward+forward reference (B frame)
+      \param the timecode is expressed in nanoseconds, relative to the beggining of the Segment
+
+    */
+    bool AddFrame(const KaxTrackEntry & track, uint64 timecode, DataBuffer & buffer, KaxBlockGroup * & MyNewBlock, const KaxBlockGroup & PastBlock, const KaxBlockGroup & ForwBlock, LacingType lacing = LACING_AUTO);
+
+    /*!
+      \brief Render the data to the stream and retrieve the position of BlockGroups for later cue entries
+    */
+    filepos_t Render(IOCallback & output, KaxCues & CueToUpdate, bool bSaveDefault = false);
+
+    /*!
+      \return the global timecode of this Cluster
+    */
+    uint64 GlobalTimecode() const;
+
+    KaxBlockGroup & GetNewBlock();
+
+    /*!
+      \brief release all the frames of all Blocks
+      \note this is a convenience to be able to keep Clusters+Blocks in memory (for future reference) withouht being a memory hog
+    */
+    void ReleaseFrames();
+
+    /*!
+      \brief return the position offset compared to the beggining of the Segment
+    */
+    uint64 GetPosition() const;
+
+    void SetParent(const KaxSegment & aParentSegment) {ParentSegment = &aParentSegment;}
+
+    void SetPreviousTimecode(uint64 aPreviousTimecode, int64 aTimecodeScale) {
+      bPreviousTimecodeIsSet = true;
+      PreviousTimecode = aPreviousTimecode;
+      SetGlobalTimecodeScale(aTimecodeScale);
+    }
+
+    /*!
+      \note dirty hack to get the mandatory data back after reading
+      \todo there should be a better way to get mandatory data
+    */
+    void InitTimecode(uint64 aTimecode, int64 aTimecodeScale) {
+      SetGlobalTimecodeScale(aTimecodeScale);
+      MinTimecode = MaxTimecode = PreviousTimecode = aTimecode * TimecodeScale;
+      bFirstFrameInside = bPreviousTimecodeIsSet = true;
+    }
+
+    int16 GetBlockLocalTimecode(uint64 GlobalTimecode) const;

makemkv-oss-1.9.5.tar.xz/libmatroska/inc/matroska/KaxClusterData.h -> makemkv-oss-1.10.2.tar.xz/libmatroska/inc/matroska/KaxClusterData.h Changed

@@ -11,12 +11,12 @@
 ** 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
@@ -28,9 +28,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: KaxClusterData.h,v 1.9 2004/04/21 19:50:10 mosu Exp $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: KaxClusterData.h,v 1.9 2004/04/21 19:50:10 mosu Exp $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBMATROSKA_CLUSTER_DATA_H
 #define LIBMATROSKA_CLUSTER_DATA_H

makemkv-oss-1.9.5.tar.xz/libmatroska/inc/matroska/KaxConfig.h -> makemkv-oss-1.10.2.tar.xz/libmatroska/inc/matroska/KaxConfig.h Changed

@@ -9,12 +9,12 @@
 ** 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
@@ -26,10 +26,10 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: KaxConfig.h,v 1.7 2004/04/14 23:26:17 robux4 Exp $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-	\author Moritz Bunkus <moritz @ bunkus.org>
+  \file
+  \version \$Id: KaxConfig.h,v 1.7 2004/04/14 23:26:17 robux4 Exp $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
+  \author Moritz Bunkus <moritz @ bunkus.org>
 */
 #ifndef LIBMATROSKA_CONFIG_H
 #define LIBMATROSKA_CONFIG_H

makemkv-oss-1.9.5.tar.xz/libmatroska/inc/matroska/KaxContentEncoding.h -> makemkv-oss-1.10.2.tar.xz/libmatroska/inc/matroska/KaxContentEncoding.h Changed

@@ -11,12 +11,12 @@
 ** 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
@@ -28,9 +28,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: KaxContentEncoding.h,v 1.7 2004/04/14 23:26:17 robux4 Exp $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: KaxContentEncoding.h,v 1.7 2004/04/14 23:26:17 robux4 Exp $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBMATROSKA_CONTENT_ENCODING_H
 #define LIBMATROSKA_CONTENT_ENCODING_H

makemkv-oss-1.9.5.tar.xz/libmatroska/inc/matroska/KaxContexts.h -> makemkv-oss-1.10.2.tar.xz/libmatroska/inc/matroska/KaxContexts.h Changed

@@ -11,12 +11,12 @@
 ** 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
@@ -28,9 +28,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id$
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id$
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBMATROSKA_CONTEXTS_H
 #define LIBMATROSKA_CONTEXTS_H

makemkv-oss-1.9.5.tar.xz/libmatroska/inc/matroska/KaxCues.h -> makemkv-oss-1.10.2.tar.xz/libmatroska/inc/matroska/KaxCues.h Changed

@@ -11,12 +11,12 @@
 ** 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
@@ -28,9 +28,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: KaxCues.h,v 1.7 2004/04/14 23:26:17 robux4 Exp $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: KaxCues.h,v 1.7 2004/04/14 23:26:17 robux4 Exp $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBMATROSKA_CUES_H
 #define LIBMATROSKA_CUES_H
@@ -48,42 +48,42 @@
 class KaxCuePoint;
 
 DECLARE_MKX_MASTER(KaxCues)
-	public:
-		~KaxCues();
+  public:
+    ~KaxCues();
 
-		//bool AddBlockGroup(const KaxBlockGroup & BlockReference); // deprecated
-		bool AddBlockBlob(const KaxBlockBlob & BlockReference);
+    //bool AddBlockGroup(const KaxBlockGroup & BlockReference); // deprecated
+    bool AddBlockBlob(const KaxBlockBlob & BlockReference);
 
-		/*!
-			\brief Indicate that the position for this Block is set
-		*/
-		void PositionSet(const KaxBlockGroup & BlockReference);
-		void PositionSet(const KaxBlockBlob & BlockReference);
+    /*!
+      \brief Indicate that the position for this Block is set
+    */
+    void PositionSet(const KaxBlockGroup & BlockReference);
+    void PositionSet(const KaxBlockBlob & BlockReference);
 
-		/*!
-			\brief override to sort by timecode/track
-		*/
-		filepos_t Render(IOCallback & output, bool bSaveDefault = false) {
-			Sort();
-			return EbmlMaster::Render(output, bSaveDefault);
-		}
+    /*!
+      \brief override to sort by timecode/track
+    */
+    filepos_t Render(IOCallback & output, bool bSaveDefault = false) {
+      Sort();
+      return EbmlMaster::Render(output, bSaveDefault);
+    }
 
-		uint64 GetTimecodePosition(uint64 aTimecode) const;
-		const KaxCuePoint * GetTimecodePoint(uint64 aTimecode) const;
+    uint64 GetTimecodePosition(uint64 aTimecode) const;
+    const KaxCuePoint * GetTimecodePoint(uint64 aTimecode) const;
 
-		void SetGlobalTimecodeScale(uint64 aGlobalTimecodeScale) {
-			mGlobalTimecodeScale = aGlobalTimecodeScale;
-			bGlobalTimecodeScaleIsSet = true;
-		}
-		uint64 GlobalTimecodeScale() const {
-			assert(bGlobalTimecodeScaleIsSet); 
-			return mGlobalTimecodeScale;
-		}
+    void SetGlobalTimecodeScale(uint64 aGlobalTimecodeScale) {
+      mGlobalTimecodeScale = aGlobalTimecodeScale;
+      bGlobalTimecodeScaleIsSet = true;
+    }
+    uint64 GlobalTimecodeScale() const {
+      assert(bGlobalTimecodeScaleIsSet);
+      return mGlobalTimecodeScale;
+    }
 
-	protected:
-		std::vector<const KaxBlockBlob *> myTempReferences;
-		bool   bGlobalTimecodeScaleIsSet;
-		uint64 mGlobalTimecodeScale;
+  protected:
+    std::vector<const KaxBlockBlob *> myTempReferences;
+    bool   bGlobalTimecodeScaleIsSet;
+    uint64 mGlobalTimecodeScale;
 };
 
 END_LIBMATROSKA_NAMESPACE

makemkv-oss-1.9.5.tar.xz/libmatroska/inc/matroska/KaxCuesData.h -> makemkv-oss-1.10.2.tar.xz/libmatroska/inc/matroska/KaxCuesData.h Changed

@@ -9,12 +9,12 @@
 ** 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
@@ -26,9 +26,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: KaxCuesData.h,v 1.8 2004/04/14 23:26:17 robux4 Exp $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: KaxCuesData.h,v 1.8 2004/04/14 23:26:17 robux4 Exp $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBMATROSKA_CUES_DATA_H
 #define LIBMATROSKA_CUES_DATA_H
@@ -49,29 +49,29 @@
 class KaxSimpleBlock;
 
 DECLARE_MKX_MASTER(KaxCuePoint)
-	public:
-		void PositionSet(const KaxBlockGroup & BlockReference, uint64 GlobalTimecodeScale);
-		void PositionSet(const KaxBlockBlob & BlobReference, uint64 GlobalTimecodeScale);
-		void PositionSet(const KaxSimpleBlock & BlockReference, uint64 GlobalTimecodeScale);
-		void PositionSet(const KaxInternalBlock & BlockReference, const KaxBlockGroup* BlockGroup, uint64 GlobalTimecodeScale);
+  public:
+    void PositionSet(const KaxBlockGroup & BlockReference, uint64 GlobalTimecodeScale);
+    void PositionSet(const KaxBlockBlob & BlobReference, uint64 GlobalTimecodeScale);
+    void PositionSet(const KaxSimpleBlock & BlockReference, uint64 GlobalTimecodeScale);
+    void PositionSet(const KaxInternalBlock & BlockReference, const KaxBlockGroup* BlockGroup, uint64 GlobalTimecodeScale);
 
-		virtual bool IsSmallerThan(const EbmlElement *Cmp) const;
+    virtual bool IsSmallerThan(const EbmlElement *Cmp) const;
 
-		const KaxCueTrackPositions * GetSeekPosition() const;
-		bool Timecode(uint64 & aTimecode, uint64 GlobalTimecodeScale) const;
+    const KaxCueTrackPositions * GetSeekPosition() const;
+    bool Timecode(uint64 & aTimecode, uint64 GlobalTimecodeScale) const;
 };
 
 DECLARE_MKX_MASTER(KaxCueTrackPositions)
-	public:
-		uint64 ClusterPosition() const;
-		uint16 TrackNumber() const;
+  public:
+    uint64 ClusterPosition() const;
+    uint16 TrackNumber() const;
 };
 
 #if MATROSKA_VERSION >= 2
 DECLARE_MKX_MASTER(KaxCueReference)
-	public:
-		void AddReference(const KaxBlockGroup & BlockReferenced, uint64 GlobalTimecodeScale);
-		void AddReference(const KaxBlockBlob & BlockReferenced, uint64 GlobalTimecodeScale);
+  public:
+    void AddReference(const KaxBlockGroup & BlockReferenced, uint64 GlobalTimecodeScale);
+    void AddReference(const KaxBlockBlob & BlockReferenced, uint64 GlobalTimecodeScale);
 };
 #endif // MATROSKA_VERSION

makemkv-oss-1.9.5.tar.xz/libmatroska/inc/matroska/KaxDefines.h -> makemkv-oss-1.10.2.tar.xz/libmatroska/inc/matroska/KaxDefines.h Changed

@@ -9,12 +9,12 @@
 ** 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
@@ -26,9 +26,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id$
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id$
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBMATROSKA_DEFINES_H
 #define LIBMATROSKA_DEFINES_H

makemkv-oss-1.9.5.tar.xz/libmatroska/inc/matroska/KaxInfo.h -> makemkv-oss-1.10.2.tar.xz/libmatroska/inc/matroska/KaxInfo.h Changed

@@ -11,12 +11,12 @@
 ** 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
@@ -28,9 +28,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: KaxInfo.h,v 1.7 2004/04/14 23:26:17 robux4 Exp $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: KaxInfo.h,v 1.7 2004/04/14 23:26:17 robux4 Exp $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBMATROSKA_INFO_H
 #define LIBMATROSKA_INFO_H

makemkv-oss-1.9.5.tar.xz/libmatroska/inc/matroska/KaxInfoData.h -> makemkv-oss-1.10.2.tar.xz/libmatroska/inc/matroska/KaxInfoData.h Changed

@@ -11,12 +11,12 @@
 ** 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
@@ -28,11 +28,11 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id$
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-	\author John Cannon      <spyder2555 @ users.sf.net>
-	\author Moritz Bunkus    <moritz @ bunkus.org>
+  \file
+  \version \$Id$
+  \author Steve Lhomme     <robux4 @ users.sf.net>
+  \author John Cannon      <spyder2555 @ users.sf.net>
+  \author Moritz Bunkus    <moritz @ bunkus.org>
 */
 #ifndef LIBMATROSKA_INFO_DATA_H
 #define LIBMATROSKA_INFO_DATA_H
@@ -53,20 +53,20 @@
 
 DECLARE_MKX_CONTEXT(KaxPrevUID);
 class MATROSKA_DLL_API KaxPrevUID : public KaxSegmentUID {
-	public:
-		KaxPrevUID(EBML_EXTRA_PARAM);
-		KaxPrevUID(const KaxPrevUID & ElementToClone) :KaxSegmentUID(ElementToClone){}
-		virtual bool ValidateSize() const { return IsFiniteSize() && (GetSize() == 16);}
+  public:
+    KaxPrevUID(EBML_EXTRA_PARAM);
+    KaxPrevUID(const KaxPrevUID & ElementToClone) :KaxSegmentUID(ElementToClone){}
+    virtual bool ValidateSize() const { return IsFiniteSize() && (GetSize() == 16);}
 
         EBML_CONCRETE_CLASS(KaxPrevUID)
 };
 
 DECLARE_MKX_CONTEXT(KaxNextUID);
 class MATROSKA_DLL_API KaxNextUID : public KaxSegmentUID {
-	public:
-		KaxNextUID(EBML_EXTRA_PARAM);
-		KaxNextUID(const KaxNextUID & ElementToClone) :KaxSegmentUID(ElementToClone){}
-		virtual bool ValidateSize() const { return IsFiniteSize() && (GetSize() == 16);}
+  public:
+    KaxNextUID(EBML_EXTRA_PARAM);
+    KaxNextUID(const KaxNextUID & ElementToClone) :KaxSegmentUID(ElementToClone){}
+    virtual bool ValidateSize() const { return IsFiniteSize() && (GetSize() == 16);}
 
         EBML_CONCRETE_CLASS(KaxNextUID)
 };

makemkv-oss-1.9.5.tar.xz/libmatroska/inc/matroska/KaxSeekHead.h -> makemkv-oss-1.10.2.tar.xz/libmatroska/inc/matroska/KaxSeekHead.h Changed

@@ -11,12 +11,12 @@
 ** 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
@@ -28,9 +28,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id$
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id$
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBMATROSKA_SEEK_HEAD_H
 #define LIBMATROSKA_SEEK_HEAD_H
@@ -48,22 +48,22 @@
 class KaxSegment;
 
 DECLARE_MKX_MASTER(KaxSeek)
-	public:
-		int64 Location() const;
-		bool IsEbmlId(const EbmlId & aId) const;
-		bool IsEbmlId(const KaxSeek & aPoint) const;
+  public:
+    int64 Location() const;
+    bool IsEbmlId(const EbmlId & aId) const;
+    bool IsEbmlId(const KaxSeek & aPoint) const;
 };
 
 DECLARE_MKX_MASTER(KaxSeekHead)
-	public:
-		/*!
-			\brief add an element to index in the Meta Seek data
-			\note the element should already be written in the file
-		*/
-		KaxSeek * IndexThis(const EbmlElement & aElt, const KaxSegment & ParentSegment);
+  public:
+    /*!
+      \brief add an element to index in the Meta Seek data
+      \note the element should already be written in the file
+    */
+    KaxSeek * IndexThis(const EbmlElement & aElt, const KaxSegment & ParentSegment);
 
-		KaxSeek * FindFirstOf(const EbmlCallbacks & Callbacks) const;
-		KaxSeek * FindNextOf(const KaxSeek &aPrev) const;
+    KaxSeek * FindFirstOf(const EbmlCallbacks & Callbacks) const;
+    KaxSeek * FindNextOf(const KaxSeek &aPrev) const;
 };
 
 END_LIBMATROSKA_NAMESPACE

makemkv-oss-1.9.5.tar.xz/libmatroska/inc/matroska/KaxSegment.h -> makemkv-oss-1.10.2.tar.xz/libmatroska/inc/matroska/KaxSegment.h Changed

@@ -11,12 +11,12 @@
 ** 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
@@ -28,9 +28,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: KaxSegment.h,v 1.8 2004/04/14 23:26:17 robux4 Exp $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: KaxSegment.h,v 1.8 2004/04/14 23:26:17 robux4 Exp $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBMATROSKA_SEGMENT_H
 #define LIBMATROSKA_SEGMENT_H
@@ -44,17 +44,17 @@
 START_LIBMATROSKA_NAMESPACE
 
 DECLARE_MKX_MASTER_CONS(KaxSegment)
-	public:
-		/*!
-			\brief give the position of the element in the segment
-		*/
-		uint64 GetRelativePosition(const EbmlElement & Elt) const;
-		uint64 GetRelativePosition(uint64 aGlobalPosition) const;
-
-		/*!
-			\brief give the position of the element in the file
-		*/
-		uint64 GetGlobalPosition(uint64 aRelativePosition) const;
+  public:
+    /*!
+      \brief give the position of the element in the segment
+    */
+    uint64 GetRelativePosition(const EbmlElement & Elt) const;
+    uint64 GetRelativePosition(uint64 aGlobalPosition) const;
+
+    /*!
+      \brief give the position of the element in the file
+    */
+    uint64 GetGlobalPosition(uint64 aRelativePosition) const;
 };
 
 END_LIBMATROSKA_NAMESPACE

makemkv-oss-1.9.5.tar.xz/libmatroska/inc/matroska/KaxSemantic.h -> makemkv-oss-1.10.2.tar.xz/libmatroska/inc/matroska/KaxSemantic.h Changed

@@ -1,23 +1,23 @@
 /**********************************************************************
 **  DO NOT EDIT, GENERATED WITH DATA2LIB
-** 
+**
 **  libmatroska : parse Matroska files, see http://www.matroska.org/
-** 
+**
 **  Copyright (c) 2002-2010, Matroska (non-profit organisation)
 **  All rights reserved.
-** 
+**
 ** This file is part of libmatroska.
 **
 ** 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
@@ -49,7 +49,7 @@
 
 DECLARE_MKX_BINARY (KaxSeekID)
 public:
-	virtual bool ValidateSize() const {return IsFiniteSize() && GetSize() <= 4;}
+  virtual bool ValidateSize() const {return IsFiniteSize() && GetSize() <= 4;}
 };
 
 DECLARE_MKX_UINTEGER(KaxSeekPosition)
@@ -62,10 +62,10 @@
 DECLARE_MKX_BINARY (KaxSegmentUID)
 #if defined(HAVE_EBML2) || defined(HAS_EBML2)
 public:
-	KaxSegmentUID(EBML_DEF_CONS EBML_DEF_SEP EBML_EXTRA_PARAM);
+  KaxSegmentUID(EBML_DEF_CONS EBML_DEF_SEP EBML_EXTRA_PARAM);
 #endif
 public:
-	virtual bool ValidateSize() const {return IsFiniteSize() && GetSize() == 16;}
+  virtual bool ValidateSize() const {return IsFiniteSize() && GetSize() == 16;}
 };
 
 DECLARE_MKX_UNISTRING(KaxSegmentFilename)
@@ -79,7 +79,7 @@
 
 DECLARE_MKX_BINARY (KaxSegmentFamily)
 public:
-	virtual bool ValidateSize() const {return IsFiniteSize() && GetSize() == 16;}
+  virtual bool ValidateSize() const {return IsFiniteSize() && GetSize() == 16;}
 };
 
 DECLARE_MKX_MASTER(KaxChapterTranslate)
@@ -152,7 +152,7 @@
 #if MATROSKA_VERSION >= 2
 DECLARE_MKX_SINTEGER(KaxReferenceVirtual)
 public:
-	filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
+  filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
 };
 
 DECLARE_MKX_BINARY (KaxCodecState)
@@ -176,22 +176,22 @@
 #if MATROSKA_VERSION >= 2
 DECLARE_MKX_UINTEGER(KaxSliceFrameNumber)
 public:
-	filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
+  filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
 };
 
 DECLARE_MKX_UINTEGER(KaxSliceBlockAddID)
 public:
-	filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
+  filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
 };
 
 DECLARE_MKX_UINTEGER(KaxSliceDelay)
 public:
-	filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
+  filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
 };
 
 DECLARE_MKX_UINTEGER(KaxSliceDuration)
 public:
-	filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
+  filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
 };
 
 DECLARE_MKX_MASTER(KaxReferenceFrame)
@@ -206,7 +206,7 @@
 
 DECLARE_MKX_BINARY (KaxEncryptedBlock)
 public:
-	filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
+  filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
 };
 #endif
 
@@ -253,13 +253,13 @@
 
 DECLARE_MKX_FLOAT(KaxTrackTimecodeScale)
 public:
-	filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
+  filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
 };
 
 #if MATROSKA_VERSION >= 2
 DECLARE_MKX_SINTEGER(KaxTrackOffset)
 public:
-	filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
+  filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
 };
 #endif
 
@@ -287,17 +287,17 @@
 #if MATROSKA_VERSION >= 2
 DECLARE_MKX_UNISTRING(KaxCodecSettings)
 public:
-	filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
+  filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
 };
 
 DECLARE_MKX_STRING(KaxCodecInfoURL)
 public:
-	filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
+  filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
 };
 
 DECLARE_MKX_STRING(KaxCodecDownloadURL)
 public:
-	filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
+  filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
 };
 
 DECLARE_MKX_UINTEGER(KaxCodecDecodeAll)
@@ -344,7 +344,7 @@
 
 DECLARE_MKX_UINTEGER(KaxOldStereoMode)
 public:
-	filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
+  filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
 };
 #endif
 
@@ -380,18 +380,18 @@
 
 DECLARE_MKX_BINARY (KaxVideoColourSpace)
 public:
-	virtual bool ValidateSize() const {return IsFiniteSize() && GetSize() == 4;}
+  virtual bool ValidateSize() const {return IsFiniteSize() && GetSize() == 4;}
 };
 
 #if MATROSKA_VERSION >= 2
 DECLARE_MKX_FLOAT(KaxVideoGamma)
 public:
-	filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
+  filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
 };
 
 DECLARE_MKX_FLOAT(KaxVideoFrameRate)
 public:
-	filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
+  filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
 };
 #endif
 
@@ -411,7 +411,7 @@
 #if MATROSKA_VERSION >= 2
 DECLARE_MKX_BINARY (KaxAudioPosition)
 public:
-	filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
+  filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
 };
 #endif
 
@@ -449,7 +449,7 @@
 
 DECLARE_MKX_BINARY (KaxTrickTrackSegmentUID)
 public:
-	virtual bool ValidateSize() const {return IsFiniteSize() && GetSize() == 16;}
+  virtual bool ValidateSize() const {return IsFiniteSize() && GetSize() == 16;}
 };
 
 DECLARE_MKX_UINTEGER(KaxTrickTrackFlag)
@@ -460,7 +460,7 @@
 
 DECLARE_MKX_BINARY (KaxTrickMasterTrackSegmentUID)
 public:
-	virtual bool ValidateSize() const {return IsFiniteSize() && GetSize() == 16;}
+  virtual bool ValidateSize() const {return IsFiniteSize() && GetSize() == 16;}
 };
 #endif

makemkv-oss-1.9.5.tar.xz/libmatroska/inc/matroska/KaxTag.h -> makemkv-oss-1.10.2.tar.xz/libmatroska/inc/matroska/KaxTag.h Changed

@@ -11,12 +11,12 @@
 ** 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
@@ -28,9 +28,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id$
-	\author Steve Lhomme   <robux4 @ users.sf.net>
+  \file
+  \version \$Id$
+  \author Steve Lhomme   <robux4 @ users.sf.net>
 */
 #ifndef LIBMATROSKA_TAG_H
 #define LIBMATROSKA_TAG_H

makemkv-oss-1.9.5.tar.xz/libmatroska/inc/matroska/KaxTags.h -> makemkv-oss-1.10.2.tar.xz/libmatroska/inc/matroska/KaxTags.h Changed

@@ -11,12 +11,12 @@
 ** 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
@@ -28,9 +28,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: KaxTags.h,v 1.7 2004/04/14 23:26:17 robux4 Exp $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: KaxTags.h,v 1.7 2004/04/14 23:26:17 robux4 Exp $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBMATROSKA_TAGS_H
 #define LIBMATROSKA_TAGS_H

makemkv-oss-1.9.5.tar.xz/libmatroska/inc/matroska/KaxTrackAudio.h -> makemkv-oss-1.10.2.tar.xz/libmatroska/inc/matroska/KaxTrackAudio.h Changed

@@ -11,12 +11,12 @@
 ** 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
@@ -28,9 +28,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: KaxTrackAudio.h,v 1.11 2004/04/14 23:26:17 robux4 Exp $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: KaxTrackAudio.h,v 1.11 2004/04/14 23:26:17 robux4 Exp $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBMATROSKA_TRACK_AUDIO_H
 #define LIBMATROSKA_TRACK_AUDIO_H

makemkv-oss-1.9.5.tar.xz/libmatroska/inc/matroska/KaxTrackEntryData.h -> makemkv-oss-1.10.2.tar.xz/libmatroska/inc/matroska/KaxTrackEntryData.h Changed

@@ -11,12 +11,12 @@
 ** 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
@@ -28,9 +28,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: KaxTrackEntryData.h,v 1.9 2004/04/14 23:26:17 robux4 Exp $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: KaxTrackEntryData.h,v 1.9 2004/04/14 23:26:17 robux4 Exp $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBMATROSKA_TRACK_ENTRY_DATA_H
 #define LIBMATROSKA_TRACK_ENTRY_DATA_H

makemkv-oss-1.9.5.tar.xz/libmatroska/inc/matroska/KaxTrackVideo.h -> makemkv-oss-1.10.2.tar.xz/libmatroska/inc/matroska/KaxTrackVideo.h Changed

@@ -11,12 +11,12 @@
 ** 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
@@ -28,9 +28,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id$
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id$
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBMATROSKA_TRACK_VIDEO_H
 #define LIBMATROSKA_TRACK_VIDEO_H

makemkv-oss-1.9.5.tar.xz/libmatroska/inc/matroska/KaxTracks.h -> makemkv-oss-1.10.2.tar.xz/libmatroska/inc/matroska/KaxTracks.h Changed

@@ -11,12 +11,12 @@
 ** 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
@@ -28,9 +28,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: KaxTracks.h,v 1.7 2004/04/14 23:26:17 robux4 Exp $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: KaxTracks.h,v 1.7 2004/04/14 23:26:17 robux4 Exp $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #ifndef LIBMATROSKA_TRACKS_H
 #define LIBMATROSKA_TRACKS_H
@@ -46,31 +46,31 @@
 START_LIBMATROSKA_NAMESPACE
 
 DECLARE_MKX_MASTER(KaxTrackEntry)
-	public:
-		EbmlUInteger & TrackNumber() const { return *(static_cast<EbmlUInteger *>(FindElt(EBML_INFO(KaxTrackNumber)))); }
+  public:
+    EbmlUInteger & TrackNumber() const { return *(static_cast<EbmlUInteger *>(FindElt(EBML_INFO(KaxTrackNumber)))); }
 
-		void EnableLacing(bool bEnable = true);
+    void EnableLacing(bool bEnable = true);
 
-		/*!
-			\note lacing set by default
-		*/
-		inline bool LacingEnabled() const {
-			KaxTrackFlagLacing * myLacing = static_cast<KaxTrackFlagLacing *>(FindFirstElt(EBML_INFO(KaxTrackFlagLacing)));
-			return((myLacing == NULL) || (uint8(*myLacing) != 0));
-		}
+    /*!
+      \note lacing set by default
+    */
+    inline bool LacingEnabled() const {
+      KaxTrackFlagLacing * myLacing = static_cast<KaxTrackFlagLacing *>(FindFirstElt(EBML_INFO(KaxTrackFlagLacing)));
+      return((myLacing == NULL) || (uint8(*myLacing) != 0));
+    }
 
-		void SetGlobalTimecodeScale(uint64 aGlobalTimecodeScale) {
-			mGlobalTimecodeScale = aGlobalTimecodeScale;
-			bGlobalTimecodeScaleIsSet = true;
-		}
-		uint64 GlobalTimecodeScale() const {
-			assert(bGlobalTimecodeScaleIsSet); 
-			return mGlobalTimecodeScale;
-		}
+    void SetGlobalTimecodeScale(uint64 aGlobalTimecodeScale) {
+      mGlobalTimecodeScale = aGlobalTimecodeScale;
+      bGlobalTimecodeScaleIsSet = true;
+    }
+    uint64 GlobalTimecodeScale() const {
+      assert(bGlobalTimecodeScaleIsSet);
+      return mGlobalTimecodeScale;
+    }
 
-	protected:
-		bool   bGlobalTimecodeScaleIsSet;
-		uint64 mGlobalTimecodeScale;
+  protected:
+    bool   bGlobalTimecodeScaleIsSet;
+    uint64 mGlobalTimecodeScale;
 };
 
 END_LIBMATROSKA_NAMESPACE

makemkv-oss-1.9.5.tar.xz/libmatroska/inc/matroska/KaxTypes.h -> makemkv-oss-1.10.2.tar.xz/libmatroska/inc/matroska/KaxTypes.h Changed

@@ -11,12 +11,12 @@
 ** 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
@@ -28,8 +28,8 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: KaxTypes.h,v 1.4 2004/04/14 23:26:17 robux4 Exp $
+  \file
+  \version \$Id: KaxTypes.h,v 1.4 2004/04/14 23:26:17 robux4 Exp $
 */
 #ifndef LIBMATROSKA_TYPES_H
 #define LIBMATROSKA_TYPES_H
@@ -41,17 +41,17 @@
 START_LIBMATROSKA_NAMESPACE
 
 enum LacingType {
-	LACING_NONE = 0,
-	LACING_XIPH,
-	LACING_FIXED,
-	LACING_EBML,
-	LACING_AUTO
+  LACING_NONE = 0,
+  LACING_XIPH,
+  LACING_FIXED,
+  LACING_EBML,
+  LACING_AUTO
 };
 
 enum BlockBlobType {
-	BLOCK_BLOB_NO_SIMPLE = 0,
-	BLOCK_BLOB_SIMPLE_AUTO,
-	BLOCK_BLOB_ALWAYS_SIMPLE,
+  BLOCK_BLOB_NO_SIMPLE = 0,
+  BLOCK_BLOB_SIMPLE_AUTO,
+  BLOCK_BLOB_ALWAYS_SIMPLE,
 };
 
 END_LIBMATROSKA_NAMESPACE

makemkv-oss-1.9.5.tar.xz/libmatroska/inc/matroska/KaxVersion.h -> makemkv-oss-1.10.2.tar.xz/libmatroska/inc/matroska/KaxVersion.h Changed

makemkv-oss-1.9.5.tar.xz/libmatroska/inc/matroska/c/libmatroska.h -> makemkv-oss-1.10.2.tar.xz/libmatroska/inc/matroska/c/libmatroska.h Changed

makemkv-oss-1.9.5.tar.xz/libmatroska/inc/matroska/c/libmatroska_t.h -> makemkv-oss-1.10.2.tar.xz/libmatroska/inc/matroska/c/libmatroska_t.h Changed

@@ -11,12 +11,12 @@
 ** 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
@@ -69,7 +69,7 @@
     \note this should be used by the libmatroska internals
 */
 typedef enum {
-	error_null_pointer  ///< NULL pointer where something else is expected
+  error_null_pointer  ///< NULL pointer where something else is expected
 } matroska_error_t;
 
 typedef void *matroska_stream;

makemkv-oss-1.9.5.tar.xz/libmatroska/src/FileKax.cpp -> makemkv-oss-1.10.2.tar.xz/libmatroska/src/FileKax.cpp Changed

@@ -11,12 +11,12 @@
 ** 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
@@ -47,404 +47,370 @@
 //typedef Track *TrackID;
 
 FileMatroska::FileMatroska(IOCallback & output)
- :myFile(output)
+  :myFile(output)
 #ifdef OLD
- ,myCurrReadBlock(NULL)
- ,myMinClusterSize(5*1024)      // 5KB is the min size of a cluster
- ,myMaxClusterSize(2*1024*1024) // 2MB is the max size of a cluster
- ,myCurrReadBlockTrack(0)
- ,myCurrWriteCluster(2*1024*1024) // myMaxClusterSize
- ,myCurrReadCluster(NULL)
- ,myReadBlockNumber(0)
+  ,myCurrReadBlock(NULL)
+  ,myMinClusterSize(5*1024)      // 5KB is the min size of a cluster
+  ,myMaxClusterSize(2*1024*1024) // 2MB is the max size of a cluster
+  ,myCurrReadBlockTrack(0)
+  ,myCurrWriteCluster(2*1024*1024) // myMaxClusterSize
+  ,myCurrReadCluster(NULL)
+  ,myReadBlockNumber(0)
 #endif // OLD
 {
 #ifdef OLD
-    myStreamInfo.MainHeaderSize = TypeHeader::default_size() +
-		ActualHeader::default_size() + 
-		ExtendedInfo::default_size() + 
-		ContentInfo::default_size();
-    myStreamInfo.TrackEntrySize = Track::default_size();
-    myStreamInfo.BlockHeadSize = BLOCK_HEADER_SIZE;
-    myStreamInfo.ClusterHeadSize = CLUSTER_HEADER_SIZE;
-    myStreamInfo.ClusterFootSize = CLUSTER_TRAILER_SIZE;
+  myStreamInfo.MainHeaderSize = TypeHeader::default_size() +
+    ActualHeader::default_size() +
+    ExtendedInfo::default_size() +
+    ContentInfo::default_size();
+  myStreamInfo.TrackEntrySize = Track::default_size();
+  myStreamInfo.BlockHeadSize = BLOCK_HEADER_SIZE;
+  myStreamInfo.ClusterHeadSize = CLUSTER_HEADER_SIZE;
+  myStreamInfo.ClusterFootSize = CLUSTER_TRAILER_SIZE;
 #endif // OLD
 }
 
 FileMatroska::~FileMatroska()
 {
-//    if (myCurrCluster != NULL)
-//	throw 0; // there are some data left to write
-//    if (myCurrReadCluster != NULL || myCurrReadBlock != NULL)
-//	throw 0; // there are some data left to write
+  //  if (myCurrCluster != NULL)
+  //    throw 0; // there are some data left to write
+  //  if (myCurrReadCluster != NULL || myCurrReadBlock != NULL)
+  //    throw 0; // there are some data left to write
 }
 
 #ifdef OLD
 void FileMatroska::SetMaxClusterSize(const uint32 value)
 {
-    myMaxClusterSize = value;
-    myCurrWriteCluster.setMaxSize(value);
+  myMaxClusterSize = value;
+  myCurrWriteCluster.setMaxSize(value);
 }
 
 void FileMatroska::Close(const uint32 aTimeLength)
 {
-    Flush();
+  Flush();
 
-    // get the file size
-    myFile.setFilePointer(0,seek_end);
-    myMainHeader.type_SetSize(myFile.getFilePointer());
+  // get the file size
+  myFile.setFilePointer(0,seek_end);
+  myMainHeader.type_SetSize(myFile.getFilePointer());
 
-    // rewrite the header at the beginning
-    myFile.setFilePointer(0,seek_beginning);
+  // rewrite the header at the beginning
+  myFile.setFilePointer(0,seek_beginning);
 
-    // get the Track-entry size
-    uint32 track_entries_size = 0;
-    for (size_t i=0; i<myTracks.size(); i++)
-    {
-	track_entries_size += myTracks[i]->default_size();
-    }
+  // get the Track-entry size
+  uint32 track_entries_size = 0;
+  for (size_t i=0; i<myTracks.size(); i++) {
+    track_entries_size += myTracks[i]->default_size();
+  }
 
-    myStreamInfo.TrackEntriesSize = track_entries_size;
-    myStreamInfo.TimeLength = aTimeLength;
-    myMainHeader.Render(myFile, myStreamInfo);
+  myStreamInfo.TrackEntriesSize = track_entries_size;
+  myStreamInfo.TimeLength = aTimeLength;
+  myMainHeader.Render(myFile, myStreamInfo);
 
-    for (i=0; i<myTracks.size(); i++)
-    {
-	delete myTracks[i];
-    }
+  for (i=0; i<myTracks.size(); i++) {
+    delete myTracks[i];
+  }
 }
 
 /*!
-    \warning after rendering the head, some parameters are locked
+  \warning after rendering the head, some parameters are locked
 */
 filepos_t FileMatroska::RenderHead(const std::string & aEncoderApp)
 {
-    try {
-	uint32 track_entries_size = 0;
-	for (size_t i=0; i<myTracks.size(); i++)
-	{
-	    track_entries_size += myTracks[i]->default_size();
-	}
-
-	std::string aStr = LIB_NAME;
-	aStr += " ";
-	aStr += VERSION;
-	myStreamInfo.EncoderLib = aStr;
-
-	myStreamInfo.EncoderApp = aEncoderApp;
-
-	myStreamInfo.TrackEntryPosition = 0 + myStreamInfo.MainHeaderSize;
-	myStreamInfo.TrackEntriesSize = myTracks.size() * myStreamInfo.TrackEntrySize;
-
-	myStreamInfo.CodecEntryPosition = myStreamInfo.MainHeaderSize + myStreamInfo.TrackEntriesSize;
-	myStreamInfo.CodecEntrySize = 4;
-	for (i=0; i<myTracks.size(); i++)
-	{
-	    myStreamInfo.CodecEntrySize += myTracks[i]->CodecSize();
-	}
-
-	// Main Header
-	filepos_t result = myMainHeader.Render(myFile, myStreamInfo);
-
-	// Track Entries
-	for (i=0; i<myTracks.size(); i++)
-	{
-	    myTracks[i]->RenderEntry(myFile, i+1);
-	}
-	myStreamInfo.ClusterPosition = myStreamInfo.CodecEntryPosition + myStreamInfo.CodecEntrySize;
-
-	// Codec Header
-	result = CodecHeader::Render(myFile, myTracks);
-
-	return result;
+  try {
+    uint32 track_entries_size = 0;
+    for (size_t i=0; i<myTracks.size(); i++) {
+      track_entries_size += myTracks[i]->default_size();
+    }
+
+    std::string aStr = LIB_NAME;
+    aStr += " ";
+    aStr += VERSION;
+    myStreamInfo.EncoderLib = aStr;
+
+    myStreamInfo.EncoderApp = aEncoderApp;
+
+    myStreamInfo.TrackEntryPosition = 0 + myStreamInfo.MainHeaderSize;
+    myStreamInfo.TrackEntriesSize = myTracks.size() * myStreamInfo.TrackEntrySize;
+
+    myStreamInfo.CodecEntryPosition = myStreamInfo.MainHeaderSize + myStreamInfo.TrackEntriesSize;
+    myStreamInfo.CodecEntrySize = 4;
+    for (i=0; i<myTracks.size(); i++) {
+      myStreamInfo.CodecEntrySize += myTracks[i]->CodecSize();
     }
-    catch (exception & Ex)
-    {
-	throw Ex;
+
+    // Main Header
+    filepos_t result = myMainHeader.Render(myFile, myStreamInfo);
+
+    // Track Entries
+    for (i=0; i<myTracks.size(); i++) {
+      myTracks[i]->RenderEntry(myFile, i+1);
     }

makemkv-oss-1.9.5.tar.xz/libmatroska/src/KaxAttached.cpp -> makemkv-oss-1.10.2.tar.xz/libmatroska/src/KaxAttached.cpp Changed

@@ -11,12 +11,12 @@
 ** 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
@@ -28,9 +28,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: KaxAttached.cpp 1202 2005-08-30 14:39:01Z robux4 $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: KaxAttached.cpp 1202 2005-08-30 14:39:01Z robux4 $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #include "matroska/KaxContexts.h"
 #include "matroska/KaxDefines.h"
@@ -43,9 +43,9 @@
 START_LIBMATROSKA_NAMESPACE
 
 KaxAttached::KaxAttached(EBML_EXTRA_DEF)
- :EbmlMaster(EBML_CLASS_SEMCONTEXT(KaxAttached) EBML_DEF_SEP EBML_EXTRA_CALL)
+  :EbmlMaster(EBML_CLASS_SEMCONTEXT(KaxAttached) EBML_DEF_SEP EBML_EXTRA_CALL)
 {
-	SetSizeLength(2); // mandatory min size support (for easier updating) (2^(7*2)-2 = 16Ko)
+  SetSizeLength(2); // mandatory min size support (for easier updating) (2^(7*2)-2 = 16Ko)
 }
 
 END_LIBMATROSKA_NAMESPACE

makemkv-oss-1.9.5.tar.xz/libmatroska/src/KaxAttachments.cpp -> makemkv-oss-1.10.2.tar.xz/libmatroska/src/KaxAttachments.cpp Changed

@@ -11,12 +11,12 @@
 ** 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
@@ -28,9 +28,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: KaxAttachments.cpp 640 2004-07-09 21:05:36Z mosu $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: KaxAttachments.cpp 640 2004-07-09 21:05:36Z mosu $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #include "matroska/KaxContexts.h"
 #include "matroska/KaxDefines.h"
@@ -42,9 +42,9 @@
 START_LIBMATROSKA_NAMESPACE
 
 KaxAttachments::KaxAttachments(EBML_EXTRA_DEF)
- :EbmlMaster(EBML_CLASS_SEMCONTEXT(KaxAttachments) EBML_DEF_SEP EBML_EXTRA_CALL)
+  :EbmlMaster(EBML_CLASS_SEMCONTEXT(KaxAttachments) EBML_DEF_SEP EBML_EXTRA_CALL)
 {
-	SetSizeLength(2); // mandatory min size support (for easier updating) (2^(7*2)-2 = 16Ko)
+  SetSizeLength(2); // mandatory min size support (for easier updating) (2^(7*2)-2 = 16Ko)
 }
 
 END_LIBMATROSKA_NAMESPACE

makemkv-oss-1.9.5.tar.xz/libmatroska/src/KaxBlock.cpp -> makemkv-oss-1.10.2.tar.xz/libmatroska/src/KaxBlock.cpp Changed

@@ -9,12 +9,12 @@
 ** 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
@@ -26,15 +26,18 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: KaxBlock.cpp 1265 2007-01-14 17:20:35Z mosu $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-	\author Julien Coloos    <suiryc @ users.sf.net>
+  \file
+  \version \$Id: KaxBlock.cpp 1265 2007-01-14 17:20:35Z mosu $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
+  \author Julien Coloos    <suiryc @ users.sf.net>
+  \author Moritz Bunkus <moritz@bunkus.org>
 */
 #include <lgpl/cassert>
 
 //#include <streams.h>
 
+#include "ebml/MemReadIOCallback.h"
+#include "ebml/SafeReadIOCallback.h"
 #include "matroska/KaxBlock.h"
 #include "matroska/KaxContexts.h"
 #include "matroska/KaxBlockData.h"
@@ -45,1002 +48,1026 @@
 
 DataBuffer * DataBuffer::Clone()
 {
-	binary *ClonedData = (binary *)malloc(mySize * sizeof(binary));
-	assert(ClonedData != NULL);
-	memcpy(ClonedData, myBuffer ,mySize );
+  binary *ClonedData = (binary *)malloc(mySize * sizeof(binary));
+  assert(ClonedData != NULL);
+  memcpy(ClonedData, myBuffer ,mySize );
 
-	SimpleDataBuffer * result = new SimpleDataBuffer(ClonedData, mySize, 0);
-	result->bValidValue = bValidValue;
-	return result;
+  SimpleDataBuffer * result = new SimpleDataBuffer(ClonedData, mySize, 0);
+  result->bValidValue = bValidValue;
+  return result;
 }
 
 SimpleDataBuffer::SimpleDataBuffer(const SimpleDataBuffer & ToClone)
- :DataBuffer((binary *)malloc(ToClone.mySize * sizeof(binary)), ToClone.mySize, myFreeBuffer)
+  :DataBuffer((binary *)malloc(ToClone.mySize * sizeof(binary)), ToClone.mySize, myFreeBuffer)
 {
-	assert(myBuffer != NULL);
-	memcpy(myBuffer, ToClone.myBuffer ,mySize );
-	bValidValue = ToClone.bValidValue;
+  assert(myBuffer != NULL);
+  memcpy(myBuffer, ToClone.myBuffer ,mySize );
+  bValidValue = ToClone.bValidValue;
 }
 
 bool KaxInternalBlock::ValidateSize() const
 {
-	return (GetSize() >= 4); /// for the moment
+  return (GetSize() >= 4); /// for the moment
 }
 
 KaxInternalBlock::~KaxInternalBlock()
 {
-	ReleaseFrames();
+  ReleaseFrames();
 }
 
 KaxInternalBlock::KaxInternalBlock(const KaxInternalBlock & ElementToClone)
- :EbmlBinary(ElementToClone)
- ,myBuffers(ElementToClone.myBuffers.size())
- ,Timecode(ElementToClone.Timecode)
- ,LocalTimecode(ElementToClone.LocalTimecode)
- ,bLocalTimecodeUsed(ElementToClone.bLocalTimecodeUsed)
- ,TrackNumber(ElementToClone.TrackNumber)
- ,ParentCluster(ElementToClone.ParentCluster) ///< \todo not exactly
+  :EbmlBinary(ElementToClone)
+  ,myBuffers(ElementToClone.myBuffers.size())
+  ,Timecode(ElementToClone.Timecode)
+  ,LocalTimecode(ElementToClone.LocalTimecode)
+  ,bLocalTimecodeUsed(ElementToClone.bLocalTimecodeUsed)
+  ,TrackNumber(ElementToClone.TrackNumber)
+  ,ParentCluster(ElementToClone.ParentCluster) ///< \todo not exactly
 {
-	// add a clone of the list
-	std::vector<DataBuffer *>::const_iterator Itr = ElementToClone.myBuffers.begin();
-	std::vector<DataBuffer *>::iterator myItr = myBuffers.begin();
-	while (Itr != ElementToClone.myBuffers.end())
-	{
-		*myItr = (*Itr)->Clone();
-		Itr++; myItr++;
-	}
+  // add a clone of the list
+  std::vector<DataBuffer *>::const_iterator Itr = ElementToClone.myBuffers.begin();
+  std::vector<DataBuffer *>::iterator myItr = myBuffers.begin();
+  while (Itr != ElementToClone.myBuffers.end()) {
+    *myItr = (*Itr)->Clone();
+    ++Itr; ++myItr;
+  }
 }
 
 
 KaxBlockGroup::~KaxBlockGroup()
 {
-//NOTE("KaxBlockGroup::~KaxBlockGroup");
+  //NOTE("KaxBlockGroup::~KaxBlockGroup");
 }
 
 KaxBlockGroup::KaxBlockGroup(EBML_EXTRA_DEF)
- :EbmlMaster(EBML_CLASS_SEMCONTEXT(KaxBlockGroup) EBML_DEF_SEP EBML_EXTRA_CALL)
- ,ParentCluster(NULL)
- ,ParentTrack(NULL)
+  :EbmlMaster(EBML_CLASS_SEMCONTEXT(KaxBlockGroup) EBML_DEF_SEP EBML_EXTRA_CALL)
+  ,ParentCluster(NULL)
+  ,ParentTrack(NULL)
 {}
 
 /*!
-	\todo handle flags
-	\todo hardcoded limit of the number of frames in a lace should be a parameter
-	\return true if more frames can be added to this Block
+  \todo handle flags
+  \todo hardcoded limit of the number of frames in a lace should be a parameter
+  \return true if more frames can be added to this Block
 */
 bool KaxInternalBlock::AddFrame(const KaxTrackEntry & track, uint64 timecode, DataBuffer & buffer, LacingType lacing, bool invisible)
 {
-	SetValueIsSet();
-	if (myBuffers.size() == 0) {
-		// first frame
-		Timecode = timecode;
-		TrackNumber = track.TrackNumber();
-		mInvisible = invisible;
-		mLacing = lacing;
-	}
-	myBuffers.push_back(&buffer);
-
-	// we don't allow more than 8 frames in a Block because the overhead improvement is minimal
-	if (/*myBuffers.size() >= 8 ||*/ lacing == LACING_NONE)
-		return false;
-
-	if (lacing == LACING_XIPH)
-		// decide wether a new frame can be added or not
-		// a frame in a lace is not efficient when the place necessary to code it in a lace is bigger 
-		// than the size of a simple Block. That means more than 6 bytes (4 in struct + 2 for EBML) to code the size
-		return (buffer.Size() < 6*0xFF);
-	else
-		return true;
+  SetValueIsSet();
+  if (myBuffers.size() == 0) {
+    // first frame
+    Timecode = timecode;
+    TrackNumber = track.TrackNumber();
+    mInvisible = invisible;
+    mLacing = lacing;
+  }
+  myBuffers.push_back(&buffer);
+
+  // we don't allow more than 8 frames in a Block because the overhead improvement is minimal
+  if (/*myBuffers.size() >= 8 ||*/ lacing == LACING_NONE)
+    return false;
+
+  if (lacing == LACING_XIPH)
+    // decide wether a new frame can be added or not
+    // a frame in a lace is not efficient when the place necessary to code it in a lace is bigger
+    // than the size of a simple Block. That means more than 6 bytes (4 in struct + 2 for EBML) to code the size
+    return (buffer.Size() < 6*0xFF);
+  else
+    return true;
 }
 
 /*!
-       \return Returns the lacing type that produces the smallest footprint.
+  \return Returns the lacing type that produces the smallest footprint.
 */
 LacingType KaxInternalBlock::GetBestLacingType() const {
-	int XiphLacingSize, EbmlLacingSize, i;
-	bool SameSize = true;
-
-	if (myBuffers.size() <= 1)
-		return LACING_NONE;
-
-	XiphLacingSize = 1; // Number of laces is stored in 1 byte.
-	EbmlLacingSize = 1;
-	for (i = 0; i < (int)myBuffers.size() - 1; i++) {
-		if (myBuffers[i]->Size() != myBuffers[i + 1]->Size())
-			SameSize = false;

makemkv-oss-1.9.5.tar.xz/libmatroska/src/KaxBlockData.cpp -> makemkv-oss-1.10.2.tar.xz/libmatroska/src/KaxBlockData.cpp Changed

@@ -9,12 +9,12 @@
 ** 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
@@ -26,9 +26,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: KaxBlockData.cpp 1226 2005-10-13 21:16:43Z robux4 $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: KaxBlockData.cpp 1226 2005-10-13 21:16:43Z robux4 $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #include <lgpl/cassert>
 
@@ -44,71 +44,71 @@
 
 const KaxBlockBlob & KaxReferenceBlock::RefBlock() const
 {
-	assert(RefdBlock != NULL);
-	return *RefdBlock;
+  assert(RefdBlock != NULL);
+  return *RefdBlock;
 }
 
 KaxReferenceBlock::KaxReferenceBlock(EBML_EXTRA_DEF)
-:EBML_DEF_SINTEGER(KaxReferenceBlock)EBML_DEF_SEP
-RefdBlock(NULL)
-,ParentBlock(NULL)
-,bTimecodeSet(false)
-,bOurBlob(false)
+  :EBML_DEF_SINTEGER(KaxReferenceBlock)EBML_DEF_SEP
+  RefdBlock(NULL)
+  ,ParentBlock(NULL)
+  ,bTimecodeSet(false)
+  ,bOurBlob(false)
 {
-    bTimecodeSet = false;
+  bTimecodeSet = false;
 }
 
 KaxReferenceBlock::KaxReferenceBlock(const KaxReferenceBlock & ElementToClone)
-:EbmlSInteger(ElementToClone)
-,RefdBlock(NULL)
-,ParentBlock(NULL)
-,bTimecodeSet(ElementToClone.bTimecodeSet)
-,bOurBlob(false)
+  :EbmlSInteger(ElementToClone)
+  ,RefdBlock(NULL)
+  ,ParentBlock(NULL)
+  ,bTimecodeSet(ElementToClone.bTimecodeSet)
+  ,bOurBlob(false)
 {
 }
 
 KaxReferenceBlock::~KaxReferenceBlock()
 {
-    FreeBlob();
+  FreeBlob();
 }
 
 void KaxReferenceBlock::FreeBlob()
 {
-    if (bOurBlob && RefdBlock!=NULL)
-        delete RefdBlock;
-    RefdBlock = NULL;
+  if (bOurBlob && RefdBlock!=NULL)
+    delete RefdBlock;
+  RefdBlock = NULL;
 }
 
 filepos_t KaxReferenceBlock::UpdateSize(bool bSaveDefault, bool bForceRender)
 {
-	if (!bTimecodeSet) {
-		assert(RefdBlock != NULL);
-		assert(ParentBlock != NULL);
+  if (!bTimecodeSet) {
+    assert(RefdBlock != NULL);
+    assert(ParentBlock != NULL);
 
-		const KaxInternalBlock &block = *RefdBlock;
-		*static_cast<EbmlSInteger*>(this) = (int64(block.GlobalTimecode()) - int64(ParentBlock->GlobalTimecode())) / int64(ParentBlock->GlobalTimecodeScale());
-	}
-	return EbmlSInteger::UpdateSize(bSaveDefault, bForceRender);
+    const KaxInternalBlock &block = *RefdBlock;
+    *static_cast<EbmlSInteger*>(this) = (int64(block.GlobalTimecode()) - int64(ParentBlock->GlobalTimecode())) / int64(ParentBlock->GlobalTimecodeScale());
+  }
+  return EbmlSInteger::UpdateSize(bSaveDefault, bForceRender);
 }
 
 void KaxReferenceBlock::SetReferencedBlock(const KaxBlockBlob * aRefdBlock)
 {
-	assert(RefdBlock == NULL);
-	assert(aRefdBlock != NULL);
-    FreeBlob();
-	RefdBlock = aRefdBlock; 
-    bOurBlob = true;
-	SetValueIsSet();
+  assert(RefdBlock == NULL);
+  assert(aRefdBlock != NULL);
+  FreeBlob();
+  RefdBlock = aRefdBlock;
+  bOurBlob = true;
+  SetValueIsSet();
 }
 
 void KaxReferenceBlock::SetReferencedBlock(const KaxBlockGroup & aRefdBlock)
 {
-    FreeBlob();
-	KaxBlockBlob *block_blob = new KaxBlockBlob(BLOCK_BLOB_NO_SIMPLE);
-	block_blob->SetBlockGroup(*const_cast<KaxBlockGroup*>(&aRefdBlock));
-	RefdBlock = block_blob;
-    bOurBlob = true;
-	SetValueIsSet();
+  FreeBlob();
+  KaxBlockBlob *block_blob = new KaxBlockBlob(BLOCK_BLOB_NO_SIMPLE);
+  block_blob->SetBlockGroup(*const_cast<KaxBlockGroup*>(&aRefdBlock));
+  RefdBlock = block_blob;
+  bOurBlob = true;
+  SetValueIsSet();
 }
 
 END_LIBMATROSKA_NAMESPACE

makemkv-oss-1.9.5.tar.xz/libmatroska/src/KaxCluster.cpp -> makemkv-oss-1.10.2.tar.xz/libmatroska/src/KaxCluster.cpp Changed

@@ -9,12 +9,12 @@
 ** 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
@@ -26,9 +26,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: KaxCluster.cpp 1228 2005-10-14 19:36:51Z robux4 $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: KaxCluster.cpp 1228 2005-10-14 19:36:51Z robux4 $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #include "matroska/KaxCluster.h"
 #include "matroska/KaxBlock.h"
@@ -40,280 +40,267 @@
 START_LIBMATROSKA_NAMESPACE
 
 KaxCluster::KaxCluster(EBML_EXTRA_DEF)
-	:EbmlMaster(EBML_CLASS_SEMCONTEXT(KaxCluster) EBML_DEF_SEP EBML_EXTRA_CALL)
-	,currentNewBlock(NULL)
-	,ParentSegment(NULL)
-	,bFirstFrameInside(false)
-	,bPreviousTimecodeIsSet(false)
-	,bTimecodeScaleIsSet(false)
-	,bSilentTracksUsed(false)
+  :EbmlMaster(EBML_CLASS_SEMCONTEXT(KaxCluster) EBML_DEF_SEP EBML_EXTRA_CALL)
+  ,currentNewBlock(NULL)
+  ,ParentSegment(NULL)
+  ,bFirstFrameInside(false)
+  ,bPreviousTimecodeIsSet(false)
+  ,bTimecodeScaleIsSet(false)
+  ,bSilentTracksUsed(false)
 {}
 
-KaxCluster::KaxCluster(const KaxCluster & ElementToClone) 
- :EbmlMaster(ElementToClone)
- ,bSilentTracksUsed(ElementToClone.bSilentTracksUsed)
+KaxCluster::KaxCluster(const KaxCluster & ElementToClone)
+  :EbmlMaster(ElementToClone)
+  ,bSilentTracksUsed(ElementToClone.bSilentTracksUsed)
 {
-	// update the parent of each children
-	EBML_MASTER_ITERATOR Itr = begin();
-	while (Itr != end())
-	{
-		if (EbmlId(**Itr) == EBML_ID(KaxBlockGroup)) {
-			static_cast<KaxBlockGroup   *>(*Itr)->SetParent(*this);
-		} else if (EbmlId(**Itr) == EBML_ID(KaxBlock)) {
-			static_cast<KaxBlock        *>(*Itr)->SetParent(*this);
+  // update the parent of each children
+  EBML_MASTER_ITERATOR Itr = begin();
+  while (Itr != end()) {
+    if (EbmlId(**Itr) == EBML_ID(KaxBlockGroup)) {
+      static_cast<KaxBlockGroup   *>(*Itr)->SetParent(*this);
+    } else if (EbmlId(**Itr) == EBML_ID(KaxBlock)) {
+      static_cast<KaxBlock        *>(*Itr)->SetParent(*this);
 #if MATROSKA_VERSION >= 2
-		} else if (EbmlId(**Itr) == EBML_ID(KaxBlockVirtual)) {
-			static_cast<KaxBlockVirtual *>(*Itr)->SetParent(*this);
+    } else if (EbmlId(**Itr) == EBML_ID(KaxBlockVirtual)) {
+      static_cast<KaxBlockVirtual *>(*Itr)->SetParent(*this);
 #endif // MATROSKA_VERSION
-		}
-        ++Itr;
-	}
+    }
+    ++Itr;
+  }
 }
 
 bool KaxCluster::AddBlockBlob(KaxBlockBlob * NewBlob)
 {
-	Blobs.push_back(NewBlob);
-	return true;
+  Blobs.push_back(NewBlob);
+  return true;
 }
 
 bool KaxCluster::AddFrameInternal(const KaxTrackEntry & track, uint64 timecode, DataBuffer & buffer, KaxBlockGroup * & MyNewBlock, const KaxBlockGroup * PastBlock, const KaxBlockGroup * ForwBlock, LacingType lacing)
 {
-	if (!bFirstFrameInside) {
-		bFirstFrameInside = true;
-		MinTimecode = MaxTimecode = timecode;
-	} else {
-		if (timecode < MinTimecode)
-			MinTimecode = timecode;
-		if (timecode > MaxTimecode)
-			MaxTimecode = timecode;
-	}
-
-	MyNewBlock = NULL;
-
-	if (lacing == LACING_NONE || !track.LacingEnabled()) {
-		currentNewBlock = NULL;
-	}
-
-	// force creation of a new block
-	if (currentNewBlock == NULL || uint32(track.TrackNumber()) != uint32(currentNewBlock->TrackNumber()) || PastBlock != NULL || ForwBlock != NULL) {
-		KaxBlockGroup & aNewBlock = GetNewBlock();
-		MyNewBlock = currentNewBlock = &aNewBlock;
-	}
-
-	if (PastBlock != NULL) {
-		if (ForwBlock != NULL) {
-			if (currentNewBlock->AddFrame(track, timecode, buffer, *PastBlock, *ForwBlock, lacing)) {
-				// more data are allowed in this Block
-				return true;
-			} else {
-				currentNewBlock = NULL;
-				return false;
-			}
-		} else {
-			if (currentNewBlock->AddFrame(track, timecode, buffer, *PastBlock, lacing)) {
-				// more data are allowed in this Block
-				return true;
-			} else {
-				currentNewBlock = NULL;
-				return false;
-			}
-		}
-	} else {
-		if (currentNewBlock->AddFrame(track, timecode, buffer, lacing)) {
-			// more data are allowed in this Block
-			return true;
-		} else {
-			currentNewBlock = NULL;
-			return false;
-		}
-	}
+  if (!bFirstFrameInside) {
+    bFirstFrameInside = true;
+    MinTimecode = MaxTimecode = timecode;
+  } else {
+    if (timecode < MinTimecode)
+      MinTimecode = timecode;
+    if (timecode > MaxTimecode)
+      MaxTimecode = timecode;
+  }
+
+  MyNewBlock = NULL;
+
+  if (lacing == LACING_NONE || !track.LacingEnabled()) {
+    currentNewBlock = NULL;
+  }
+
+  // force creation of a new block
+  if (currentNewBlock == NULL || uint32(track.TrackNumber()) != uint32(currentNewBlock->TrackNumber()) || PastBlock != NULL || ForwBlock != NULL) {
+    KaxBlockGroup & aNewBlock = GetNewBlock();
+    MyNewBlock = currentNewBlock = &aNewBlock;
+  }
+
+  if (PastBlock != NULL) {
+    if (ForwBlock != NULL) {
+      if (currentNewBlock->AddFrame(track, timecode, buffer, *PastBlock, *ForwBlock, lacing)) {
+        // more data are allowed in this Block
+        return true;
+      } else {
+        currentNewBlock = NULL;
+        return false;
+      }
+    } else {
+      if (currentNewBlock->AddFrame(track, timecode, buffer, *PastBlock, lacing)) {
+        // more data are allowed in this Block
+        return true;
+      } else {
+        currentNewBlock = NULL;
+        return false;
+      }
+    }
+  } else {
+    if (currentNewBlock->AddFrame(track, timecode, buffer, lacing)) {
+      // more data are allowed in this Block
+      return true;
+    } else {
+      currentNewBlock = NULL;
+      return false;
+    }
+  }
 }
 
 bool KaxCluster::AddFrame(const KaxTrackEntry & track, uint64 timecode, DataBuffer & buffer, KaxBlockGroup * & MyNewBlock, LacingType lacing)
 {
-	assert(Blobs.size() == 0); // mutually exclusive for the moment
-	return AddFrameInternal(track, timecode, buffer, MyNewBlock, NULL, NULL, lacing);
+  assert(Blobs.size() == 0); // mutually exclusive for the moment
+  return AddFrameInternal(track, timecode, buffer, MyNewBlock, NULL, NULL, lacing);

makemkv-oss-1.9.5.tar.xz/libmatroska/src/KaxContexts.cpp -> makemkv-oss-1.10.2.tar.xz/libmatroska/src/KaxContexts.cpp Changed

@@ -11,12 +11,12 @@
 ** 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
@@ -28,9 +28,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: KaxContexts.cpp 640 2004-07-09 21:05:36Z mosu $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: KaxContexts.cpp 640 2004-07-09 21:05:36Z mosu $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #include "ebml/EbmlContexts.h"
 #include "ebml/EbmlHead.h"
@@ -61,7 +61,7 @@
 // for the moment
 const EbmlSemanticContext & GetKaxGlobal_Context()
 {
-	return GetEbmlGlobal_Context();
+  return GetEbmlGlobal_Context();
 }
 
 END_LIBMATROSKA_NAMESPACE

makemkv-oss-1.9.5.tar.xz/libmatroska/src/KaxCues.cpp -> makemkv-oss-1.10.2.tar.xz/libmatroska/src/KaxCues.cpp Changed

@@ -9,12 +9,12 @@
 ** 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
@@ -26,9 +26,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: KaxCues.cpp 1265 2007-01-14 17:20:35Z mosu $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: KaxCues.cpp 1265 2007-01-14 17:20:35Z mosu $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #include <lgpl/cassert>
 
@@ -44,119 +44,116 @@
 
 KaxCues::~KaxCues()
 {
-	assert(myTempReferences.size() == 0); // otherwise that means you have added references and forgot to set the position
+  assert(myTempReferences.size() == 0); // otherwise that means you have added references and forgot to set the position
 }
 /* deprecated and wrong
 bool KaxCues::AddBlockGroup(const KaxBlockGroup & BlockRef)
 {
-	// Do not add the element if it's already present.
-	std::vector<const KaxBlockBlob *>::iterator ListIdx;
-	KaxBlockBlob *BlockReference = new KaxBlockBlob(BLOCK_BLOB_NO_SIMPLE);
-	BlockReference->SetBlockGroup(*const_cast<KaxBlockGroup*>(&BlockRef));
-
-	for (ListIdx = myTempReferences.begin(); ListIdx != myTempReferences.end(); ListIdx++)
-		if (&(KaxBlockGroup&)*ListIdx == &BlockRef)
-        {
-            delete BlockReference;
-			return true;
-        }
-
-	myTempReferences.push_back(BlockReference);
-	return true;
+  // Do not add the element if it's already present.
+  std::vector<const KaxBlockBlob *>::iterator ListIdx;
+  KaxBlockBlob *BlockReference = new KaxBlockBlob(BLOCK_BLOB_NO_SIMPLE);
+  BlockReference->SetBlockGroup(*const_cast<KaxBlockGroup*>(&BlockRef));
+
+  for (ListIdx = myTempReferences.begin(); ListIdx != myTempReferences.end(); ListIdx++)
+    if (&(KaxBlockGroup&)*ListIdx == &BlockRef) {
+      delete BlockReference;
+      return true;
+    }
+
+  myTempReferences.push_back(BlockReference);
+  return true;
 }
 */
 bool KaxCues::AddBlockBlob(const KaxBlockBlob & BlockReference)
 {
-	// Do not add the element if it's already present.
-	std::vector<const KaxBlockBlob *>::iterator ListIdx;
+  // Do not add the element if it's already present.
+  std::vector<const KaxBlockBlob *>::iterator ListIdx;
 
-	for (ListIdx = myTempReferences.begin(); ListIdx != myTempReferences.end(); ++ListIdx)
-		if (*ListIdx == &BlockReference)
-			return true;
+  for (ListIdx = myTempReferences.begin(); ListIdx != myTempReferences.end(); ++ListIdx)
+    if (*ListIdx == &BlockReference)
+      return true;
 
-	myTempReferences.push_back(&BlockReference);
-	return true;
+  myTempReferences.push_back(&BlockReference);
+  return true;
 }
 
 void KaxCues::PositionSet(const KaxBlockBlob & BlockReference)
 {
-	// look for the element in the temporary references
-	std::vector<const KaxBlockBlob *>::iterator ListIdx;
-
-	for (ListIdx = myTempReferences.begin(); ListIdx != myTempReferences.end(); ++ListIdx) {
-		if (*ListIdx == &BlockReference) {
-			// found, now add the element to the entry list
-			KaxCuePoint & NewPoint = AddNewChild<KaxCuePoint>(*this);
-			NewPoint.PositionSet(BlockReference, GlobalTimecodeScale());
-			myTempReferences.erase(ListIdx);
-			break;
-		}
-	}
+  // look for the element in the temporary references
+  std::vector<const KaxBlockBlob *>::iterator ListIdx;
+
+  for (ListIdx = myTempReferences.begin(); ListIdx != myTempReferences.end(); ++ListIdx) {
+    if (*ListIdx == &BlockReference) {
+      // found, now add the element to the entry list
+      KaxCuePoint & NewPoint = AddNewChild<KaxCuePoint>(*this);
+      NewPoint.PositionSet(BlockReference, GlobalTimecodeScale());
+      myTempReferences.erase(ListIdx);
+      break;
+    }
+  }
 }
 
 void KaxCues::PositionSet(const KaxBlockGroup & BlockRef)
 {
-	// look for the element in the temporary references
-	std::vector<const KaxBlockBlob *>::iterator ListIdx;
-
-	for (ListIdx = myTempReferences.begin(); ListIdx != myTempReferences.end(); ++ListIdx) {
-		const KaxInternalBlock &refTmp = **ListIdx;
-		if (refTmp.GlobalTimecode() == BlockRef.GlobalTimecode() &&
-			refTmp.TrackNum() == BlockRef.TrackNumber()) {
-			// found, now add the element to the entry list
-			KaxCuePoint & NewPoint = AddNewChild<KaxCuePoint>(*this);
-			NewPoint.PositionSet(**ListIdx, GlobalTimecodeScale());
-			myTempReferences.erase(ListIdx);
-			break;
-		}
-	}
+  // look for the element in the temporary references
+  std::vector<const KaxBlockBlob *>::iterator ListIdx;
+
+  for (ListIdx = myTempReferences.begin(); ListIdx != myTempReferences.end(); ++ListIdx) {
+    const KaxInternalBlock &refTmp = **ListIdx;
+    if (refTmp.GlobalTimecode() == BlockRef.GlobalTimecode() &&
+        refTmp.TrackNum() == BlockRef.TrackNumber()) {
+      // found, now add the element to the entry list
+      KaxCuePoint & NewPoint = AddNewChild<KaxCuePoint>(*this);
+      NewPoint.PositionSet(**ListIdx, GlobalTimecodeScale());
+      myTempReferences.erase(ListIdx);
+      break;
+    }
+  }
 }
 
 /*!
-	\warning Assume that the list has been sorted (Sort())
+  \warning Assume that the list has been sorted (Sort())
 */
 const KaxCuePoint * KaxCues::GetTimecodePoint(uint64 aTimecode) const
 {
-	uint64 TimecodeToLocate = aTimecode / GlobalTimecodeScale();
-	const KaxCuePoint * aPointPrev = NULL;
-	uint64 aPrevTime = 0;
-	uint64 aNextTime = EBML_PRETTYLONGINT(0xFFFFFFFFFFFF);
-
-    EBML_MASTER_CONST_ITERATOR Itr;
-	for (Itr = begin(); Itr != end(); ++Itr)
-    {
-		if (EbmlId(*(*Itr)) == EBML_ID(KaxCuePoint)) {
-			const KaxCuePoint *tmp = static_cast<const KaxCuePoint *>(*Itr);
-			// check the tile
-			const KaxCueTime *aTime = static_cast<const KaxCueTime *>(tmp->FindFirstElt(EBML_INFO(KaxCueTime)));
-			if (aTime != NULL)
-			{
-				uint64 _Time = uint64(*aTime);
-				if (_Time > aPrevTime && _Time < TimecodeToLocate) {
-					aPrevTime = _Time;
-					aPointPrev = tmp;
-				}
-				if (_Time < aNextTime && _Time > TimecodeToLocate) {
-					aNextTime= _Time;
-				}
-			}
-		}
-	}
-
-	return aPointPrev;
+  uint64 TimecodeToLocate = aTimecode / GlobalTimecodeScale();
+  const KaxCuePoint * aPointPrev = NULL;
+  uint64 aPrevTime = 0;
+  uint64 aNextTime = EBML_PRETTYLONGINT(0xFFFFFFFFFFFF);
+
+  EBML_MASTER_CONST_ITERATOR Itr;
+  for (Itr = begin(); Itr != end(); ++Itr) {
+    if (EbmlId(*(*Itr)) == EBML_ID(KaxCuePoint)) {
+      const KaxCuePoint *tmp = static_cast<const KaxCuePoint *>(*Itr);
+      // check the tile
+      const KaxCueTime *aTime = static_cast<const KaxCueTime *>(tmp->FindFirstElt(EBML_INFO(KaxCueTime)));
+      if (aTime != NULL) {
+        uint64 _Time = uint64(*aTime);
+        if (_Time > aPrevTime && _Time < TimecodeToLocate) {
+          aPrevTime = _Time;
+          aPointPrev = tmp;
+        }
+        if (_Time < aNextTime && _Time > TimecodeToLocate) {
+          aNextTime= _Time;
+        }

makemkv-oss-1.9.5.tar.xz/libmatroska/src/KaxCuesData.cpp -> makemkv-oss-1.10.2.tar.xz/libmatroska/src/KaxCuesData.cpp Changed

@@ -9,12 +9,12 @@
 ** 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
@@ -26,9 +26,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: KaxCuesData.cpp 1265 2007-01-14 17:20:35Z mosu $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: KaxCuesData.cpp 1265 2007-01-14 17:20:35Z mosu $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #include <lgpl/cassert>
 
@@ -44,211 +44,206 @@
 START_LIBMATROSKA_NAMESPACE
 
 /*!
-	\todo handle codec state checking
-	\todo remove duplicate references (reference to 2 frames that each reference the same frame)
+  \todo handle codec state checking
+  \todo remove duplicate references (reference to 2 frames that each reference the same frame)
 */
 void KaxCuePoint::PositionSet(const KaxBlockGroup & BlockReference, uint64 GlobalTimecodeScale)
 {
-	// fill me
-	KaxCueTime & NewTime = GetChild<KaxCueTime>(*this);
-	*static_cast<EbmlUInteger*>(&NewTime) = BlockReference.GlobalTimecode() / GlobalTimecodeScale;
+  // fill me
+  KaxCueTime & NewTime = GetChild<KaxCueTime>(*this);
+  *static_cast<EbmlUInteger*>(&NewTime) = BlockReference.GlobalTimecode() / GlobalTimecodeScale;
+
+  KaxCueTrackPositions & NewPositions = AddNewChild<KaxCueTrackPositions>(*this);
+  KaxCueTrack & TheTrack = GetChild<KaxCueTrack>(NewPositions);
+  *static_cast<EbmlUInteger*>(&TheTrack) = BlockReference.TrackNumber();
 
-	KaxCueTrackPositions & NewPositions = AddNewChild<KaxCueTrackPositions>(*this);
-	KaxCueTrack & TheTrack = GetChild<KaxCueTrack>(NewPositions);
-	*static_cast<EbmlUInteger*>(&TheTrack) = BlockReference.TrackNumber();
-	
-	KaxCueClusterPosition & TheClustPos = GetChild<KaxCueClusterPosition>(NewPositions);
-	*static_cast<EbmlUInteger*>(&TheClustPos) = BlockReference.ClusterPosition();
+  KaxCueClusterPosition & TheClustPos = GetChild<KaxCueClusterPosition>(NewPositions);
+  *static_cast<EbmlUInteger*>(&TheClustPos) = BlockReference.ClusterPosition();
 
 #if MATROSKA_VERSION >= 2
-	// handle reference use
-	if (BlockReference.ReferenceCount() != 0)
-	{
-		unsigned int i;
-		for (i=0; i<BlockReference.ReferenceCount(); i++) {
-			KaxCueReference & NewRefs = AddNewChild<KaxCueReference>(NewPositions);
-			NewRefs.AddReference(BlockReference.Reference(i).RefBlock(), GlobalTimecodeScale);
-		}
-	}
-
-	KaxCodecState *CodecState = static_cast<KaxCodecState *>(BlockReference.FindFirstElt(EBML_INFO(KaxCodecState)));
-	if (CodecState != NULL) {
-		KaxCueCodecState &CueCodecState = AddNewChild<KaxCueCodecState>(NewPositions);
-		*static_cast<EbmlUInteger*>(&CueCodecState) = BlockReference.GetParentCluster()->GetParentSegment()->GetRelativePosition(CodecState->GetElementPosition());
-	}
+  // handle reference use
+  if (BlockReference.ReferenceCount() != 0) {
+    unsigned int i;
+    for (i=0; i<BlockReference.ReferenceCount(); i++) {
+      KaxCueReference & NewRefs = AddNewChild<KaxCueReference>(NewPositions);
+      NewRefs.AddReference(BlockReference.Reference(i).RefBlock(), GlobalTimecodeScale);
+    }
+  }
+
+  KaxCodecState *CodecState = static_cast<KaxCodecState *>(BlockReference.FindFirstElt(EBML_INFO(KaxCodecState)));
+  if (CodecState != NULL) {
+    KaxCueCodecState &CueCodecState = AddNewChild<KaxCueCodecState>(NewPositions);
+    *static_cast<EbmlUInteger*>(&CueCodecState) = BlockReference.GetParentCluster()->GetParentSegment()->GetRelativePosition(CodecState->GetElementPosition());
+  }
 #endif // MATROSKA_VERSION
 
-	SetValueIsSet();
+  SetValueIsSet();
 }
 
 void KaxCuePoint::PositionSet(const KaxBlockBlob & BlobReference, uint64 GlobalTimecodeScale)
 {
-	const KaxInternalBlock &BlockReference = BlobReference;
-	const KaxBlockGroup* BlockGroupPointer = NULL;
-
-	if (!BlobReference.IsSimpleBlock()) {
-		const KaxBlockGroup &BlockGroup = BlobReference;
-		BlockGroupPointer = & BlockGroup;
-	}
-	PositionSet(BlockReference,BlockGroupPointer,GlobalTimecodeScale);
+  const KaxInternalBlock &BlockReference = BlobReference;
+  const KaxBlockGroup* BlockGroupPointer = NULL;
+
+  if (!BlobReference.IsSimpleBlock()) {
+    const KaxBlockGroup &BlockGroup = BlobReference;
+    BlockGroupPointer = & BlockGroup;
+  }
+  PositionSet(BlockReference,BlockGroupPointer,GlobalTimecodeScale);
 }
 
 void KaxCuePoint::PositionSet(const KaxSimpleBlock & BlockReference, uint64 GlobalTimecodeScale)
 {
-	PositionSet(BlockReference,NULL,GlobalTimecodeScale);
+  PositionSet(BlockReference,NULL,GlobalTimecodeScale);
 }
 
 void KaxCuePoint::PositionSet(const KaxInternalBlock & BlockReference, const KaxBlockGroup* BlockGroup, uint64 GlobalTimecodeScale)
 {
-	// fill me
-	KaxCueTime & NewTime = GetChild<KaxCueTime>(*this);
-	*static_cast<EbmlUInteger*>(&NewTime) = BlockReference.GlobalTimecode() / GlobalTimecodeScale;
+  // fill me
+  KaxCueTime & NewTime = GetChild<KaxCueTime>(*this);
+  *static_cast<EbmlUInteger*>(&NewTime) = BlockReference.GlobalTimecode() / GlobalTimecodeScale;
+  KaxCueTrackPositions & NewPositions = AddNewChild<KaxCueTrackPositions>(*this);
+  KaxCueTrack & TheTrack = GetChild<KaxCueTrack>(NewPositions);
+  *static_cast<EbmlUInteger*>(&TheTrack) = BlockReference.TrackNum();
 
-	KaxCueTrackPositions & NewPositions = AddNewChild<KaxCueTrackPositions>(*this);
-	KaxCueTrack & TheTrack = GetChild<KaxCueTrack>(NewPositions);
-	*static_cast<EbmlUInteger*>(&TheTrack) = BlockReference.TrackNum();
-	
-	KaxCueClusterPosition & TheClustPos = GetChild<KaxCueClusterPosition>(NewPositions);
-	*static_cast<EbmlUInteger*>(&TheClustPos) = BlockReference.ClusterPosition();
+  KaxCueClusterPosition & TheClustPos = GetChild<KaxCueClusterPosition>(NewPositions);
+  *static_cast<EbmlUInteger*>(&TheClustPos) = BlockReference.ClusterPosition();
 
 #if 0 // MATROSKA_VERSION >= 2
-	// handle reference use
-	if (BlockReference.ReferenceCount() != 0)
-	{
-		unsigned int i;
-		for (i=0; i<BlockReference.ReferenceCount(); i++) {
-			KaxCueReference & NewRefs = AddNewChild<KaxCueReference>(NewPositions);
-			NewRefs.AddReference(BlockReference.Reference(i).RefBlock(), GlobalTimecodeScale);
-		}
-	}
+  // handle reference use
+  if (BlockReference.ReferenceCount() != 0) {
+    unsigned int i;
+    for (i=0; i<BlockReference.ReferenceCount(); i++) {
+      KaxCueReference & NewRefs = AddNewChild<KaxCueReference>(NewPositions);
+      NewRefs.AddReference(BlockReference.Reference(i).RefBlock(), GlobalTimecodeScale);
+    }
+  }
 #endif // MATROSKA_VERSION
 
 #if MATROSKA_VERSION >= 2
-	if (BlockGroup!=NULL) {
-		const KaxCodecState *CodecState = static_cast<KaxCodecState *>(BlockGroup->FindFirstElt(EBML_INFO(KaxCodecState)));
-		if (CodecState != NULL) {
-			KaxCueCodecState &CueCodecState = AddNewChild<KaxCueCodecState>(NewPositions);
-			*static_cast<EbmlUInteger*>(&CueCodecState) = BlockGroup->GetParentCluster()->GetParentSegment()->GetRelativePosition(CodecState->GetElementPosition());
-		}
-	}
+  if (BlockGroup!=NULL) {
+    const KaxCodecState *CodecState = static_cast<KaxCodecState *>(BlockGroup->FindFirstElt(EBML_INFO(KaxCodecState)));
+    if (CodecState != NULL) {
+      KaxCueCodecState &CueCodecState = AddNewChild<KaxCueCodecState>(NewPositions);
+      *static_cast<EbmlUInteger*>(&CueCodecState) = BlockGroup->GetParentCluster()->GetParentSegment()->GetRelativePosition(CodecState->GetElementPosition());
+    }
+  }
 #endif // MATROSKA_VERSION
 
-	SetValueIsSet();
+  SetValueIsSet();
 }
 
 #if MATROSKA_VERSION >= 2
 /*!
-	\todo handle codec state checking
+  \todo handle codec state checking
 */
 void KaxCueReference::AddReference(const KaxBlockBlob & BlockReference, uint64 GlobalTimecodeScale)
 {
-	const KaxInternalBlock & theBlock = BlockReference;
-	KaxCueRefTime & NewTime = GetChild<KaxCueRefTime>(*this);
-	*static_cast<EbmlUInteger*>(&NewTime) = theBlock.GlobalTimecode() / GlobalTimecodeScale;
+  const KaxInternalBlock & theBlock = BlockReference;
+  KaxCueRefTime & NewTime = GetChild<KaxCueRefTime>(*this);
+  *static_cast<EbmlUInteger*>(&NewTime) = theBlock.GlobalTimecode() / GlobalTimecodeScale;
 
-	KaxCueRefCluster & TheClustPos = GetChild<KaxCueRefCluster>(*this);
-	*static_cast<EbmlUInteger*>(&TheClustPos) = theBlock.ClusterPosition();
+  KaxCueRefCluster & TheClustPos = GetChild<KaxCueRefCluster>(*this);

makemkv-oss-1.9.5.tar.xz/libmatroska/src/KaxInfoData.cpp -> makemkv-oss-1.10.2.tar.xz/libmatroska/src/KaxInfoData.cpp Changed

@@ -11,12 +11,12 @@
 ** 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
@@ -28,10 +28,10 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id$
-	\author Steve Lhomme     <robux4 @ users.sf.net>
-	\author John Cannon      <spyder2555 @ users.sf.net>
+  \file
+  \version \$Id$
+  \author Steve Lhomme     <robux4 @ users.sf.net>
+  \author John Cannon      <spyder2555 @ users.sf.net>
 */
 #include "matroska/KaxInfoData.h"
 #include "matroska/KaxContexts.h"
@@ -41,18 +41,18 @@
 START_LIBMATROSKA_NAMESPACE
 
 KaxPrevUID::KaxPrevUID(EBML_EXTRA_DEF)
-:KaxSegmentUID(EBML_DEF_BINARY_CTX(KaxPrevUID) EBML_DEF_SEP EBML_EXTRA_CALL)
+  :KaxSegmentUID(EBML_DEF_BINARY_CTX(KaxPrevUID) EBML_DEF_SEP EBML_EXTRA_CALL)
 {
 }
 
 KaxNextUID::KaxNextUID(EBML_EXTRA_DEF)
-:KaxSegmentUID(EBML_DEF_BINARY_CTX(KaxNextUID) EBML_DEF_SEP EBML_EXTRA_CALL)
+  :KaxSegmentUID(EBML_DEF_BINARY_CTX(KaxNextUID) EBML_DEF_SEP EBML_EXTRA_CALL)
 {
 }
 
 #if defined(HAVE_EBML2) || defined(HAS_EBML2)
 KaxSegmentUID::KaxSegmentUID(EBML_DEF_CONS EBML_DEF_SEP EBML_EXTRA_DEF)
-:EbmlBinary(EBML_DEF_PARAM EBML_DEF_SEP EBML_EXTRA_CALL)
+  :EbmlBinary(EBML_DEF_PARAM EBML_DEF_SEP EBML_EXTRA_CALL)
 {
 }
 #endif

makemkv-oss-1.9.5.tar.xz/libmatroska/src/KaxSeekHead.cpp -> makemkv-oss-1.10.2.tar.xz/libmatroska/src/KaxSeekHead.cpp Changed

@@ -11,12 +11,12 @@
 ** 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
@@ -28,9 +28,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: KaxSeekHead.cpp 640 2004-07-09 21:05:36Z mosu $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: KaxSeekHead.cpp 640 2004-07-09 21:05:36Z mosu $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #include "matroska/KaxSeekHead.h"
 #include "matroska/KaxContexts.h"
@@ -44,107 +44,100 @@
 START_LIBMATROSKA_NAMESPACE
 
 /*!
-	\todo verify that the element is not already in the list
+  \todo verify that the element is not already in the list
 */
 KaxSeek * KaxSeekHead::IndexThis(const EbmlElement & aElt, const KaxSegment & ParentSegment)
 {
-	// create a new point
-	KaxSeek & aNewPoint = AddNewChild<KaxSeek>(*this);
-
-	// add the informations to this element
-	KaxSeekPosition & aNewPos = GetChild<KaxSeekPosition>(aNewPoint);
-	*static_cast<EbmlUInteger *>(&aNewPos) = ParentSegment.GetRelativePosition(aElt);
-
-	KaxSeekID & aNewID = GetChild<KaxSeekID>(aNewPoint);
-	binary ID[4];
-    ((const EbmlId&)aElt).Fill(ID);
-	aNewID.CopyBuffer(ID, EBML_ID_LENGTH((const EbmlId&)aElt));
-    return &aNewPoint;
+  // create a new point
+  KaxSeek & aNewPoint = AddNewChild<KaxSeek>(*this);
+
+  // add the informations to this element
+  KaxSeekPosition & aNewPos = GetChild<KaxSeekPosition>(aNewPoint);
+  *static_cast<EbmlUInteger *>(&aNewPos) = ParentSegment.GetRelativePosition(aElt);
+
+  KaxSeekID & aNewID = GetChild<KaxSeekID>(aNewPoint);
+  binary ID[4];
+  ((const EbmlId&)aElt).Fill(ID);
+  aNewID.CopyBuffer(ID, EBML_ID_LENGTH((const EbmlId&)aElt));
+  return &aNewPoint;
 }
 
 KaxSeek * KaxSeekHead::FindFirstOf(const EbmlCallbacks & Callbacks) const
 {
-	// parse all the Entries and find the first to match the type
-	KaxSeek * aElt = static_cast<KaxSeek *>(FindFirstElt(EBML_INFO(KaxSeek)));
-	while (aElt != NULL)
-	{
-		KaxSeekID * aId = NULL;
-        EBML_MASTER_ITERATOR Itr;
-		for (Itr = aElt->begin(); Itr != aElt->end(); ++Itr)
-        {
-			if (EbmlId(*(*Itr)) == EBML_ID(KaxSeekID)) {
-				aId = static_cast<KaxSeekID*>(*Itr);
-				EbmlId aEbmlId(aId->GetBuffer(), (unsigned int) aId->GetSize());
-				if (aEbmlId == EBML_INFO_ID(Callbacks))
-				{
-					return aElt;
-				}
-				break;
-			}
-		}
-		aElt = static_cast<KaxSeek *>(FindNextElt(*aElt));
-	}
-
-	return NULL;
+  // parse all the Entries and find the first to match the type
+  KaxSeek * aElt = static_cast<KaxSeek *>(FindFirstElt(EBML_INFO(KaxSeek)));
+  while (aElt != NULL) {
+    KaxSeekID * aId = NULL;
+    EBML_MASTER_ITERATOR Itr;
+    for (Itr = aElt->begin(); Itr != aElt->end(); ++Itr) {
+      if (EbmlId(*(*Itr)) == EBML_ID(KaxSeekID)) {
+        aId = static_cast<KaxSeekID*>(*Itr);
+        EbmlId aEbmlId(aId->GetBuffer(), (unsigned int)aId->GetSize());
+        if (aEbmlId == EBML_INFO_ID(Callbacks)) {
+          return aElt;
+        }
+        break;
+      }
+    }
+    aElt = static_cast<KaxSeek *>(FindNextElt(*aElt));
+  }
+
+  return NULL;
 }
 
 KaxSeek * KaxSeekHead::FindNextOf(const KaxSeek &aPrev) const
 {
-    EBML_MASTER_CONST_ITERATOR Itr;
-	KaxSeek *tmp;
-	
-	// look for the previous in the list
-	for (Itr = begin(); Itr != end(); ++Itr)
-    {
-		if (*Itr == static_cast<const EbmlElement*>(&aPrev))
-			break;
-	}
-
-	if (Itr != end())
-    {
-		++Itr;
-	    for (; Itr != end(); ++Itr)
-        {
-			if (EbmlId(*(*Itr)) == EBML_ID(KaxSeek))
-			{
-				tmp = (KaxSeek *)(*Itr);
-				if (tmp->IsEbmlId(aPrev))
-					return tmp;
-			}
-		}
-	}
-
-	return NULL;
+  EBML_MASTER_CONST_ITERATOR Itr;
+  KaxSeek *tmp;
+
+  // look for the previous in the list
+  for (Itr = begin(); Itr != end(); ++Itr) {
+    if (*Itr == static_cast<const EbmlElement*>(&aPrev))
+      break;
+  }
+
+  if (Itr != end()) {
+    ++Itr;
+    for (; Itr != end(); ++Itr) {
+      if (EbmlId(*(*Itr)) == EBML_ID(KaxSeek)) {
+        tmp = (KaxSeek *)(*Itr);
+        if (tmp->IsEbmlId(aPrev))
+          return tmp;
+      }
+    }
+  }
+
+  return NULL;
 }
 
 int64 KaxSeek::Location() const
 {
-	KaxSeekPosition *aPos = static_cast<KaxSeekPosition*>(FindFirstElt(EBML_INFO(KaxSeekPosition)));
-	if (aPos == NULL)
-		return 0;
-	return uint64(*aPos);
+  KaxSeekPosition *aPos = static_cast<KaxSeekPosition*>(FindFirstElt(EBML_INFO(KaxSeekPosition)));
+  if (aPos == NULL)
+    return 0;
+  return uint64(*aPos);
 }
 
 bool KaxSeek::IsEbmlId(const EbmlId & aId) const
 {
-	KaxSeekID *_Id = static_cast<KaxSeekID*>(FindFirstElt(EBML_INFO(KaxSeekID)));
-	if (_Id == NULL)
-		return false;
-	EbmlId aEbmlId(_Id->GetBuffer(), (unsigned int) _Id->GetSize());
-	return (aId == aEbmlId);
+  KaxSeekID *_Id = static_cast<KaxSeekID*>(FindFirstElt(EBML_INFO(KaxSeekID)));
+  if (_Id == NULL)
+    return false;
+  EbmlId aEbmlId(_Id->GetBuffer(), (unsigned int)_Id->GetSize());
+  return (aId == aEbmlId);
 }
 
 bool KaxSeek::IsEbmlId(const KaxSeek & aPoint) const
 {
-	KaxSeekID *_IdA = static_cast<KaxSeekID*>(FindFirstElt(EBML_INFO(KaxSeekID)));
-	if (_IdA == NULL)
-		return false;
-	KaxSeekID *_IdB = static_cast<KaxSeekID*>(aPoint.FindFirstElt(EBML_INFO(KaxSeekID)));
-	if (_IdB == NULL)
-		return false;
-	EbmlId aEbmlIdA(_IdA->GetBuffer(), _IdA->GetSize());
-	EbmlId aEbmlIdB(_IdB->GetBuffer(), _IdB->GetSize());
-	return (aEbmlIdA == aEbmlIdB);
+  KaxSeekID *_IdA = static_cast<KaxSeekID*>(FindFirstElt(EBML_INFO(KaxSeekID)));
+  if (_IdA == NULL)
+    return false;
+  KaxSeekID *_IdB = static_cast<KaxSeekID*>(aPoint.FindFirstElt(EBML_INFO(KaxSeekID)));
+  if (_IdB == NULL)

makemkv-oss-1.9.5.tar.xz/libmatroska/src/KaxSegment.cpp -> makemkv-oss-1.10.2.tar.xz/libmatroska/src/KaxSegment.cpp Changed

@@ -11,12 +11,12 @@
 ** 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
@@ -28,9 +28,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: KaxSegment.cpp 1096 2005-03-17 09:14:52Z robux4 $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: KaxSegment.cpp 1096 2005-03-17 09:14:52Z robux4 $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #include "matroska/KaxSegment.h"
 #include "ebml/EbmlHead.h"
@@ -46,40 +46,39 @@
 START_LIBMATROSKA_NAMESPACE
 
 KaxSegment::KaxSegment(EBML_EXTRA_DEF)
-	:EbmlMaster(EBML_CLASS_SEMCONTEXT(KaxSegment) EBML_DEF_SEP EBML_EXTRA_CALL)
+  :EbmlMaster(EBML_CLASS_SEMCONTEXT(KaxSegment) EBML_DEF_SEP EBML_EXTRA_CALL)
 {
-	SetSizeLength(5); // mandatory min size support (for easier updating) (2^(7*5)-2 = 32Go)
-	SetSizeInfinite(); // by default a segment is big and the size is unknown in advance
+  SetSizeLength(5); // mandatory min size support (for easier updating) (2^(7*5)-2 = 32Go)
+  SetSizeInfinite(); // by default a segment is big and the size is unknown in advance
 }
 
 KaxSegment::KaxSegment(const KaxSegment & ElementToClone)
- :EbmlMaster(ElementToClone)
+  :EbmlMaster(ElementToClone)
 {
-	// update the parent of each children
-	EBML_MASTER_ITERATOR Itr = begin();
-	while (Itr != end())
-	{
-		if (EbmlId(**Itr) == EBML_ID(KaxCluster)) {
-			static_cast<KaxCluster *>(*Itr)->SetParent(*this);
-		}
-        ++Itr;
-	}
+  // update the parent of each children
+  EBML_MASTER_ITERATOR Itr = begin();
+  while (Itr != end()) {
+    if (EbmlId(**Itr) == EBML_ID(KaxCluster)) {
+      static_cast<KaxCluster *>(*Itr)->SetParent(*this);
+    }
+    ++Itr;
+  }
 }
 
 
 uint64 KaxSegment::GetRelativePosition(uint64 aGlobalPosition) const
 {
-	return aGlobalPosition - GetElementPosition() - HeadSize();
+  return aGlobalPosition - GetElementPosition() - HeadSize();
 }
 
 uint64 KaxSegment::GetRelativePosition(const EbmlElement & Elt) const
 {
-	return GetRelativePosition(Elt.GetElementPosition());
+  return GetRelativePosition(Elt.GetElementPosition());
 }
 
 uint64 KaxSegment::GetGlobalPosition(uint64 aRelativePosition) const
 {
-	return aRelativePosition + GetElementPosition() + HeadSize();
+  return aRelativePosition + GetElementPosition() + HeadSize();
 }
 
 END_LIBMATROSKA_NAMESPACE

makemkv-oss-1.9.5.tar.xz/libmatroska/src/KaxSemantic.cpp -> makemkv-oss-1.10.2.tar.xz/libmatroska/src/KaxSemantic.cpp Changed

@@ -1,23 +1,23 @@
 /**********************************************************************
 **  DO NOT EDIT, GENERATED WITH DATA2LIB
-** 
+**
 **  libmatroska : parse Matroska files, see http://www.matroska.org/
-** 
+**
 **  Copyright (c) 2002-2010, Matroska (non-profit organisation)
 **  All rights reserved.
-** 
+**
 ** This file is part of libmatroska.
 **
 ** 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
@@ -699,103 +699,103 @@
 DEFINE_MKX_BINARY (KaxTagBinary, 0x4485, 2, KaxTagSimple, "TagBinary");
 
 filepos_t KaxBlockVirtual::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
-	assert(false); // no you are not allowed to use this element !
-	return 0;
+  assert(false); // no you are not allowed to use this element !
+  return 0;
 }
 
 filepos_t KaxReferenceVirtual::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
-	assert(false); // no you are not allowed to use this element !
-	return 0;
+  assert(false); // no you are not allowed to use this element !
+  return 0;
 }
 
 filepos_t KaxSliceFrameNumber::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
-	assert(false); // no you are not allowed to use this element !
-	return 0;
+  assert(false); // no you are not allowed to use this element !
+  return 0;
 }
 
 filepos_t KaxSliceBlockAddID::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
-	assert(false); // no you are not allowed to use this element !
-	return 0;
+  assert(false); // no you are not allowed to use this element !
+  return 0;
 }
 
 filepos_t KaxSliceDelay::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
-	assert(false); // no you are not allowed to use this element !
-	return 0;
+  assert(false); // no you are not allowed to use this element !
+  return 0;
 }
 
 filepos_t KaxSliceDuration::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
-	assert(false); // no you are not allowed to use this element !
-	return 0;
+  assert(false); // no you are not allowed to use this element !
+  return 0;
 }
 
 filepos_t KaxEncryptedBlock::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
-	assert(false); // no you are not allowed to use this element !
-	return 0;
+  assert(false); // no you are not allowed to use this element !
+  return 0;
 }
 
 filepos_t KaxTrackTimecodeScale::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
-	assert(false); // no you are not allowed to use this element !
-	return 0;
+  assert(false); // no you are not allowed to use this element !
+  return 0;
 }
 
 filepos_t KaxTrackOffset::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
-	assert(false); // no you are not allowed to use this element !
-	return 0;
+  assert(false); // no you are not allowed to use this element !
+  return 0;
 }
 
 filepos_t KaxCodecSettings::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
-	assert(false); // no you are not allowed to use this element !
-	return 0;
+  assert(false); // no you are not allowed to use this element !
+  return 0;
 }
 
 filepos_t KaxCodecInfoURL::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
-	assert(false); // no you are not allowed to use this element !
-	return 0;
+  assert(false); // no you are not allowed to use this element !
+  return 0;
 }
 
 filepos_t KaxCodecDownloadURL::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
-	assert(false); // no you are not allowed to use this element !
-	return 0;
+  assert(false); // no you are not allowed to use this element !
+  return 0;
 }
 
 filepos_t KaxOldStereoMode::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
-	assert(false); // no you are not allowed to use this element !
-	return 0;
+  assert(false); // no you are not allowed to use this element !
+  return 0;
 }
 
 filepos_t KaxVideoGamma::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
-	assert(false); // no you are not allowed to use this element !
-	return 0;
+  assert(false); // no you are not allowed to use this element !
+  return 0;
 }
 
 filepos_t KaxVideoFrameRate::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
-	assert(false); // no you are not allowed to use this element !
-	return 0;
+  assert(false); // no you are not allowed to use this element !
+  return 0;
 }
 
 filepos_t KaxAudioPosition::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
-	assert(false); // no you are not allowed to use this element !
-	return 0;
+  assert(false); // no you are not allowed to use this element !
+  return 0;
 }
 
 filepos_t KaxCueRefCluster::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
-	assert(false); // no you are not allowed to use this element !
-	return 0;
+  assert(false); // no you are not allowed to use this element !
+  return 0;
 }
 
 filepos_t KaxCueRefNumber::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
-	assert(false); // no you are not allowed to use this element !
-	return 0;
+  assert(false); // no you are not allowed to use this element !
+  return 0;
 }
 
 filepos_t KaxCueRefCodecState::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
-	assert(false); // no you are not allowed to use this element !
-	return 0;
+  assert(false); // no you are not allowed to use this element !
+  return 0;
 }
 
 filepos_t KaxFileReferral::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {
-	assert(false); // no you are not allowed to use this element !
-	return 0;
+  assert(false); // no you are not allowed to use this element !
+  return 0;
 }
 
 END_LIBMATROSKA_NAMESPACE

makemkv-oss-1.9.5.tar.xz/libmatroska/src/KaxTracks.cpp -> makemkv-oss-1.10.2.tar.xz/libmatroska/src/KaxTracks.cpp Changed

@@ -11,12 +11,12 @@
 ** 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
@@ -28,9 +28,9 @@
 **********************************************************************/
 
 /*!
-	\file
-	\version \$Id: KaxTracks.cpp 1202 2005-08-30 14:39:01Z robux4 $
-	\author Steve Lhomme     <robux4 @ users.sf.net>
+  \file
+  \version \$Id: KaxTracks.cpp 1202 2005-08-30 14:39:01Z robux4 $
+  \author Steve Lhomme     <robux4 @ users.sf.net>
 */
 #include "matroska/KaxTracks.h"
 
@@ -41,14 +41,14 @@
 START_LIBMATROSKA_NAMESPACE
 
 KaxTrackEntry::KaxTrackEntry(EBML_EXTRA_DEF)
-	:EbmlMaster(EBML_CLASS_SEMCONTEXT(KaxTrackEntry) EBML_DEF_SEP EBML_EXTRA_CALL)
-	,bGlobalTimecodeScaleIsSet(false)
+  :EbmlMaster(EBML_CLASS_SEMCONTEXT(KaxTrackEntry) EBML_DEF_SEP EBML_EXTRA_CALL)
+  ,bGlobalTimecodeScaleIsSet(false)
 {}
 
 void KaxTrackEntry::EnableLacing(bool bEnable)
 {
-	KaxTrackFlagLacing & myLacing = GetChild<KaxTrackFlagLacing>(*this);
-	*(static_cast<EbmlUInteger *>(&myLacing)) = bEnable ? 1 : 0;
+  KaxTrackFlagLacing & myLacing = GetChild<KaxTrackFlagLacing>(*this);
+  *(static_cast<EbmlUInteger *>(&myLacing)) = bEnable ? 1 : 0;
 }
 
 END_LIBMATROSKA_NAMESPACE

makemkv-oss-1.9.5.tar.xz/libmatroska/src/KaxVersion.cpp -> makemkv-oss-1.10.2.tar.xz/libmatroska/src/KaxVersion.cpp Changed

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -100,6 +100,8 @@
   ap_iaOutputAudioChannelLayoutName=46,
   ap_iaOutputAudioChannelLayout=47,
   ap_iaOutputAudioMixDescription=48,
+  ap_iaComment=49,
+  ap_iaOffsetSequenceId=50,
   ap_iaMaxValue
 } AP_ItemAttributeId;
 
@@ -131,6 +133,7 @@
 static const unsigned int AP_AVStreamFlag_DerivedStream=2048;
 static const unsigned int AP_AVStreamFlag_ForcedSubtitles=4096;
 static const unsigned int AP_AVStreamFlag_ProfileSecondaryStream=16384;
+static const unsigned int AP_AVStreamFlag_OffsetSequenceIdPresent=32768;
 
 
 static const unsigned int AP_APP_LOC_POGZ=1;
@@ -287,6 +290,7 @@
 static const unsigned long APP_IFACE_SETTINGS_ADV_DEFAULT_SELECTION=6174;
 static const unsigned long APP_IFACE_SETTINGS_ADV_FFMPEG_PATH=6175;
 static const unsigned long APP_IFACE_SETTINGS_ADV_DTSHDDEC_PATH=6176;
+static const unsigned long APP_IFACE_SETTINGS_PROT_JAVA_PATH=6177;
 static const unsigned long APP_IFACE_BACKUPDLG_TEXT_CAPTION=6137;
 static const unsigned long APP_IFACE_BACKUPDLG_TEXT=6138;
 static const unsigned long APP_IFACE_BACKUPDLG_FOLDER=6139;
@@ -396,10 +400,13 @@
   apset_screen_state ,
   apset_app_DefaultProfileName ,
   apset_app_DefaultSelectionString ,
-  apset_old_app_ffmpeg ,
+  apset_app_Java ,
   apset_app_dtshddec ,
   apset_app_SiteInfoString ,
   apset_path_OpenFile ,
+  apset_path_DestDir ,
+  apset_path_BackupDirMRU ,
+  apset_path_DestDirMRU ,
   apset_MaxValue
 } ApSettingId;

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

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

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

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

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

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

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

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

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

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

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

@@ -1,7 +1,7 @@
 /*
     MakeMKV GUI - Graphics user interface application for MakeMKV
 
-    Copyright (C) 2007-2015 GuinpinSoft inc <makemkvgui@makemkv.com>
+    Copyright (C) 2007-2016 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
@@ -17,10 +17,16 @@
 #include "qtapp.h"
 #include "image_defs.h"
 
-CDirSelectBox::CDirSelectBox(CDirSelectBox::Style BoxStyle,const QString &Name, QWidgetList widgets , QWidget *parent) : QGroupBox(Name,parent)
+CDirSelectBox::CDirSelectBox(CApClient* ap_client,CDirSelectBox::Style BoxStyle,const QString &Name, QWidgetList widgets , QWidget *parent) : QGroupBox(Name,parent)
 {
+    client = ap_client;
     style = BoxStyle;
-    lineEditDir = new QLineEdit();
+    comboBoxDir = new QComboBox();
+    comboBoxDir->setEditable(true);
+    comboBoxDir->setInsertPolicy(QComboBox::NoInsert);
+    lineEditDir = comboBoxDir->lineEdit();
+    appendName = NULL;
+
     connect(lineEditDir,SIGNAL(textChanged(const QString &)),this,SLOT(SlotTextChanged(const QString &)));
     QGridLayout *lay = new QGridLayout();
 
@@ -37,7 +43,7 @@
         connect(btn, SIGNAL(toggled(bool)) , this , SLOT(SlotRadioToggled()) );
     }
 
-    lay->addWidget(lineEditDir,row,0);
+    lay->addWidget(comboBoxDir,row,0);
     lay->setColumnStretch(0,2);
 
     static QIcon *set_folder_icon;
@@ -58,7 +64,8 @@
     case DirBoxDir:
         toolButtonAction  = new QAction(*set_folder_icon, Name, this);
         break;
-    case DirBoxOutDir:
+    case DirBoxOutDirMKV:
+    case DirBoxOutDirBackup:
         toolButtonAction  = new QAction(*set_out_folder_icon, UI_QSTRING(APP_IFACE_ACT_SETFOLDER_NAME), this);
         toolButtonAction->setStatusTip(UI_QSTRING(APP_IFACE_ACT_SETFOLDER_STIP));
         break;
@@ -79,6 +86,11 @@
     EmitValidChanged();
 }
 
+void CDirSelectBox::setAppendName(const QString* AppendName)
+{
+    appendName = AppendName;
+}
+
 void CDirSelectBox::setIndexValue(int Index)
 {
     if (Index>=MaxRadioButtons) return;
@@ -99,14 +111,31 @@
 void CDirSelectBox::SlotButtonPressed()
 {
     QString dir;
+
+    dir = lineEditDir->text();
+    if (appendName) {
+        unsigned int dlen = dir.length();
+        unsigned int alen = appendName->length();
+        if (dlen>(alen+1)) {
+            if ( (dir.at(dlen-(alen+1))==QLatin1Char('/')) ||
+                 (dir.at(dlen-(alen+1))==QLatin1Char('\\')) )
+            {
+                if (dir.endsWith(appendName)) {
+                    dir.chop(alen+1);
+                }
+            }
+        }
+    }
+
     switch(style)
     {
     case DirBoxDir:
-    case DirBoxOutDir:
+    case DirBoxOutDirMKV:
+    case DirBoxOutDirBackup:
         dir = QFileDialog::getExistingDirectory(
             this,
             UI_QSTRING(APP_IFACE_OPENFOLDER_TITLE),
-            lineEditDir->text());
+            dir);
         break;
     case DirBoxFile:
         dir = QFileDialog::getOpenFileName(
@@ -116,16 +145,79 @@
 
     if ( (dir.isEmpty()) || (dir.isNull()) ) return;
 
-    setText(dir);
+    if (appendName) {
+        dir = append(dir,appendName);
+    }
+
+    setText(dir,true);
+
+    if (client && (style==DirBoxOutDirMKV)) {
+        client->SetSettingString(apset_path_DestDirMRU,Utf16FromQString(getMRU()));
+    }
+    if (client && (style==DirBoxOutDirBackup)) {
+        client->SetSettingString(apset_path_BackupDirMRU,Utf16FromQString(getMRU()));
+    }
 }
 
-void CDirSelectBox::setText(const QString &Text)
+void CDirSelectBox::setText(const QString &Text,bool AddMRU)
 {
-    lineEditDir->setText(Text);
+    if (AddMRU) {
+        addMRU(Text,true);
+        lineEditDir->setText(Text);
+        comboBoxDir->setCurrentIndex(0);
+    } else {
+        lineEditDir->setText(Text);
+    }
     EmitValidChanged();
     emit SignalChanged();
 }
 
+void CDirSelectBox::clear()
+{
+    comboBoxDir->clear();
+    setText(QString(),false);
+}
+
+QString CDirSelectBox::append(const QString& Text,const QString* AppendName)
+{
+    QString path;
+
+    path.reserve( Text.length() + 2 + AppendName->length() );
+    path.append(Text);
+    if (!Text.endsWith(QLatin1Char('/'))) {
+        path.append(QLatin1Char('/'));
+    }
+    path.append(*AppendName);
+
+    return path;
+}
+
+void CDirSelectBox::setMRU(const utf16_t* Data,const QString* AppendLast)
+{
+    const utf16_t *start,*end;
+
+    if (Data==NULL) return;
+
+    start = Data;
+    while(start) {
+        QString path;
+
+        while(*start=='*') start++;
+        end = start;
+        while ( (*end!='*') && (*end!=0) ) end++;
+
+        if (start!=end) {
+            path = QStringFromUtf16(start,end-start);
+            if (AppendLast) {
+                path = append(path,AppendLast);
+            }
+            addMRU(path,false);
+        }
+        if (*end==0) break;
+        start = end+1;
+    }
+}
+
 QAction* CDirSelectBox::selectDialogAction()
 {
     return toolButtonAction;
@@ -164,9 +256,72 @@
 
 void CDirSelectBox::setDirEnabled(bool Enabled)
 {
-    lineEditDir->setEnabled(Enabled);
+    comboBoxDir->setEnabled(Enabled);
     toolButtonAction->setEnabled(Enabled);
 }
 
+void CDirSelectBox::addMRU(const QString &Text,bool Top)
+{
+    int count = comboBoxDir->count();
+
+    if (Text.length()==0) return;
+
+    bool added = false;
+    for (int i=0;i<count;i++)
+    {
+        if (Text == comboBoxDir->itemText(i)) {
+            if (Top) {
+                comboBoxDir->removeItem(i);
+                comboBoxDir->insertItem(0,Text);
+            };
+            added = true;

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

@@ -1,7 +1,7 @@
 /*
     MakeMKV GUI - Graphics user interface application for MakeMKV
 
-    Copyright (C) 2007-2015 GuinpinSoft inc <makemkvgui@makemkv.com>
+    Copyright (C) 2007-2016 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
@@ -26,34 +26,44 @@
     typedef enum Style
     {
         DirBoxDir,
-        DirBoxOutDir,
+        DirBoxOutDirMKV,
+        DirBoxOutDirBackup,
         DirBoxFile
     } Style;
 
 private:
+    CApClient*   client;
     QLineEdit*   lineEditDir;
+    QComboBox*   comboBoxDir;
+    QStringList  mru;
     QToolButton* toolButtonSelect;
     QAction*     toolButtonAction;
     bool         validState;
     Style        style;
-
+    const QString*  appendName;
 private:
 
     static const unsigned int MaxRadioButtons = 5;
     QAbstractButton*    radioButtons[MaxRadioButtons];
 
 public:
-    CDirSelectBox(CDirSelectBox::Style BoxStyle,const QString &Name, QWidgetList widgets = QWidgetList(), QWidget *parent = 0);
+    CDirSelectBox(CApClient* ap_client,CDirSelectBox::Style BoxStyle,const QString &Name, QWidgetList widgets = QWidgetList(), QWidget *parent = 0);
     void setIndexValue(int Index);
     int getIndexValue();
     bool IsDirValid();
-    void setText(const QString &Text);
+    void setText(const QString &Text,bool addMRU=false);
+    void setMRU(const utf16_t* Data,const QString* AppendLast=NULL);
     QString text();
     QAction* selectDialogAction();
     void setDirEnabled(bool Enabled);
+    QString getMRU();
+    void setAppendName(const QString* AppendName);
+    void clear();
 
 private:
     void EmitValidChanged();
+    void addMRU(const QString &Text,bool Top);
+    static QString append(const QString& Text,const QString* AppendName);
 
 private slots:
     void SlotButtonPressed();

makemkv-oss-1.9.5.tar.xz/makemkvgui/src/drivebox.cpp -> makemkv-oss-1.10.2.tar.xz/makemkvgui/src/drivebox.cpp Changed

makemkv-oss-1.9.5.tar.xz/makemkvgui/src/drivebox.h -> makemkv-oss-1.10.2.tar.xz/makemkvgui/src/drivebox.h Changed

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,7 +1,7 @@
 /*
     MakeMKV GUI - Graphics user interface application for MakeMKV
 
-    Copyright (C) 2007-2015 GuinpinSoft inc <makemkvgui@makemkv.com>
+    Copyright (C) 2007-2016 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
@@ -391,10 +391,14 @@
 
     QString name = DriveInfo[ndx].label;
 
-    dlg.backupDir->setText(QStringFromUtf16(m_app->GetAppString(AP_vastr_OutputBaseName)) + QLatin1String("/backup/") + name);
+    dlg.backupDir->setAppendName(&name);
+    dlg.backupDir->setText(QStringFromUtf16(m_app->GetAppString(AP_vastr_OutputBaseName)) + QLatin1String("/backup/") + name,true);
+    dlg.backupDir->setMRU(m_app->GetSettingString(apset_path_BackupDirMRU),&name);
 
     if (dlg.exec()==QDialog::Accepted)
     {
+        dlg.backupDir->setText(dlg.backupDir->text(),true);
+        m_app->SetSettingString(apset_path_BackupDirMRU,Utf16FromQString(dlg.backupDir->getMRU()));
         m_app->BackupDisc(ndx,Utf16FromQString(dlg.backupDir->text()),dlg.backupDecrypt);
     }
 }
@@ -403,6 +407,9 @@
 {
     m_FileInfo.setFile(saveFolderBox->text());
 
+    QString defPath = QStringFromUtf16(m_app->GetAppString(AP_vastr_OutputFolderName));
+    bool custPath = (defPath != saveFolderBox->text());
+
     SlotInfoCboxIndexChanged();
 
     QString absname;
@@ -435,9 +442,11 @@
 
     }
 
-    saveFolderBox->setText(absname);
+    saveFolderBox->setText(absname,custPath);
     m_app->SetOutputFolder(Utf16FromQString(absname));
 
+    m_app->SetSettingString(apset_path_DestDirMRU,Utf16FromQString(saveFolderBox->getMRU()));
+
     m_app->SaveAllSelectedTitlesToMkv();
 }
 
@@ -687,7 +696,7 @@
 
     QFrame* r_frame = new QFrame();
 
-    saveFolderBox = new CDirSelectBox(CDirSelectBox::DirBoxOutDir, UI_QSTRING(APP_IFACE_OPENFOLDER_INFO_TITLE) );
+    saveFolderBox = new CDirSelectBox(m_app,CDirSelectBox::DirBoxOutDirMKV, UI_QSTRING(APP_IFACE_OPENFOLDER_INFO_TITLE) );
     connect( saveFolderBox , SIGNAL(SignalDirValidChanged()) , this , SLOT(SlotOutputFolderEdited()) );
 
     QGroupBox* info_box = new QGroupBox(UI_QSTRING(APP_IFACE_MAIN_FRAME_INFO));

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

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

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

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

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

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

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

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

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

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

makemkv-oss-1.9.5.tar.xz/makemkvgui/src/qtgui.h -> makemkv-oss-1.10.2.tar.xz/makemkvgui/src/qtgui.h Changed

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

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

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

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

@@ -1,7 +1,7 @@
 /*
     MakeMKV GUI - Graphics user interface application for MakeMKV
 
-    Copyright (C) 2007-2015 GuinpinSoft inc <makemkvgui@makemkv.com>
+    Copyright (C) 2007-2016 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
@@ -29,7 +29,7 @@
     buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::Apply , Qt::Horizontal);
 
     // dvd
-    dvdTab = new CDVDTab();
+    dvdTab = new CDVDTab(client);
     tabWidget->addTab(dvdTab, UI_QSTRING(APP_TTREE_VIDEO));
 
     // IO
@@ -146,7 +146,8 @@
     // dvd
     const utf16_t *dest_path = client->GetSettingString(apset_app_DestinationDir);
     if (NULL==dest_path) dest_path=zero;
-    dvdTab->destinationDir->setText(QStringFromUtf16(dest_path));
+    dvdTab->destinationDir->setText(QStringFromUtf16(dest_path),true);
+    dvdTab->destinationDir->setMRU(client->GetSettingString(apset_path_DestDirMRU));
 
     int dest_type = client->GetSettingInt(apset_app_DestinationType);
     dvdTab->destinationDir->setIndexValue(dest_type);
@@ -157,6 +158,7 @@
     // prot
     int SpRemoveMethod = client->GetSettingInt(apset_dvd_SPRemoveMethod);
     protTab->comboBoxSpRemoveMethod->setCurrentIndex(SpRemoveMethod);
+    protTab->javaDir->setText(QStringFromUtf16( client->GetSettingString(apset_app_Java)));
 
     int dump_always = client->GetSettingInt(apset_bdplus_DumpAlways);
     protTab->check_DumpAlways->setCheckState( (dump_always==0) ? Qt::Unchecked : Qt::Checked );
@@ -249,6 +251,7 @@
     //prot
     client->SetSettingInt(apset_dvd_SPRemoveMethod,protTab->comboBoxSpRemoveMethod->currentIndex());
     client->SetSettingInt( apset_bdplus_DumpAlways , (protTab->check_DumpAlways->checkState() == Qt::Checked) ? 1 : 0 );
+    client->SetSettingString(apset_app_Java,Utf16FromQString(protTab->javaDir->text()));
 
     // stream
     client->SetSettingInt(apset_stream_EnableUPNP , (streamTab->checkEnableUpnp->checkState() == Qt::Checked) ? 1 : 0 );
@@ -330,7 +333,7 @@
     this->setLayout(lay);
 }
 
-CDVDTab::CDVDTab(QWidget *parent) : QWidget(parent)
+CDVDTab::CDVDTab(CApClient* client,QWidget *parent) : QWidget(parent)
 {
     radio_None = new QRadioButton(UI_QSTRING(APP_IFACE_SETTINGS_DEST_TYPE_NONE));
     radio_Auto = new QRadioButton(UI_QSTRING(APP_IFACE_SETTINGS_DEST_TYPE_AUTO));
@@ -343,7 +346,7 @@
     lst.append(radio_SemiAuto);
     lst.append(radio_Custom);
 
-    destinationDir = new CDirSelectBox(CDirSelectBox::DirBoxOutDir,UI_QSTRING(APP_IFACE_SETTINGS_DESTDIR),lst);
+    destinationDir = new CDirSelectBox(client,CDirSelectBox::DirBoxOutDirMKV,UI_QSTRING(APP_IFACE_SETTINGS_DESTDIR),lst);
 
     connect(destinationDir, SIGNAL(SignalIndexChanged()) , this , SLOT(SlotIndexChanged()) );
 
@@ -391,10 +394,13 @@
     m_lay->addWidget(check_DumpAlways,0,1);
     miscBox->setLayout(m_lay);
 
+    javaDir = new CDirSelectBox(NULL,CDirSelectBox::DirBoxFile,UI_QSTRING(APP_IFACE_SETTINGS_PROT_JAVA_PATH));
+
     QBoxLayout *lay = new QVBoxLayout();
 
     lay->addWidget(dvdBox);
     lay->addWidget(miscBox);
+    lay->addWidget(javaDir);
 
     lay->addStretch(2);
     this->setLayout(lay);
@@ -433,7 +439,7 @@
 
 CGeneralTab::CGeneralTab(QWidget *parent) : QWidget(parent)
 {
-    dataDir = new CDirSelectBox(CDirSelectBox::DirBoxDir,UI_QSTRING(APP_IFACE_SETTINGS_DATA_DIR));
+    dataDir = new CDirSelectBox(NULL,CDirSelectBox::DirBoxDir,UI_QSTRING(APP_IFACE_SETTINGS_DATA_DIR));
 
     QGroupBox* miscBox = new QGroupBox(UI_QSTRING(APP_IFACE_SETTINGS_GENERAL_MISC));
     QGridLayout *m_lay = new QGridLayout();
@@ -624,7 +630,7 @@
     b_lay->addWidget(lineEditSelection,1,1);
     box->setLayout(b_lay);
 
-    dtshddecDir = new CDirSelectBox(CDirSelectBox::DirBoxFile,UI_QSTRING(APP_IFACE_SETTINGS_ADV_DTSHDDEC_PATH));
+    dtshddecDir = new CDirSelectBox(NULL,CDirSelectBox::DirBoxFile,UI_QSTRING(APP_IFACE_SETTINGS_ADV_DTSHDDEC_PATH));
 
     QBoxLayout *lay = new QVBoxLayout();

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

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

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

@@ -1,7 +1,7 @@
 /*
     MakeMKV GUI - Graphics user interface application for MakeMKV
 
-    Copyright (C) 2007-2015 GuinpinSoft inc <makemkvgui@makemkv.com>
+    Copyright (C) 2007-2016 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[21356]={
+static const unsigned short en_po_str[21645]={
 '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,
@@ -126,7 +126,7 @@
 'P','r','o','c','e','s','s','i','n','g',' ','t','i','t','l','e','s',0,
 'V','C','-','1',' ','v','i','d','e','o',' ','s','t','r','e','a','m',' ','w','i','t','h','o','u','t',' ','T','F','C','N','T','R',' ','i','n','f','o','r','m','a','t','i','o','n',' ','i','s',' ','n','o','t',' ','s','u','p','p','o','r','t','e','d',',',' ','s','o','r','r','y','.',' ','F','e','w',' ','H','D','-','D','V','D','s',' ','u','s','e',' ','i','t',' ','a','n','y','w','a','y','.',0,
 'O','p','e','n','i','n','g',' ','M','K','V',' ','f','i','l','e',0,
-'T','r','a','c','k',' ','#','%','1',' ','o','f',' ','t','y','p','e',' ','%','2',' ','i','n',' ','M','K','V',' ','f','i','l','e',' ','i','s',' ','n','o','t',' ','r','e','c','o','g','n','i','z','e','d',' ','a','n','d',' ','w','a','s',' ','s','k','i','p','p','e','d','.',0,
+'T','r','a','c','k',' ','#','%','1',' ','o','f',' ','t','y','p','e',' ','%','2',' ','i','n',' ','%','3',' ','f','i','l','e',' ','i','s',' ','n','o','t',' ','r','e','c','o','g','n','i','z','e','d',' ','a','n','d',' ','w','a','s',' ','s','k','i','p','p','e','d','.',0,
 'M','K','V',' ','f','i','l','e',' ','h','a','s',' ','n','o',' ','v','i','d','e','o',' ','t','r','a','c','k','s',' ','a','n','d',' ','c','a','n',0x27,'t',' ','b','e',' ','o','p','e','n','e','d','.',0,
 'S','k','i','p','p','i','n','g',' ','A','V',' ','c','l','i','p',' ','%','1',' ','s','i','n','c','e',' ','i','t',' ','i','s',' ','n','o','t',' ','a',' ','v','i','d','e','o',' ','a','p','p','l','i','c','a','t','i','o','n',0,
 'A','A','C','S','-','p','r','o','t','e','c','t','e','d',' ','d','i','s','c','s',' ','t','h','a','t',' ','u','s','e',' ','S','K','B',' ','a','r','e',' ','n','o','t',' ','s','u','p','p','o','r','t','e','d',0,
@@ -172,6 +172,8 @@
 'H','i','g','h','e','s','t',' ','A','A','C','S',' ','v','e','r','s','i','o','n',' ','i','s',' ','v','%','1',' ',',',' ','M','K','B',' ','s','a','v','e','d',' ','a','s',' ','%','2',0,
 'I','t',' ','a','p','p','e','a','r','s',' ','t','h','a','t',' ','y','o','u',' ','a','r','e',' ','o','p','e','n','i','n','g',' ','t','h','e',' ','d','i','s','c',' ','p','r','o','c','e','s','s','e','d',' ','b','y',' ','D','v','d','F','a','b','/','M','a','c','T','h','e','R','i','p','p','e','r',' ','w','h','i','c','h',' ','i','s',' ','k','n','o','w','n',' ','t','o',' ','p','r','o','d','u','c','e',' ','d','a','m','a','g','e','d',' ','V','O','B',' ','f','i','l','e','s','.',' ','E','r','r','o','r','s',' ','m','a','y',' ','f','o','l','l','o','w',' ','-',' ','p','l','e','a','s','e',' ','u','s','e',' ','o','r','i','g','i','n','a','l',' ','d','i','s','c',' ','i','n','s','t','e','a','d','.',0,
 'B','o','t','h',' ','d','i','s','c',' ','a','n','d',' ','d','r','i','v','e',' ','r','e','q','u','i','r','e',' ','b','u','s',' ','e','n','c','r','y','p','t','i','o','n',',',' ','b','u','t',' ','t','h','e',' ','b','u','s',' ','k','e','y',' ','i','s',' ','n','o','t',' ','k','n','o','w','n','.',0,
+'U','s','i','n','g',' ','J','a','v','a',' ','r','u','n','t','i','m','e',' ','f','r','o','m',' ','%','1',0,
+'T','h','i','s',' ','d','i','s','c',' ','r','e','q','u','i','r','e','s',' ','J','a','v','a',' ','r','u','n','t','i','m','e',' ','(','J','R','E',')',',',' ','b','u','t',' ','n','o','n','e',' ','w','a','s',' ','f','o','u','n','d','.',' ','C','e','r','t','a','i','n',' ','f','u','n','c','t','i','o','n','s',' ','w','i','l','l',' ','f','a','i','l',',',' ','p','l','e','a','s','e',' ','i','n','s','t','a','l','l',' ','J','a','v','a','.',' ','S','e','e',' ','%','1',' ','f','o','r',' ','d','e','t','a','i','l','s','.',0,
 'P','r','o','c','e','s','s','i','n','g',' ','A','V',' ','c','l','i','p','s',0,
 'P','r','o','c','e','s','s','i','n','g',' ','m','o','v','i','e',' ','p','l','a','y','l','i','s','t','s',0,
 'D','e','c','r','y','p','t','i','n','g',0,
@@ -211,6 +213,7 @@
 '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,
+'C','l','i','p',' ','b','o','u','n','d','a','r','y',' ','n','o','t',' ','a','l','i','g','n','e','d',',',' ','m','o','v','i','n','g',' ','t','o',' ','t','h','e',' ','c','l','o','s','e','s','t',' ','a','l','i','g','n','e','d',' ','v','a','l','u','e',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,
@@ -308,6 +311,7 @@
 'S','t','e','r','e','o',0,
 'S','u','r','r','o','u','n','d',0,
 'M','a','k','e','M','K','V',' ','w','e','b','s','i','t','e',' ','a','d','d','r','e','s','s',' ','i','s',' ','%','1',0,
+'F','i','l','e',' ','"','%','1','"',' ','w','a','s',' ','s','k','i','p','p','e','d',0,
 'P','r','i','m','a','r','y',' ','t','i','t','l','e',0,
 'T','y','p','e',0,
 'N','a','m','e',0,
@@ -339,6 +343,8 @@
 'M','K','V',' ','F','l','a','g','s',0,
 'C','h','a','n','n','e','l',' ','l','a','y','o','u','t',0,
 'A','u','d','i','o',' ','m','i','x',0,
+'C','o','m','m','e','n','t',0,
+'3','D',' ','p','l','a','n','e',0,
 'C','o','p','y',' ','a','s',' ','i','s',0,
 'R','a','w',' ','L','P','C','M',' ','a','u','d','i','o',' ','w','i','t','h','o','u','t',' ','c','h','a','n','n','e','l',' ','c','o','n','f','i','g','u','r','a','t','i','o','n',' ','m','e','t','a','d','a','t','a',0,
 'L','P','C','M',' ','a','u','d','i','o',' ','i','n',' ','W','A','V',' ','c','o','n','t','a','i','n','e','r',' ','w','i','t','h',' ','c','h','a','n','n','e','l',' ','c','o','n','f','i','g','u','r','a','t','i','o','n',' ','m','e','t','a','d','a','t','a',0,
@@ -507,6 +513,7 @@
 'D','e','f','a','u','l','t',' ','s','e','l','e','c','t','i','o','n',' ','r','u','l','e',' ',':',0,
 'F','F','M','P','E','G',' ','l','o','c','a','t','i','o','n',0,
 'd','t','s','d','e','c','o','d','e','r','d','l','l','.','d','l','l',' ','l','o','c','a','t','i','o','n',0,
+'C','u','s','t','o','m',' ','J','a','v','a',' ','e','x','e','c','u','t','a','b','l','e',' ','l','o','c','a','t','i','o','n',0,
 'P','r','o','f','i','l','e',0,
 'P','r','o','p','e','r','t','i','e','s',0,
 'T','i','t','l','e',0,
@@ -559,7 +566,7 @@
 'O','S',' ','d','e','v','i','c','e',' ','n','a','m','e',':',' ',0,
 0};
 
-static const unsigned int en_po_off[1087]={
+static const unsigned int en_po_off[1101]={
 1000,0,1001,12,1002,36,1003,53,1004,77,1005,124,1006,135,1007,136,1008,226,1009,275,1010,301,
 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,
@@ -570,46 +577,46 @@
 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};
+3204,5602,3210,5699,3220,5716,3221,5783,3300,5833,3301,5889,3302,5941,3303,5988,3304,6055,3305,6076,3306,6130,
+3307,6229,3308,6260,3309,6302,3310,6348,3311,6440,3312,6507,3313,6584,3314,6652,3315,6701,3316,6724,3317,6747,
+3318,6769,3319,6822,3320,6884,3321,6944,3322,7022,3323,7074,3324,7133,3325,7179,3326,7232,3327,7305,3328,7369,
+3329,7418,3330,7511,3331,7568,3332,7602,3333,7628,3334,7693,3335,8092,3336,8460,3337,8843,3338,8922,3339,8958,
+3340,9007,3341,9080,3342,9126,3343,9299,3344,9373,3345,9400,3400,9529,3401,9549,3402,9576,3403,9587,3404,9605,
+3405,9626,3406,9634,3407,9654,4001,9667,4002,9750,4003,9816,4004,9881,4007,9964,4008,10026,4009,10084,4020,10195,
+4021,10230,4022,10282,4023,10314,4024,10378,4025,10412,4026,10458,4027,10505,4028,10553,4040,10596,4041,10674,4042,10733,
+4043,10785,4044,10882,4045,10953,4046,11051,4047,11094,4048,11132,4049,11167,4050,11219,4051,11300,4052,11350,4053,11381,
+4054,11532,4055,11549,4060,11612,4061,11669,4062,11731,4500,11826,4501,11907,4502,11932,4503,11965,4504,11999,5000,12051,
+5001,12076,5002,12128,5003,12145,5004,12180,5005,12207,5006,12223,5007,12246,5008,12269,5009,12310,5010,12343,5011,12363,
+5012,12396,5013,12435,5014,12490,5015,12525,5016,12594,5017,12618,5018,12637,5019,12661,5020,12686,5021,12841,5022,12987,
+5024,13070,5025,13101,5026,13117,5027,13124,5028,13136,5029,13148,5030,13158,5031,13170,5033,13182,5036,13193,5037,13225,
+5038,13268,5039,13433,5040,13614,5041,13840,5042,13987,5043,14037,5044,14133,5045,14146,5046,14160,5047,14173,5048,14191,
+5049,14206,5050,14213,5051,14263,5052,14421,5053,14594,5054,14790,5055,14850,5056,14918,5057,14986,5058,15014,5060,15161,
+5061,15170,5062,15183,5063,15194,5064,15206,5065,15212,5066,15220,5067,15235,5068,15241,5069,15307,5070,15321,5071,15333,
+5072,15510,5073,15543,5074,15623,5075,15749,5076,15800,5077,15861,5078,15900,5079,15962,5080,16005,5081,16020,5082,16033,
+5083,16077,5084,16147,5085,16224,5086,16288,5087,16296,5088,16317,5089,16341,5090,16352,5091,16357,5092,16364,5093,16373,
+5094,16403,5100,16425,5201,16439,5202,16444,5203,16449,5204,16458,5207,16467,5208,16473,5209,16488,5210,16497,5214,16502,
+5215,16511,5216,16517,5217,16534,5218,16546,5219,16562,5220,16573,5221,16586,5222,16597,5223,16603,5224,16613,5225,16629,
+5226,16643,5227,16655,5228,16665,5233,16683,5234,16696,5235,16710,5238,16729,5239,16739,5240,16749,5248,16764,5249,16774,
+5250,16782,5301,16791,5302,16802,5303,16856,5304,16920,5305,16931,5306,16948,5307,16958,5380,16968,5381,16976,6000,16983,
+6001,16996,6002,17015,6003,17034,6005,17068,6006,17089,6007,17103,6008,17185,6010,17199,6011,17211,6012,17218,6013,17262,
+6014,17269,6015,17294,6016,17312,6017,17359,6018,17380,6019,17401,6020,17407,6021,17414,6022,17431,6023,17438,6024,17471,
+6026,17495,6030,17552,6031,17558,6032,17564,6034,17570,6035,17578,6036,17588,6037,17596,6038,17621,6039,17633,6040,17645,
+6041,17674,6042,17729,6043,17742,6044,17770,6045,17783,6046,17796,6047,17818,6048,17828,6050,17852,6051,17897,6052,17990,
+6053,18002,6054,18018,6055,18034,6056,18049,6057,18062,6058,18083,6059,18089,6060,18096,6061,18103,6062,18116,6063,18130,
+6064,18147,6065,18165,6066,18181,6067,18194,6068,18206,6069,18220,6070,18225,6071,18234,6072,18241,6073,18248,6074,18256,
+6075,18269,6076,18274,6077,18298,6078,18329,6079,18384,6080,18454,6081,18462,6082,18467,6083,18486,6084,18510,6085,18530,
+6086,18535,6087,18568,6088,18610,6089,18630,6090,18635,6091,18640,6092,18649,6093,18656,6094,18676,6095,18690,6096,18711,
+6097,18719,6098,18743,6099,18805,6100,18826,6101,18837,6102,18849,6103,18857,6104,18862,6105,18887,6106,18894,6107,18919,
+6108,18940,6109,18981,6110,18998,6111,19009,6112,19026,6119,19040,6120,19070,6121,19099,6122,19128,6123,19162,6124,19193,
+6125,19225,6126,19245,6127,19275,6128,19303,6129,19325,6130,19339,6131,19365,6132,19373,6133,19396,6134,19407,6135,19419,
+6136,19439,6137,19459,6138,19471,6139,19736,6142,19768,6143,19791,6144,19802,6145,19819,6146,19829,6147,19854,6148,19862,
+6149,19882,6150,19924,6151,19948,6152,19988,6153,19997,6154,20018,6156,20039,6157,20044,6158,20049,6159,20075,6161,20088,
+6162,20102,6163,20128,6164,20146,6165,20149,6166,20159,6167,20170,6168,20193,6169,20221,6170,20235,6171,20270,6172,20303,
+6173,20312,6174,20330,6175,20355,6176,20371,6177,20398,6180,20430,6181,20438,6200,20449,6201,20455,6202,20461,6203,20467,
+6204,20477,6205,20482,6206,20494,6207,20503,6209,20517,6210,20530,6211,20541,6212,20556,6213,20568,6214,20577,6215,20588,
+6216,20597,6220,20605,6221,20629,6222,20642,6223,20653,6224,20663,6225,20676,6226,21045,6227,21063,6228,21164,6229,21175,
+6300,21192,6301,21221,6302,21239,6303,21254,6304,21264,6305,21275,6306,21291,6307,21310,6308,21326,6309,21349,6320,21372,
+6321,21404,6322,21436,6323,21461,6324,21477,6325,21489,6326,21501,6327,21521,6329,21540,6330,21561,6331,21594,6332,21627,0};
 
 extern "C" const unsigned short * en_po_getstr_utf16(unsigned int code)
 {

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

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

@@ -1,7 +1,7 @@
 /*
     MakeMKV GUI - Graphics user interface application for MakeMKV
 
-    Copyright (C) 2007-2015 GuinpinSoft inc <makemkvgui@makemkv.com>
+    Copyright (C) 2007-2016 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
@@ -112,6 +112,7 @@
 
     AppendItem(str,pi,ap_iaDateTime);
     AppendItem(str,pi,ap_iaName,expertMode);
+    AppendItem(str,pi,ap_iaComment);
     AppendItem(str,pi,ap_iaSourceFileName);
     AppendItem(str,pi,ap_iaOriginalTitleId);
     AppendItem(str,pi,ap_iaAngleInfo);
@@ -119,6 +120,7 @@
     AppendItem(str,pi,ap_iaDuration);
     AppendItem(str,pi,ap_iaChapterCount);
     AppendItem(str,pi,ap_iaCodecLong,ap_iaOutputCodecShort);
+    AppendItem(str,pi,ap_iaOffsetSequenceId);
     AppendItem(str,pi,ap_iaAudioChannelsCount,ap_iaOutputAudioChannelsCount);
     AppendItem(str,pi,ap_iaAudioChannelLayoutName,ap_iaOutputAudioChannelLayoutName);
     AppendItem(str,pi,ap_iaAudioSampleRate,ap_iaOutputAudioSampleRate);

makemkv-oss-1.9.5.tar.xz/msvc/inc/stdint.h -> makemkv-oss-1.10.2.tar.xz/msvc/inc/stdint.h Changed

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

Changes of Revision 35