Commit 55ce1245 authored by Steve Lhomme's avatar Steve Lhomme

libmatroska2: a copy of a Block doesn't actually copy the data (for now)

git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/foundation_src@448 a6f86f6d-0131-4f8e-9e7b-e335508773d5
parent 569de32f
......@@ -3,7 +3,7 @@
PROJECT matroska2
{
PROJECT_NAME "libmatroska2"
PROJECT_VERSION 0.9.12
PROJECT_VERSION 0.9.13
PROJECT_VENDOR "Matroska Foundation"
}
......
......@@ -1845,7 +1845,7 @@ failed:
}
#endif
static matroska_block *CopyBlockData(const matroska_block *Element, const void *Cookie)
static matroska_block *CopyBlockInfo(const matroska_block *Element, const void *Cookie)
{
matroska_block *Result = (matroska_block*)INHERITED(Element,ebml_element_vmt,Node_ClassId(Element))->Copy(Element,Cookie);
if (Result)
......@@ -1854,7 +1854,7 @@ static matroska_block *CopyBlockData(const matroska_block *Element, const void *
Result->IsKeyframe = Element->IsKeyframe;
Result->IsDiscardable = Element->IsDiscardable;
Result->Invisible = Element->Invisible;
#if 0
#if 0 // computed once blocks are added
Result->LocalTimecode = Element->LocalTimecode;
Result->LocalTimecodeUsed = Element->LocalTimecodeUsed;
Result->GlobalTimecode = Element->GlobalTimecode;
......@@ -1863,6 +1863,8 @@ static matroska_block *CopyBlockData(const matroska_block *Element, const void *
array SizeList = Element->; // int32_t
array Data = Element->; // uint8_t
array Durations = Element->; // timecode_t
#else
Result->Base.Base.bValueIsSet = 0;
#endif
Node_SET(Result,MATROSKA_BLOCK_READ_TRACK,&Element->ReadTrack);
Node_SET(Result,MATROSKA_BLOCK_READ_SEGMENTINFO,&Element->ReadSegInfo);
......@@ -2057,7 +2059,7 @@ META_VMT(TYPE_FUNC,ebml_element_vmt,UpdateSize,UpdateBlockSize)
#if defined(CONFIG_EBML_WRITING)
META_VMT(TYPE_FUNC,ebml_element_vmt,RenderData,RenderBlockData)
#endif
META_VMT(TYPE_FUNC,ebml_element_vmt,Copy,CopyBlockData)
META_VMT(TYPE_FUNC,ebml_element_vmt,Copy,CopyBlockInfo)
META_DATA(TYPE_ARRAY,0,matroska_block,SizeList)
META_DATA(TYPE_ARRAY,0,matroska_block,Data)
META_DATA(TYPE_ARRAY,0,matroska_block,Durations)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment