/*****************************************************************************
- * netlist.c: input thread
- * Manages the TS and PES netlists (see netlist.h).
+ * input_netlist.c: netlist management
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
+ * $Id: input_netlist.c,v 1.31 2001/02/14 15:58:29 henri Exp $
*
- * Authors:
+ * Authors: Henri Fallon <henri@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* 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.
- *
+ *
* This program 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 GNU
- * General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <sys/types.h> /* on BSD, uio.h needs types.h */
-#include <sys/uio.h> /* "input.h" */
+#include "defs.h"
-#include <stdlib.h> /* free() */
-#include <string.h> /* strerror() */
-#include <errno.h> /* errno */
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/uio.h> /* struct iovec */
+#include <unistd.h>
-#include "common.h"
#include "config.h"
+#include "common.h"
+#include "threads.h" /* mutex */
#include "mtime.h"
-#include "threads.h"
-#include "intf_msg.h"
-#include "debug.h"
+#include "intf_msg.h" /* intf_*Msg */
+
+#include "stream_control.h"
+#include "input_ext-intf.h"
+#include "input_ext-dec.h"
+
#include "input.h"
#include "input_netlist.h"
*****************************************************************************/
/*****************************************************************************
- * input_NetlistOpen: initialize the netlists buffers
+ * input_NetlistInit: allocates netlist buffers and init indexes
*****************************************************************************/
-int input_NetlistInit( input_thread_t *p_input )
+int input_NetlistInit( input_thread_t * p_input, int i_nb_data, int i_nb_pes,
+ size_t i_buffer_size, int i_read_once )
{
- int i_base, i_packets, i_iovec;
-
- /* Initialize running indexes. */
-#ifdef INPUT_LIFO_TS_NETLIST
- p_input->netlist.i_ts_index = INPUT_TS_READ_ONCE;
-#else
- p_input->netlist.i_ts_start = 0;
- p_input->netlist.i_ts_end = 0;
-#endif
-#ifdef INPUT_LIFO_PES_NETLIST
- p_input->netlist.i_pes_index = 1; /* We allocate one PES at a time */
-#else
- p_input->netlist.i_pes_start = 0;
- p_input->netlist.i_pes_end = 0;
-#endif
+ unsigned int i_loop;
+ netlist_t * p_netlist;
- /* Initialize all iovec from the TS netlist with the length of a packet */
- for( i_iovec = 0; i_iovec < INPUT_MAX_TS + INPUT_TS_READ_ONCE; i_iovec++ )
+ /* First we allocate and initialise our netlist struct */
+ p_input->p_method_data = malloc(sizeof(netlist_t));
+ if ( p_input->p_method_data == NULL )
+ {
+ intf_ErrMsg("Unable to malloc the netlist struct");
+ return (-1);
+ }
+
+ p_netlist = (netlist_t *) p_input->p_method_data;
+
+ p_netlist->i_read_once = i_read_once;
+
+ /* allocate the buffers */
+ p_netlist->p_buffers =
+ (byte_t *) malloc(i_buffer_size* i_nb_data );
+ if ( p_netlist->p_buffers == NULL )
+ {
+ intf_ErrMsg ("Unable to malloc in netlist initialization (1)");
+ return (-1);
+ }
+
+ p_netlist->p_data =
+ (data_packet_t *) malloc(sizeof(data_packet_t)*(i_nb_data));
+ if ( p_netlist->p_data == NULL )
+ {
+ intf_ErrMsg ("Unable to malloc in netlist initialization (2)");
+ return (-1);
+ }
+
+ p_netlist->p_pes =
+ (pes_packet_t *) malloc(sizeof(pes_packet_t)*(i_nb_pes));
+ if ( p_netlist->p_pes == NULL )
+ {
+ intf_ErrMsg ("Unable to malloc in netlist initialization (3)");
+ return (-1);
+ }
+
+ /* allocate the FIFOs */
+ p_netlist->pp_free_data =
+ (data_packet_t **) malloc (i_nb_data * sizeof(data_packet_t *) );
+ if ( p_netlist->pp_free_data == NULL )
{
- p_input->netlist.p_ts_free[i_iovec].iov_len = TS_PACKET_SIZE;
+ intf_ErrMsg ("Unable to malloc in netlist initialization (4)");
}
+ p_netlist->pp_free_pes =
+ (pes_packet_t **) malloc (i_nb_pes * sizeof(pes_packet_t *) );
+ if ( p_netlist->pp_free_pes == NULL )
+ {
+ intf_ErrMsg ("Unable to malloc in netlist initialization (5)");
+ }
+
+ p_netlist->p_free_iovec = ( struct iovec * )
+ malloc( (i_nb_data + p_netlist->i_read_once) * sizeof(struct iovec) );
+ if ( p_netlist->p_free_iovec == NULL )
+ {
+ intf_ErrMsg ("Unable to malloc in netlist initialization (6)");
+ }
+
+ /* Fill the data FIFO */
+ for ( i_loop = 0; i_loop < i_nb_data; i_loop++ )
+ {
+ p_netlist->pp_free_data[i_loop] =
+ p_netlist->p_data + i_loop;
- /* Allocate a big piece of memory to contain the INPUT_MAX_TS TS packets */
- if( ( p_input->netlist.p_ts_packets = malloc( (INPUT_MAX_TS + 1)
- * sizeof(ts_packet_t) ) ) == NULL )
+ p_netlist->pp_free_data[i_loop]->p_buffer =
+ p_netlist->p_buffers + i_loop * i_buffer_size;
+
+ p_netlist->pp_free_data[i_loop]->p_payload_start =
+ p_netlist->pp_free_data[i_loop]->p_buffer;
+
+ p_netlist->pp_free_data[i_loop]->p_payload_end =
+ p_netlist->pp_free_data[i_loop]->p_buffer + i_buffer_size;
+ }
+ /* Fill the PES FIFO */
+ for ( i_loop = 0; i_loop < i_nb_pes ; i_loop++ )
+ {
+ p_netlist->pp_free_pes[i_loop] =
+ p_netlist->p_pes + i_loop;
+ }
+
+ /* Deal with the iovec */
+ for ( i_loop = 0; i_loop < i_nb_data; i_loop++ )
{
- intf_ErrMsg("input error: can't allocate TS netlist buffer (%s)\n",
- strerror(errno) );
- return( -1 );
+ p_netlist->p_free_iovec[i_loop].iov_base =
+ p_netlist->p_buffers + i_loop * i_buffer_size;
+
+ p_netlist->p_free_iovec[i_loop].iov_len = i_buffer_size;
}
+
+ /* vlc_mutex_init */
+ vlc_mutex_init (&p_netlist->lock);
+
+ /* initialize indexes */
+ p_netlist->i_data_start = 0;
+ p_netlist->i_data_end = i_nb_data - 1;
+
+ p_netlist->i_pes_start = 0;
+ p_netlist->i_pes_end = i_nb_pes - 1;
+
+ p_netlist->i_nb_data = i_nb_data;
+ p_netlist->i_nb_pes = i_nb_pes;
+ p_netlist->i_buffer_size = i_buffer_size;
- /* Allocate a big piece of memory to contain the INPUT_MAX_PES PES packets */
- if( !( p_input->netlist.p_pes_packets = malloc( (INPUT_MAX_PES + 1)
- * sizeof(pes_packet_t) ) ) )
+ return (0); /* Everything went all right */
+}
+
+/*****************************************************************************
+ * input_NetlistGetiovec: returns an iovec pointer for a readv() operation
+ *****************************************************************************
+ * We return an iovec vector, so that readv can read many packets at a time,
+ * and we set pp_data to direct to the fifo pointer, which will allow us
+ * to get the corresponding data_packet.
+ *****************************************************************************/
+struct iovec * input_NetlistGetiovec( void * p_method_data )
+{
+ netlist_t * p_netlist;
+
+ /* cast */
+ p_netlist = ( netlist_t * ) p_method_data;
+
+ /* check */
+ if(
+ (p_netlist->i_data_end - p_netlist->i_data_start + p_netlist->i_nb_data)
+ %p_netlist->i_nb_data < p_netlist->i_read_once )
{
- intf_ErrMsg("input error: can't allocate PES netlist buffer (%s)\n",
- strerror(errno) );
- free( p_input->netlist.p_ts_packets );
- return( -1 );
+ intf_ErrMsg("Empty iovec FIFO. Unable to allocate memory");
+ return (NULL);
}
- /* Insert TS packets into the TS netlist */
-#ifdef INPUT_LIFO_TS_NETLIST
- i_base = p_input->netlist.i_ts_index;
-#else
- i_base = p_input->netlist.i_ts_start;
-#endif
- /* i_base is now the base address to locate free packets in the netlist */
+ /* readv only takes contiguous buffers
+ * so, as a solution, we chose to have a FIFO a bit longer
+ * than i_nb_data, and copy the begining of the FIFO to its end
+ * if the readv needs to go after the end */
+ if( p_netlist->i_nb_data - p_netlist->i_data_start <
+ p_netlist->i_read_once )
+ {
+ memcpy( &p_netlist->p_free_iovec[p_netlist->i_nb_data],
+ p_netlist->p_free_iovec,
+ (p_netlist->i_read_once-
+ (p_netlist->i_nb_data-p_netlist->i_data_start))
+ * sizeof(struct iovec)
+ );
+
+ }
+
+ return &p_netlist->p_free_iovec[p_netlist->i_data_start];
+
+}
+
+/*****************************************************************************
+ * input_NetlistMviovec: move the iovec pointer after a readv() operation
+ *****************************************************************************/
+void input_NetlistMviovec( void * p_method_data, size_t i_nb_iovec,
+ struct data_packet_s * pp_packets[INPUT_READ_ONCE] )
+{
+ netlist_t * p_netlist;
+ unsigned int i_loop = 0;
+ unsigned int i_current;
+
+ /* cast */
+ p_netlist = (netlist_t *) p_method_data;
+
+ /* lock */
+ vlc_mutex_lock ( &p_netlist->lock );
+
+ i_current = p_netlist->i_data_start;
- for( i_packets = 0; i_packets < INPUT_MAX_TS + 1; i_packets++ )
+
+ /* Fills a table of pointers to packets associated with the io_vec's */
+while (i_loop < i_nb_iovec )
{
- p_input->netlist.p_ts_free[i_base + i_packets].iov_base
- = (p_input->netlist.p_ts_packets + i_packets);
- /* Initialize TS length. */
- (p_input->netlist.p_ts_packets[i_packets]).i_payload_end = TS_PACKET_SIZE;
+ if( i_current >= p_netlist->i_nb_data )
+ i_current-=p_netlist->i_nb_data;
+
+ pp_packets[i_loop] = p_netlist->pp_free_data[i_current];
+
+ i_loop ++;
+ i_current ++;
}
- /* Insert PES packets into the netlist */
-#ifdef INPUT_LIFO_PES_NETLIST
- i_base = p_input->netlist.i_pes_index;
-#else
- i_base = p_input->netlist.i_pes_start;
+ p_netlist->i_data_start += i_nb_iovec;
+ p_netlist->i_data_start %= p_netlist->i_nb_data;
+
+ /* unlock */
+ vlc_mutex_unlock (&p_netlist->lock);
+
+}
+
+/*****************************************************************************
+ * input_NetlistNewPacket: returns a free data_packet_t
+ *****************************************************************************/
+struct data_packet_s * input_NetlistNewPacket( void * p_method_data,
+ size_t i_buffer_size )
+{
+ netlist_t * p_netlist;
+ struct data_packet_s * p_return;
+
+ /* cast */
+ p_netlist = ( netlist_t * ) p_method_data;
+
+#ifdef DEBUG
+ if( i_buffer_size > p_netlist->i_buffer_size )
+ {
+ /* This should not happen */
+ intf_ErrMsg( "Netlist packet too small !" );
+ return NULL;
+ }
#endif
- /* i_base is now the base address to locate free packets in the netlist */
- for( i_packets = 0; i_packets < INPUT_MAX_PES + 1; i_packets++ )
+ /* lock */
+ vlc_mutex_lock ( &p_netlist->lock );
+
+ /* check */
+ if ( p_netlist->i_data_start == p_netlist->i_data_end )
{
- p_input->netlist.p_pes_free[i_base + i_packets]
- = p_input->netlist.p_pes_packets + i_packets;
+ intf_ErrMsg("Empty Data FIFO in netlist. Unable to allocate memory");
+ return ( NULL );
}
+
+ p_return = (p_netlist->pp_free_data[p_netlist->i_data_start]);
+ p_netlist->i_data_start++;
+ p_netlist->i_data_start %= p_netlist->i_nb_data;
- /* the p_pes_header_save buffer is allocated on the fly by the PES
- demux if needed, and freed with the PES packet when the netlist
- is destroyed. We initialise the field to NULL so that the demux
- can determine if it has already allocated this buffer or not. */
- for( i_packets = 0; i_packets < INPUT_MAX_PES + 1; i_packets++ )
+ /* unlock */
+ vlc_mutex_unlock (&p_netlist->lock);
+
+
+ /* initialize data */
+ p_return->p_next = NULL;
+ p_return->b_discard_payload = 0;
+
+ p_return->p_payload_start = p_return->p_buffer;
+ p_return->p_payload_end = p_return->p_payload_start + i_buffer_size;
+
+ return ( p_return );
+}
+
+/*****************************************************************************
+ * input_NetlistNewPES: returns a free pes_packet_t
+ *****************************************************************************/
+struct pes_packet_s * input_NetlistNewPES( void * p_method_data )
+{
+ netlist_t * p_netlist;
+ pes_packet_t * p_return;
+
+ /* cast */
+ p_netlist = (netlist_t *) p_method_data;
+
+ /* lock */
+ vlc_mutex_lock ( &p_netlist->lock );
+
+ /* check */
+ if ( p_netlist->i_pes_start == p_netlist->i_pes_end )
{
- p_input->netlist.p_pes_packets[i_packets].p_pes_header_save = NULL;
+ intf_ErrMsg("Empty PES FIFO in netlist - Unable to allocate memory");
+ return ( NULL );
}
- return( 0 );
+ /* allocate */
+ p_return = p_netlist->pp_free_pes[p_netlist->i_pes_start];
+ p_netlist->i_pes_start++;
+ p_netlist->i_pes_start %= p_netlist->i_nb_pes;
+
+ /* unlock */
+ vlc_mutex_unlock (&p_netlist->lock);
+
+ /* initialize PES */
+ p_return->b_data_alignment =
+ p_return->b_discontinuity =
+ p_return->i_pts = p_return->i_dts = 0;
+ p_return->i_pes_size = 0;
+ p_return->p_first = NULL;
+
+ return ( p_return );
+}
+
+/*****************************************************************************
+ * input_NetlistDeletePacket: puts a data_packet_t back into the netlist
+ *****************************************************************************/
+void input_NetlistDeletePacket( void * p_method_data, data_packet_t * p_data )
+{
+ netlist_t * p_netlist;
+
+ /* cast */
+ p_netlist = (netlist_t *) p_method_data;
+
+ /* lock */
+ vlc_mutex_lock ( &p_netlist->lock );
+
+
+ /* Delete data_packet */
+ p_netlist->i_data_end ++;
+ p_netlist->i_data_end %= p_netlist->i_nb_data;
+
+ p_netlist->pp_free_data[p_netlist->i_data_end] = p_data;
+ p_netlist->p_free_iovec[p_netlist->i_data_end].iov_base = p_data->p_buffer;
+
+ /* re initialize for next time */
+ p_data->p_payload_start = p_data->p_buffer;
+ p_data->p_next = NULL;
+
+ /* unlock */
+ vlc_mutex_unlock (&p_netlist->lock);
}
/*****************************************************************************
- * input_NetlistClean: clean the netlists buffers
+ * input_NetlistDeletePES: puts a pes_packet_t back into the netlist
*****************************************************************************/
-void input_NetlistEnd( input_thread_t *p_input )
+void input_NetlistDeletePES( void * p_method_data, pes_packet_t * p_pes )
{
- int i;
+ netlist_t * p_netlist;
+ data_packet_t * p_current_packet,* p_next_packet;
+
+ /* cast */
+ p_netlist = (netlist_t *)p_method_data;
- /* free TS netlist */
- free( p_input->netlist.p_ts_packets );
+ /* lock */
+ vlc_mutex_lock ( &p_netlist->lock );
- /* free the pes_buffer_save buffers of the PES packets if they have
- been allocated */
- for( i = 0; i < INPUT_MAX_PES + 1; i++ )
+ /* delete free p_pes->p_first, p_next ... */
+ p_current_packet = p_pes->p_first;
+ while ( p_current_packet != NULL )
{
- byte_t* p_buffer = p_input->netlist.p_pes_packets[i].p_pes_header_save;
- if(p_buffer)
- free(p_buffer);
+ /* copy of NetListDeletePacket, duplicate code avoid many locks */
+
+ p_netlist->i_data_end ++;
+ p_netlist->i_data_end %= p_netlist->i_nb_data;
+
+ /* re initialize*/
+ p_current_packet->p_payload_start = p_current_packet->p_buffer;
+
+ p_netlist->pp_free_data[p_netlist->i_data_end] = p_current_packet;
+
+ p_netlist->p_free_iovec[p_netlist->i_data_end].iov_base
+ = p_current_packet->p_buffer;
+
+ p_next_packet = p_current_packet->p_next;
+ p_current_packet->p_next = NULL;
+ p_current_packet = p_next_packet;
}
+
+ /* delete our current PES packet */
+ p_netlist->i_pes_end ++;
+ p_netlist->i_pes_end %= p_netlist->i_nb_pes;
+ p_netlist->pp_free_pes[p_netlist->i_pes_end] = p_pes;
+
+ /* unlock */
+ vlc_mutex_unlock (&p_netlist->lock);
- /* free PES netlist */
- free( p_input->netlist.p_pes_packets );
}
+/*****************************************************************************
+ * input_NetlistEnd: frees all allocated structures
+ *****************************************************************************/
+void input_NetlistEnd( input_thread_t * p_input)
+{
+ netlist_t * p_netlist;
+
+ /* cast */
+ p_netlist = ( netlist_t * ) p_input->p_method_data;
+
+ /* destroy the mutex lock */
+ vlc_mutex_destroy (&p_netlist->lock);
+
+ /* free the FIFO, the buffer, and the netlist structure */
+ free (p_netlist->pp_free_data);
+ free (p_netlist->pp_free_pes);
+ free (p_netlist->p_pes);
+ free (p_netlist->p_data);
+ free (p_netlist->p_buffers);
+
+ /* free the netlist */
+ free (p_netlist);
+}
projects / vlc / blobdiff