/*****************************************************************************
- * a52sys.c : A/52 input module for vlc
+ * flac.c : FLAC demux module for vlc
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: flac.c,v 1.1 2003/02/23 16:31:48 sigmunau Exp $
+ * Copyright (C) 2001-2003 the VideoLAN team
+ * $Id$
*
- * Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
+ * Authors: Gildas Bazin <gbazin@netcourrier.com>
*
* 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
*
* 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <string.h> /* strdup() */
-#include <errno.h>
-
#include <vlc/vlc.h>
#include <vlc/input.h>
-
-#include <sys/types.h>
+#include <vlc_codec.h>
/*****************************************************************************
- * Constants
+ * Module descriptor
*****************************************************************************/
-#define A52_PACKET_SIZE 16384
-#define MAX_PACKETS_IN_FIFO 1
+static int Open ( vlc_object_t * );
+static void Close ( vlc_object_t * );
+
+vlc_module_begin();
+ set_description( _("FLAC demuxer") );
+ set_capability( "demux2", 155 );
+ set_category( CAT_INPUT );
+ set_subcategory( SUBCAT_INPUT_DEMUX );
+ set_callbacks( Open, Close );
+ add_shortcut( "flac" );
+vlc_module_end();
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static int Init ( vlc_object_t * );
-static int Demux ( input_thread_t * );
+static int Demux ( demux_t * );
+static int Control( demux_t *, int, va_list );
-/*****************************************************************************
- * Module descriptor
- *****************************************************************************/
-vlc_module_begin();
- set_description( "flac demuxer" );
- set_capability( "demux", 155 );
- set_callbacks( Init, NULL );
- add_shortcut( "flac" );
-vlc_module_end();
+struct demux_sys_t
+{
+ vlc_bool_t b_start;
+ es_out_id_t *p_es;
+
+ /* Packetizer */
+ decoder_t *p_packetizer;
+ vlc_meta_t *p_meta;
+};
+
+#define STREAMINFO_SIZE 38
+#define FLAC_PACKET_SIZE 16384
/*****************************************************************************
- * Init: initializes ES structures
+ * Open: initializes ES structures
*****************************************************************************/
-static int Init( vlc_object_t * p_this )
+static int Open( vlc_object_t * p_this )
{
- input_thread_t * p_input = (input_thread_t *)p_this;
- es_descriptor_t * p_es;
- byte_t * p_peek;
+ demux_t *p_demux = (demux_t*)p_this;
+ module_t *p_id3;
+ demux_sys_t *p_sys;
+ int i_peek;
+ byte_t *p_peek;
+ es_format_t fmt;
- /* Initialize access plug-in structures. */
- if( p_input->i_mtu == 0 )
+ /* Have a peep at the show. */
+ if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC;
+
+ if( p_peek[0]!='f' || p_peek[1]!='L' || p_peek[2]!='a' || p_peek[3]!='C' )
{
- /* Improve speed. */
- p_input->i_bufsize = INPUT_DEFAULT_BUFSIZE;
+ if( !p_demux->b_force ) return VLC_EGENERIC;
+
+ /* User forced */
+ msg_Err( p_demux, "this doesn't look like a flac stream, "
+ "continuing anyway" );
}
- p_input->pf_demux = Demux;
- p_input->pf_rewind = NULL;
+ p_demux->pf_demux = Demux;
+ p_demux->pf_control = Control;
+ p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
+ es_format_Init( &fmt, AUDIO_ES, VLC_FOURCC( 'f', 'l', 'a', 'c' ) );
+ p_sys->b_start = VLC_TRUE;
+ p_sys->p_meta = NULL;
- /* Have a peep at the show. */
- if( input_Peek( p_input, &p_peek, 4 ) < 4 )
+ /* We need to read and store the STREAMINFO metadata */
+ i_peek = stream_Peek( p_demux->s, &p_peek, 8 );
+ if( p_peek[4] & 0x7F )
{
- /* Stream shorter than 4 bytes... */
- msg_Err( p_input, "cannot peek()" );
- return( -1 );
+ msg_Err( p_demux, "this isn't a STREAMINFO metadata block" );
+ return VLC_EGENERIC;
}
- if( *p_peek != 'f' || *(p_peek + 1) != 'L' || *(p_peek +2) != 'a'
- || *(p_peek+3) != 'C')
+ if( ((p_peek[5]<<16)+(p_peek[6]<<8)+p_peek[7]) != (STREAMINFO_SIZE - 4) )
{
- if( *p_input->psz_demux && !strncmp( p_input->psz_demux, "flac", 4 ) )
- {
- /* User forced */
- msg_Err( p_input, "this doesn't look like an flac stream, continuing" );
- }
- else
- {
- msg_Warn( p_input, "flac module discarded (no startcode)" );
- return( -1 );
- }
+ msg_Err( p_demux, "invalid size for a STREAMINFO metadata block" );
+ return VLC_EGENERIC;
}
- if( input_InitStream( p_input, 0 ) == -1 )
+ /* Load the FLAC packetizer */
+ INIT_APACKETIZER( p_sys->p_packetizer, 'f', 'l', 'a', 'c' );
+
+ /* Store STREAMINFO for the decoder and packetizer */
+ p_sys->p_packetizer->fmt_in.i_extra = fmt.i_extra = STREAMINFO_SIZE + 4;
+ p_sys->p_packetizer->fmt_in.p_extra = malloc( STREAMINFO_SIZE + 4 );
+ stream_Read( p_demux->s, p_sys->p_packetizer->fmt_in.p_extra,
+ STREAMINFO_SIZE + 4 );
+
+ /* Fake this as the last metadata block */
+ ((uint8_t*)p_sys->p_packetizer->fmt_in.p_extra)[4] |= 0x80;
+ fmt.p_extra = malloc( STREAMINFO_SIZE + 4 );
+ memcpy( fmt.p_extra, p_sys->p_packetizer->fmt_in.p_extra,
+ STREAMINFO_SIZE + 4 );
+
+ p_sys->p_packetizer->p_module =
+ module_Need( p_sys->p_packetizer, "packetizer", NULL, 0 );
+ if( !p_sys->p_packetizer->p_module )
{
- return( -1 );
+ if( p_sys->p_packetizer->fmt_in.p_extra )
+ free( p_sys->p_packetizer->fmt_in.p_extra );
+ vlc_object_destroy( p_sys->p_packetizer );
+
+ msg_Err( p_demux, "cannot find flac packetizer" );
+ return VLC_EGENERIC;
}
- input_AddProgram( p_input, 0, 0 );
- p_input->stream.p_selected_program = p_input->stream.pp_programs[0];
- vlc_mutex_lock( &p_input->stream.stream_lock );
- p_es = input_AddES( p_input, p_input->stream.p_selected_program, 0xBD, 0 );
- p_es->i_stream_id = 0xBD;
- p_es->i_fourcc = VLC_FOURCC('f','l','a','c');
- p_es->i_cat = AUDIO_ES;
- input_SelectES( p_input, p_es );
- p_input->stream.p_selected_area->i_tell = 0;
- p_input->stream.p_selected_program->b_is_ok = 1;
- vlc_mutex_unlock( &p_input->stream.stream_lock );
-
- return( 0 );
+
+ p_sys->p_es = es_out_Add( p_demux->out, &fmt );
+
+ /* Parse possible id3 header */
+ if( ( p_id3 = module_Need( p_demux, "id3", NULL, 0 ) ) )
+ {
+ p_sys->p_meta = (vlc_meta_t *)p_demux->p_private;
+ p_demux->p_private = NULL;
+ module_Unneed( p_demux, p_id3 );
+ }
+
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * Close: frees unused data
+ *****************************************************************************/
+static void Close( vlc_object_t * p_this )
+{
+ demux_t *p_demux = (demux_t*)p_this;
+ demux_sys_t *p_sys = p_demux->p_sys;
+
+ /* Unneed module */
+ module_Unneed( p_sys->p_packetizer, p_sys->p_packetizer->p_module );
+
+ if( p_sys->p_packetizer->fmt_in.p_extra )
+ free( p_sys->p_packetizer->fmt_in.p_extra );
+
+ /* Delete the decoder */
+ vlc_object_destroy( p_sys->p_packetizer );
+ if( p_sys->p_meta ) vlc_meta_Delete( p_sys->p_meta );
+ free( p_sys );
}
/*****************************************************************************
*****************************************************************************
* Returns -1 in case of error, 0 in case of EOF, 1 otherwise
*****************************************************************************/
-static int Demux( input_thread_t * p_input )
+static int Demux( demux_t *p_demux )
{
- ssize_t i_read;
- decoder_fifo_t * p_fifo =
- p_input->stream.p_selected_program->pp_es[0]->p_decoder_fifo;
- pes_packet_t * p_pes;
- data_packet_t * p_data;
+ demux_sys_t *p_sys = p_demux->p_sys;
+ block_t *p_block_in, *p_block_out;
- if( p_fifo == NULL )
+ if( !( p_block_in = stream_Block( p_demux->s, FLAC_PACKET_SIZE ) ) )
{
- return -1;
+ return 0;
}
- i_read = input_SplitBuffer( p_input, &p_data, A52_PACKET_SIZE );
-
- if ( i_read <= 0 )
+ if( p_sys->b_start )
{
- return i_read;
+ p_block_in->i_pts = p_block_in->i_dts = 1;
+ p_sys->b_start = VLC_FALSE;
}
-
- p_pes = input_NewPES( p_input->p_method_data );
-
- if( p_pes == NULL )
+ else
{
- msg_Err( p_input, "out of memory" );
- input_DeletePacket( p_input->p_method_data, p_data );
- return( -1 );
+ p_block_in->i_pts = p_block_in->i_dts = 0;
}
- p_pes->i_rate = p_input->stream.control.i_rate;
- p_pes->p_first = p_pes->p_last = p_data;
- p_pes->i_pes_size = i_read;
- p_pes->i_nb_data = 1;
-
- vlc_mutex_lock( &p_fifo->data_lock );
- if( p_fifo->i_depth >= MAX_PACKETS_IN_FIFO )
+ while( (p_block_out = p_sys->p_packetizer->pf_packetize(
+ p_sys->p_packetizer, &p_block_in )) )
{
- /* Wait for the decoder. */
- vlc_cond_wait( &p_fifo->data_wait, &p_fifo->data_lock );
- }
- vlc_mutex_unlock( &p_fifo->data_lock );
+ while( p_block_out )
+ {
+ block_t *p_next = p_block_out->p_next;
- if( (p_input->stream.p_selected_program->i_synchro_state == SYNCHRO_REINIT)
- |(p_input->stream.p_selected_program->i_synchro_state == SYNCHRO_START)
- | (input_ClockManageControl( p_input,
- p_input->stream.p_selected_program,
- (mtime_t)0 ) == PAUSE_S) )
- {
- msg_Warn( p_input, "synchro reinit" );
- p_pes->i_pts = mdate() + DEFAULT_PTS_DELAY;
- p_input->stream.p_selected_program->i_synchro_state = SYNCHRO_OK;
- }
+ /* set PCR */
+ es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block_out->i_dts );
- input_DecodePES( p_fifo, p_pes );
+ es_out_Send( p_demux->out, p_sys->p_es, p_block_out );
+
+ p_block_out = p_next;
+ }
+ }
return 1;
}
+/*****************************************************************************
+ * Control:
+ *****************************************************************************/
+static int Control( demux_t *p_demux, int i_query, va_list args )
+{
+ /* demux_sys_t *p_sys = p_demux->p_sys; */
+ /* FIXME bitrate */
+ if( i_query == DEMUX_SET_TIME ) return VLC_EGENERIC;
+ else if( i_query == DEMUX_GET_META )
+ {
+ vlc_meta_t *p_meta = (vlc_meta_t *)va_arg( args, vlc_meta_t* );
+ if( p_demux->p_sys->p_meta )
+ vlc_meta_Merge( p_meta, p_demux->p_sys->p_meta );
+ return VLC_SUCCESS;
+ }
+ else return demux2_vaControlHelper( p_demux->s, 0, -1,
+ 8*0, 1, i_query, args );
+}
+
projects / vlc / blobdiff