[ttml1] add errata to correct drop{NTSC,PAL} calculation; [ttml2] correct drop{NTSC,PAL} calculation
--- a/ttml1/spec/ttml1-errata.html Thu Oct 29 13:39:23 2015 +0900
+++ b/ttml1/spec/ttml1-errata.html Thu Oct 29 13:41:51 2015 +0900
@@ -16,7 +16,7 @@
</head>
<body>
<h1>Errata for Timed Text Markup Language 1 (TTML1)</h1>
- <h2>W3C Recommendation 24 September 2013</h2>
+ <h2>W3C Recommendation 29 October 2015</h2>
<dl>
<dt><span style="font-weight: normal;">This version:</span></dt>
<dd><a href="http://www.w3.org/2013/09/ttml1-errata.html">http://www.w3.org/2013/09/ttml1-errata.html</a></dd>
@@ -54,7 +54,7 @@
<h2>Conventions</h2>
<p>Added text marked <span class="diff-add">thus</span>. Removed text
marked <span class="diff-del">thus</span>. Changed text marked <span class="diff-chg">thus</span>.</p>
- <h2 id="errors">Known errata as of 17 September 2014</h2>
+ <h2 id="errors">Known errata as of 29 October 2015</h2>
<ul>
<li><a href="#errata-2.2-1">Correction in TTML1 Section 2.2 Terminology</a>
(published 2014-07-31)</li>
@@ -78,6 +78,8 @@
Registration</a> (published 2014-01-30)</li>
<li><a href="#errata-M-1">Correction in TTML1 Appendix M - Concrete
Encoding</a> (published 2014-02-20)</li>
+ <li><a href="#errata-N-1">Correction in TTML1 Appendix N - Time Expression Semantics (Non-Normative)</a>
+ (published 2015-10-29)</li>
</ul>
<h2>Errata</h2>
<hr />
@@ -356,5 +358,28 @@
<span class="diff-add"><code>&quot;</code></span></span>.".
</p>
<hr />
+ <p id="errata-N-1">Correction
+ in <a href="http://www.w3.org/TR/ttml1/#time-expression-semantics-smpte">TTML1 Appendix N - Time Expression Semantics (Non-Normative)</a> (published 2015-10-29)</p>
+ <p class="description"><span class="title-description">Description</span>:</p>
+ <p class="description">Correction in the drop mode calculation:<br />
+ </p>
+ <ul>
+ <li>in <span style="font-weight: bold;">TTML Semantics – Time Expressions and SMPTE Time Relationship</span>
+ correct formulas used in steps 2 and 3.</li>
+ </ul>
+ <p class="description"><em><strong><span class="title-correction">Resolution</span></strong></em>:</p>
+ <p>In step (2), change</p>
+ <ul style="list-style-type:none"><li>"if <emph>dropMode</emph> is <code>dropNTSC</code>, let
+ <code>droppedFrames = (hours * 54 + floor(minutes - minutes/10)) * 2</code>;"</li></ul>
+ <p>to read as</p>
+ <ul style="list-style-type:none"><li>"if <emph>dropMode</emph> is <code>dropNTSC</code>, let
+ <code>droppedFrames = (hours * 54 + <span class="diff-chg">minutes - floor(minutes/10)</span>) * 2</code>;"</li></ul>
+ <p>In step (3), change</p>
+ <ul style="list-style-type:none"><li>"if <emph>dropMode</emph> is <code>dropPAL</code>, let
+ <code>droppedFrames = (hours * 27 + floor(minutes/2 - minutes/20)) * 4</code>;"</li></ul>
+ <p>to read as</p>
+ <ul style="list-style-type:none"><li>"if <emph>dropMode</emph> is <code>dropPAL</code>, let
+ <code>droppedFrames = (hours * 27 + <span class="diff-chg">floor(minutes/2) - floor(minutes/20)</span>) * 4</code>;"</li></ul>
+ <hr />
</body>
</html>
--- a/ttml2/spec/ttml2.xml Thu Oct 29 13:39:23 2015 +0900
+++ b/ttml2/spec/ttml2.xml Thu Oct 29 13:41:51 2015 +0900
@@ -19973,12 +19973,12 @@
<sitem/>
<sitem>
2. if <emph>dropMode</emph> is <code>dropNTSC</code>, let
-<code>droppedFrames = (hours * 54 + floor(minutes - minutes/10)) * 2</code>;
+<code>droppedFrames = (hours * 54 + minutes - floor(minutes/10)) * 2</code>;
</sitem>
<sitem/>
<sitem>
3. otherwise, if <emph>dropMode</emph> is <code>dropPAL</code>, let
-<code>droppedFrames = (hours * 27 + floor(minutes/2 - minutes/20)) * 4</code>;
+<code>droppedFrames = (hours * 27 + floor(minutes/2) - floor(minutes/20)) * 4</code>;
</sitem>
<sitem/>
<sitem>