[Freevo-cvslog] Kaa r941 - trunk/xine/src/drivers

[Jason T. <ta...@sa...>]

Author: tack
Date: Wed Nov 30 19:43:50 2005
New Revision: 941

Modified:
   trunk/xine/src/drivers/video_out_kaa.c

Log:
Fix bug where autoslice was always starting at 0.


Modified: trunk/xine/src/drivers/video_out_kaa.c
==============================================================================
--- trunk/xine/src/drivers/video_out_kaa.c	(original)
+++ trunk/xine/src/drivers/video_out_kaa.c	Wed Nov 30 19:43:50 2005
@@ -237,9 +237,9 @@
     for (y = 0; y < h; y++) {
         for (x = 0; x < w; x += 8) {
             if (*(uint64_t *)(p + x)) {
-                if (slice_y1 == -1)
+                if (slice_y1 == -2) {
                     slice_y1 = y;
-                else
+                } else
                     slice_y2 = y;
                 break;
             }
@@ -676,8 +676,8 @@
         alpha_planes[i] = this->osd_pre_alpha_planes[i];
         dst_frame_planes[i] = frame->base[i] + ((slice_y >> c) * frame->pitches[i]);
         src_frame_planes[i] = frame->base[i] + ((slice_y >> c) * frame->pitches[i]);
-        overlay_planes[i] += (slice_y >> c) * (this->osd_w >> c);
-        alpha_planes[i] += (slice_y >> c) * (this->osd_w >> c);
+        overlay_planes[i] += (slice_y >> c) * this->osd_strides[i];
+        alpha_planes[i] += (slice_y >> c) * this->osd_strides[i];
     }
 
 #if defined(ARCH_X86) || defined(ARCH_X86_64)
@@ -694,7 +694,7 @@
     if (frame->format == XINE_IMGFMT_YUY2)
         w *= 2;
 
-    for (plane = 0; plane < 3 && overlay_planes[plane]; plane++) {
+    for (plane = 0; plane < 3 && this->osd_planes[plane]; plane++) {
         if (plane == 1 && frame->format == XINE_IMGFMT_YV12) {
             w >>= 1;
             slice_h >>= 1;