small bugfixes, more debugging output

CVS patchset: 77
CVS date: 2001/05/22 23:07:49

4 files changed, 22 insertions, 3 deletions

diff --git a/src/libmpeg2/decode.c b/src/libmpeg2/decode.c
index ce1bb7290..ee32e934f 100644
--- a/src/libmpeg2/decode.c
+++ b/src/libmpeg2/decode.c
@@ -62,6 +62,8 @@ void mpeg2_init (mpeg2dec_t * mpeg2dec,
 
     /* initialize supstructures */
     header_state_init (mpeg2dec->picture);
+
+    output->open (output);
 }
 
 void decode_free_image_buffers (mpeg2dec_t * mpeg2dec) {
@@ -304,6 +306,8 @@ int mpeg2_decode_data (mpeg2dec_t * mpeg2dec, uint8_t * current, uint8_t * end,
     chunk_ptr = mpeg2dec->chunk_ptr;
     mpeg2dec->pts = pts;
 
+    printf ("mpeg2dec: decode_data...\n");
+
     while (current != end) {
 	while (1) {
 	    byte = *current++;
@@ -334,6 +338,9 @@ int mpeg2_decode_data (mpeg2dec_t * mpeg2dec, uint8_t * current, uint8_t * end,
 	chunk_ptr = mpeg2dec->chunk_buffer;
 	shift = 0xffffff00;
     }
+
+    printf ("mpeg2dec: decode_data finished\n");
+
     mpeg2dec->chunk_ptr = chunk_ptr;
     mpeg2dec->shift = shift;
 #ifdef ARCH_X86
@@ -356,6 +363,7 @@ void mpeg2_close (mpeg2dec_t * mpeg2dec)
 
     free (mpeg2dec->chunk_buffer);
     free (mpeg2dec->picture);
+
 }
 
 void mpeg2_skip_frames (mpeg2dec_t * mpeg2dec, int num_frames)
diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c
index c0a78f2ea..94d662eca 100644
--- a/src/video_out/video_out_xv.c
+++ b/src/video_out/video_out_xv.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_xv.c,v 1.17 2001/05/22 13:26:06 f1rmb Exp $
+ * $Id: video_out_xv.c,v 1.18 2001/05/22 23:07:49 guenter Exp $
  * 
  * video_out_xv.c, X11 video extension interface for xine
  *
@@ -237,6 +237,8 @@ static void xv_update_frame_format (vo_driver_t *this_gen, vo_frame_t *frame_gen
     XUnlockDisplay (this->display); 
   }
 
+  printf ("video_out_xv: update format done\n");
+
   frame->ratio_code = ratio_code;
 }
 
diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c
index e24d4ad4b..ebf38ded2 100644
--- a/src/xine-engine/video_decoder.c
+++ b/src/xine-engine/video_decoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_decoder.c,v 1.11 2001/05/01 00:55:23 guenter Exp $
+ * $Id: video_decoder.c,v 1.12 2001/05/22 23:07:49 guenter Exp $
  *
  */
 
@@ -37,8 +37,12 @@ void *video_decoder_loop (void *this_gen) {
 
   while (running) {
 
+    printf ("video_decoder: get buffer\n");
+
     buf = this->video_fifo->get (this->video_fifo);
 
+    printf ("video_decoder: processing buffer\n");
+
     /* gVD.mnCurInputPos = pBuf->nInputPos; */
 
     switch (buf->type) {
diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c
index b42660434..f8d2da8fc 100644
--- a/src/xine-engine/video_out.c
+++ b/src/xine-engine/video_out.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out.c,v 1.4 2001/05/16 15:32:04 guenter Exp $
+ * $Id: video_out.c,v 1.5 2001/05/22 23:07:49 guenter Exp $
  *
  */
 
@@ -251,6 +251,7 @@ static void vo_open (vo_instance_t *this) {
   if (!this->video_loop_running) {
     this->video_loop_running = 1;
     pthread_create (&this->video_thread, NULL, video_out_loop, this) ;
+    printf ("video_out: thread created.\n");
   } else
     printf ("video_out: vo_open : warning! video thread already running\n");
 
@@ -262,6 +263,8 @@ static vo_frame_t *vo_get_frame (vo_instance_t *this,
 
   vo_frame_t *img;
 
+  printf ("video_out: vo_get_frame\n");
+
   if (this->pts_per_frame != duration) {
     this->pts_per_frame = duration;
     this->pts_per_half_frame = duration / 2;
@@ -281,6 +284,8 @@ static vo_frame_t *vo_get_frame (vo_instance_t *this,
 
   pthread_mutex_unlock (&img->mutex);
   
+  printf ("video_out: vo_get_frame done\n");
+
   return img;
 }