KaxBlock.h   KaxBlock.h 
skipping to change at line 87 skipping to change at line 87
memcpy(myBuffer, aBuffer, mySize); memcpy(myBuffer, aBuffer, mySize);
} }
else else
myBuffer = aBuffer; myBuffer = aBuffer;
} }
virtual ~DataBuffer() {} virtual ~DataBuffer() {}
virtual binary * Buffer() {assert(bValidValue); return myBuf fer;} virtual binary * Buffer() {assert(bValidValue); return myBuf fer;}
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 const uint32 Size() const {return mySize;}; virtual 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) {
if (myFreeBuffer != NULL) if (myFreeBuffer != NULL)
bResult = myFreeBuffer(aBuffer); bResult = myFreeBuffer(aBuffer);
if (bInternalBuffer) if (bInternalBuffer)
delete [] myBuffer; delete [] myBuffer;
myBuffer = NULL; myBuffer = NULL;
mySize = 0; mySize = 0;
bValidValue = false; bValidValue = false;
skipping to change at line 308 skipping to change at line 308
class MATROSKA_DLL_API KaxSimpleBlock : public KaxInternalBlock { class MATROSKA_DLL_API KaxSimpleBlock : public KaxInternalBlock {
public: public:
KaxSimpleBlock(EBML_EXTRA_PARAM) :KaxInternalBlock(EBML_DEF_ BINARY_CTX(KaxSimpleBlock)EBML_DEF_SEP true EBML_DEF_SEP EBML_EXTRA_CALL) { } KaxSimpleBlock(EBML_EXTRA_PARAM) :KaxInternalBlock(EBML_DEF_ BINARY_CTX(KaxSimpleBlock)EBML_DEF_SEP true EBML_DEF_SEP EBML_EXTRA_CALL) { }
void SetKeyframe(bool b_keyframe) { bIsKeyframe = b_keyframe ; } void SetKeyframe(bool b_keyframe) { bIsKeyframe = b_keyframe ; }
void SetDiscardable(bool b_discard) { bIsDiscardable = b_dis card; } void SetDiscardable(bool b_discard) { bIsDiscardable = b_dis card; }
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)
}; };
#endif // MATROSKA_VERSION #endif // MATROSKA_VERSION
/// Placeholder class for either a BlockGroup or a SimpleBlock /// Placeholder class for either a BlockGroup or a SimpleBlock
class MATROSKA_DLL_API KaxBlockBlob { class MATROSKA_DLL_API KaxBlockBlob {
public: public:
KaxBlockBlob(BlockBlobType sblock_mode) :ParentCluster(NULL), Simple BlockMode(sblock_mode) { KaxBlockBlob(BlockBlobType sblock_mode) :ParentCluster(NULL), Simple BlockMode(sblock_mode) {
 End of changes. 2 change blocks. 
2 lines changed or deleted 1 lines changed or added


 KaxChapters.h   KaxChapters.h 
skipping to change at line 32 skipping to change at line 32
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
** **
** See http://www.matroska.org/license/lgpl/ 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: KaxChapters.h 725 2011-03-27 17:09:02Z robux4 $ \version \$Id$
\author Steve Lhomme <robux4 @ users.sf.net> \author Steve Lhomme <robux4 @ users.sf.net>
*/ */
#ifndef LIBMATROSKA_CHAPTERS_H #ifndef LIBMATROSKA_CHAPTERS_H
#define LIBMATROSKA_CHAPTERS_H #define LIBMATROSKA_CHAPTERS_H
#include "matroska/KaxSemantic.h" #include "matroska/KaxSemantic.h"
#endif // LIBMATROSKA_CHAPTERS_H #endif // LIBMATROSKA_CHAPTERS_H
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 KaxContexts.h   KaxContexts.h 
skipping to change at line 32 skipping to change at line 32
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
** **
** See http://www.matroska.org/license/lgpl/ 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: KaxContexts.h 348 2010-06-26 09:10:20Z robux4 $ \version \$Id$
\author Steve Lhomme <robux4 @ users.sf.net> \author Steve Lhomme <robux4 @ users.sf.net>
*/ */
#ifndef LIBMATROSKA_CONTEXTS_H #ifndef LIBMATROSKA_CONTEXTS_H
#define LIBMATROSKA_CONTEXTS_H #define LIBMATROSKA_CONTEXTS_H
#include "matroska/KaxTypes.h" #include "matroska/KaxTypes.h"
#include "ebml/EbmlElement.h" #include "ebml/EbmlElement.h"
using namespace LIBEBML_NAMESPACE; using namespace LIBEBML_NAMESPACE;
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 KaxDefines.h   KaxDefines.h 
skipping to change at line 30 skipping to change at line 30
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
** **
** See http://www.matroska.org/license/lgpl/ 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: KaxDefines.h 725 2011-03-27 17:09:02Z robux4 $ \version \$Id$
\author Steve Lhomme <robux4 @ users.sf.net> \author Steve Lhomme <robux4 @ users.sf.net>
*/ */
#ifndef LIBMATROSKA_DEFINES_H #ifndef LIBMATROSKA_DEFINES_H
#define LIBMATROSKA_DEFINES_H #define LIBMATROSKA_DEFINES_H
#include "ebml/EbmlVersion.h" #include "ebml/EbmlVersion.h"
#include "ebml/EbmlElement.h" #include "ebml/EbmlElement.h"
#if defined(HAVE_EBML2) || defined(HAS_EBML2) #if defined(HAVE_EBML2) || defined(HAS_EBML2)
#define DEFINE_MKX_CONTEXT(a) DEFINE_xxx_CONTEXT(a,EBML_Sema nticGlobal) #define DEFINE_MKX_CONTEXT(a) DEFINE_xxx_CONTEXT(a,EBML_Sema nticGlobal)
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 KaxInfoData.h   KaxInfoData.h 
skipping to change at line 32 skipping to change at line 32
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
** **
** See http://www.matroska.org/license/lgpl/ 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: KaxInfoData.h 725 2011-03-27 17:09:02Z robux4 $ \version \$Id$
\author Steve Lhomme <robux4 @ users.sf.net> \author Steve Lhomme <robux4 @ users.sf.net>
\author John Cannon <spyder2555 @ users.sf.net> \author John Cannon <spyder2555 @ users.sf.net>
\author Moritz Bunkus <moritz @ bunkus.org> \author Moritz Bunkus <moritz @ bunkus.org>
*/ */
#ifndef LIBMATROSKA_INFO_DATA_H #ifndef LIBMATROSKA_INFO_DATA_H
#define LIBMATROSKA_INFO_DATA_H #define LIBMATROSKA_INFO_DATA_H
#include "matroska/KaxTypes.h" #include "matroska/KaxTypes.h"
#include "ebml/EbmlUInteger.h" #include "ebml/EbmlUInteger.h"
#include "ebml/EbmlFloat.h" #include "ebml/EbmlFloat.h"
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 KaxSeekHead.h   KaxSeekHead.h 
skipping to change at line 32 skipping to change at line 32
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
** **
** See http://www.matroska.org/license/lgpl/ 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: KaxSeekHead.h 725 2011-03-27 17:09:02Z robux4 $ \version \$Id$
\author Steve Lhomme <robux4 @ users.sf.net> \author Steve Lhomme <robux4 @ users.sf.net>
*/ */
#ifndef LIBMATROSKA_SEEK_HEAD_H #ifndef LIBMATROSKA_SEEK_HEAD_H
#define LIBMATROSKA_SEEK_HEAD_H #define LIBMATROSKA_SEEK_HEAD_H
#include "matroska/KaxTypes.h" #include "matroska/KaxTypes.h"
#include "ebml/EbmlMaster.h" #include "ebml/EbmlMaster.h"
#include "ebml/EbmlBinary.h" #include "ebml/EbmlBinary.h"
#include "ebml/EbmlUInteger.h" #include "ebml/EbmlUInteger.h"
#include "matroska/KaxDefines.h" #include "matroska/KaxDefines.h"
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 KaxSemantic.h   KaxSemantic.h 
skipping to change at line 236 skipping to change at line 236
DECLARE_MKX_UINTEGER(KaxTrackMinCache) DECLARE_MKX_UINTEGER(KaxTrackMinCache)
}; };
DECLARE_MKX_UINTEGER(KaxTrackMaxCache) 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 bS
aveDefault);
}; };
#if MATROSKA_VERSION >= 2 #if MATROSKA_VERSION >= 2
DECLARE_MKX_SINTEGER(KaxTrackOffset) DECLARE_MKX_SINTEGER(KaxTrackOffset)
public: public:
filepos_t RenderData(IOCallback & output, bool bForceRender, bool bS aveDefault); filepos_t RenderData(IOCallback & output, bool bForceRender, bool bS aveDefault);
}; };
#endif #endif
DECLARE_MKX_UINTEGER(KaxMaxBlockAdditionID) DECLARE_MKX_UINTEGER(KaxMaxBlockAdditionID)
skipping to change at line 312 skipping to change at line 319
DECLARE_MKX_MASTER(KaxTrackVideo) DECLARE_MKX_MASTER(KaxTrackVideo)
}; };
#if MATROSKA_VERSION >= 2 #if MATROSKA_VERSION >= 2
DECLARE_MKX_UINTEGER(KaxVideoFlagInterlaced) 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 bS aveDefault); filepos_t RenderData(IOCallback & output, bool bForceRender, bool bS aveDefault);
}; };
#endif #endif
DECLARE_MKX_UINTEGER(KaxVideoPixelWidth) DECLARE_MKX_UINTEGER(KaxVideoPixelWidth)
}; };
DECLARE_MKX_UINTEGER(KaxVideoPixelHeight) DECLARE_MKX_UINTEGER(KaxVideoPixelHeight)
skipping to change at line 483 skipping to change at line 493
DECLARE_MKX_UINTEGER(KaxCueTime) DECLARE_MKX_UINTEGER(KaxCueTime)
}; };
DECLARE_MKX_UINTEGER(KaxCueTrack) 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)
}; };
#if MATROSKA_VERSION >= 2 #if MATROSKA_VERSION >= 2
DECLARE_MKX_UINTEGER(KaxCueCodecState) DECLARE_MKX_UINTEGER(KaxCueCodecState)
}; };
DECLARE_MKX_UINTEGER(KaxCueRefTime) DECLARE_MKX_UINTEGER(KaxCueRefTime)
}; };
skipping to change at line 567 skipping to change at line 585
DECLARE_MKX_UINTEGER(KaxEditionFlagOrdered) DECLARE_MKX_UINTEGER(KaxEditionFlagOrdered)
}; };
DECLARE_MKX_MASTER(KaxChapterAtom) 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)
}; };
DECLARE_MKX_UINTEGER(KaxChapterTimeEnd) DECLARE_MKX_UINTEGER(KaxChapterTimeEnd)
}; };
DECLARE_MKX_UINTEGER(KaxChapterFlagHidden) DECLARE_MKX_UINTEGER(KaxChapterFlagHidden)
}; };
DECLARE_MKX_UINTEGER(KaxChapterFlagEnabled) DECLARE_MKX_UINTEGER(KaxChapterFlagEnabled)
 End of changes. 5 change blocks. 
