[xine-cvs] CVS: xine-lib/src/libspudec spu.c,1.16,1.17 xine_decoder.c,1.19,1.20

[James Courtier-D. <jcd...@us...>]

Update of /cvsroot/xine/xine-lib/src/libspudec
In directory usw-pr-cvs1:/tmp/cvs-serv28051/xine-lib/src/libspudec

Modified Files:
	spu.c xine_decoder.c 
Log Message:
Some minor changes.
DVDs only have 8 audio streams.


Index: spu.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libspudec/spu.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- spu.c	2001/10/20 17:51:58	1.16
+++ spu.c	2001/10/21 15:04:13	1.17
@@ -297,7 +297,7 @@
   field ^= 1; // Toggle fields
 	
   if (put_y >= spu->height) {
-    LOG (LOG_DEBUG, ".");
+    LOG (LOG_DEBUG, "put_y >= spu->height\n");
     return -1;
   }
   return 0;

Index: xine_decoder.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libspudec/xine_decoder.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xine_decoder.c	2001/10/21 12:09:06	1.19
+++ xine_decoder.c	2001/10/21 15:04:13	1.20
@@ -308,8 +308,8 @@
   this->spu_events[new_event].event->object.overlay = malloc (sizeof(vo_overlay_t));
   memcpy(this->spu_events[new_event].event->object.overlay, 
     event->object.overlay, sizeof(vo_overlay_t));
-  print_overlay( event->object.overlay );
-  print_overlay( this->spu_events[new_event].event->object.overlay );  
+//  print_overlay( event->object.overlay );
+//  print_overlay( this->spu_events[new_event].event->object.overlay );  
   pthread_mutex_unlock (&this->spu_events_mutex);
    
   return new_event;
@@ -546,6 +546,11 @@
       if (this->spu_events[this_event].event->object.overlay != NULL) {
         vo_overlay_t *overlay = this->spu_objects[handle].overlay;
         vo_overlay_t *event_overlay = this->spu_events[this_event].event->object.overlay;
+        LOG (LOG_DEBUG, "event_overlay\n");
+        print_overlay(event_overlay);
+        LOG (LOG_DEBUG, "overlay\n");
+        print_overlay(overlay);
+
         this->spu_objects[handle].handle = handle; /* This should not change for menus */
         overlay->rle = event_overlay->rle;
         overlay->data_size = event_overlay->data_size;
@@ -555,9 +560,9 @@
         overlay->width = event_overlay->width;
         overlay->height = event_overlay->height;
         overlay->rgb_clut = event_overlay->rgb_clut;
-        if((event_overlay->color[0] |
-            event_overlay->color[1] |
-            event_overlay->color[2] |
+        if((event_overlay->color[0] +
+            event_overlay->color[1] +
+            event_overlay->color[2] +
             event_overlay->color[3]) > 0 ) {
           LOG (LOG_DEBUG, "mixing clut\n");
           overlay->color[0] = event_overlay->color[0];
@@ -565,9 +570,9 @@
           overlay->color[2] = event_overlay->color[2];
           overlay->color[3] = event_overlay->color[3];
         }
-        if((event_overlay->trans[0] |
-            event_overlay->trans[1] |
-            event_overlay->trans[2] |
+        if((event_overlay->trans[0] +
+            event_overlay->trans[1] +
+            event_overlay->trans[2] +
             event_overlay->trans[3]) > 0 ) {
           LOG (LOG_DEBUG, "mixing trans\n");
           overlay->trans[0] = event_overlay->trans[0];
@@ -576,6 +581,7 @@
           overlay->trans[3] = event_overlay->trans[3];
         }
         this->spu_showing[1].handle = handle;
+        LOG (LOG_DEBUG, "overlay after\n");
         print_overlay(overlay);
       }
       break;
@@ -585,6 +591,10 @@
       if (this->spu_events[this_event].event->object.overlay != NULL) {
         vo_overlay_t *overlay = this->spu_objects[handle].overlay;
         vo_overlay_t *event_overlay = this->spu_events[this_event].event->object.overlay;
+        LOG (LOG_DEBUG, "event_overlay\n");
+        print_overlay(event_overlay);
+        LOG (LOG_DEBUG, "overlay\n");
+        print_overlay(overlay);
         this->spu_objects[handle].handle = handle; /* This should not change for menus */
         overlay->clip_top = event_overlay->clip_top;
         overlay->clip_bottom = event_overlay->clip_bottom;
@@ -612,6 +622,7 @@
           overlay->trans[3] = event_overlay->trans[3];
         }
         this->spu_showing[1].handle = handle;
+        LOG (LOG_DEBUG, "overlay after\n");
         print_overlay(overlay);
       }
       break;