[xiph-commits] r15734 - branches/theora-thusnelda/lib/dec

[tterribe at svn.xiph.org]

Author: tterribe
Date: 2009-03-02 17:26:24 -0800 (Mon, 02 Mar 2009)
New Revision: 15734

Modified:
   branches/theora-thusnelda/lib/dec/decapiwrapper.c
Log:
Fix up the decoder telemetry.


Modified: branches/theora-thusnelda/lib/dec/decapiwrapper.c
===================================================================
--- branches/theora-thusnelda/lib/dec/decapiwrapper.c	2009-03-03 01:25:03 UTC (rev 15733)
+++ branches/theora-thusnelda/lib/dec/decapiwrapper.c	2009-03-03 01:26:24 UTC (rev 15734)
@@ -199,10 +199,10 @@
     unsigned char *data = cairo_image_surface_get_data(cs);
     unsigned cstride = cairo_image_surface_get_stride(cs);
     for(y=0;y<h;y+=2){
-      unsigned char *Ya = buf[0].data + y*buf[0].ystride;
-      unsigned char *Yb = buf[0].data + (y+1)*buf[0].ystride;
-      unsigned char *U  = buf[1].data + (y>>1)*buf[1].ystride;
-      unsigned char *V  = buf[2].data + (y>>1)*buf[2].ystride;
+      unsigned char *Ya = buf[0].data + y*buf[0].stride;
+      unsigned char *Yb = buf[0].data + (y+1)*buf[0].stride;
+      unsigned char *U  = buf[1].data + (y>>1)*buf[1].stride;
+      unsigned char *V  = buf[2].data + (y>>1)*buf[2].stride;
       unsigned char *Ca = data + y*cstride; 
       unsigned char *Cb = data + (y+1)*cstride; 
       for(x=0;x<w*4;x+=8){
@@ -462,14 +462,14 @@
 
     /* out of the Cairo plane into the telemetry YUV buffer */
     buf[0].data = decode->telemetry_frame_data;
-    buf[1].data = decode->telemetry_frame_data+h*buf[0].ystride;
-    buf[2].data = decode->telemetry_frame_data+h*buf[0].ystride+h/2*buf[1].ystride;
+    buf[1].data = decode->telemetry_frame_data+h*buf[0].stride;
+    buf[2].data = decode->telemetry_frame_data+h*buf[0].stride+h/2*buf[1].stride;
 
     for(y=0;y<h;y+=2){
-      unsigned char *Ya = buf[0].data + y*buf[0].ystride;
-      unsigned char *Yb = buf[0].data + (y+1)*buf[0].ystride;
-      unsigned char *U  = buf[1].data + (y>>1)*buf[1].ystride;
-      unsigned char *V  = buf[2].data + (y>>1)*buf[2].ystride;
+      unsigned char *Ya = buf[0].data + y*buf[0].stride;
+      unsigned char *Yb = buf[0].data + (y+1)*buf[0].stride;
+      unsigned char *U  = buf[1].data + (y>>1)*buf[1].stride;
+      unsigned char *V  = buf[2].data + (y>>1)*buf[2].stride;
       unsigned char *Ca = data + y*cstride; 
       unsigned char *Cb = data + (y+1)*cstride; 
       for(x=0;x<w*4;x+=8){