[xine-cvs] CVS: xine-lib/src/libmpeg2 decode.c,1.48,1.49 header.c,1.10,1.11 xine_decoder.c,1.22,1.23

[Guenter B. <gu...@us...>]

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

Modified Files:
	decode.c header.c xine_decoder.c 
Log Message:
big debug output cleanup. removed debug output from log window, logging
relevant information like stream type/size/bitrate instead.
demuxer cleanup, removed no-longer-needed macros :-)

switched off video_out/libmpeg2/... verbose log output messages.




Index: decode.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libmpeg2/decode.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- decode.c	17 Feb 2002 15:53:28 -0000	1.48
+++ decode.c	17 Feb 2002 17:32:50 -0000	1.49
@@ -40,7 +40,9 @@
 #define LOG_PAN_SCAN
 */
 
+/*
 #define LOG
+*/
 
 #define BUFFER_SIZE (224 * 1024)
 
@@ -253,6 +255,11 @@
 	    || (picture->frame_width != picture->coded_picture_width)
 	    || (picture->frame_height != picture->coded_picture_height)) {
             xine_frame_change_event_t notify_event;
+
+	    xine_log (mpeg2dec->xine, XINE_LOG_FORMAT,
+		      "libmpeg2: frame size is %d x %d, ratio is %d\n",
+		      picture->frame_width, picture->frame_height,
+		      picture->frame_rate_code);
             
 	    printf ("libmpeg2: frame size has changed to from %d x %d to %d x %d\n",
 		    picture->frame_width, picture->frame_height,
@@ -565,7 +572,11 @@
 	picture->frame_width  = picture->coded_picture_width;
 	picture->frame_height = picture->coded_picture_height;
 
-	printf ("mpeg2dec: frame size %d x %d\n",
+	xine_log (mpeg2dec->xine, XINE_LOG_FORMAT,
+		  "libmpeg2: frame size is %d x %d\n",
+		  picture->frame_width, picture->frame_height);
+            
+	printf ("libmpeg2: frame size %d x %d\n",
 		picture->frame_width, picture->frame_height);
             
 	notify_event.event.type = XINE_EVENT_FRAME_CHANGE;

Index: header.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libmpeg2/header.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- header.c	9 Feb 2002 07:13:23 -0000	1.10
+++ header.c	17 Feb 2002 17:32:50 -0000	1.11
@@ -184,7 +184,7 @@
 	picture->coded_picture_height =
 	    (picture->coded_picture_height + 31) & ~31;
 
-    printf ("libmpeg2: low_delay : %d\n", picture->low_delay);
+    /* printf ("libmpeg2: low_delay : %d\n", picture->low_delay); */
 
 /*
     printf ("libmpeg2: sequence extension+5 : %08x (%d)\n",

Index: xine_decoder.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libmpeg2/xine_decoder.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xine_decoder.c	11 Feb 2002 01:55:20 -0000	1.22
+++ xine_decoder.c	17 Feb 2002 17:32:50 -0000	1.23
@@ -36,8 +36,9 @@
 #include "buffer.h"
 #include "xine_internal.h"
 
+/*
 #define LOG
-
+*/
 
 typedef struct mpeg2dec_decoder_s {
   video_decoder_t  video_decoder;
@@ -54,7 +55,9 @@
 
   mpeg2dec_decoder_t *this = (mpeg2dec_decoder_t *) this_gen;
 
+#ifdef LOG
   printf ("libmpeg2: init... \n");
+#endif
 
   pthread_mutex_lock (&this->lock);
 
@@ -64,13 +67,17 @@
 
   pthread_mutex_unlock (&this->lock);
 
+#ifdef LOG
   printf ("libmpeg2: init...done\n");
+#endif
 }
 
 static void mpeg2dec_decode_data (video_decoder_t *this_gen, buf_element_t *buf) {
   mpeg2dec_decoder_t *this = (mpeg2dec_decoder_t *) this_gen;
 
+#ifdef LOG
   printf ("libmpeg2: decode_data...\n");
+#endif
 
   pthread_mutex_lock (&this->lock);
 
@@ -84,7 +91,9 @@
 
   pthread_mutex_unlock (&this->lock);
 
+#ifdef LOG
   printf ("libmpeg2: decode_data...done\n");
+#endif
 }
 
 static void mpeg2dec_flush (video_decoder_t *this_gen) {
@@ -102,7 +111,9 @@
 
   mpeg2dec_decoder_t *this = (mpeg2dec_decoder_t *) this_gen;
 
+#ifdef LOG
   printf ("libmpeg2: close\n");
+#endif
 
   pthread_mutex_lock (&this->lock);