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.

CVS patchset: 1503
CVS date: 2002/02/17 17:32:49

3 files changed, 26 insertions, 4 deletions

diff --git a/src/libmpeg2/decode.c b/src/libmpeg2/decode.c
index 5b8cbed14..d3639e882 100644
--- a/src/libmpeg2/decode.c
+++ b/src/libmpeg2/decode.c
@@ -40,7 +40,9 @@
 #define LOG_PAN_SCAN
 */
 
+/*
 #define LOG
+*/
 
 #define BUFFER_SIZE (224 * 1024)
 
@@ -253,6 +255,11 @@ static inline int parse_chunk (mpeg2dec_t * mpeg2dec, int code,
 	    || (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 @@ void mpeg2_find_sequence_header (mpeg2dec_t * mpeg2dec,
 	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;
diff --git a/src/libmpeg2/header.c b/src/libmpeg2/header.c
index 0a486f0f9..21157d3c4 100644
--- a/src/libmpeg2/header.c
+++ b/src/libmpeg2/header.c
@@ -184,7 +184,7 @@ static int header_process_sequence_extension (picture_t * picture,
 	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",
diff --git a/src/libmpeg2/xine_decoder.c b/src/libmpeg2/xine_decoder.c
index b5c40788c..91274771a 100644
--- a/src/libmpeg2/xine_decoder.c
+++ b/src/libmpeg2/xine_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: xine_decoder.c,v 1.22 2002/02/11 01:55:20 guenter Exp $
+ * $Id: xine_decoder.c,v 1.23 2002/02/17 17:32:50 guenter Exp $
  *
  * stuff needed to turn libmpeg2 into a xine decoder plugin
  */
@@ -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 @@ static void mpeg2dec_init (video_decoder_t *this_gen, vo_instance_t *video_out)
 
   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 @@ static void mpeg2dec_init (video_decoder_t *this_gen, vo_instance_t *video_out)
 
   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 @@ static void mpeg2dec_decode_data (video_decoder_t *this_gen, buf_element_t *buf)
 
   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 @@ static void mpeg2dec_close (video_decoder_t *this_gen) {
 
   mpeg2dec_decoder_t *this = (mpeg2dec_decoder_t *) this_gen;
 
+#ifdef LOG
   printf ("libmpeg2: close\n");
+#endif
 
   pthread_mutex_lock (&this->lock);