1 files changed, 68 insertions, 31 deletions

diff --git a/src/xine-engine/spu_decoder.c b/src/xine-engine/spu_decoder.c
index 03f008367..0878bf06a 100644
--- a/src/xine-engine/spu_decoder.c
+++ b/src/xine-engine/spu_decoder.c
@@ -17,8 +17,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: spu_decoder.c,v 1.2 2001/06/18 15:43:01 richwareham Exp $
+ * $Id: spu_decoder.c,v 1.3 2001/07/04 17:10:24 uid32519 Exp $
  *
+ 
+ * functions that implement spu decoding
  */
 
 #ifdef HAVE_CONFIG_H
@@ -27,52 +29,95 @@
 
 #include "xine_internal.h"
 
-#include "libspudec/spudec.h"
-
 void *spu_decoder_loop (void *this_gen) {
 
   buf_element_t   *buf;
   xine_t          *this = (xine_t *) this_gen;
   int              running = 1;
-  int              streamtype;
-  spudec_t        *decoder;
+  int              i;
+  spu_decoder_t *decoder;
 
-  decoder = this->spu_decoder;
   while (running) {
 
-    /* printf ("video_decoder: getting buffer...\n"); */
-
     buf = this->spu_fifo->get (this->spu_fifo);
-    if (buf->input_pos)
-      this->cur_input_pos = buf->input_pos;
 
-    /* printf ("spu_decoder: got buffer %d\n", buf->type); */
+    this->cur_input_pos = buf->input_pos;
 
     switch (buf->type) {
+
     case BUF_CONTROL_START:
+      if (this->cur_spu_decoder_plugin) {
+	this->cur_spu_decoder_plugin->close (this->cur_spu_decoder_plugin);
+	this->cur_spu_decoder_plugin = NULL;
+      }
+
+      pthread_mutex_lock (&this->xine_lock);
+      this->spu_finished = 0;
+      pthread_mutex_unlock (&this->xine_lock);
+
+      for (i=0 ; i<50; i++)
+	this->spu_track_map[0] = 0;
+
+      this->spu_track_map_entries = 0;
+
       break;
 
     case BUF_CONTROL_END:
+      if (this->cur_spu_decoder_plugin) {
+	this->cur_spu_decoder_plugin->close (this->cur_spu_decoder_plugin);
+	this->cur_spu_decoder_plugin = NULL;
+      }
+
+      pthread_mutex_lock (&this->xine_lock);
+
+      this->spu_finished = 1;
+      
+      if (this->video_finished) {
+	pthread_mutex_unlock (&this->xine_lock);
+	xine_notify_stream_finished (this);
+      } else
+	pthread_mutex_unlock (&this->xine_lock);
+
       break;
 
     case BUF_CONTROL_QUIT:
+      if (this->cur_spu_decoder_plugin) {
+	this->cur_spu_decoder_plugin->close (this->cur_spu_decoder_plugin);
+	this->cur_spu_decoder_plugin = NULL;
+      }
       running = 0;
       break;
 
     default:
       if ( (buf->type & 0xFF000000) == BUF_SPU_BASE ) {
-	int stream_id;
-
-	printf ("spu_decoder: got an SPU buffer, type %08x\n", buf->type); 
-
-	stream_id = buf->type & 0xFF;
 
-	if(decoder) {
-	  decoder->push_packet(decoder, buf);
+	  
+	/* now, decode this buffer if it's the right track */
+	  
+	if ( (buf->type  & 0xFFFF)== this->spu_channel) {
+	    
+	  int streamtype = (buf->type>>16) & 0xFF;
+	  decoder = this->spu_decoder_plugins [streamtype];
+	  printf("SPU DECODER: %p\n",decoder);	    
+	  if (decoder) {
+	    if (this->cur_spu_decoder_plugin != decoder) {
+		
+	      if (this->cur_spu_decoder_plugin) 
+		this->cur_spu_decoder_plugin->close (this->cur_spu_decoder_plugin);
+		
+	      this->cur_spu_decoder_plugin = decoder;
+		
+	      this->cur_spu_decoder_plugin->init (this->cur_spu_decoder_plugin, this->video_out);  
+	    }
+	      
+	    printf ("spu_decoder: decoder data sent\n"); 
+	    decoder->decode_data (decoder, buf);
+	  }
 	}
-      }
+      } else
+	fprintf (stderr,"spu_decoder: unknown buffer type: %08x\n", buf->type);
     }
-
+    
     buf->free_buffer (buf);
   }
 
@@ -80,15 +125,9 @@ void *spu_decoder_loop (void *this_gen) {
 }
 
 void spu_decoder_init (xine_t *this) {
-  buf_element_t *buf;
-
-  this->spu_decoder = spudec_init(this); 
 
   this->spu_fifo = fifo_buffer_new (1500, 4096);
-
-  buf = this->spu_fifo->buffer_pool_alloc (this->spu_fifo);
-  buf->type = BUF_CONTROL_START;
-  this->spu_fifo->put (this->spu_fifo, buf);
+	  printf ("spu_decoder_init: thread starting %p\n",this->video_out);
 
   pthread_create (&this->spu_thread, NULL, spu_decoder_loop, this) ;
 }
@@ -98,15 +137,13 @@ void spu_decoder_shutdown (xine_t *this) {
   buf_element_t *buf;
   void          *p;
 
-  this->spu_fifo->clear(this->spu_fifo);
+  /* this->spu_fifo->clear(this->spu_fifo); */
 
   buf = this->spu_fifo->buffer_pool_alloc (this->spu_fifo);
   buf->type = BUF_CONTROL_QUIT;
   this->spu_fifo->put (this->spu_fifo, buf);
 
-  spudec_close(this->spu_decoder);
-  this->spu_decoder = NULL;
-
   pthread_join (this->spu_thread, &p);
 }
 
+