Commit ca8263bf authored by Steve Lhomme's avatar Steve Lhomme

no more TrackTimecodeScale in Matroska v4

no more TrackTimecodeScale writing in libmatroska

git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/foundation_src@853 a6f86f6d-0131-4f8e-9e7b-e335508773d5
parent 239858ff
This diff is collapsed.
......@@ -26,6 +26,12 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/**
* A tool to generate the libmatroska semantic files
* input: specdata.xml
* output: KaxSemantic.cpp / KaxSemantic.h
*/
#include "data2lib2_stdafx.h"
#include "spec_element.h"
......@@ -481,11 +487,6 @@ static void OutputCHeader(textwriter *CFile, bool_t WithInclude)
}
/**
* A tool to format the table in the specs
* input: spec.xml
* output: table_spec.xml
*/
int main(void)
{
parsercontext p;
......@@ -537,13 +538,13 @@ int main(void)
for (element=ARRAYBEGIN(Elements,SpecElement*); element!=ARRAYEND(Elements,SpecElement*);++element) {
if ((element+1) == ARRAYEND(Elements,SpecElement*))
Extras.IsLast = 1;
if ((*element)->Id == 0x18538067)
if ((*element)->Id == 0x18538067) // Segment
Extras.PassedEBML = 1;
if (Extras.PassedEBML)
{
if (!IsValidElement(*element))
if (!IsValidElement(*element) || (*element)->Id == 0x23314F) // TrackTimecodeScale
{
TextPrintf(&CFile, T("\nfilepos_t Kax%s::RenderData(IOCallback & output, bool bForceRender, bool bSaveDefault) {\n"), GetClassName(*element));
TextPrintf(&CFile, T("\nfilepos_t Kax%s::RenderData(IOCallback & /* output */, bool /* bForceRender */, bool /* bSaveDefault */) {\n"), GetClassName(*element));
TextWrite(&CFile, T("\tassert(false); // no you are not allowed to use this element !\n"));
TextWrite(&CFile, T("\treturn 0;\n"));
TextWrite(&CFile, T("}\n"));
......
......@@ -26,6 +26,12 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/**
* A tool to generate the libmatroska2 semantic files
* input: specdata.xml
* output: matroska_sem.c / matroska_sem.h
*/
#include "data2lib2_stdafx.h"
#include "spec_element.h"
......@@ -382,11 +388,6 @@ static void OutputCHeader(textwriter *CFile, bool_t WithInclude)
}
/**
* A tool to format the table in the specs
* input: spec.xml
* output: table_spec.xml
*/
int main(void)
{
parsercontext p;
......
......@@ -26,6 +26,12 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/**
* A tool to format the table in the specs
* input: specdata.xml
* output: spec.xml
*/
#include "data2spec_stdafx.h"
#include "spec_element.h"
......@@ -493,11 +499,6 @@ META_CLASS(SIZE,sizeof(SpecElement))
META_END(NODE_CLASS)
/**
* A tool to format the table in the specs
* input: spec.xml
* output: table_spec.xml
*/
int main(void)
{
parsercontext p;
......
......@@ -83,7 +83,7 @@
<element name="MinCache" cppname="TrackMinCache" level="3" id="0x6DE7" type="uinteger" mandatory="1" minver="1" webm="0" default="0">The minimum number of frames a player should be able to cache during playback. If set to 0, the reference pseudo-cache system is not used.</element>
<element name="MaxCache" cppname="TrackMaxCache" level="3" id="0x6DF8" type="uinteger" minver="1" webm="0">The maximum cache size required to store referenced frames in and the current frame. 0 means no cache is needed.</element>
<element name="DefaultDuration" cppname="TrackDefaultDuration" level="3" id="0x23E383" type="uinteger" minver="1" range="not 0">Number of nanoseconds (i.e. not scaled) per frame.</element>
<element name="TrackTimecodeScale" level="3" id="0x23314F" type="float" mandatory="1" minver="1" webm="0" default="1.0" range="&gt; 0">The scale to apply on this track to work at normal speed in relation with other tracks (mostly used to adjust video speed when the audio length differs).</element>
<element name="TrackTimecodeScale" level="3" id="0x23314F" type="float" mandatory="1" minver="1" maxver="3" webm="0" default="1.0" range="&gt; 0">DEPRECATED, DO NOT USE. The scale to apply on this track to work at normal speed in relation with other tracks (mostly used to adjust video speed when the audio length differs).</element>
<element name="TrackOffset" level="3" id="0x537F" type="integer" webm="0" default="0">A value to add to the Block's Timecode. This can be used to adjust the playback offset of a track.</element>
<element name="MaxBlockAdditionID" level="3" id="0x55EE" type="uinteger" mandatory="1" minver="1" webm="0" default="0">The maximum value of <a href="http://www.matroska.org/technical/specs/index.html#BlockAddID">BlockAddID</a>. A value 0 means there is no <a href="http://www.matroska.org/technical/specs/index.html#BlockAdditions">BlockAdditions</a> for this track.</element>
<element name="Name" cppname="TrackName" level="3" id="0x536E" type="utf-8" minver="1">A human-readable track name.</element>
......
......@@ -26,6 +26,12 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/**
* A tool to format the table in the specs
* input: spec.xml
* output: table_spec.xml
*/
#include "tabler_stdafx.h"
#ifndef CONFIG_EBML_UNICODE
#define CONFIG_EBML_UNICODE
......@@ -88,11 +94,6 @@ static void DumpLevel(parser *p, textwriter *parent)
}
}
/**
* A tool to format the table in the specs
* input: spec.xml
* output: table_spec.xml
*/
int main(void)
{
parsercontext p;
......
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