Compare commits
3 Commits
dev
...
release-1.
| Author | SHA1 | Date | |
|---|---|---|---|
|
14c9e3ad3b | ||
|
|
51f99000c5 | ||
|
|
f12d63c798 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1 +0,0 @@
|
|||||||
*.[ao]
|
|
||||||
10
ChangeLog
10
ChangeLog
@@ -1,12 +1,3 @@
|
|||||||
2013-03-19 mosu/robux4
|
|
||||||
New 1.4.0 version:
|
|
||||||
* Note that this release is not binary compatible to 1.3.0 due to
|
|
||||||
the dependancy on libEBML 1.3.0 which is not binary compatible
|
|
||||||
to its predecessor.
|
|
||||||
- Added new elements CueDuration, CueRelativePosition,
|
|
||||||
ChapterStringUID, VideoAlphaMode and DefaultDecodedFieldDuration
|
|
||||||
- Removed the Debian build files from our package.
|
|
||||||
|
|
||||||
2011-09-23 robux4/mosu
|
2011-09-23 robux4/mosu
|
||||||
New 1.3.0 version:
|
New 1.3.0 version:
|
||||||
- initialize all data members
|
- initialize all data members
|
||||||
@@ -1990,3 +1981,4 @@ New 0.9.0 version:
|
|||||||
trunk/libmatroska/test/utf8,
|
trunk/libmatroska/test/utf8,
|
||||||
trunk/libmatroska/test/utf8/test5.cpp: Initial CVS version after
|
trunk/libmatroska/test/utf8/test5.cpp: Initial CVS version after
|
||||||
the crash
|
the crash
|
||||||
|
|
||||||
|
|||||||
1006
LICENSE.LGPL
1006
LICENSE.LGPL
File diff suppressed because it is too large
Load Diff
204
debian/changelog
vendored
Normal file
204
debian/changelog
vendored
Normal file
@@ -0,0 +1,204 @@
|
|||||||
|
libmatroska (1.3.0-1) natty; urgency=low
|
||||||
|
|
||||||
|
* New version.
|
||||||
|
|
||||||
|
-- Moritz Bunkus <moritz@bunkus.org> Fri, 23 Sep 2011 13:54:26 +0200
|
||||||
|
|
||||||
|
libmatroska (1.2.0-1) natty; urgency=low
|
||||||
|
|
||||||
|
* New version.
|
||||||
|
|
||||||
|
-- Moritz Bunkus <moritz@bunkus.org> Wed, 15 Jun 2011 13:58:59 +0200
|
||||||
|
|
||||||
|
libmatroska (1.1.0-1) lucid; urgency=low
|
||||||
|
|
||||||
|
* New version.
|
||||||
|
|
||||||
|
-- Moritz Bunkus <moritz@bunkus.org> Sun, 30 Jan 2011 15:30:00 +0200
|
||||||
|
|
||||||
|
libmatroska (1.0.0-1) lucid; urgency=low
|
||||||
|
|
||||||
|
* New version.
|
||||||
|
|
||||||
|
-- Moritz Bunkus <moritz@bunkus.org> Sat, 05 Jun 2010 10:39:00 +0200
|
||||||
|
|
||||||
|
libmatroska (0.9.0-1) karmic; urgency=low
|
||||||
|
|
||||||
|
* New version.
|
||||||
|
|
||||||
|
-- Moritz Bunkus <moritz@bunkus.org> Sun, 09 May 2010 16:59:20 +0200
|
||||||
|
|
||||||
|
libmatroska (0.8.1-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* New version.
|
||||||
|
|
||||||
|
-- Moritz Bunkus <moritz@bunkus.org> Mon, 16 Jan 2007 17:00:30 +0100
|
||||||
|
|
||||||
|
libmatroska (0.8.0-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* New version.
|
||||||
|
|
||||||
|
-- Moritz Bunkus <moritz@bunkus.org> Tue, 18 Oct 2005 20:00:18 +0200
|
||||||
|
|
||||||
|
libmatroska (0.7.7-2) unstable; urgency=low
|
||||||
|
|
||||||
|
* Rebuilt with g++ 4.0.2.
|
||||||
|
|
||||||
|
-- Moritz Bunkus <moritz@bunkus.org> Sat, 15 Oct 2005 14:25:46 +0200
|
||||||
|
|
||||||
|
libmatroska (0.7.7-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* New version.
|
||||||
|
|
||||||
|
-- Moritz Bunkus <moritz@bunkus.org> Fri, 20 May 2005 16:28:21 +0200
|
||||||
|
|
||||||
|
libmatroska (0.7.6-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* New version.
|
||||||
|
|
||||||
|
-- Moritz Bunkus <moritz@bunkus.org> Sat, 16 Apr 2005 13:24:30 +0200
|
||||||
|
|
||||||
|
libmatroska (0.7.5-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* New version.
|
||||||
|
|
||||||
|
-- Moritz Bunkus <moritz@bunkus.org> Sun, 6 Feb 2005 21:02:42 +0100
|
||||||
|
|
||||||
|
libmatroska (0.7.4-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* New version.
|
||||||
|
|
||||||
|
-- Moritz Bunkus <moritz@bunkus.org> Sun, 26 Sep 2004 12:35:05 +0200
|
||||||
|
|
||||||
|
libmatroska (0.7.3-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* New version.
|
||||||
|
|
||||||
|
-- Moritz Bunkus <moritz@bunkus.org> Mon, 16 Aug 2004 22:52:57 +0200
|
||||||
|
|
||||||
|
libmatroska (0.7.2-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* New version.
|
||||||
|
|
||||||
|
-- Moritz Bunkus <moritz@bunkus.org> Wed, 4 Aug 2004 19:49:25 +0200
|
||||||
|
|
||||||
|
libmatroska (0.7.1-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* New version.
|
||||||
|
|
||||||
|
-- Moritz Bunkus <moritz@bunkus.org> Sun, 25 Jul 2004 12:41:11 +0200
|
||||||
|
|
||||||
|
libmatroska (0.7.0-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* New version.
|
||||||
|
|
||||||
|
-- Moritz Bunkus <moritz@bunkus.org> Fri, 23 Apr 2004 18:45:32 +0200
|
||||||
|
|
||||||
|
libmatroska (0.6.3-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* New version.
|
||||||
|
|
||||||
|
-- Moritz Bunkus <moritz@bunkus.org> Mon, 5 Jan 2004 19:55:59 +0100
|
||||||
|
|
||||||
|
libmatroska (0.6.2-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* New version.
|
||||||
|
|
||||||
|
-- Moritz Bunkus <moritz@bunkus.org> Tue, 30 Dec 2003 10:59:47 +0100
|
||||||
|
|
||||||
|
libmatroska (0.6.1-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* New version.
|
||||||
|
|
||||||
|
-- Moritz Bunkus <moritz@bunkus.org> Thu, 30 Oct 2003 13:49:33 +0100
|
||||||
|
|
||||||
|
libmatroska (0.6.0-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* New version.
|
||||||
|
|
||||||
|
-- Moritz Bunkus <moritz@bunkus.org> Tue, 28 Oct 2003 23:09:34 +0100
|
||||||
|
|
||||||
|
libmatroska (0.5.3-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* New version.
|
||||||
|
|
||||||
|
-- Moritz Bunkus <moritz@bunkus.org> Wed, 22 Oct 2003 19:22:10 +0200
|
||||||
|
|
||||||
|
libmatroska (0.5.2-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* New version.
|
||||||
|
|
||||||
|
-- Moritz Bunkus <moritz@bunkus.org> Wed, 17 Sep 2003 22:22:10 +0200
|
||||||
|
|
||||||
|
libmatroska (0.5.1-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* New version.
|
||||||
|
|
||||||
|
-- Moritz Bunkus <moritz@bunkus.org> Mon, 1 Sep 2003 13:42:56 +0200
|
||||||
|
|
||||||
|
libmatroska (0.5.0-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* New version.
|
||||||
|
|
||||||
|
-- Moritz Bunkus <moritz@bunkus.org> Mon, 28 Jul 2003 10:49:27 +0200
|
||||||
|
|
||||||
|
libmatroska (0.4.4-2) unstable; urgency=low
|
||||||
|
|
||||||
|
* New version.
|
||||||
|
|
||||||
|
-- Moritz Bunkus <moritz@bunkus.org> Sat, 14 Jun 2003 17:40:11 +0200
|
||||||
|
|
||||||
|
libmatroska (0.4.4-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* New version.
|
||||||
|
|
||||||
|
-- Moritz Bunkus <moritz@bunkus.org> Wed, 11 Jun 2003 20:32:09 +0200
|
||||||
|
|
||||||
|
libmatroska (0.4.3-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* New version with API changes.
|
||||||
|
|
||||||
|
-- Moritz Bunkus <moritz@bunkus.org> Wed, 21 May 2003 22:35:52 +0200
|
||||||
|
|
||||||
|
libmatroska (0.4.2-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* New version with API changes.
|
||||||
|
|
||||||
|
-- Moritz Bunkus <moritz@bunkus.org> Tue, 6 May 2003 22:33:44 +0200
|
||||||
|
|
||||||
|
libmatroska (0.4.1-2) unstable; urgency=low
|
||||||
|
|
||||||
|
* Compiled with gcc 3.2.3
|
||||||
|
|
||||||
|
-- Moritz Bunkus <moritz@bunkus.org> Sun, 04 May 2003 22:11:33 +0200
|
||||||
|
|
||||||
|
libmatroska (0.4.1-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* Some bugfixes, memleak fixed.
|
||||||
|
|
||||||
|
-- Moritz Bunkus <moritz@bunkus.org> Sat, 03 May 2003 23:07:33 +0200
|
||||||
|
|
||||||
|
libmatroska (0.4.0-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* First alpha release :)
|
||||||
|
|
||||||
|
-- Moritz Bunkus <moritz@bunkus.org> Wed, 30 Apr 2003 10:44:33 +0200
|
||||||
|
|
||||||
|
libmatroska (0.2.0.20030425) unstable; urgency=low
|
||||||
|
|
||||||
|
* New version with bugfixes by Steve.
|
||||||
|
|
||||||
|
-- Moritz Bunkus <moritz@bunkus.org> Fri, 25 Apr 2003 20:01:49 +0200
|
||||||
|
|
||||||
|
libmatroska (0.2.0.20030421) unstable; urgency=low
|
||||||
|
|
||||||
|
* Separated libebml from libmatroska like in the upstream sources.)
|
||||||
|
|
||||||
|
-- Moritz Bunkus <moritz@bunkus.org> Mon, 21 Apr 2003 16:33:36 +0200
|
||||||
|
|
||||||
|
libmatroska (0.0.20030225) unstable; urgency=low
|
||||||
|
|
||||||
|
* Initial Release.
|
||||||
|
|
||||||
|
-- Moritz Bunkus <moritz@bunkus.org> Tue, 25 Feb 2003 18:28:52 +0100
|
||||||
|
|
||||||
17
debian/control
vendored
Normal file
17
debian/control
vendored
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
Source: libmatroska
|
||||||
|
Priority: optional
|
||||||
|
Maintainer: Moritz Bunkus <moritz@bunkus.org>
|
||||||
|
Build-Depends: debhelper (>> 3.0.0), libebml-dev (>= 1.0.0-1)
|
||||||
|
Standards-Version: 3.5.8
|
||||||
|
Section: libs
|
||||||
|
|
||||||
|
Package: libmatroska-dev
|
||||||
|
Section: libdevel
|
||||||
|
Architecture: any
|
||||||
|
Depends: libebml-dev (>= 1.0.0-1)
|
||||||
|
Description: an extensible open standard Audio/Video container format
|
||||||
|
Matroska is aiming to become the standard of Multimedia
|
||||||
|
Container Formats one day. It is based on EBML (Extensible Binary
|
||||||
|
Meta Language), a kind of binary version of XML. This way the
|
||||||
|
significant advantages in terms of future format extensability
|
||||||
|
are gained without breaking file support in old parsers.
|
||||||
26
debian/copyright
vendored
Normal file
26
debian/copyright
vendored
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
This package was debianized by Moritz Bunkus <moritz@bunkus.org> on
|
||||||
|
Mon, 21 Apr 2003 12:49:33 +0200.
|
||||||
|
|
||||||
|
It was downloaded from http://www.matroska.org/
|
||||||
|
|
||||||
|
Upstream Author: Steve Lhomme <steve.lhomme@free.fr>
|
||||||
|
|
||||||
|
Copyright (C) 2002-2003 Steve Lhomme. All rights reserved.
|
||||||
|
|
||||||
|
This file may be distributed under the terms of the Q Public License
|
||||||
|
as defined by Trolltech AS of Norway and appearing in the file
|
||||||
|
LICENSE.QPL included in the packaging of this file.
|
||||||
|
|
||||||
|
This proram is also licensed under the GPL. See
|
||||||
|
/usr/share/common-licenses/GPL for details.
|
||||||
|
|
||||||
|
Licensees holding an other license may use this file in accordance with
|
||||||
|
the Agreement provided with the Software.
|
||||||
|
|
||||||
|
This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
|
||||||
|
WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
|
|
||||||
|
See http://www.matroska.org/license/qpl/ for QPL licensing information.
|
||||||
|
|
||||||
|
Contact license@matroska.org if any conditions of this licensing are
|
||||||
|
not clear to you.
|
||||||
2
debian/dirs
vendored
Normal file
2
debian/dirs
vendored
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
usr/bin
|
||||||
|
usr/sbin
|
||||||
0
debian/docs
vendored
Normal file
0
debian/docs
vendored
Normal file
2
debian/libmatroska-dev.dirs
vendored
Normal file
2
debian/libmatroska-dev.dirs
vendored
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
usr/lib
|
||||||
|
usr/include
|
||||||
2
debian/libmatroska-dev.files
vendored
Normal file
2
debian/libmatroska-dev.files
vendored
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
usr/include/*
|
||||||
|
usr/lib/lib*.a
|
||||||
95
debian/rules
vendored
Normal file
95
debian/rules
vendored
Normal file
@@ -0,0 +1,95 @@
|
|||||||
|
#!/usr/bin/make -f
|
||||||
|
# Sample debian/rules that uses debhelper.
|
||||||
|
# GNU copyright 1997 to 1999 by Joey Hess.
|
||||||
|
|
||||||
|
# Uncomment this to turn on verbose mode.
|
||||||
|
#export DH_VERBOSE=1
|
||||||
|
|
||||||
|
# This is the debhelper compatibility version to use.
|
||||||
|
export DH_COMPAT=4
|
||||||
|
|
||||||
|
# shared library versions, option 1
|
||||||
|
version=2.0.5
|
||||||
|
major=2
|
||||||
|
# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
|
||||||
|
#version=`ls src/.libs/lib*.so.* | \
|
||||||
|
# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
|
||||||
|
#major=`ls src/.libs/lib*.so.* | \
|
||||||
|
# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
|
||||||
|
|
||||||
|
# configure: configure-stamp
|
||||||
|
# configure-stamp:
|
||||||
|
# dh_testdir
|
||||||
|
# # Add here commands to configure the package.
|
||||||
|
|
||||||
|
# touch configure-stamp
|
||||||
|
|
||||||
|
|
||||||
|
build: build-stamp
|
||||||
|
build-stamp:
|
||||||
|
dh_testdir
|
||||||
|
|
||||||
|
# Add here commands to compile the package.
|
||||||
|
$(MAKE) -C make/linux $(DEB_BUILD_OPTIONS) LIBEBML_INCLUDE_DIR=/usr/include/ebml staticlib
|
||||||
|
|
||||||
|
touch build-stamp
|
||||||
|
|
||||||
|
clean:
|
||||||
|
dh_testdir
|
||||||
|
dh_testroot
|
||||||
|
rm -f build-stamp
|
||||||
|
|
||||||
|
# Add here commands to clean up after the build process.
|
||||||
|
-$(MAKE) -C make/linux $(DEB_BUILD_OPTIONS) clean
|
||||||
|
|
||||||
|
dh_clean
|
||||||
|
|
||||||
|
install: build
|
||||||
|
dh_testdir
|
||||||
|
dh_testroot
|
||||||
|
dh_clean -k
|
||||||
|
dh_installdirs
|
||||||
|
|
||||||
|
# Add here commands to install the package into debian/tmp
|
||||||
|
$(MAKE) -C make/linux prefix=$(CURDIR)/debian/tmp/usr \
|
||||||
|
install_headers install_staticlib
|
||||||
|
|
||||||
|
|
||||||
|
# Build architecture-independent files here.
|
||||||
|
binary-indep: build install
|
||||||
|
# We have nothing to do by default.
|
||||||
|
|
||||||
|
# Build architecture-dependent files here.
|
||||||
|
binary-arch: build install
|
||||||
|
dh_testdir
|
||||||
|
dh_testroot
|
||||||
|
dh_movefiles
|
||||||
|
|
||||||
|
# dh_installdebconf
|
||||||
|
dh_installdocs
|
||||||
|
# dh_installexamples
|
||||||
|
# dh_installmenu
|
||||||
|
# dh_installlogrotate
|
||||||
|
# dh_installemacsen
|
||||||
|
# dh_installpam
|
||||||
|
# dh_installmime
|
||||||
|
# dh_installinit
|
||||||
|
# dh_installcron
|
||||||
|
# dh_installman
|
||||||
|
# dh_installinfo
|
||||||
|
# dh_undocumented
|
||||||
|
dh_installchangelogs ChangeLog
|
||||||
|
dh_link
|
||||||
|
# dh_strip
|
||||||
|
dh_compress
|
||||||
|
dh_fixperms
|
||||||
|
dh_makeshlibs
|
||||||
|
dh_installdeb
|
||||||
|
# dh_perl
|
||||||
|
dh_shlibdeps
|
||||||
|
dh_gencontrol
|
||||||
|
dh_md5sums
|
||||||
|
dh_builddeb
|
||||||
|
|
||||||
|
binary: binary-indep binary-arch
|
||||||
|
.PHONY: build clean binary-indep binary-arch binary install configure
|
||||||
422
make/Doxyfile
422
make/Doxyfile
@@ -1,211 +1,211 @@
|
|||||||
# Doxyfile 1.3
|
# Doxyfile 1.3
|
||||||
|
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
# General configuration options
|
# General configuration options
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
PROJECT_NAME = libmatroska
|
PROJECT_NAME = libmatroska
|
||||||
PROJECT_NUMBER = 0.5.0
|
PROJECT_NUMBER = 0.5.0
|
||||||
OUTPUT_DIRECTORY = ../../doc/src
|
OUTPUT_DIRECTORY = ../../doc/src
|
||||||
OUTPUT_LANGUAGE = English
|
OUTPUT_LANGUAGE = English
|
||||||
USE_WINDOWS_ENCODING = YES
|
USE_WINDOWS_ENCODING = YES
|
||||||
EXTRACT_ALL = YES
|
EXTRACT_ALL = YES
|
||||||
EXTRACT_PRIVATE = NO
|
EXTRACT_PRIVATE = NO
|
||||||
EXTRACT_STATIC = YES
|
EXTRACT_STATIC = YES
|
||||||
EXTRACT_LOCAL_CLASSES = YES
|
EXTRACT_LOCAL_CLASSES = YES
|
||||||
HIDE_UNDOC_MEMBERS = NO
|
HIDE_UNDOC_MEMBERS = NO
|
||||||
HIDE_UNDOC_CLASSES = NO
|
HIDE_UNDOC_CLASSES = NO
|
||||||
HIDE_FRIEND_COMPOUNDS = NO
|
HIDE_FRIEND_COMPOUNDS = NO
|
||||||
HIDE_IN_BODY_DOCS = NO
|
HIDE_IN_BODY_DOCS = NO
|
||||||
BRIEF_MEMBER_DESC = YES
|
BRIEF_MEMBER_DESC = YES
|
||||||
REPEAT_BRIEF = YES
|
REPEAT_BRIEF = YES
|
||||||
ALWAYS_DETAILED_SEC = NO
|
ALWAYS_DETAILED_SEC = NO
|
||||||
INLINE_INHERITED_MEMB = YES
|
INLINE_INHERITED_MEMB = YES
|
||||||
FULL_PATH_NAMES = NO
|
FULL_PATH_NAMES = NO
|
||||||
STRIP_FROM_PATH =
|
STRIP_FROM_PATH =
|
||||||
INTERNAL_DOCS = NO
|
INTERNAL_DOCS = NO
|
||||||
CASE_SENSE_NAMES = YES
|
CASE_SENSE_NAMES = YES
|
||||||
SHORT_NAMES = NO
|
SHORT_NAMES = NO
|
||||||
HIDE_SCOPE_NAMES = NO
|
HIDE_SCOPE_NAMES = NO
|
||||||
VERBATIM_HEADERS = YES
|
VERBATIM_HEADERS = YES
|
||||||
SHOW_INCLUDE_FILES = NO
|
SHOW_INCLUDE_FILES = NO
|
||||||
JAVADOC_AUTOBRIEF = YES
|
JAVADOC_AUTOBRIEF = YES
|
||||||
MULTILINE_CPP_IS_BRIEF = NO
|
MULTILINE_CPP_IS_BRIEF = NO
|
||||||
DETAILS_AT_TOP = YES
|
DETAILS_AT_TOP = YES
|
||||||
INHERIT_DOCS = YES
|
INHERIT_DOCS = YES
|
||||||
INLINE_INFO = YES
|
INLINE_INFO = YES
|
||||||
SORT_MEMBER_DOCS = NO
|
SORT_MEMBER_DOCS = NO
|
||||||
DISTRIBUTE_GROUP_DOC = NO
|
DISTRIBUTE_GROUP_DOC = NO
|
||||||
TAB_SIZE = 2
|
TAB_SIZE = 2
|
||||||
GENERATE_TODOLIST = YES
|
GENERATE_TODOLIST = YES
|
||||||
GENERATE_TESTLIST = YES
|
GENERATE_TESTLIST = YES
|
||||||
GENERATE_BUGLIST = YES
|
GENERATE_BUGLIST = YES
|
||||||
GENERATE_DEPRECATEDLIST= YES
|
GENERATE_DEPRECATEDLIST= YES
|
||||||
ALIASES =
|
ALIASES =
|
||||||
ENABLED_SECTIONS =
|
ENABLED_SECTIONS =
|
||||||
MAX_INITIALIZER_LINES = 30
|
MAX_INITIALIZER_LINES = 30
|
||||||
OPTIMIZE_OUTPUT_FOR_C = NO
|
OPTIMIZE_OUTPUT_FOR_C = NO
|
||||||
OPTIMIZE_OUTPUT_JAVA = NO
|
OPTIMIZE_OUTPUT_JAVA = NO
|
||||||
SHOW_USED_FILES = YES
|
SHOW_USED_FILES = YES
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
# configuration options related to warning and progress messages
|
# configuration options related to warning and progress messages
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
QUIET = NO
|
QUIET = NO
|
||||||
WARNINGS = YES
|
WARNINGS = YES
|
||||||
WARN_IF_UNDOCUMENTED = YES
|
WARN_IF_UNDOCUMENTED = YES
|
||||||
WARN_IF_DOC_ERROR = YES
|
WARN_IF_DOC_ERROR = YES
|
||||||
WARN_FORMAT = "$file:$line: $text"
|
WARN_FORMAT = "$file:$line: $text"
|
||||||
WARN_LOGFILE =
|
WARN_LOGFILE =
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
# configuration options related to the input files
|
# configuration options related to the input files
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
INPUT = ../../libebml/src \
|
INPUT = ../../libebml/src \
|
||||||
../../libebml/src/platform/win32 \
|
../../libebml/src/platform/win32 \
|
||||||
../../libebml/ebml \
|
../../libebml/ebml \
|
||||||
../../libebml/ebml/c \
|
../../libebml/ebml/c \
|
||||||
../src \
|
../src \
|
||||||
../matroska \
|
../matroska \
|
||||||
../matroska/c
|
../matroska/c
|
||||||
FILE_PATTERNS = *.cpp \
|
FILE_PATTERNS = *.cpp \
|
||||||
*.h
|
*.h
|
||||||
RECURSIVE = NO
|
RECURSIVE = NO
|
||||||
EXCLUDE =
|
EXCLUDE =
|
||||||
EXCLUDE_SYMLINKS = NO
|
EXCLUDE_SYMLINKS = NO
|
||||||
EXCLUDE_PATTERNS =
|
EXCLUDE_PATTERNS =
|
||||||
EXAMPLE_PATH =
|
EXAMPLE_PATH =
|
||||||
EXAMPLE_PATTERNS =
|
EXAMPLE_PATTERNS =
|
||||||
EXAMPLE_RECURSIVE = NO
|
EXAMPLE_RECURSIVE = NO
|
||||||
IMAGE_PATH =
|
IMAGE_PATH =
|
||||||
INPUT_FILTER =
|
INPUT_FILTER =
|
||||||
FILTER_SOURCE_FILES = NO
|
FILTER_SOURCE_FILES = NO
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
# configuration options related to source browsing
|
# configuration options related to source browsing
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
SOURCE_BROWSER = YES
|
SOURCE_BROWSER = YES
|
||||||
INLINE_SOURCES = NO
|
INLINE_SOURCES = NO
|
||||||
STRIP_CODE_COMMENTS = YES
|
STRIP_CODE_COMMENTS = YES
|
||||||
REFERENCED_BY_RELATION = NO
|
REFERENCED_BY_RELATION = NO
|
||||||
REFERENCES_RELATION = YES
|
REFERENCES_RELATION = YES
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
# configuration options related to the alphabetical class index
|
# configuration options related to the alphabetical class index
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
ALPHABETICAL_INDEX = NO
|
ALPHABETICAL_INDEX = NO
|
||||||
COLS_IN_ALPHA_INDEX = 5
|
COLS_IN_ALPHA_INDEX = 5
|
||||||
IGNORE_PREFIX =
|
IGNORE_PREFIX =
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
# configuration options related to the HTML output
|
# configuration options related to the HTML output
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
GENERATE_HTML = YES
|
GENERATE_HTML = YES
|
||||||
HTML_OUTPUT = html
|
HTML_OUTPUT = html
|
||||||
HTML_FILE_EXTENSION = .html
|
HTML_FILE_EXTENSION = .html
|
||||||
HTML_HEADER =
|
HTML_HEADER =
|
||||||
HTML_FOOTER =
|
HTML_FOOTER =
|
||||||
HTML_STYLESHEET = libmatroska.css
|
HTML_STYLESHEET = libmatroska.css
|
||||||
HTML_ALIGN_MEMBERS = YES
|
HTML_ALIGN_MEMBERS = YES
|
||||||
GENERATE_HTMLHELP = NO
|
GENERATE_HTMLHELP = NO
|
||||||
CHM_FILE =
|
CHM_FILE =
|
||||||
HHC_LOCATION =
|
HHC_LOCATION =
|
||||||
GENERATE_CHI = NO
|
GENERATE_CHI = NO
|
||||||
BINARY_TOC = NO
|
BINARY_TOC = NO
|
||||||
TOC_EXPAND = NO
|
TOC_EXPAND = NO
|
||||||
DISABLE_INDEX = NO
|
DISABLE_INDEX = NO
|
||||||
ENUM_VALUES_PER_LINE = 4
|
ENUM_VALUES_PER_LINE = 4
|
||||||
GENERATE_TREEVIEW = NO
|
GENERATE_TREEVIEW = NO
|
||||||
TREEVIEW_WIDTH = 250
|
TREEVIEW_WIDTH = 250
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
# configuration options related to the LaTeX output
|
# configuration options related to the LaTeX output
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
GENERATE_LATEX = YES
|
GENERATE_LATEX = YES
|
||||||
LATEX_OUTPUT = latex
|
LATEX_OUTPUT = latex
|
||||||
LATEX_CMD_NAME = latex
|
LATEX_CMD_NAME = latex
|
||||||
MAKEINDEX_CMD_NAME = makeindex
|
MAKEINDEX_CMD_NAME = makeindex
|
||||||
COMPACT_LATEX = YES
|
COMPACT_LATEX = YES
|
||||||
PAPER_TYPE = a4wide
|
PAPER_TYPE = a4wide
|
||||||
EXTRA_PACKAGES =
|
EXTRA_PACKAGES =
|
||||||
LATEX_HEADER =
|
LATEX_HEADER =
|
||||||
PDF_HYPERLINKS = YES
|
PDF_HYPERLINKS = YES
|
||||||
USE_PDFLATEX = YES
|
USE_PDFLATEX = YES
|
||||||
LATEX_BATCHMODE = NO
|
LATEX_BATCHMODE = NO
|
||||||
LATEX_HIDE_INDICES = NO
|
LATEX_HIDE_INDICES = NO
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
# configuration options related to the RTF output
|
# configuration options related to the RTF output
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
GENERATE_RTF = YES
|
GENERATE_RTF = YES
|
||||||
RTF_OUTPUT = rtf
|
RTF_OUTPUT = rtf
|
||||||
COMPACT_RTF = NO
|
COMPACT_RTF = NO
|
||||||
RTF_HYPERLINKS = YES
|
RTF_HYPERLINKS = YES
|
||||||
RTF_STYLESHEET_FILE =
|
RTF_STYLESHEET_FILE =
|
||||||
RTF_EXTENSIONS_FILE =
|
RTF_EXTENSIONS_FILE =
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
# configuration options related to the man page output
|
# configuration options related to the man page output
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
GENERATE_MAN = NO
|
GENERATE_MAN = NO
|
||||||
MAN_OUTPUT = man
|
MAN_OUTPUT = man
|
||||||
MAN_EXTENSION = .3
|
MAN_EXTENSION = .3
|
||||||
MAN_LINKS = YES
|
MAN_LINKS = YES
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
# configuration options related to the XML output
|
# configuration options related to the XML output
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
GENERATE_XML = NO
|
GENERATE_XML = NO
|
||||||
XML_SCHEMA =
|
XML_SCHEMA =
|
||||||
XML_DTD =
|
XML_DTD =
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
# configuration options for the AutoGen Definitions output
|
# configuration options for the AutoGen Definitions output
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
GENERATE_AUTOGEN_DEF = NO
|
GENERATE_AUTOGEN_DEF = NO
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
# configuration options related to the Perl module output
|
# configuration options related to the Perl module output
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
GENERATE_PERLMOD = NO
|
GENERATE_PERLMOD = NO
|
||||||
PERLMOD_LATEX = NO
|
PERLMOD_LATEX = NO
|
||||||
PERLMOD_PRETTY = YES
|
PERLMOD_PRETTY = YES
|
||||||
PERLMOD_MAKEVAR_PREFIX =
|
PERLMOD_MAKEVAR_PREFIX =
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
# Configuration options related to the preprocessor
|
# Configuration options related to the preprocessor
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
ENABLE_PREPROCESSING = YES
|
ENABLE_PREPROCESSING = YES
|
||||||
MACRO_EXPANSION = NO
|
MACRO_EXPANSION = NO
|
||||||
EXPAND_ONLY_PREDEF = NO
|
EXPAND_ONLY_PREDEF = NO
|
||||||
SEARCH_INCLUDES = YES
|
SEARCH_INCLUDES = YES
|
||||||
INCLUDE_PATH =
|
INCLUDE_PATH =
|
||||||
INCLUDE_FILE_PATTERNS =
|
INCLUDE_FILE_PATTERNS =
|
||||||
PREDEFINED =
|
PREDEFINED =
|
||||||
EXPAND_AS_DEFINED =
|
EXPAND_AS_DEFINED =
|
||||||
SKIP_FUNCTION_MACROS = YES
|
SKIP_FUNCTION_MACROS = YES
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
# Configuration::addtions related to external references
|
# Configuration::addtions related to external references
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
TAGFILES =
|
TAGFILES =
|
||||||
GENERATE_TAGFILE =
|
GENERATE_TAGFILE =
|
||||||
ALLEXTERNALS = NO
|
ALLEXTERNALS = NO
|
||||||
EXTERNAL_GROUPS = YES
|
EXTERNAL_GROUPS = YES
|
||||||
PERL_PATH = /usr/bin/perl
|
PERL_PATH = /usr/bin/perl
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
# Configuration options related to the dot tool
|
# Configuration options related to the dot tool
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
CLASS_DIAGRAMS = YES
|
CLASS_DIAGRAMS = YES
|
||||||
HIDE_UNDOC_RELATIONS = YES
|
HIDE_UNDOC_RELATIONS = YES
|
||||||
HAVE_DOT = NO
|
HAVE_DOT = NO
|
||||||
CLASS_GRAPH = YES
|
CLASS_GRAPH = YES
|
||||||
COLLABORATION_GRAPH = YES
|
COLLABORATION_GRAPH = YES
|
||||||
TEMPLATE_RELATIONS = YES
|
TEMPLATE_RELATIONS = YES
|
||||||
INCLUDE_GRAPH = YES
|
INCLUDE_GRAPH = YES
|
||||||
INCLUDED_BY_GRAPH = YES
|
INCLUDED_BY_GRAPH = YES
|
||||||
GRAPHICAL_HIERARCHY = YES
|
GRAPHICAL_HIERARCHY = YES
|
||||||
DOT_IMAGE_FORMAT = png
|
DOT_IMAGE_FORMAT = png
|
||||||
DOT_PATH =
|
DOT_PATH =
|
||||||
DOTFILE_DIRS =
|
DOTFILE_DIRS =
|
||||||
MAX_DOT_GRAPH_WIDTH = 1024
|
MAX_DOT_GRAPH_WIDTH = 1024
|
||||||
MAX_DOT_GRAPH_HEIGHT = 1024
|
MAX_DOT_GRAPH_HEIGHT = 1024
|
||||||
MAX_DOT_GRAPH_DEPTH = 0
|
MAX_DOT_GRAPH_DEPTH = 0
|
||||||
GENERATE_LEGEND = YES
|
GENERATE_LEGEND = YES
|
||||||
DOT_CLEANUP = YES
|
DOT_CLEANUP = YES
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
# Configuration::addtions related to the search engine
|
# Configuration::addtions related to the search engine
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
SEARCHENGINE = NO
|
SEARCHENGINE = NO
|
||||||
CGI_NAME = search.cgi
|
CGI_NAME = search.cgi
|
||||||
CGI_URL =
|
CGI_URL =
|
||||||
DOC_URL =
|
DOC_URL =
|
||||||
DOC_ABSPATH =
|
DOC_ABSPATH =
|
||||||
BIN_ABSPATH = /usr/local/bin/
|
BIN_ABSPATH = /usr/local/bin/
|
||||||
EXT_DOC_PATHS =
|
EXT_DOC_PATHS =
|
||||||
|
|||||||
@@ -1,179 +1,178 @@
|
|||||||
# libmatroska core Makefile (used in cygwin)
|
# libmatroska core Makefile (used in cygwin)
|
||||||
# $Id: Makefile 1254 2006-06-02 14:32:52Z mosu $
|
# $Id: Makefile 1254 2006-06-02 14:32:52Z mosu $
|
||||||
# Author: Steve Lhomme <robux4 @ users.sf.net>
|
# Author: Steve Lhomme <robux4 @ users.sf.net>
|
||||||
# Author: Moritz Bunkus <moritz @ bunkus.org>
|
# Author: Moritz Bunkus <moritz @ bunkus.org>
|
||||||
|
|
||||||
#
|
#
|
||||||
# The library is built without debug information. If you want
|
# The library is built without debug information. If you want
|
||||||
# debug information to be included then compile with
|
# debug information to be included then compile with
|
||||||
# 'make DEBUG=yes'.
|
# 'make DEBUG=yes'.
|
||||||
#
|
#
|
||||||
|
|
||||||
# Paths
|
# Paths
|
||||||
# BeOS wants the libs and headers in /boot/home/config
|
# BeOS wants the libs and headers in /boot/home/config
|
||||||
ifeq (BeOS,$(shell uname -s))
|
ifeq (BeOS,$(shell uname -s))
|
||||||
prefix=/boot/home/config
|
prefix=/boot/home/config
|
||||||
else
|
else
|
||||||
prefix=/usr/local
|
prefix=/usr/local
|
||||||
endif
|
endif
|
||||||
libdir=$(prefix)/lib
|
libdir=$(prefix)/lib
|
||||||
includedir=$(prefix)/include/matroska
|
includedir=$(prefix)/include/matroska
|
||||||
|
|
||||||
# Programs
|
# Programs
|
||||||
CROSS =
|
CROSS =
|
||||||
CXX = $(CROSS)g++
|
CXX = $(CROSS)g++
|
||||||
LD = $(CXX)
|
LD = $(CXX)
|
||||||
AR = $(CROSS)ar
|
AR = $(CROSS)ar
|
||||||
RANLIB = $(CROSS)ranlib
|
RANLIB = $(CROSS)ranlib
|
||||||
INSTALL = install
|
INSTALL = install
|
||||||
INSTALL_OPTS = -m 644
|
INSTALL_OPTS = -m 644
|
||||||
INSTALL_OPTS_LIB = -m 644
|
INSTALL_OPTS_LIB = -m 644
|
||||||
INSTALL_DIR_OPTS = -m 755
|
INSTALL_DIR_OPTS = -m 755
|
||||||
|
|
||||||
CWD=$(shell pwd)
|
CWD=$(shell pwd)
|
||||||
|
|
||||||
# Options
|
# Options
|
||||||
LIBEBML_INCLUDE_DIR=$(CWD)/../../../libebml
|
LIBEBML_INCLUDE_DIR=$(CWD)/../../../libebml
|
||||||
LIBEBML_LIB_DIR=$(CWD)/../../../libebml/make/linux
|
LIBEBML_LIB_DIR=$(CWD)/../../../libebml/make/linux
|
||||||
EXTENSION=.cpp
|
EXTENSION=.cpp
|
||||||
|
|
||||||
ifeq (yes,$(DEBUG))
|
ifeq (yes,$(DEBUG))
|
||||||
DEBUGFLAGS=-g -DDEBUG
|
DEBUGFLAGS=-g -DDEBUG
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq (Darwin,$(shell uname -s))
|
SRC_DIR=$(CWD)/../../src/
|
||||||
link=static
|
INCLUDE_DIR=$(CWD)/../../matroska
|
||||||
else
|
MUX_SRC_DIR=$(CWD)/../../test/mux/
|
||||||
link=both
|
TAG_SRC_DIR=$(CWD)/../../test/tags/
|
||||||
endif
|
|
||||||
|
# Librarires
|
||||||
targets_both = staticlib sharedlib
|
INCLUDE=-I$(CWD)/../.. -I$(LIBEBML_INCLUDE_DIR)
|
||||||
targets_shared = sharedlib
|
LIBS=
|
||||||
targets_static = staticlib
|
MUX_LIBS=-lmatroska -lebml $(LIBICONV)
|
||||||
|
|
||||||
SRC_DIR=$(CWD)/../../src/
|
# Names
|
||||||
INCLUDE_DIR=$(CWD)/../../matroska
|
LIBRARY=libmatroska.a
|
||||||
MUX_SRC_DIR=$(CWD)/../../test/mux/
|
LIBRARY_SO=libmatroska.so
|
||||||
TAG_SRC_DIR=$(CWD)/../../test/tags/
|
LIBRARY_SO_VER=libmatroska.so.5
|
||||||
|
|
||||||
# Libraries
|
# source-files
|
||||||
INCLUDE=-I$(CWD)/../.. -I$(LIBEBML_INCLUDE_DIR)
|
sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
|
||||||
LIBS=
|
|
||||||
MUX_LIBS=-lmatroska -lebml $(LIBICONV)
|
# header files; replace .cxx extension with .h
|
||||||
|
headers:=$(patsubst %$(EXTENSION),%.h,$(sources))
|
||||||
# Names
|
|
||||||
LIBRARY=libmatroska.a
|
# object files; replace .cxx extension with .o
|
||||||
LIBRARY_SO=libmatroska.so
|
objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
|
||||||
LIBRARY_SO_VER=libmatroska.so.6
|
|
||||||
|
objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))
|
||||||
# source-files
|
|
||||||
sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
|
WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \
|
||||||
|
-Wshadow
|
||||||
# header files; replace .cxx extension with .h
|
COMPILEFLAGS=$(DEBUGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(WARNINGFLAGS) $(INCLUDE)
|
||||||
headers:=$(patsubst %$(EXTENSION),%.h,$(sources))
|
LINKFLAGS=-L. -L$(LIBEBML_LIB_DIR) $(LDFLAGS)
|
||||||
|
DEPENDFLAGS = $(CXXFLAGS) $(INCLUDE)
|
||||||
# object files; replace .cxx extension with .o
|
|
||||||
objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
|
ifeq (Darwin,$(shell uname -s))
|
||||||
|
all: staticlib
|
||||||
objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))
|
else
|
||||||
|
all: staticlib sharedlib
|
||||||
WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -D_GNU_SOURCE -Wshadow
|
endif
|
||||||
COMPILEFLAGS=$(DEBUGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(WARNINGFLAGS) $(INCLUDE)
|
|
||||||
LINKFLAGS=-L. -L$(LIBEBML_LIB_DIR) $(LDFLAGS)
|
staticlib: $(LIBRARY)
|
||||||
DEPENDFLAGS = $(CXXFLAGS) $(INCLUDE)
|
|
||||||
|
sharedlib: $(LIBRARY_SO)
|
||||||
all: $(targets_$(link))
|
|
||||||
|
lib:
|
||||||
staticlib: $(LIBRARY)
|
@echo "Use the 'staticlib', 'sharedlib' or 'all' targets."
|
||||||
|
@false
|
||||||
sharedlib: $(LIBRARY_SO)
|
|
||||||
|
# Build rules
|
||||||
lib:
|
%.o: %$(EXTENSION)
|
||||||
@echo "Use the 'staticlib', 'sharedlib' or 'all' targets."
|
$(CXX) -c $(COMPILEFLAGS) -o $@ $<
|
||||||
@false
|
|
||||||
|
%.lo: %$(EXTENSION)
|
||||||
# Build rules
|
$(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
|
||||||
%.o: %$(EXTENSION)
|
|
||||||
$(CXX) -c $(COMPILEFLAGS) -o $@ $<
|
$(LIBRARY): $(objects)
|
||||||
|
$(AR) rcvu $@ $(objects)
|
||||||
%.lo: %$(EXTENSION)
|
$(RANLIB) $@
|
||||||
$(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
|
|
||||||
|
$(LIBRARY_SO): $(objects_so)
|
||||||
$(LIBRARY): $(objects)
|
$(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml
|
||||||
$(AR) rcvu $@ $(objects)
|
rm -f $(LIBRARY_SO)
|
||||||
$(RANLIB) $@
|
ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
|
||||||
|
|
||||||
$(LIBRARY_SO): $(objects_so)
|
clean: cleantest
|
||||||
$(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml
|
rm -f $(objects) $(objects_so)
|
||||||
rm -f $(LIBRARY_SO)
|
rm -f $(LIBRARY)
|
||||||
ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
|
rm -f $(LIBRARY_SO)
|
||||||
|
rm -f $(LIBRARY_SO_VER)
|
||||||
clean: cleantest
|
rm -f CORE
|
||||||
rm -f $(objects) $(objects_so)
|
|
||||||
rm -f $(LIBRARY)
|
cleantest:
|
||||||
rm -f $(LIBRARY_SO)
|
rm -f test6 test8 test9 test6.o test8.o test9.o
|
||||||
rm -f $(LIBRARY_SO_VER)
|
|
||||||
rm -f CORE
|
distclean dist-clean: clean
|
||||||
|
rm -f .depend
|
||||||
cleantest:
|
|
||||||
rm -f test6 test8 test9 test6.o test8.o test9.o
|
depend:
|
||||||
|
@echo Calculating dependecies:
|
||||||
distclean dist-clean: clean
|
@rm -f .depend
|
||||||
rm -f .depend
|
@touch .depend
|
||||||
|
@for i in $(sources); do \
|
||||||
depend:
|
o="`echo $$i | sed -e 's/\.c$$/.o/' -e 's/\.cpp$$/.o/'`" ; \
|
||||||
@echo Calculating dependecies:
|
echo ' ' $$i: $$o ; \
|
||||||
@rm -f .depend
|
$(CXX) $(DEPENDFLAGS) -MM -MT $$o $$i >> .depend ; \
|
||||||
@touch .depend
|
done
|
||||||
@for i in $(sources); do \
|
|
||||||
o="`echo $$i | sed -e 's/\.c$$/.o/' -e 's/\.cpp$$/.o/'`" ; \
|
test: test6 test9
|
||||||
echo ' ' $$i: $$o ; \
|
|
||||||
$(CXX) $(DEPENDFLAGS) -MM -MT $$o $$i >> .depend ; \
|
test6: test6.o $(LIBRARY) $(LIBRARY_SO)
|
||||||
done
|
$(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
|
||||||
|
|
||||||
test: test6 test9
|
test6.o: $(MUX_SRC_DIR)test6.cpp
|
||||||
|
$(CXX) -c $(COMPILEFLAGS) -o $@ $<
|
||||||
test6: test6.o $(LIBRARY) $(LIBRARY_SO)
|
|
||||||
$(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
|
test8: test8.o $(LIBRARY) $(LIBRARY_SO)
|
||||||
|
$(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
|
||||||
test6.o: $(MUX_SRC_DIR)test6.cpp
|
|
||||||
$(CXX) -c $(COMPILEFLAGS) -o $@ $<
|
test8.o: $(MUX_SRC_DIR)test8.cpp
|
||||||
|
$(CXX) -c $(COMPILEFLAGS) -o $@ $<
|
||||||
test8: test8.o $(LIBRARY) $(LIBRARY_SO)
|
|
||||||
$(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
|
test9: test9.o $(LIBRARY) $(LIBRARY_SO)
|
||||||
|
$(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
|
||||||
test8.o: $(MUX_SRC_DIR)test8.cpp
|
|
||||||
$(CXX) -c $(COMPILEFLAGS) -o $@ $<
|
test9.o: $(TAG_SRC_DIR)test9.cpp
|
||||||
|
$(CXX) -c $(COMPILEFLAGS) -o $@ $<
|
||||||
test9: test9.o $(LIBRARY) $(LIBRARY_SO)
|
|
||||||
$(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
|
ifeq (Darwin,$(shell uname -s))
|
||||||
|
install: install_staticlib install_headers
|
||||||
test9.o: $(TAG_SRC_DIR)test9.cpp
|
else
|
||||||
$(CXX) -c $(COMPILEFLAGS) -o $@ $<
|
install: install_staticlib install_sharedlib install_headers
|
||||||
|
endif
|
||||||
install: $(targets_$(link):%=install_%) install_headers
|
|
||||||
|
install_headers:
|
||||||
install_headers:
|
$(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
|
||||||
$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)
|
for i in $(INCLUDE_DIR)/*.h; do \
|
||||||
for i in $(INCLUDE_DIR)/*.h; do \
|
$(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \
|
||||||
$(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \
|
done
|
||||||
done
|
$(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c
|
||||||
$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c
|
for i in $(INCLUDE_DIR)/c/*.h; do \
|
||||||
for i in $(INCLUDE_DIR)/c/*.h; do \
|
$(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \
|
||||||
$(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \
|
done
|
||||||
done
|
|
||||||
|
install_staticlib: $(LIBRARY)
|
||||||
install_staticlib: $(LIBRARY)
|
$(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
|
||||||
$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
|
$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
|
||||||
$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir)
|
|
||||||
|
install_sharedlib: $(LIBRARY_SO)
|
||||||
install_sharedlib: $(LIBRARY_SO)
|
$(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
|
||||||
$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
|
$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
|
||||||
$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)
|
ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
|
||||||
ln -fs $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)/$(LIBRARY_SO)
|
|
||||||
|
ifneq ($(wildcard .depend),)
|
||||||
ifneq ($(wildcard .depend),)
|
include .depend
|
||||||
include .depend
|
endif
|
||||||
endif
|
|
||||||
|
# DO NOT DELETE
|
||||||
# DO NOT DELETE
|
|
||||||
|
|||||||
@@ -1,98 +1,98 @@
|
|||||||
##
|
##
|
||||||
## This Makefile is made for cygwin, but might probably work on any standard UNIX too
|
## This Makefile is made for cygwin, but might probably work on any standard UNIX too
|
||||||
##
|
##
|
||||||
|
|
||||||
#****************************************************************************
|
#****************************************************************************
|
||||||
|
|
||||||
# DEBUG can be set to YES to include debugging info, or NO otherwise
|
# DEBUG can be set to YES to include debugging info, or NO otherwise
|
||||||
DEBUG = YES
|
DEBUG = YES
|
||||||
|
|
||||||
# PROFILE can be set to YES to include profiling info, or NO otherwise
|
# PROFILE can be set to YES to include profiling info, or NO otherwise
|
||||||
PROFILE = NO
|
PROFILE = NO
|
||||||
|
|
||||||
#****************************************************************************
|
#****************************************************************************
|
||||||
|
|
||||||
CC = gcc
|
CC = gcc
|
||||||
CXX = g++
|
CXX = g++
|
||||||
LD = gcc
|
LD = gcc
|
||||||
AR = ar rcvu
|
AR = ar rcvu
|
||||||
RANLIB = ranlib
|
RANLIB = ranlib
|
||||||
DEPEND = makedepend
|
DEPEND = makedepend
|
||||||
INDENT =indent --gnu-style -ut -ts6 -br -npsl -npcs
|
INDENT =indent --gnu-style -ut -ts6 -br -npsl -npcs
|
||||||
DELETE =rm -f
|
DELETE =rm -f
|
||||||
|
|
||||||
GLOBAL_CFLAGS = -Wall -Wno-unknown-pragmas -Wno-format
|
GLOBAL_CFLAGS = -Wall -Wno-unknown-pragmas -Wno-format
|
||||||
DEBUG_CFLAGS = -g -O0 -DDEBUG ${GLOBAL_CFLAGS}
|
DEBUG_CFLAGS = -g -O0 -DDEBUG ${GLOBAL_CFLAGS}
|
||||||
RELEASE_CFLAGS = -O2 ${GLOBAL_CFLAGS}
|
RELEASE_CFLAGS = -O2 ${GLOBAL_CFLAGS}
|
||||||
|
|
||||||
P_OPTIONS = -pedantic
|
P_OPTIONS = -pedantic
|
||||||
|
|
||||||
LIBS =
|
LIBS =
|
||||||
|
|
||||||
DEBUG_CXXFLAGS = ${DEBUG_CFLAGS}
|
DEBUG_CXXFLAGS = ${DEBUG_CFLAGS}
|
||||||
RELEASE_CXXFLAGS = ${RELEASE_CFLAGS}
|
RELEASE_CXXFLAGS = ${RELEASE_CFLAGS}
|
||||||
|
|
||||||
DEBUG_LDFLAGS = -g
|
DEBUG_LDFLAGS = -g
|
||||||
RELEASE_LDFLAGS =
|
RELEASE_LDFLAGS =
|
||||||
|
|
||||||
ifeq (YES, ${DEBUG})
|
ifeq (YES, ${DEBUG})
|
||||||
CFLAGS = ${DEBUG_CFLAGS} ${INCS} ${P_OPTIONS}
|
CFLAGS = ${DEBUG_CFLAGS} ${INCS} ${P_OPTIONS}
|
||||||
CXXFLAGS = ${DEBUG_CXXFLAGS} ${INCS} ${P_OPTIONS}
|
CXXFLAGS = ${DEBUG_CXXFLAGS} ${INCS} ${P_OPTIONS}
|
||||||
LDFLAGS = ${DEBUG_LDFLAGS}
|
LDFLAGS = ${DEBUG_LDFLAGS}
|
||||||
DEPENDFLAGS = ${DEBUG_CFLAGS} ${INCS}
|
DEPENDFLAGS = ${DEBUG_CFLAGS} ${INCS}
|
||||||
else
|
else
|
||||||
CFLAGS = ${RELEASE_CFLAGS} ${INCS} ${P_OPTIONS}
|
CFLAGS = ${RELEASE_CFLAGS} ${INCS} ${P_OPTIONS}
|
||||||
CXXFLAGS = ${RELEASE_CXXFLAGS} ${INCS} ${P_OPTIONS}
|
CXXFLAGS = ${RELEASE_CXXFLAGS} ${INCS} ${P_OPTIONS}
|
||||||
LDFLAGS = ${RELEASE_LDFLAGS}
|
LDFLAGS = ${RELEASE_LDFLAGS}
|
||||||
DEPENDFLAGS = ${RELEASE_CFLAGS} ${INCS}
|
DEPENDFLAGS = ${RELEASE_CFLAGS} ${INCS}
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq (YES, ${PROFILE})
|
ifeq (YES, ${PROFILE})
|
||||||
CFLAGS := ${CFLAGS} -pg
|
CFLAGS := ${CFLAGS} -pg
|
||||||
CXXFLAGS := ${CXXFLAGS} -pg
|
CXXFLAGS := ${CXXFLAGS} -pg
|
||||||
LDFLAGS := ${LDFLAGS} -pg
|
LDFLAGS := ${LDFLAGS} -pg
|
||||||
endif
|
endif
|
||||||
|
|
||||||
#****************************************************************************
|
#****************************************************************************
|
||||||
# Preprocessor directives
|
# Preprocessor directives
|
||||||
#****************************************************************************
|
#****************************************************************************
|
||||||
|
|
||||||
ifeq (YES, ${PROFILE})
|
ifeq (YES, ${PROFILE})
|
||||||
DEFS =
|
DEFS =
|
||||||
else
|
else
|
||||||
DEFS =
|
DEFS =
|
||||||
endif
|
endif
|
||||||
|
|
||||||
#****************************************************************************
|
#****************************************************************************
|
||||||
# Include paths
|
# Include paths
|
||||||
#****************************************************************************
|
#****************************************************************************
|
||||||
|
|
||||||
#INCS := -I/usr/include/g++-2 -I/usr/local/include
|
#INCS := -I/usr/include/g++-2 -I/usr/local/include
|
||||||
#INCS =
|
#INCS =
|
||||||
|
|
||||||
|
|
||||||
#****************************************************************************
|
#****************************************************************************
|
||||||
# Makefile code common to all platforms
|
# Makefile code common to all platforms
|
||||||
#****************************************************************************
|
#****************************************************************************
|
||||||
|
|
||||||
CFLAGS := ${CFLAGS} ${DEFS}
|
CFLAGS := ${CFLAGS} ${DEFS}
|
||||||
CXXFLAGS := ${CXXFLAGS} ${DEFS}
|
CXXFLAGS := ${CXXFLAGS} ${DEFS}
|
||||||
|
|
||||||
#****************************************************************************
|
#****************************************************************************
|
||||||
# General rules
|
# General rules
|
||||||
#****************************************************************************
|
#****************************************************************************
|
||||||
|
|
||||||
indent:
|
indent:
|
||||||
$(INDENT) --line-length 100 ${SRCS} ${SRCS_HEADERS}
|
$(INDENT) --line-length 100 ${SRCS} ${SRCS_HEADERS}
|
||||||
$(DELETE) *.*~
|
$(DELETE) *.*~
|
||||||
|
|
||||||
indent80:
|
indent80:
|
||||||
$(INDENT) --line-length 80 ${SRCS} ${SRCS_HEADERS}
|
$(INDENT) --line-length 80 ${SRCS} ${SRCS_HEADERS}
|
||||||
$(DELETE) *.*~
|
$(DELETE) *.*~
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f core *.o *.so *.a *.exe
|
rm -f core *.o *.so *.a *.exe
|
||||||
|
|
||||||
# what are the source dependencies
|
# what are the source dependencies
|
||||||
depend: $(SRCS)
|
depend: $(SRCS)
|
||||||
$(DEPEND) $(DEPENDFLAGS) $(SRCS)
|
$(DEPEND) $(DEPENDFLAGS) $(SRCS)
|
||||||
|
|||||||
@@ -1,18 +1,18 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
# A small script that looks for duplicate EBML IDs in all of libmatroska's
|
# A small script that looks for duplicate EBML IDs in all of libmatroska's
|
||||||
# source files.
|
# source files.
|
||||||
|
|
||||||
echo 'Duplicate IDs:'
|
echo 'Duplicate IDs:'
|
||||||
grep -h '^EbmlId.*_TheId' ../../src/*cpp | \
|
grep -h '^EbmlId.*_TheId' ../../src/*cpp | \
|
||||||
sed -e 's/TheId/TheId /' | \
|
sed -e 's/TheId/TheId /' | \
|
||||||
awk '{ print $3 }' | \
|
awk '{ print $3 }' | \
|
||||||
sed -e 's/(//' -e 's/,//' | \
|
sed -e 's/(//' -e 's/,//' | \
|
||||||
sort | \
|
sort | \
|
||||||
uniq -d | \
|
uniq -d | \
|
||||||
( while read id ; do
|
( while read id ; do
|
||||||
echo ''
|
echo ''
|
||||||
echo ${id}:
|
echo ${id}:
|
||||||
grep -i $id ../../src/*cpp
|
grep -i $id ../../src/*cpp
|
||||||
done )
|
done )
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
# SPEC file for (at least) Fedora Core 1, 2, 3
|
# SPEC file for (at least) Fedora Core 1, 2, 3
|
||||||
|
|
||||||
Name: libmatroska
|
Name: libmatroska
|
||||||
Version: 1.4.0
|
Version: 1.3.0
|
||||||
Release: 1
|
Release: 1
|
||||||
License: LGPL
|
License: LGPL
|
||||||
Summary: Matroska Video Container
|
Summary: Matroska Video Container
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ BuildRequires: bzip2 cpp libebml make tar zlib zlib-devel binutils gcc gcc-c++ l
|
|||||||
|
|
||||||
Name: libmatroska
|
Name: libmatroska
|
||||||
URL: http://dl.matroska.org/downloads/libmatroska/
|
URL: http://dl.matroska.org/downloads/libmatroska/
|
||||||
Version: 1.4.0
|
Version: 1.3.0
|
||||||
Release: 1
|
Release: 1
|
||||||
Summary: library to deal with matroska files.
|
Summary: library to deal with matroska files.
|
||||||
License: LGPL
|
License: LGPL
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#!/usr/bin/sh
|
#!/usr/bin/sh
|
||||||
# you should have "doxygen" in your path
|
# you should have "doxygen" in your path
|
||||||
# http://www.doxygen.org/
|
# http://www.doxygen.org/
|
||||||
|
|
||||||
echo make Documentation
|
echo make Documentation
|
||||||
|
|
||||||
doxygen Doxyfile > Doxygen.log.txt 2> Doxygen.err.txt
|
doxygen Doxyfile > Doxygen.log.txt 2> Doxygen.err.txt
|
||||||
|
|||||||
@@ -1,163 +1,163 @@
|
|||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
** libmatroska : parse Matroska files, see http://www.matroska.org/
|
** libmatroska : parse Matroska files, see http://www.matroska.org/
|
||||||
**
|
**
|
||||||
** <file/class description>
|
** <file/class description>
|
||||||
**
|
**
|
||||||
** Copyright (C) 2002-2010 Steve Lhomme. All rights reserved.
|
** Copyright (C) 2002-2010 Steve Lhomme. All rights reserved.
|
||||||
**
|
**
|
||||||
** This file is part of libmatroska.
|
** This file is part of libmatroska.
|
||||||
**
|
**
|
||||||
** This library is free software; you can redistribute it and/or
|
** This library is free software; you can redistribute it and/or
|
||||||
** modify it under the terms of the GNU Lesser General Public
|
** modify it under the terms of the GNU Lesser General Public
|
||||||
** License as published by the Free Software Foundation; either
|
** License as published by the Free Software Foundation; either
|
||||||
** version 2.1 of the License, or (at your option) any later version.
|
** 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,
|
** This library is distributed in the hope that it will be useful,
|
||||||
** but WITHOUT ANY WARRANTY; without even the implied warranty of
|
** but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
** Lesser General Public License for more details.
|
** Lesser General Public License for more details.
|
||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
**********************************************************************/
|
**********************************************************************/
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\file
|
\file
|
||||||
\version \$Id: FileKax.h,v 1.5 2004/04/14 23:26:17 robux4 Exp $
|
\version \$Id: FileKax.h,v 1.5 2004/04/14 23:26:17 robux4 Exp $
|
||||||
\author Steve Lhomme <robux4 @ users.sf.net>
|
\author Steve Lhomme <robux4 @ users.sf.net>
|
||||||
*/
|
*/
|
||||||
#ifndef LIBMATROSKA_FILE_H
|
#ifndef LIBMATROSKA_FILE_H
|
||||||
#define LIBMATROSKA_FILE_H
|
#define LIBMATROSKA_FILE_H
|
||||||
|
|
||||||
//#include <vector>
|
//#include <vector>
|
||||||
|
|
||||||
#include "matroska/KaxTypes.h"
|
#include "matroska/KaxTypes.h"
|
||||||
#include "ebml/IOCallback.h"
|
#include "ebml/IOCallback.h"
|
||||||
//#include "MainHeader.h"
|
//#include "MainHeader.h"
|
||||||
//#include "TrackType.h"
|
//#include "TrackType.h"
|
||||||
//#include "StreamInfo.h"
|
//#include "StreamInfo.h"
|
||||||
//#include "Cluster.h"
|
//#include "Cluster.h"
|
||||||
//#include "CodecHeader.h"
|
//#include "CodecHeader.h"
|
||||||
|
|
||||||
using namespace LIBEBML_NAMESPACE;
|
using namespace LIBEBML_NAMESPACE;
|
||||||
|
|
||||||
START_LIBMATROSKA_NAMESPACE
|
START_LIBMATROSKA_NAMESPACE
|
||||||
|
|
||||||
//class Track;
|
//class Track;
|
||||||
//class Frame;
|
//class Frame;
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\class MATROSKA_DLL_API FileMatroska
|
\class MATROSKA_DLL_API FileMatroska
|
||||||
\brief General container of all the parameters and data of an Matroska file
|
\brief General container of all the parameters and data of an Matroska file
|
||||||
\todo Handle the filename and next filename
|
\todo Handle the filename and next filename
|
||||||
\todo Handle the IOCallback selection/type
|
\todo Handle the IOCallback selection/type
|
||||||
*/
|
*/
|
||||||
class MATROSKA_DLL_API FileMatroska {
|
class MATROSKA_DLL_API FileMatroska {
|
||||||
public:
|
public:
|
||||||
FileMatroska(IOCallback & output);
|
FileMatroska(IOCallback & output);
|
||||||
~FileMatroska();
|
~FileMatroska();
|
||||||
#ifdef OLD
|
#ifdef OLD
|
||||||
filepos_t RenderHead(const std::string & aEncoderApp);
|
filepos_t RenderHead(const std::string & aEncoderApp);
|
||||||
uint32 ReadHead();
|
uint32 ReadHead();
|
||||||
uint32 ReadTracks();
|
uint32 ReadTracks();
|
||||||
uint32 ReadCodec();
|
uint32 ReadCodec();
|
||||||
void Close(const uint32 aTimeLength);
|
void Close(const uint32 aTimeLength);
|
||||||
|
|
||||||
inline void type_SetInfo(const std::string & aStr) {myMainHeader.type_SetInfo(aStr);}
|
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_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(const std::string & aStr) {myMainHeader.type_SetSize(aStr);}
|
||||||
inline void type_SetSize(uint64 aSize) {myMainHeader.type_SetSize(aSize);}
|
inline void type_SetSize(uint64 aSize) {myMainHeader.type_SetSize(aSize);}
|
||||||
|
|
||||||
inline uint8 GetTrackNumber() const { return myTracks.size(); }
|
inline uint8 GetTrackNumber() const { return myTracks.size(); }
|
||||||
|
|
||||||
void track_SetName(Track * aTrack, const std::string & aName);
|
void track_SetName(Track * aTrack, const std::string & aName);
|
||||||
void track_SetLaced(Track * aTrack, bool bLaced = true);
|
void track_SetLaced(Track * aTrack, bool bLaced = true);
|
||||||
|
|
||||||
Track * CreateTrack(const track_type aType);
|
Track * CreateTrack(const track_type aType);
|
||||||
inline Track * GetTrack(const uint8 aTrackNb) const
|
inline Track * GetTrack(const uint8 aTrackNb) const
|
||||||
{
|
{
|
||||||
if (aTrackNb > myTracks.size())
|
if (aTrackNb > myTracks.size())
|
||||||
return NULL;
|
return NULL;
|
||||||
else
|
else
|
||||||
return myTracks[aTrackNb-1];
|
return myTracks[aTrackNb-1];
|
||||||
}
|
}
|
||||||
|
|
||||||
void Track_GetInfo(const Track * aTrack, TrackInfo & aTrackInfo) const;
|
void Track_GetInfo(const Track * aTrack, TrackInfo & aTrackInfo) const;
|
||||||
|
|
||||||
void Track_SetInfo_Audio(Track * aTrack, const TrackInfoAudio & aTrackInfo);
|
void Track_SetInfo_Audio(Track * aTrack, const TrackInfoAudio & aTrackInfo);
|
||||||
void Track_GetInfo_Audio(const Track * aTrack, TrackInfoAudio & aTrackInfo) const;
|
void Track_GetInfo_Audio(const Track * aTrack, TrackInfoAudio & aTrackInfo) const;
|
||||||
|
|
||||||
void Track_SetInfo_Video(Track * aTrack, const TrackInfoVideo & aTrackInfo);
|
void Track_SetInfo_Video(Track * aTrack, const TrackInfoVideo & aTrackInfo);
|
||||||
void Track_GetInfo_Video(const Track * aTrack, TrackInfoVideo & aTrackInfo) const;
|
void Track_GetInfo_Video(const Track * aTrack, TrackInfoVideo & aTrackInfo) const;
|
||||||
|
|
||||||
void SelectReadingTrack(Track * aTrack, bool select = true);
|
void SelectReadingTrack(Track * aTrack, bool select = true);
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\return wether the frame has been added or not
|
\return wether the frame has been added or not
|
||||||
*/
|
*/
|
||||||
bool AddFrame(Track * aTrack, const uint32 aTimecode, const binary *aFrame, const uint32 aFrameSize,
|
bool AddFrame(Track * aTrack, const uint32 aTimecode, const binary *aFrame, const uint32 aFrameSize,
|
||||||
bool aKeyFrame = true, bool aBFrame = false);
|
bool aKeyFrame = true, bool aBFrame = false);
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\return wether the frame has been read or not
|
\return wether the frame has been read or not
|
||||||
*/
|
*/
|
||||||
bool ReadFrame(Track * & aTrack, uint32 & aTimecode, const binary * & aFrame, uint32 & aFrameSize,
|
bool ReadFrame(Track * & aTrack, uint32 & aTimecode, const binary * & aFrame, uint32 & aFrameSize,
|
||||||
bool & aKeyFrame, bool & aBFrame);
|
bool & aKeyFrame, bool & aBFrame);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Render the pending cluster to file
|
Render the pending cluster to file
|
||||||
*/
|
*/
|
||||||
void Flush();
|
void Flush();
|
||||||
|
|
||||||
void SetMaxClusterSize(const uint32 value);
|
void SetMaxClusterSize(const uint32 value);
|
||||||
void SetMinClusterSize(const uint32 value) {myMinClusterSize = value;}
|
void SetMinClusterSize(const uint32 value) {myMinClusterSize = value;}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
MainHeader myMainHeader;
|
MainHeader myMainHeader;
|
||||||
|
|
||||||
std::vector<Track *> myTracks;
|
std::vector<Track *> myTracks;
|
||||||
std::vector<uint8> mySelectedTracks;
|
std::vector<uint8> mySelectedTracks;
|
||||||
|
|
||||||
// Track *findTrack(Track * aTrack) const;
|
// Track *findTrack(Track * aTrack) const;
|
||||||
|
|
||||||
Cluster myCurrWriteCluster; /// \todo merge with the write one ?
|
Cluster myCurrWriteCluster; /// \todo merge with the write one ?
|
||||||
uint32 myReadBlockNumber;
|
uint32 myReadBlockNumber;
|
||||||
Cluster myCurrReadCluster;
|
Cluster myCurrReadCluster;
|
||||||
binary * myCurrReadBlock; ///< The buffer containing the current read block
|
binary * myCurrReadBlock; ///< The buffer containing the current read block
|
||||||
uint32 myCurrReadBlockSize; ///< The size of 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
|
uint8 myCurrReadBlockTrack; ///< The track number of the current track to read
|
||||||
|
|
||||||
uint32 myMaxClusterSize;
|
uint32 myMaxClusterSize;
|
||||||
uint32 myMinClusterSize;
|
uint32 myMinClusterSize;
|
||||||
|
|
||||||
StreamInfo myStreamInfo;
|
StreamInfo myStreamInfo;
|
||||||
|
|
||||||
CodecHeader myCodecHeader;
|
CodecHeader myCodecHeader;
|
||||||
|
|
||||||
inline bool IsMyTrack(const Track * aTrack) const;
|
inline bool IsMyTrack(const Track * aTrack) const;
|
||||||
inline bool IsReadingTrack(const uint8 aTrackNum) const;
|
inline bool IsReadingTrack(const uint8 aTrackNum) const;
|
||||||
#endif // OLD
|
#endif // OLD
|
||||||
IOCallback & myFile;
|
IOCallback & myFile;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
END_LIBMATROSKA_NAMESPACE
|
END_LIBMATROSKA_NAMESPACE
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
MATROSKA_DLL_API void matroska_init();
|
MATROSKA_DLL_API void matroska_init();
|
||||||
MATROSKA_DLL_API void matroska_done();
|
MATROSKA_DLL_API void matroska_done();
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // FILE_KAX_HPP
|
#endif // FILE_KAX_HPP
|
||||||
|
|||||||
@@ -19,9 +19,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -19,9 +19,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -17,9 +17,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
@@ -84,7 +84,7 @@ class MATROSKA_DLL_API DataBuffer {
|
|||||||
virtual binary * Buffer() {assert(bValidValue); return myBuffer;}
|
virtual binary * Buffer() {assert(bValidValue); return myBuffer;}
|
||||||
virtual uint32 & Size() {return mySize;};
|
virtual uint32 & Size() {return mySize;};
|
||||||
virtual const binary * Buffer() const {assert(bValidValue); return myBuffer;}
|
virtual const binary * Buffer() const {assert(bValidValue); return myBuffer;}
|
||||||
virtual uint32 Size() const {return mySize;};
|
virtual const uint32 Size() const {return mySize;};
|
||||||
bool FreeBuffer(const DataBuffer & aBuffer) {
|
bool FreeBuffer(const DataBuffer & aBuffer) {
|
||||||
bool bResult = true;
|
bool bResult = true;
|
||||||
if (myBuffer != NULL && bValidValue) {
|
if (myBuffer != NULL && bValidValue) {
|
||||||
@@ -305,6 +305,7 @@ class MATROSKA_DLL_API KaxSimpleBlock : public KaxInternalBlock {
|
|||||||
bool IsKeyframe() const { return bIsKeyframe; }
|
bool IsKeyframe() const { return bIsKeyframe; }
|
||||||
bool IsDiscardable() const { return bIsDiscardable; }
|
bool IsDiscardable() const { return bIsDiscardable; }
|
||||||
|
|
||||||
|
operator KaxInternalBlock &() { return *this; }
|
||||||
void SetParent(KaxCluster & aParentCluster);
|
void SetParent(KaxCluster & aParentCluster);
|
||||||
|
|
||||||
EBML_CONCRETE_CLASS(KaxSimpleBlock)
|
EBML_CONCRETE_CLASS(KaxSimpleBlock)
|
||||||
|
|||||||
@@ -17,9 +17,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -19,9 +19,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -17,9 +17,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -19,9 +19,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -1,70 +1,70 @@
|
|||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
** libmatroska : parse Matroska files, see http://www.matroska.org/
|
** libmatroska : parse Matroska files, see http://www.matroska.org/
|
||||||
**
|
**
|
||||||
** <file/class description>
|
** <file/class description>
|
||||||
**
|
**
|
||||||
** Copyright (C) 2002-2010 Steve Lhomme. All rights reserved.
|
** Copyright (C) 2002-2010 Steve Lhomme. All rights reserved.
|
||||||
**
|
**
|
||||||
** This library is free software; you can redistribute it and/or
|
** This library is free software; you can redistribute it and/or
|
||||||
** modify it under the terms of the GNU Lesser General Public
|
** modify it under the terms of the GNU Lesser General Public
|
||||||
** License as published by the Free Software Foundation; either
|
** License as published by the Free Software Foundation; either
|
||||||
** version 2.1 of the License, or (at your option) any later version.
|
** 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,
|
** This library is distributed in the hope that it will be useful,
|
||||||
** but WITHOUT ANY WARRANTY; without even the implied warranty of
|
** but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
** Lesser General Public License for more details.
|
** Lesser General Public License for more details.
|
||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
**********************************************************************/
|
**********************************************************************/
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\file
|
\file
|
||||||
\version \$Id: KaxConfig.h,v 1.7 2004/04/14 23:26:17 robux4 Exp $
|
\version \$Id: KaxConfig.h,v 1.7 2004/04/14 23:26:17 robux4 Exp $
|
||||||
\author Steve Lhomme <robux4 @ users.sf.net>
|
\author Steve Lhomme <robux4 @ users.sf.net>
|
||||||
\author Moritz Bunkus <moritz @ bunkus.org>
|
\author Moritz Bunkus <moritz @ bunkus.org>
|
||||||
*/
|
*/
|
||||||
#ifndef LIBMATROSKA_CONFIG_H
|
#ifndef LIBMATROSKA_CONFIG_H
|
||||||
#define LIBMATROSKA_CONFIG_H
|
#define LIBMATROSKA_CONFIG_H
|
||||||
|
|
||||||
#define LIBMATROSKA_NAMESPACE libmatroska
|
#define LIBMATROSKA_NAMESPACE libmatroska
|
||||||
|
|
||||||
#if defined(NO_NAMESPACE) // for older GCC
|
#if defined(NO_NAMESPACE) // for older GCC
|
||||||
# define START_LIBMATROSKA_NAMESPACE
|
# define START_LIBMATROSKA_NAMESPACE
|
||||||
# define END_LIBMATROSKA_NAMESPACE
|
# define END_LIBMATROSKA_NAMESPACE
|
||||||
#else // NO_NAMESPACE
|
#else // NO_NAMESPACE
|
||||||
# define START_LIBMATROSKA_NAMESPACE namespace LIBMATROSKA_NAMESPACE {
|
# define START_LIBMATROSKA_NAMESPACE namespace LIBMATROSKA_NAMESPACE {
|
||||||
# define END_LIBMATROSKA_NAMESPACE };
|
# define END_LIBMATROSKA_NAMESPACE };
|
||||||
#endif // NO_NAMESPACE
|
#endif // NO_NAMESPACE
|
||||||
|
|
||||||
// There are special implementations for certain platforms. For example on Windows
|
// There are special implementations for certain platforms. For example on Windows
|
||||||
// we use the Win32 file API. here we set the appropriate macros.
|
// we use the Win32 file API. here we set the appropriate macros.
|
||||||
#if defined(_WIN32)||defined(WIN32)
|
#if defined(_WIN32)||defined(WIN32)
|
||||||
|
|
||||||
# if defined(MATROSKA_DLL)
|
# if defined(MATROSKA_DLL)
|
||||||
# if defined(MATROSKA_DLL_EXPORT)
|
# if defined(MATROSKA_DLL_EXPORT)
|
||||||
# define MATROSKA_DLL_API __declspec(dllexport)
|
# define MATROSKA_DLL_API __declspec(dllexport)
|
||||||
# else // MATROSKA_DLL_EXPORT
|
# else // MATROSKA_DLL_EXPORT
|
||||||
# define MATROSKA_DLL_API __declspec(dllimport)
|
# define MATROSKA_DLL_API __declspec(dllimport)
|
||||||
# endif // MATROSKA_DLL_EXPORT
|
# endif // MATROSKA_DLL_EXPORT
|
||||||
# else // MATROSKA_DLL
|
# else // MATROSKA_DLL
|
||||||
# define MATROSKA_DLL_API
|
# define MATROSKA_DLL_API
|
||||||
# endif // MATROSKA_DLL
|
# endif // MATROSKA_DLL
|
||||||
|
|
||||||
#else
|
#else
|
||||||
# define MATROSKA_DLL_API
|
# define MATROSKA_DLL_API
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined(MATROSKA_VERSION)
|
#if !defined(MATROSKA_VERSION)
|
||||||
#define MATROSKA_VERSION 2
|
#define MATROSKA_VERSION 2
|
||||||
#endif // MATROSKA_VERSION
|
#endif // MATROSKA_VERSION
|
||||||
|
|
||||||
|
|
||||||
#endif // LIBMATROSKA_CONFIG_H
|
#endif // LIBMATROSKA_CONFIG_H
|
||||||
|
|||||||
@@ -19,9 +19,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -19,9 +19,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -19,9 +19,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -17,9 +17,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -17,9 +17,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -19,9 +19,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -19,9 +19,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -19,9 +19,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -1,62 +1,62 @@
|
|||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
** libmatroska : parse Matroska files, see http://www.matroska.org/
|
** libmatroska : parse Matroska files, see http://www.matroska.org/
|
||||||
**
|
**
|
||||||
** <file/class MATROSKA_DLL_API description>
|
** <file/class MATROSKA_DLL_API description>
|
||||||
**
|
**
|
||||||
** Copyright (C) 2002-2010 Steve Lhomme. All rights reserved.
|
** Copyright (C) 2002-2010 Steve Lhomme. All rights reserved.
|
||||||
**
|
**
|
||||||
** This file is part of libmatroska.
|
** This file is part of libmatroska.
|
||||||
**
|
**
|
||||||
** This library is free software; you can redistribute it and/or
|
** This library is free software; you can redistribute it and/or
|
||||||
** modify it under the terms of the GNU Lesser General Public
|
** modify it under the terms of the GNU Lesser General Public
|
||||||
** License as published by the Free Software Foundation; either
|
** License as published by the Free Software Foundation; either
|
||||||
** version 2.1 of the License, or (at your option) any later version.
|
** 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,
|
** This library is distributed in the hope that it will be useful,
|
||||||
** but WITHOUT ANY WARRANTY; without even the implied warranty of
|
** but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
** Lesser General Public License for more details.
|
** Lesser General Public License for more details.
|
||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
**********************************************************************/
|
**********************************************************************/
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\file
|
\file
|
||||||
\version \$Id: KaxSegment.h,v 1.8 2004/04/14 23:26:17 robux4 Exp $
|
\version \$Id: KaxSegment.h,v 1.8 2004/04/14 23:26:17 robux4 Exp $
|
||||||
\author Steve Lhomme <robux4 @ users.sf.net>
|
\author Steve Lhomme <robux4 @ users.sf.net>
|
||||||
*/
|
*/
|
||||||
#ifndef LIBMATROSKA_SEGMENT_H
|
#ifndef LIBMATROSKA_SEGMENT_H
|
||||||
#define LIBMATROSKA_SEGMENT_H
|
#define LIBMATROSKA_SEGMENT_H
|
||||||
|
|
||||||
#include "matroska/KaxTypes.h"
|
#include "matroska/KaxTypes.h"
|
||||||
#include "ebml/EbmlMaster.h"
|
#include "ebml/EbmlMaster.h"
|
||||||
#include "matroska/KaxDefines.h"
|
#include "matroska/KaxDefines.h"
|
||||||
|
|
||||||
using namespace LIBEBML_NAMESPACE;
|
using namespace LIBEBML_NAMESPACE;
|
||||||
|
|
||||||
START_LIBMATROSKA_NAMESPACE
|
START_LIBMATROSKA_NAMESPACE
|
||||||
|
|
||||||
DECLARE_MKX_MASTER_CONS(KaxSegment)
|
DECLARE_MKX_MASTER_CONS(KaxSegment)
|
||||||
public:
|
public:
|
||||||
/*!
|
/*!
|
||||||
\brief give the position of the element in the segment
|
\brief give the position of the element in the segment
|
||||||
*/
|
*/
|
||||||
uint64 GetRelativePosition(const EbmlElement & Elt) const;
|
uint64 GetRelativePosition(const EbmlElement & Elt) const;
|
||||||
uint64 GetRelativePosition(uint64 aGlobalPosition) const;
|
uint64 GetRelativePosition(uint64 aGlobalPosition) const;
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\brief give the position of the element in the file
|
\brief give the position of the element in the file
|
||||||
*/
|
*/
|
||||||
uint64 GetGlobalPosition(uint64 aRelativePosition) const;
|
uint64 GetGlobalPosition(uint64 aRelativePosition) const;
|
||||||
};
|
};
|
||||||
|
|
||||||
END_LIBMATROSKA_NAMESPACE
|
END_LIBMATROSKA_NAMESPACE
|
||||||
|
|
||||||
#endif // LIBMATROSKA_SEGMENT_H
|
#endif // LIBMATROSKA_SEGMENT_H
|
||||||
|
|||||||
@@ -20,9 +20,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
@@ -157,9 +157,6 @@ public:
|
|||||||
|
|
||||||
DECLARE_MKX_BINARY (KaxCodecState)
|
DECLARE_MKX_BINARY (KaxCodecState)
|
||||||
};
|
};
|
||||||
|
|
||||||
DECLARE_MKX_SINTEGER(KaxDiscardPadding)
|
|
||||||
};
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
DECLARE_MKX_MASTER(KaxSlices)
|
DECLARE_MKX_MASTER(KaxSlices)
|
||||||
@@ -246,14 +243,7 @@ DECLARE_MKX_UINTEGER(KaxTrackMaxCache)
|
|||||||
DECLARE_MKX_UINTEGER(KaxTrackDefaultDuration)
|
DECLARE_MKX_UINTEGER(KaxTrackDefaultDuration)
|
||||||
};
|
};
|
||||||
|
|
||||||
#if MATROSKA_VERSION >= 2
|
|
||||||
DECLARE_MKX_UINTEGER(KaxTrackDefaultDecodedFieldDuration)
|
|
||||||
};
|
|
||||||
#endif
|
|
||||||
|
|
||||||
DECLARE_MKX_FLOAT(KaxTrackTimecodeScale)
|
DECLARE_MKX_FLOAT(KaxTrackTimecodeScale)
|
||||||
public:
|
|
||||||
filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#if MATROSKA_VERSION >= 2
|
#if MATROSKA_VERSION >= 2
|
||||||
@@ -307,14 +297,6 @@ DECLARE_MKX_UINTEGER(KaxCodecDecodeAll)
|
|||||||
DECLARE_MKX_UINTEGER(KaxTrackOverlay)
|
DECLARE_MKX_UINTEGER(KaxTrackOverlay)
|
||||||
};
|
};
|
||||||
|
|
||||||
#if MATROSKA_VERSION >= 2
|
|
||||||
DECLARE_MKX_UINTEGER(KaxCodecDelay)
|
|
||||||
};
|
|
||||||
|
|
||||||
DECLARE_MKX_UINTEGER(KaxSeekPreRoll)
|
|
||||||
};
|
|
||||||
#endif
|
|
||||||
|
|
||||||
DECLARE_MKX_MASTER(KaxTrackTranslate)
|
DECLARE_MKX_MASTER(KaxTrackTranslate)
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -339,9 +321,6 @@ DECLARE_MKX_UINTEGER(KaxVideoFlagInterlaced)
|
|||||||
DECLARE_MKX_UINTEGER(KaxVideoStereoMode)
|
DECLARE_MKX_UINTEGER(KaxVideoStereoMode)
|
||||||
};
|
};
|
||||||
|
|
||||||
DECLARE_MKX_UINTEGER(KaxVideoAlphaMode)
|
|
||||||
};
|
|
||||||
|
|
||||||
DECLARE_MKX_UINTEGER(KaxOldStereoMode)
|
DECLARE_MKX_UINTEGER(KaxOldStereoMode)
|
||||||
public:
|
public:
|
||||||
filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
|
filepos_t RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault);
|
||||||
@@ -522,14 +501,6 @@ DECLARE_MKX_UINTEGER(KaxCueTrack)
|
|||||||
DECLARE_MKX_UINTEGER(KaxCueClusterPosition)
|
DECLARE_MKX_UINTEGER(KaxCueClusterPosition)
|
||||||
};
|
};
|
||||||
|
|
||||||
#if MATROSKA_VERSION >= 2
|
|
||||||
DECLARE_MKX_UINTEGER(KaxCueRelativePosition)
|
|
||||||
};
|
|
||||||
|
|
||||||
DECLARE_MKX_UINTEGER(KaxCueDuration)
|
|
||||||
};
|
|
||||||
#endif
|
|
||||||
|
|
||||||
DECLARE_MKX_UINTEGER(KaxCueBlockNumber)
|
DECLARE_MKX_UINTEGER(KaxCueBlockNumber)
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -619,11 +590,6 @@ DECLARE_MKX_MASTER(KaxChapterAtom)
|
|||||||
DECLARE_MKX_UINTEGER(KaxChapterUID)
|
DECLARE_MKX_UINTEGER(KaxChapterUID)
|
||||||
};
|
};
|
||||||
|
|
||||||
#if MATROSKA_VERSION >= 2
|
|
||||||
DECLARE_MKX_UNISTRING(KaxChapterStringUID)
|
|
||||||
};
|
|
||||||
#endif
|
|
||||||
|
|
||||||
DECLARE_MKX_UINTEGER(KaxChapterTimeStart)
|
DECLARE_MKX_UINTEGER(KaxChapterTimeStart)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -19,9 +19,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -19,9 +19,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -19,9 +19,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -19,9 +19,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -19,9 +19,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -19,9 +19,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -1,59 +1,59 @@
|
|||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
** libmatroska : parse Matroska files, see http://www.matroska.org/
|
** libmatroska : parse Matroska files, see http://www.matroska.org/
|
||||||
**
|
**
|
||||||
** <file/class description>
|
** <file/class description>
|
||||||
**
|
**
|
||||||
** Copyright (C) 2002-2010 Steve Lhomme. All rights reserved.
|
** Copyright (C) 2002-2010 Steve Lhomme. All rights reserved.
|
||||||
**
|
**
|
||||||
** This file is part of libmatroska.
|
** This file is part of libmatroska.
|
||||||
**
|
**
|
||||||
** This library is free software; you can redistribute it and/or
|
** This library is free software; you can redistribute it and/or
|
||||||
** modify it under the terms of the GNU Lesser General Public
|
** modify it under the terms of the GNU Lesser General Public
|
||||||
** License as published by the Free Software Foundation; either
|
** License as published by the Free Software Foundation; either
|
||||||
** version 2.1 of the License, or (at your option) any later version.
|
** 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,
|
** This library is distributed in the hope that it will be useful,
|
||||||
** but WITHOUT ANY WARRANTY; without even the implied warranty of
|
** but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
** Lesser General Public License for more details.
|
** Lesser General Public License for more details.
|
||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
**********************************************************************/
|
**********************************************************************/
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\file
|
\file
|
||||||
\version \$Id: KaxTypes.h,v 1.4 2004/04/14 23:26:17 robux4 Exp $
|
\version \$Id: KaxTypes.h,v 1.4 2004/04/14 23:26:17 robux4 Exp $
|
||||||
*/
|
*/
|
||||||
#ifndef LIBMATROSKA_TYPES_H
|
#ifndef LIBMATROSKA_TYPES_H
|
||||||
#define LIBMATROSKA_TYPES_H
|
#define LIBMATROSKA_TYPES_H
|
||||||
|
|
||||||
#include "matroska/KaxConfig.h"
|
#include "matroska/KaxConfig.h"
|
||||||
#include "ebml/EbmlTypes.h"
|
#include "ebml/EbmlTypes.h"
|
||||||
#include "matroska/c/libmatroska_t.h"
|
#include "matroska/c/libmatroska_t.h"
|
||||||
|
|
||||||
START_LIBMATROSKA_NAMESPACE
|
START_LIBMATROSKA_NAMESPACE
|
||||||
|
|
||||||
enum LacingType {
|
enum LacingType {
|
||||||
LACING_NONE = 0,
|
LACING_NONE = 0,
|
||||||
LACING_XIPH,
|
LACING_XIPH,
|
||||||
LACING_FIXED,
|
LACING_FIXED,
|
||||||
LACING_EBML,
|
LACING_EBML,
|
||||||
LACING_AUTO
|
LACING_AUTO
|
||||||
};
|
};
|
||||||
|
|
||||||
enum BlockBlobType {
|
enum BlockBlobType {
|
||||||
BLOCK_BLOB_NO_SIMPLE = 0,
|
BLOCK_BLOB_NO_SIMPLE = 0,
|
||||||
BLOCK_BLOB_SIMPLE_AUTO,
|
BLOCK_BLOB_SIMPLE_AUTO,
|
||||||
BLOCK_BLOB_ALWAYS_SIMPLE,
|
BLOCK_BLOB_ALWAYS_SIMPLE,
|
||||||
};
|
};
|
||||||
|
|
||||||
END_LIBMATROSKA_NAMESPACE
|
END_LIBMATROSKA_NAMESPACE
|
||||||
|
|
||||||
#endif // LIBMATROSKA_TYPES_H
|
#endif // LIBMATROSKA_TYPES_H
|
||||||
|
|||||||
@@ -17,9 +17,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
@@ -40,7 +40,7 @@
|
|||||||
|
|
||||||
START_LIBMATROSKA_NAMESPACE
|
START_LIBMATROSKA_NAMESPACE
|
||||||
|
|
||||||
#define LIBMATROSKA_VERSION 0x010400
|
#define LIBMATROSKA_VERSION 0x010300
|
||||||
|
|
||||||
extern const std::string KaxCodeVersion;
|
extern const std::string KaxCodeVersion;
|
||||||
extern const std::string KaxCodeDate;
|
extern const std::string KaxCodeDate;
|
||||||
|
|||||||
@@ -19,9 +19,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.
|
||||||
**
|
**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
|
|||||||
@@ -19,9 +19,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -19,9 +19,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -19,9 +19,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -19,9 +19,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -17,9 +17,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
@@ -161,7 +161,7 @@ LacingType KaxInternalBlock::GetBestLacingType() const {
|
|||||||
return LACING_EBML;
|
return LACING_EBML;
|
||||||
}
|
}
|
||||||
|
|
||||||
filepos_t KaxInternalBlock::UpdateSize(bool /* bSaveDefault */, bool /* bForceRender */)
|
filepos_t KaxInternalBlock::UpdateSize(bool bSaveDefault, bool bForceRender)
|
||||||
{
|
{
|
||||||
LacingType LacingHere;
|
LacingType LacingHere;
|
||||||
assert(EbmlBinary::GetBuffer() == NULL); // Data is not used for KaxInternalBlock
|
assert(EbmlBinary::GetBuffer() == NULL); // Data is not used for KaxInternalBlock
|
||||||
@@ -238,7 +238,7 @@ KaxBlockVirtual::~KaxBlockVirtual()
|
|||||||
SetBuffer( NULL, 0 );
|
SetBuffer( NULL, 0 );
|
||||||
}
|
}
|
||||||
|
|
||||||
filepos_t KaxBlockVirtual::UpdateSize(bool /* bSaveDefault */, bool /* bForceRender */)
|
filepos_t KaxBlockVirtual::UpdateSize(bool bSaveDefault, bool bForceRender)
|
||||||
{
|
{
|
||||||
assert(TrackNumber < 0x4000);
|
assert(TrackNumber < 0x4000);
|
||||||
binary *cursor = EbmlBinary::GetBuffer();
|
binary *cursor = EbmlBinary::GetBuffer();
|
||||||
@@ -268,7 +268,7 @@ filepos_t KaxBlockVirtual::UpdateSize(bool /* bSaveDefault */, bool /* bForceRen
|
|||||||
\todo more optimisation is possible (render the Block head and don't copy the buffer in memory, care should be taken with the allocation of Data)
|
\todo more optimisation is possible (render the Block head and don't copy the buffer in memory, care should be taken with the allocation of Data)
|
||||||
\todo the actual timecode to write should be retrieved from the Cluster from here
|
\todo the actual timecode to write should be retrieved from the Cluster from here
|
||||||
*/
|
*/
|
||||||
filepos_t KaxInternalBlock::RenderData(IOCallback & output, bool /* bForceRender */, bool /* bSaveDefault */)
|
filepos_t KaxInternalBlock::RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault)
|
||||||
{
|
{
|
||||||
if (myBuffers.size() == 0) {
|
if (myBuffers.size() == 0) {
|
||||||
return 0;
|
return 0;
|
||||||
@@ -1034,7 +1034,7 @@ void KaxBlockBlob::SetBlockGroup( KaxBlockGroup &BlockRef )
|
|||||||
Block.group = &BlockRef;
|
Block.group = &BlockRef;
|
||||||
}
|
}
|
||||||
|
|
||||||
filepos_t KaxBlockVirtual::ReadData(IOCallback & input, ScopeMode /* ReadFully */)
|
filepos_t KaxBlockVirtual::ReadData(IOCallback & input, ScopeMode ReadFully)
|
||||||
{
|
{
|
||||||
input.setFilePointer(SizePosition + CodedSizeLength(Size, SizeLength, bSizeIsFinite) + Size, seek_beginning);
|
input.setFilePointer(SizePosition + CodedSizeLength(Size, SizeLength, bSizeIsFinite) + Size, seek_beginning);
|
||||||
return GetSize();
|
return GetSize();
|
||||||
|
|||||||
@@ -17,9 +17,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -17,9 +17,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -19,9 +19,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -17,9 +17,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -17,9 +17,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -19,9 +19,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -19,9 +19,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -19,9 +19,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
1565
src/KaxSemantic.cpp
1565
src/KaxSemantic.cpp
File diff suppressed because it is too large
Load Diff
@@ -19,9 +19,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -19,9 +19,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
@@ -37,7 +37,7 @@
|
|||||||
|
|
||||||
START_LIBMATROSKA_NAMESPACE
|
START_LIBMATROSKA_NAMESPACE
|
||||||
|
|
||||||
const std::string KaxCodeVersion = "1.4.0";
|
const std::string KaxCodeVersion = "1.3.0";
|
||||||
const std::string KaxCodeDate = __TIMESTAMP__;
|
const std::string KaxCodeDate = __TIMESTAMP__;
|
||||||
|
|
||||||
END_LIBMATROSKA_NAMESPACE
|
END_LIBMATROSKA_NAMESPACE
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
## libmatroska Makefile
|
## libmatroska Makefile
|
||||||
## (c) 2002 Steve Lhomme
|
## (c) 2002 Steve Lhomme
|
||||||
## This software is licensed under the LGPL, see LICENSE.LGPL
|
## This software is licensed under the LGPL, see LGPL.txt
|
||||||
|
|
||||||
all: endian
|
all: endian
|
||||||
echo "Making endianess tests"
|
echo "Making endianess tests"
|
||||||
(cd endian; make)
|
(cd endian; make)
|
||||||
clean:
|
clean:
|
||||||
echo "Cleaning all tests"
|
echo "Cleaning all tests"
|
||||||
(cd endian; make $@)
|
(cd endian; make $@)
|
||||||
|
|||||||
@@ -1,62 +1,62 @@
|
|||||||
# libmatroska core Makefile (used in cygwin)
|
# libmatroska core Makefile (used in cygwin)
|
||||||
# $Id: Makefile 640 2004-07-09 21:05:36Z mosu $
|
# $Id: Makefile 640 2004-07-09 21:05:36Z mosu $
|
||||||
|
|
||||||
# Options
|
# Options
|
||||||
EXTENSION=.cpp
|
EXTENSION=.cpp
|
||||||
CXXFLAGS=-g -DDEBUG -Wall -Wno-unknown-pragmas -DWIN32 -I../../src/
|
CXXFLAGS=-g -DDEBUG -Wall -Wno-unknown-pragmas -DWIN32 -I../../src/
|
||||||
LDFLAGS=
|
LDFLAGS=
|
||||||
|
|
||||||
SRC_DIR=../../src/
|
SRC_DIR=../../src/
|
||||||
|
|
||||||
# Programs
|
# Programs
|
||||||
CXX=g++ -c
|
CXX=g++ -c
|
||||||
LD=g++
|
LD=g++
|
||||||
DEP=$(CXX) -MM
|
DEP=$(CXX) -MM
|
||||||
DEPEND = makedepend
|
DEPEND = makedepend
|
||||||
AR = ar rcvu
|
AR = ar rcvu
|
||||||
RANLIB = ranlib
|
RANLIB = ranlib
|
||||||
|
|
||||||
# Librarires
|
# Librarires
|
||||||
INCLUDE=
|
INCLUDE=
|
||||||
LIBS=
|
LIBS=
|
||||||
|
|
||||||
# Names
|
# Names
|
||||||
PROGRAM=test00
|
PROGRAM=test00
|
||||||
|
|
||||||
# source-files
|
# source-files
|
||||||
sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
|
sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
|
||||||
|
|
||||||
# header files; replace .cxx extension with .h
|
# header files; replace .cxx extension with .h
|
||||||
headers:=$(patsubst %$(EXTENSION),%.hpp,$(sources))
|
headers:=$(patsubst %$(EXTENSION),%.hpp,$(sources))
|
||||||
|
|
||||||
# files holding dependency information; replace .cxx extension with .dep
|
# files holding dependency information; replace .cxx extension with .dep
|
||||||
dependencies:=$(patsubst %$(EXTENSION),%.dep,$(sources))
|
dependencies:=$(patsubst %$(EXTENSION),%.dep,$(sources))
|
||||||
|
|
||||||
# object files; replace .cxx extension with .o
|
# object files; replace .cxx extension with .o
|
||||||
objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
|
objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
|
||||||
|
|
||||||
OBJ=$(objects) test00.o
|
OBJ=$(objects) test00.o
|
||||||
|
|
||||||
DEPENDFLAGS = ${CXXFLAGS} ${INCLUDE}
|
DEPENDFLAGS = ${CXXFLAGS} ${INCLUDE}
|
||||||
|
|
||||||
# Build rules
|
# Build rules
|
||||||
%.o: %$(EXTENSION)
|
%.o: %$(EXTENSION)
|
||||||
$(CXX) $(CXXFLAGS) $(INCLUDE) -o $@ $<
|
$(CXX) $(CXXFLAGS) $(INCLUDE) -o $@ $<
|
||||||
|
|
||||||
$(PROGRAM): $(OBJ)
|
$(PROGRAM): $(OBJ)
|
||||||
# $(AR) $@ $(objects)
|
# $(AR) $@ $(objects)
|
||||||
# $(RANLIB) $@
|
# $(RANLIB) $@
|
||||||
$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
|
$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
|
||||||
${LD} -o $@ ${LDFLAGS} ${OBJ} ${LIBS} ${EXTRA_LIBS}
|
${LD} -o $@ ${LDFLAGS} ${OBJ} ${LIBS} ${EXTRA_LIBS}
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f $(OBJ)
|
rm -f $(OBJ)
|
||||||
rm -f $(dependencies)
|
rm -f $(dependencies)
|
||||||
rm -f $(PROGRAM)
|
rm -f $(PROGRAM)
|
||||||
rm -f CORE
|
rm -f CORE
|
||||||
|
|
||||||
# what are the source dependencies
|
# what are the source dependencies
|
||||||
depend: $(sources)
|
depend: $(sources)
|
||||||
$(DEPEND) $(DEPENDFLAGS) $(sources)
|
$(DEPEND) $(DEPENDFLAGS) $(sources)
|
||||||
|
|
||||||
# DO NOT DELETE
|
# DO NOT DELETE
|
||||||
|
|||||||
@@ -7,21 +7,24 @@
|
|||||||
**
|
**
|
||||||
** This file is part of libmatroska.
|
** This file is part of libmatroska.
|
||||||
**
|
**
|
||||||
** This library is free software; you can redistribute it and/or
|
** This file may be distributed under the terms of the Q Public License
|
||||||
** modify it under the terms of the GNU Lesser General Public
|
** as defined by Trolltech AS of Norway and appearing in the file
|
||||||
** License as published by the Free Software Foundation; either
|
** LICENSE.QPL included in the packaging of this file.
|
||||||
** version 2.1 of the License, or (at your option) any later version.
|
**
|
||||||
**
|
** This file may be distributed and/or modified under the terms of the
|
||||||
** This library is distributed in the hope that it will be useful,
|
** GNU General Public License version 2 as published by the Free Software
|
||||||
** but WITHOUT ANY WARRANTY; without even the implied warranty of
|
** Foundation and appearing in the file LICENSE.GPL included in the
|
||||||
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
** packaging of this file.
|
||||||
** Lesser General Public License for more details.
|
**
|
||||||
**
|
** Licensees holding an other license may use this file in accordance with
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** the Agreement provided with the Software.
|
||||||
** License along with this library; if not, write to the Free Software
|
**
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
|
||||||
|
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
|
**
|
||||||
|
** See http://www.matroska.org/license/qpl/ for QPL licensing information.
|
||||||
|
** See http://www.matroska.org/license/gpl/ for GPL 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
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -7,21 +7,24 @@
|
|||||||
**
|
**
|
||||||
** This file is part of libmatroska.
|
** This file is part of libmatroska.
|
||||||
**
|
**
|
||||||
** This library is free software; you can redistribute it and/or
|
** This file may be distributed under the terms of the Q Public License
|
||||||
** modify it under the terms of the GNU Lesser General Public
|
** as defined by Trolltech AS of Norway and appearing in the file
|
||||||
** License as published by the Free Software Foundation; either
|
** LICENSE.QPL included in the packaging of this file.
|
||||||
** version 2.1 of the License, or (at your option) any later version.
|
**
|
||||||
**
|
** This file may be distributed and/or modified under the terms of the
|
||||||
** This library is distributed in the hope that it will be useful,
|
** GNU General Public License version 2 as published by the Free Software
|
||||||
** but WITHOUT ANY WARRANTY; without even the implied warranty of
|
** Foundation and appearing in the file LICENSE.GPL included in the
|
||||||
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
** packaging of this file.
|
||||||
** Lesser General Public License for more details.
|
**
|
||||||
**
|
** Licensees holding an other license may use this file in accordance with
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** the Agreement provided with the Software.
|
||||||
** License along with this library; if not, write to the Free Software
|
**
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
|
||||||
|
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
|
**
|
||||||
|
** See http://www.matroska.org/license/qpl/ for QPL licensing information.
|
||||||
|
** See http://www.matroska.org/license/gpl/ for GPL 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
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -19,9 +19,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -17,9 +17,9 @@
|
|||||||
**
|
**
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** You should have received a copy of the GNU Lesser General Public
|
||||||
** License along with this library; if not, write to the Free Software
|
** License along with this library; if not, write to the Free Software
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
**
|
**
|
||||||
** See http://www.gnu.org/licenses/lgpl-2.1.html for LGPL licensing information.**
|
** See http://www.matroska.org/license/lgpl/ for LGPL licensing information.**
|
||||||
** Contact license@matroska.org if any conditions of this licensing are
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -7,21 +7,24 @@
|
|||||||
**
|
**
|
||||||
** This file is part of libmatroska.
|
** This file is part of libmatroska.
|
||||||
**
|
**
|
||||||
** This library is free software; you can redistribute it and/or
|
** This file may be distributed under the terms of the Q Public License
|
||||||
** modify it under the terms of the GNU Lesser General Public
|
** as defined by Trolltech AS of Norway and appearing in the file
|
||||||
** License as published by the Free Software Foundation; either
|
** LICENSE.QPL included in the packaging of this file.
|
||||||
** version 2.1 of the License, or (at your option) any later version.
|
**
|
||||||
**
|
** This file may be distributed and/or modified under the terms of the
|
||||||
** This library is distributed in the hope that it will be useful,
|
** GNU General Public License version 2 as published by the Free Software
|
||||||
** but WITHOUT ANY WARRANTY; without even the implied warranty of
|
** Foundation and appearing in the file LICENSE.GPL included in the
|
||||||
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
** packaging of this file.
|
||||||
** Lesser General Public License for more details.
|
**
|
||||||
**
|
** Licensees holding an other license may use this file in accordance with
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** the Agreement provided with the Software.
|
||||||
** License along with this library; if not, write to the Free Software
|
**
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
|
||||||
|
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
|
**
|
||||||
|
** See http://www.matroska.org/license/qpl/ for QPL licensing information.
|
||||||
|
** See http://www.matroska.org/license/gpl/ for GPL 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
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
@@ -7,21 +7,24 @@
|
|||||||
**
|
**
|
||||||
** This file is part of libmatroska.
|
** This file is part of libmatroska.
|
||||||
**
|
**
|
||||||
** This library is free software; you can redistribute it and/or
|
** This file may be distributed under the terms of the Q Public License
|
||||||
** modify it under the terms of the GNU Lesser General Public
|
** as defined by Trolltech AS of Norway and appearing in the file
|
||||||
** License as published by the Free Software Foundation; either
|
** LICENSE.QPL included in the packaging of this file.
|
||||||
** version 2.1 of the License, or (at your option) any later version.
|
**
|
||||||
**
|
** This file may be distributed and/or modified under the terms of the
|
||||||
** This library is distributed in the hope that it will be useful,
|
** GNU General Public License version 2 as published by the Free Software
|
||||||
** but WITHOUT ANY WARRANTY; without even the implied warranty of
|
** Foundation and appearing in the file LICENSE.GPL included in the
|
||||||
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
** packaging of this file.
|
||||||
** Lesser General Public License for more details.
|
**
|
||||||
**
|
** Licensees holding an other license may use this file in accordance with
|
||||||
** You should have received a copy of the GNU Lesser General Public
|
** the Agreement provided with the Software.
|
||||||
** License along with this library; if not, write to the Free Software
|
**
|
||||||
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
|
||||||
|
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
|
**
|
||||||
|
** See http://www.matroska.org/license/qpl/ for QPL licensing information.
|
||||||
|
** See http://www.matroska.org/license/gpl/ for GPL 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
|
** Contact license@matroska.org if any conditions of this licensing are
|
||||||
** not clear to you.
|
** not clear to you.
|
||||||
**
|
**
|
||||||
|
|||||||
Reference in New Issue
Block a user