0 lines changed or deleted 24 lines changed or added


 KaxTag.h   KaxTag.h 
skipping to change at line 32 skipping to change at line 32
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
** **
** See http://www.matroska.org/license/lgpl/ 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: KaxTag.h 725 2011-03-27 17:09:02Z robux4 $ \version \$Id$
\author Steve Lhomme <robux4 @ users.sf.net> \author Steve Lhomme <robux4 @ users.sf.net>
*/ */
#ifndef LIBMATROSKA_TAG_H #ifndef LIBMATROSKA_TAG_H
#define LIBMATROSKA_TAG_H #define LIBMATROSKA_TAG_H
#include "matroska/KaxSemantic.h" #include "matroska/KaxSemantic.h"
#endif // LIBMATROSKA_TAG_H #endif // LIBMATROSKA_TAG_H
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 KaxTrackVideo.h   KaxTrackVideo.h 
skipping to change at line 32 skipping to change at line 32
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
** **
** See http://www.matroska.org/license/lgpl/ 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: KaxTrackVideo.h 725 2011-03-27 17:09:02Z robux4 $ \version \$Id$
\author Steve Lhomme <robux4 @ users.sf.net> \author Steve Lhomme <robux4 @ users.sf.net>
*/ */
#ifndef LIBMATROSKA_TRACK_VIDEO_H #ifndef LIBMATROSKA_TRACK_VIDEO_H
#define LIBMATROSKA_TRACK_VIDEO_H #define LIBMATROSKA_TRACK_VIDEO_H
#include "matroska/KaxSemantic.h" #include "matroska/KaxSemantic.h"
#endif // LIBMATROSKA_TRACK_VIDEO_H #endif // LIBMATROSKA_TRACK_VIDEO_H
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 KaxVersion.h   KaxVersion.h 
skipping to change at line 43 skipping to change at line 43
#ifndef LIBMATROSKA_VERSION_H #ifndef LIBMATROSKA_VERSION_H
#define LIBMATROSKA_VERSION_H #define LIBMATROSKA_VERSION_H
#include <string> #include <string>
#include "ebml/EbmlConfig.h" #include "ebml/EbmlConfig.h"
#include "matroska/KaxConfig.h" #include "matroska/KaxConfig.h"
START_LIBMATROSKA_NAMESPACE START_LIBMATROSKA_NAMESPACE
#define LIBMATROSKA_VERSION 0x010300 #define LIBMATROSKA_VERSION 0x010400
extern const std::string KaxCodeVersion; extern const std::string KaxCodeVersion;
extern const std::string KaxCodeDate; extern const std::string KaxCodeDate;
/*! /*!
\todo Improve the CRC/ECC system (backward and forward possible ?) t o fit streaming/live writing/simple reading \todo Improve the CRC/ECC system (backward and forward possible ?) t o fit streaming/live writing/simple reading
*/ */
END_LIBMATROSKA_NAMESPACE END_LIBMATROSKA_NAMESPACE
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/