New net_buf_ctrl strategy.

see http://sourceforge.net/mailarchive/forum.php?thread_id=1568239&forum_id=7131

CVS patchset: 4116
CVS date: 2003/02/08 13:52:44

2 files changed, 53 insertions, 32 deletions

diff --git a/src/xine-engine/buffer.c b/src/xine-engine/buffer.c
index 05b94fdd7..5c7de503f 100644
--- a/src/xine-engine/buffer.c
+++ b/src/xine-engine/buffer.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: buffer.c,v 1.22 2003/01/26 23:36:46 f1rmb Exp $
+ * $Id: buffer.c,v 1.23 2003/02/08 13:52:44 tmattern Exp $
  *
  *
  * contents:
@@ -60,7 +60,7 @@ static void buffer_pool_free (buf_element_t *element) {
   pthread_mutex_unlock (&this->buffer_pool_mutex);
 }
 
-/* 
+/*
  * helper function to release buffer pool lock
  * in case demux thread is cancelled
  */
@@ -120,7 +120,7 @@ static buf_element_t *buffer_pool_alloc (fifo_buffer_t *this) {
  */
 
 static buf_element_t *buffer_pool_try_alloc (fifo_buffer_t *this) {
-  
+
   buf_element_t *buf;
 
   pthread_mutex_lock (&this->buffer_pool_mutex);
@@ -163,9 +163,10 @@ static void fifo_buffer_put (fifo_buffer_t *fifo, buf_element_t *element) {
   else 
     fifo->first = element;
 
-  fifo->last  = element;
+  fifo->last = element;
   element->next = NULL;
   fifo->fifo_size++;
+  fifo->fifo_data_size += element->size;
 
   pthread_cond_signal (&fifo->not_empty);
 
@@ -186,6 +187,7 @@ static void fifo_buffer_insert (fifo_buffer_t *fifo, buf_element_t *element) {
     fifo->last = element;
     
   fifo->fifo_size++;
+  fifo->fifo_data_size += element->size;
 
   pthread_cond_signal (&fifo->not_empty);
 
@@ -199,7 +201,7 @@ static void fifo_buffer_insert (fifo_buffer_t *fifo, buf_element_t *element) {
 static buf_element_t *fifo_buffer_get (fifo_buffer_t *fifo) {
 
   buf_element_t *buf;
-  
+
   pthread_mutex_lock (&fifo->mutex);
 
   while (fifo->first==NULL) {
@@ -213,6 +215,7 @@ static buf_element_t *fifo_buffer_get (fifo_buffer_t *fifo) {
     fifo->last = NULL;
 
   fifo->fifo_size--;
+  fifo->fifo_data_size -= buf->size;
 
   pthread_mutex_unlock (&fifo->mutex);
 
@@ -223,7 +226,7 @@ static buf_element_t *fifo_buffer_get (fifo_buffer_t *fifo) {
  * clear buffer (put all contained buffer elements back into buffer pool)
  */
 static void fifo_buffer_clear (fifo_buffer_t *fifo) {
-  
+
   buf_element_t *buf, *next, *prev;
 
   pthread_mutex_lock (&fifo->mutex);
@@ -242,16 +245,16 @@ static void fifo_buffer_clear (fifo_buffer_t *fifo) {
 	prev->next = next;
       else
 	fifo->first = next;
-      
+
       if (!next)
 	fifo->last = prev;
-      
+
       fifo->fifo_size--;
 
       buf->free_buffer(buf);
     } else
       prev = buf;
-    
+
     buf = next;
   }
 
@@ -273,6 +276,19 @@ static int fifo_buffer_size (fifo_buffer_t *this) {
 }
 
 /*
+ * Return the amount of the data in the fifo buffer
+ */
+static uint32_t fifo_buffer_data_size (fifo_buffer_t *this) {
+  uint32_t data_size;
+
+  pthread_mutex_lock(&this->mutex);
+  data_size = this->fifo_data_size;
+  pthread_mutex_unlock(&this->mutex);
+
+  return data_size;
+}
+
+/*
  * Destroy the buffer
  */
 static void fifo_buffer_dispose (fifo_buffer_t *this) {
@@ -293,11 +309,11 @@ static void fifo_buffer_dispose (fifo_buffer_t *this) {
 
     buf = next;
   }
-  
+
   while (received < this->buffer_pool_capacity) {
-  
+
     buf = this->get(this);
-    
+
     free(buf->extra_info);
     free(buf);
     received++;
@@ -331,13 +347,14 @@ fifo_buffer_t *fifo_buffer_new (int num_buffers, uint32_t buf_size) {
   this->get             = fifo_buffer_get;
   this->clear           = fifo_buffer_clear;
   this->size		= fifo_buffer_size;
+  this->data_size	= fifo_buffer_data_size;
   this->dispose		= fifo_buffer_dispose;
 
   pthread_mutex_init (&this->mutex, NULL);
   pthread_cond_init (&this->not_empty, NULL);
 
   /*
-   * init buffer pool, allocate nNumBuffers of buf_size bytes each 
+   * init buffer pool, allocate nNumBuffers of buf_size bytes each
    */
 
 
@@ -345,10 +362,10 @@ fifo_buffer_t *fifo_buffer_new (int num_buffers, uint32_t buf_size) {
     buf_size += alignment - (buf_size % alignment);
 
   /*
-  printf ("Allocating %d buffers of %ld bytes in one chunk (alignment = %d)\n", 
+  printf ("Allocating %d buffers of %ld bytes in one chunk (alignment = %d)\n",
 	  num_buffers, (long int) buf_size, alignment);
 	  */
-  multi_buffer = xine_xmalloc_aligned (alignment, num_buffers * buf_size, 
+  multi_buffer = xine_xmalloc_aligned (alignment, num_buffers * buf_size,
 				       &this->buffer_pool_base);
 
   this->buffer_pool_top = NULL;
@@ -360,7 +377,7 @@ fifo_buffer_t *fifo_buffer_new (int num_buffers, uint32_t buf_size) {
     buf_element_t *buf;
 
     buf = xine_xmalloc (sizeof (buf_element_t));
-    
+
     buf->mem = multi_buffer;
     multi_buffer += buf_size;
 
@@ -368,7 +385,7 @@ fifo_buffer_t *fifo_buffer_new (int num_buffers, uint32_t buf_size) {
     buf->free_buffer = buffer_pool_free;
     buf->source      = this;
     buf->extra_info  = malloc(sizeof(extra_info_t));
-    
+
     buffer_pool_free (buf);
   }
   this->buffer_pool_num_free  = num_buffers;
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
index 057e3222b..1e180e475 100644
--- a/src/xine-engine/buffer.h
+++ b/src/xine-engine/buffer.h
@@ -7,7 +7,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -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: buffer.h,v 1.99 2003/01/31 18:29:47 miguelfreitas Exp $
+ * $Id: buffer.h,v 1.100 2003/02/08 13:52:44 tmattern Exp $
  *
  *
  * contents:
@@ -276,7 +276,7 @@ struct buf_element_s {
 
 /* these are the types of special buffers */
 
-/* 
+/*
  * In a BUF_SPECIAL_PALETTE buffer:
  * decoder_info[1] = BUF_SPECIAL_PALETTE
  * decoder_info[2] = number of entries in palette table
@@ -392,7 +392,10 @@ typedef struct fifo_buffer_s fifo_buffer_t;
 struct fifo_buffer_s
 {
   buf_element_t  *first, *last;
+
   int             fifo_size;
+  uint32_t        fifo_data_size;
+  void            *fifo_empty_cb_data;
 
   pthread_mutex_t mutex;
   pthread_cond_t  not_empty;
@@ -402,35 +405,36 @@ struct fifo_buffer_s
    */
 
   void (*put) (fifo_buffer_t *fifo, buf_element_t *buf);
-  
+
   buf_element_t *(*get) (fifo_buffer_t *fifo);
 
   void (*clear) (fifo_buffer_t *fifo) ;
 
   int (*size) (fifo_buffer_t *fifo);
 
+  uint32_t (*data_size) (fifo_buffer_t *fifo);
+
   void (*dispose) (fifo_buffer_t *fifo);
 
-  /* 
-   * alloc buffer for this fifo from global buf pool 
+  /*
+   * alloc buffer for this fifo from global buf pool
    * you don't have to use this function to allocate a buffer,
    * an input plugin can decide to implement it's own
    * buffer allocation functions
    */
 
   buf_element_t *(*buffer_pool_alloc) (fifo_buffer_t *this);
-  
-  
+
+
   /*
    * special functions, not used by demuxers
-   */ 
-  
+   */
+
   /* the same as buffer_pool_alloc but may fail if none is available */
   buf_element_t *(*buffer_pool_try_alloc) (fifo_buffer_t *this);
-  
+
   /* the samme as put but insert at the head of the fifo */
   void (*insert) (fifo_buffer_t *fifo, buf_element_t *buf);
-  
 
   /*
    * private variables for buffer pool management
@@ -448,7 +452,7 @@ struct fifo_buffer_s
 /*
  * allocate and initialize new (empty) fifo buffer,
  * init buffer pool for it:
- * allocate num_buffers of buf_size bytes each 
+ * allocate num_buffers of buf_size bytes each
  */
 
 fifo_buffer_t *fifo_buffer_new (int num_buffers, uint32_t buf_size);
@@ -474,8 +478,8 @@ char * buf_audio_name( uint32_t buf_type );
 /* no attribute packed? let's try with pragma pack as a last resort */
 #pragma pack(2)
 #endif
-/* this is xine version of BITMAPINFOHEADER 
- * - should be safe to compile on 64bits machines 
+/* this is xine version of BITMAPINFOHEADER
+ * - should be safe to compile on 64bits machines
  * - will always use machine endian format, so demuxers reading
  *   stuff from win32 formats must use the function below.
  */