[xiph-commits] r16197 - in trunk/xiph-qt: . Theora/src

[arek at svn.xiph.org]

Author: arek
Date: 2009-07-04 14:50:49 -0700 (Sat, 04 Jul 2009)
New Revision: 16197

Modified:
   trunk/xiph-qt/ChangeLog
   trunk/xiph-qt/Theora/src/TheoraDecoder.c
Log:
	* Theora/src/TheoraDecoder.c:
	Don't indicate "dropped frame" as early as in DecodeBand - seems
	to make difference on Windows.



Modified: trunk/xiph-qt/ChangeLog
===================================================================
--- trunk/xiph-qt/ChangeLog	2009-07-04 21:44:16 UTC (rev 16196)
+++ trunk/xiph-qt/ChangeLog	2009-07-04 21:50:49 UTC (rev 16197)
@@ -1,5 +1,11 @@
 2009-07-04  Arek Korbik  <arkadini at gmail.com>
 
+	* Theora/src/TheoraDecoder.c:
+	Don't indicate "dropped frame" as early as in DecodeBand - seems
+	to make difference on Windows.
+
+2009-07-04  Arek Korbik  <arkadini at gmail.com>
+
 	* build-win32/XiphQT.sln (added):
 	* build-win32/XiphQT.vcproj (added):
 	Add VS2008 project files.

Modified: trunk/xiph-qt/Theora/src/TheoraDecoder.c
===================================================================
--- trunk/xiph-qt/Theora/src/TheoraDecoder.c	2009-07-04 21:44:16 UTC (rev 16196)
+++ trunk/xiph-qt/Theora/src/TheoraDecoder.c	2009-07-04 21:50:49 UTC (rev 16197)
@@ -492,9 +492,14 @@
             data_buffer = glob->p_buffer;
         }
 
-        if (myDrp->draw == 0)
-            err = codecDroppedFrameErr;
-        else {
+        if (myDrp->draw == 0) {
+            // returning codecDroppedFrameErr here seems to seriously confuse QuickTime on Windows,
+            //  so let's pretend it's all cool - the DrawBand will return that same error later, but
+            // that's apparently much more OK
+
+            // err = codecDroppedFrameErr;
+            ;
+        } else {
             op.b_o_s = 0;
             op.e_o_s = 0;
             op.granulepos = -1;