[xine-cvs] CVS: xine-lib/src/demuxers demux_mpeg_block.c,1.35,1.36

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

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

Modified Files:
	demux_mpeg_block.c 
Log Message:
don't estimate bitrate twice for the same mrl

Index: demux_mpeg_block.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_mpeg_block.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- demux_mpeg_block.c	2001/09/01 14:33:00	1.35
+++ demux_mpeg_block.c	2001/09/01 21:46:20	1.36
@@ -63,6 +63,8 @@
   gui_get_next_mrl_cb_t next_mrl_cb;
   gui_branched_cb_t     branched_cb;
 
+  char                  cur_mrl[256];
+
   uint8_t              *scratch;
 
 } demux_mpeg_block_t ;
@@ -642,8 +644,10 @@
     buf->type    = BUF_CONTROL_START;
     this->audio_fifo->put (this->audio_fifo, buf);
   }
+
+  if (!this->rate)
+    this->rate = demux_mpeg_block_estimate_rate (this);
 
-  this->rate = demux_mpeg_block_estimate_rate (this);
 
   if((this->input->get_capabilities(this->input) & INPUT_CAP_SEEKABLE) != 0) {
 
@@ -697,6 +701,23 @@
   pthread_create (&this->thread, NULL, demux_mpeg_block_loop, this) ;
 }
 
+static void demux_mpeg_block_accept_input (demux_mpeg_block_t *this,
+					   input_plugin_t *input) {
+
+  this->input = input;
+
+  if (strcmp (this->cur_mrl, input->get_mrl(input))) {
+
+    this->rate = 0;
+
+    printf ("demux_mpeg_block: mrl %s is new, will estimated bitrate\n");
+
+    strncpy (this->cur_mrl, input->get_mrl(input), 256);
+  } else 
+    printf ("demux_mpeg_block: mrl %s is known, estimated bitrate: %d\n",
+	    this->cur_mrl, this->rate * 50 * 8);
+}
+
 static int demux_mpeg_block_open(demux_plugin_t *this_gen,
 				 input_plugin_t *input, int stage) {
 
@@ -743,8 +764,8 @@
 	if ( !input->get_blocksize(input) 
 	     && ((this->scratch[4]>>4) != 4) )
 	  return DEMUX_CANNOT_HANDLE;
-	  
-	this->input = input;
+
+	demux_mpeg_block_accept_input (this, input);	  
 	return DEMUX_CAN_HANDLE;
       }	
     }
@@ -766,12 +787,12 @@
 	      && (!strncmp((media+3), "mpeg2", 5) ))) 
 	 ) {
 	this->blocksize = 2048;
-	this->input = input;
+	demux_mpeg_block_accept_input (this, input);	  
 	return DEMUX_CAN_HANDLE;
       }
       if(!strncmp(MRL, "vcd", 3)) {
 	this->blocksize = 2324;
-	this->input = input;
+	demux_mpeg_block_accept_input (this, input);	  
 	return DEMUX_CAN_HANDLE;
       }
     } 
@@ -790,7 +811,7 @@
     
     if(!strcasecmp(ending, ".vob")) {
       this->blocksize = 2048;
-      this->input = input;
+      demux_mpeg_block_accept_input (this, input);	  
       return DEMUX_CAN_HANDLE;
     }
   }