/*****************************************************************************
* flac.c : FLAC demux module for vlc
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: flac.c,v 1.7 2003/11/21 12:18:54 gbazin Exp $
+ * Copyright (C) 2001-2003 VideoLAN
+ * $Id$
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
* 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
#include <vlc/input.h>
#include <vlc_codec.h>
-#define STREAMINFO_SIZE 38
-#define FLAC_PACKET_SIZE 16384
-
/*****************************************************************************
- * Local prototypes
+ * Module descriptor
*****************************************************************************/
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
-static int Demux ( input_thread_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 Demux ( demux_t * );
+static int Control( demux_t *, int, va_list );
struct demux_sys_t
{
/* Packetizer */
decoder_t *p_packetizer;
+ vlc_meta_t *p_meta;
};
-/*****************************************************************************
- * Module descriptor
- *****************************************************************************/
-vlc_module_begin();
- set_description( _("flac demuxer") );
- set_capability( "demux", 155 );
- set_callbacks( Open, Close );
- add_shortcut( "flac" );
-vlc_module_end();
+#define STREAMINFO_SIZE 38
+#define FLAC_PACKET_SIZE 16384
/*****************************************************************************
* Open: initializes ES structures
*****************************************************************************/
static int Open( vlc_object_t * p_this )
{
- input_thread_t *p_input = (input_thread_t *)p_this;
- demux_sys_t *p_sys;
- int i_peek;
- byte_t * p_peek;
- es_format_t fmt;
-
- p_input->pf_demux = Demux;
- p_input->pf_demux_control = demux_vaControlDefault;
- p_input->pf_rewind = NULL;
+ 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;
/* Have a peep at the show. */
- if( input_Peek( p_input, &p_peek, 4 ) < 4 )
- {
- /* Stream shorter than 4 bytes... */
- msg_Err( p_input, "cannot peek()" );
- return VLC_EGENERIC;
- }
+ 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' )
{
- if( p_input->psz_demux && !strncmp( p_input->psz_demux, "flac", 4 ) )
- {
- /* User forced */
- msg_Err( p_input, "this doesn't look like a flac stream, "
- "continuing anyway" );
- }
- else
- {
- msg_Warn( p_input, "flac module discarded (no startcode)" );
- return VLC_EGENERIC;
- }
+ 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->p_demux_data = p_sys = malloc( sizeof( demux_sys_t ) );
+ 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;
-
- /* Skip stream marker */
- stream_Read( p_input->s, NULL, 4 );
+ p_sys->p_meta = 0;
/* We need to read and store the STREAMINFO metadata */
- i_peek = stream_Peek( p_input->s, &p_peek, 4 );
- if( p_peek[0] & 0x7F )
+ i_peek = stream_Peek( p_demux->s, &p_peek, 8 );
+ if( p_peek[4] & 0x7F )
{
- msg_Err( p_input, "This isn't a STREAMINFO metadata block" );
+ msg_Err( p_demux, "this isn't a STREAMINFO metadata block" );
return VLC_EGENERIC;
}
- if( ((p_peek[1]<<16)+(p_peek[2]<<8)+p_peek[3]) != (STREAMINFO_SIZE - 4) )
+ if( ((p_peek[5]<<16)+(p_peek[6]<<8)+p_peek[7]) != (STREAMINFO_SIZE - 4) )
{
- msg_Err( p_input, "Invalid size for a STREAMINFO metadata block" );
+ msg_Err( p_demux, "invalid size for a STREAMINFO metadata block" );
return VLC_EGENERIC;
}
/*
* Load the FLAC packetizer
*/
- p_sys->p_packetizer = vlc_object_create( p_input, VLC_OBJECT_DECODER );
- p_sys->p_packetizer->pf_decode = 0;
+ p_sys->p_packetizer = vlc_object_create( p_demux, VLC_OBJECT_DECODER );
p_sys->p_packetizer->pf_decode_audio = 0;
p_sys->p_packetizer->pf_decode_video = 0;
p_sys->p_packetizer->pf_decode_sub = 0;
p_sys->p_packetizer->pf_packetize = 0;
- p_sys->p_packetizer->pf_run = 0;
/* Initialization of decoder structure */
es_format_Init( &p_sys->p_packetizer->fmt_in, AUDIO_ES,
VLC_FOURCC( 'f', 'l', 'a', 'c' ) );
/* Store STREAMINFO for the decoder and packetizer */
- p_sys->p_packetizer->fmt_in.i_extra = fmt.i_extra = STREAMINFO_SIZE;
- p_sys->p_packetizer->fmt_in.p_extra = malloc( STREAMINFO_SIZE );
- stream_Read( p_input->s, p_sys->p_packetizer->fmt_in.p_extra,
- STREAMINFO_SIZE );
+ 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)[0] |= 0x80;
- fmt.p_extra = malloc( STREAMINFO_SIZE );
- memcpy( fmt.p_extra, p_sys->p_packetizer->fmt_in.p_extra, STREAMINFO_SIZE);
+ ((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 );
+ module_Need( p_sys->p_packetizer, "packetizer", NULL, 0 );
if( !p_sys->p_packetizer->p_module )
{
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_input, "cannot find flac packetizer" );
+
+ msg_Err( p_demux, "cannot find flac packetizer" );
return VLC_EGENERIC;
}
- /* Create one program */
- vlc_mutex_lock( &p_input->stream.stream_lock );
- if( input_InitStream( p_input, 0 ) == -1 )
+ 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 ) ) )
{
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- msg_Err( p_input, "cannot init stream" );
- return VLC_EGENERIC;
+ p_sys->p_meta = (vlc_meta_t *)p_demux->p_private;
+ p_demux->p_private = NULL;
+ module_Unneed( p_demux, p_id3 );
}
- p_input->stream.i_mux_rate = 0;
- vlc_mutex_unlock( &p_input->stream.stream_lock );
-
- p_sys->p_es = es_out_Add( p_input->p_es_out, &fmt );
return VLC_SUCCESS;
}
*****************************************************************************/
static void Close( vlc_object_t * p_this )
{
- input_thread_t *p_input = (input_thread_t*)p_this;
- demux_sys_t *p_sys = p_input->p_demux_data;
+ 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 );
/* 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 )
{
- demux_sys_t *p_sys = p_input->p_demux_data;
- block_t *p_block_in, *p_block_out;
+ demux_sys_t *p_sys = p_demux->p_sys;
+ block_t *p_block_in, *p_block_out;
- if( !( p_block_in = stream_Block( p_input->s, FLAC_PACKET_SIZE ) ) )
+ if( !( p_block_in = stream_Block( p_demux->s, FLAC_PACKET_SIZE ) ) )
{
return 0;
}
{
block_t *p_next = p_block_out->p_next;
- input_ClockManageRef( p_input,
- p_input->stream.p_selected_program,
- p_block_out->i_pts * 9 / 100 );
+ /* set PCR */
+ es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block_out->i_dts );
- p_block_in->b_discontinuity = 0;
- p_block_out->i_dts = p_block_out->i_pts =
- input_ClockGetTS( p_input, p_input->stream.p_selected_program,
- p_block_out->i_pts * 9 / 100 );
-
- es_out_Send( p_input->p_es_out, p_sys->p_es, p_block_out );
+ 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 **pp_meta = (vlc_meta_t **)va_arg( args, vlc_meta_t** );
+ if( p_demux->p_sys->p_meta )
+ *pp_meta = vlc_meta_Duplicate( p_demux->p_sys->p_meta );
+ else *pp_meta = NULL;
+ return VLC_SUCCESS;
+ }
+ else return demux2_vaControlHelper( p_demux->s, 0, -1,
+ 8*0, 1, i_query, args );
+}
+
projects / vlc / blobdiff