Skip to content

V
vlc-1.1
Commit 08ece243 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

* a52.c aac.c au.c dts.c flac.c wav.c: Converted all audio only demuxers 

 to demux2.
parent ae60413f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 390 additions and 569 deletions
modules/demux/a52.c
View file @ 08ece243
This diff is collapsed.
modules/demux/aac.c
View file @ 08ece243
......@@ -2,7 +2,7 @@
* aac.c : Raw aac Stream input module for vlc
*****************************************************************************
* Copyright (C) 2001-2003 VideoLAN
* $Id: aac.c,v 1.9 2004/01/25 20:05:28 hartman Exp $
* $Id: aac.c,v 1.10 2004/03/03 11:40:19 fenrir Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -37,7 +37,7 @@ static void Close ( vlc_object_t * );
vlc_module_begin();
set_description( _("AAC demuxer" ) );
set_capability( "demux", 10 );
set_capability( "demux2", 100 );
set_callbacks( Open, Close );
add_shortcut( "aac" );
vlc_module_end();
......@@ -50,8 +50,6 @@ vlc_module_end();
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static int Demux ( input_thread_t * );
struct demux_sys_t
{
mtime_t i_time;
......@@ -59,6 +57,9 @@ struct demux_sys_t
es_out_id_t *p_es;
};
static int Demux ( demux_t * );
static int Control( demux_t *, int, va_list );
static int i_aac_samplerate[16] =
{
96000, 88200, 64000, 48000, 44100, 32000,
......@@ -70,6 +71,7 @@ static int i_aac_samplerate[16] =
#define AAC_SAMPLE_RATE( p ) i_aac_samplerate[((p)[2]>>2)&0x0f]
#define AAC_CHANNELS( p ) ( (((p)[2]&0x01)<<2) | (((p)[3]>>6)&0x03) )
#define AAC_FRAME_SIZE( p ) ( (((p)[3]&0x03) << 11)|( (p)[4] << 3 )|( (((p)[5]) >>5)&0x7 ) )
/* FIXME it's plain wrong */
#define AAC_FRAME_SAMPLES( p ) 1024
......@@ -86,33 +88,29 @@ static inline int HeaderCheck( uint8_t *p )
return VLC_TRUE;
}
/*****************************************************************************
* Open: initializes AAC demux structures
*****************************************************************************/
static int Open( vlc_object_t * p_this )
{
input_thread_t *p_input = (input_thread_t *)p_this;
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
int b_forced = VLC_FALSE;
uint8_t *p_peek;
module_t *p_id3;
es_format_t fmt;
if( p_input->psz_demux && !strncmp( p_input->psz_demux, "aac", 3 ) )
if( !strncmp( p_demux->psz_demux, "aac", 3 ) )
{
b_forced = VLC_TRUE;
}
if( p_input->psz_name )
if( p_demux->psz_path )
{
int i_len = strlen( p_input->psz_name );
int i_len = strlen( p_demux->psz_path );
if( i_len > 4 && !strcasecmp( &p_input->psz_name[i_len - 4], ".aac" ) )
if( i_len > 4 && !strcasecmp( &p_demux->psz_path[i_len - 4], ".aac" ) )
{
b_forced = VLC_TRUE;
}
......@@ -123,33 +121,31 @@ static int Open( vlc_object_t * p_this )
/* I haven't find any sure working aac detection so only forced or
* extention check
*/
msg_Warn( p_input, "AAC module discarded" );
msg_Warn( p_demux, "AAC module discarded" );
return VLC_EGENERIC;
}
/* skip possible id3 header */
p_id3 = module_Need( p_input, "id3", NULL );
if ( p_id3 )
if( ( p_id3 = module_Need( p_demux, "id3", NULL ) ) )
{
module_Unneed( p_input, p_id3 );
module_Unneed( p_demux, p_id3 );
}
p_input->pf_demux = Demux;
p_input->pf_demux_control = demux_vaControlDefault;
p_demux->pf_demux = Demux;
p_demux->pf_control = Control;
p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
p_input->p_demux_data = p_sys = malloc( sizeof( demux_sys_t ) );
p_sys->i_time = 0;
/* peek the begining (10 is for adts header) */
if( stream_Peek( p_input->s, &p_peek, 10 ) < 10 )
if( stream_Peek( p_demux->s, &p_peek, 10 ) < 10 )
{
msg_Err( p_input, "cannot peek" );
msg_Err( p_demux, "cannot peek" );
goto error;
}
if( !strncmp( p_peek, "ADIF", 4 ) )
{
msg_Err( p_input, "ADIF file. Not yet supported. (Please report)" );
msg_Err( p_demux, "ADIF file. Not yet supported. (Please report)" );
goto error;
}
......@@ -159,25 +155,14 @@ static int Open( vlc_object_t * p_this )
fmt.audio.i_channels = AAC_CHANNELS( p_peek );
fmt.audio.i_rate = AAC_SAMPLE_RATE( p_peek );
msg_Dbg( p_input,
msg_Dbg( p_demux,
"adts header: id=%d channels=%d sample_rate=%d",
AAC_ID( p_peek ),
AAC_CHANNELS( p_peek ),
AAC_SAMPLE_RATE( p_peek ) );
}
vlc_mutex_lock( &p_input->stream.stream_lock );
if( input_InitStream( p_input, 0 ) == -1)
{
vlc_mutex_unlock( &p_input->stream.stream_lock );
msg_Err( p_input, "cannot init stream" );
goto error;
}
p_input->stream.i_mux_rate = 0 / 50;
vlc_mutex_unlock( &p_input->stream.stream_lock );
p_sys->p_es = es_out_Add( p_input->p_es_out, &fmt );
p_sys->p_es = es_out_Add( p_demux->out, &fmt );
return VLC_SUCCESS;
error:
......@@ -191,17 +176,17 @@ error:
*****************************************************************************
* 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;
demux_sys_t *p_sys = p_demux->p_sys;
block_t *p_block;
uint8_t h[8];
uint8_t *p_peek;
if( stream_Peek( p_input->s, &p_peek, 8 ) < 8 )
if( stream_Peek( p_demux->s, &p_peek, 8 ) < 8 )
{
msg_Warn( p_input, "cannot peek" );
msg_Warn( p_demux, "cannot peek" );
return 0;
}
......@@ -212,10 +197,10 @@ static int Demux( input_thread_t * p_input )
int i_skip = 0;
int i_peek;
i_peek = stream_Peek( p_input->s, &p_peek, 8096 );
i_peek = stream_Peek( p_demux->s, &p_peek, 8096 );
if( i_peek < 8 )
{
msg_Warn( p_input, "cannot peek" );
msg_Warn( p_demux, "cannot peek" );
return 0;
}
......@@ -232,29 +217,27 @@ static int Demux( input_thread_t * p_input )
i_skip++;
}
msg_Warn( p_input, "garbage=%d bytes", i_skip );
stream_Read( p_input->s, NULL, i_skip );
msg_Warn( p_demux, "garbage=%d bytes", i_skip );
stream_Read( p_demux->s, NULL, i_skip );
return 1;
}
memcpy( h, p_peek, 8 ); /* can't use p_peek after stream_* */
input_ClockManageRef( p_input,
p_input->stream.p_selected_program,
p_sys->i_time * 9 / 100 );
if( ( p_block = stream_Block( p_input->s, AAC_FRAME_SIZE( h ) ) ) == NULL )
/* set PCR */
es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_time );
if( ( p_block = stream_Block( p_demux->s, AAC_FRAME_SIZE( h ) ) ) == NULL )
{
msg_Warn( p_input, "cannot read data" );
msg_Warn( p_demux, "cannot read data" );
return 0;
}
p_block->i_dts =
p_block->i_pts = input_ClockGetTS( p_input,
p_input->stream.p_selected_program,
p_sys->i_time * 9 / 100 );
p_block->i_dts = p_block->i_pts = p_sys->i_time;
es_out_Send( p_input->p_es_out, p_sys->p_es, p_block );
es_out_Send( p_demux->out, p_sys->p_es, p_block );
p_sys->i_time += (mtime_t)1000000 *
(mtime_t)AAC_FRAME_SAMPLES( h ) /
......@@ -267,9 +250,21 @@ static int Demux( input_thread_t * p_input )
*****************************************************************************/
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;
free( p_sys );
}
/*****************************************************************************
* Control:
*****************************************************************************/
static int Control( demux_t *p_demux, int i_query, va_list args )
{
/* demux_sys_t *p_sys = p_demux->p_sys; */
/* FIXME calculate the bitrate */
return demux2_vaControlHelper( p_demux->s,
0, -1,
8*0, 1, i_query, args );
}
modules/demux/au.c
View file @ 08ece243
......@@ -2,7 +2,7 @@
* au.c : au file input module for vlc
*****************************************************************************
* Copyright (C) 2001-2003 VideoLAN
* $Id: au.c,v 1.13 2004/01/29 15:11:17 fenrir Exp $
* $Id: au.c,v 1.14 2004/03/03 11:40:19 fenrir Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -331,75 +331,9 @@ static void Close( vlc_object_t * p_this )
static int Control( demux_t *p_demux, int i_query, va_list args )
{
demux_sys_t *p_sys = p_demux->p_sys;
double f, *pf;
int64_t *pi64;
switch( i_query )
{
case DEMUX_GET_POSITION:
{
int64_t i_tell = stream_Tell( p_demux->s );
int64_t i_end = stream_Size( p_demux->s );
pf = (double*) va_arg( args, double* );
if( p_sys->i_header_size < i_end )
{
*pf = (double)( i_tell - p_sys->i_header_size ) /
(double)(i_end - p_sys->i_header_size);
return VLC_SUCCESS;
}
return VLC_EGENERIC;
}
case DEMUX_SET_POSITION:
{
int64_t i_end = stream_Size( p_demux->s );
f = (double) va_arg( args, double );
if( p_sys->i_header_size < i_end )
{
int64_t i_frame = (f * ( i_end - p_sys->i_header_size )) /
p_sys->fmt.audio.i_blockalign;
if( stream_Seek( p_demux->s, p_sys->i_header_size +
i_frame * p_sys->fmt.audio.i_blockalign ) )
{
return VLC_EGENERIC;
}
p_sys->i_time = 1 + ( i_frame * p_sys->fmt.audio.i_blockalign / p_sys->i_frame_size ) * p_sys->i_frame_length;
return VLC_SUCCESS;
}
return VLC_EGENERIC;
}
case DEMUX_GET_TIME:
pi64 = (int64_t*)va_arg( args, int64_t * );
*pi64 = p_sys->i_time;
return VLC_SUCCESS;
case DEMUX_GET_LENGTH:
{
int64_t i_size = stream_Size( p_demux->s ) - p_sys->i_header_size;
if( i_size > 0 )
{
pi64 = (int64_t*)va_arg( args, int64_t * );
*pi64 = i_size / p_sys->i_frame_size * p_sys->i_frame_length;
return VLC_SUCCESS;
}
return VLC_EGENERIC;
}
case DEMUX_SET_TIME:
case DEMUX_GET_FPS:
default:
return VLC_EGENERIC;
}
return demux2_vaControlHelper( p_demux->s, p_sys->i_header_size, -1,
p_sys->fmt.i_bitrate, p_sys->fmt.audio.i_blockalign,
i_query, args );
}
modules/demux/dts.c
View file @ 08ece243
This diff is collapsed.
modules/demux/flac.c
View file @ 08ece243
......@@ -2,7 +2,7 @@
* flac.c : FLAC demux module for vlc
*****************************************************************************
* Copyright (C) 2001-2003 VideoLAN
* $Id: flac.c,v 1.11 2004/02/25 17:48:52 fenrir Exp $
* $Id: flac.c,v 1.12 2004/03/03 11:40:19 fenrir Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -28,15 +28,24 @@
#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_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
{
......@@ -47,76 +56,64 @@ struct demux_sys_t
decoder_t *p_packetizer;
};
/*****************************************************************************
* 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_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
int i_peek;
byte_t * p_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;
/* Have a peep at the show. */
if( input_Peek( p_input, &p_peek, 4 ) < 4 )
if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 )
{
/* Stream shorter than 4 bytes... */
msg_Err( p_input, "cannot peek()" );
msg_Err( p_demux, "cannot peek()" );
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 ) )
if( strncmp( p_demux->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)" );
msg_Warn( p_demux, "flac module discarded (no startcode)" );
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;
/* We need to read and store the STREAMINFO metadata */
i_peek = stream_Peek( p_input->s, &p_peek, 8 );
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[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 = 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;
......@@ -129,7 +126,7 @@ static int Open( vlc_object_t * p_this )
/* 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_input->s, p_sys->p_packetizer->fmt_in.p_extra,
stream_Read( p_demux->s, p_sys->p_packetizer->fmt_in.p_extra,
STREAMINFO_SIZE + 4 );
/* Fake this as the last metadata block */
......@@ -146,22 +143,11 @@ static int Open( vlc_object_t * p_this )
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 )
{
vlc_mutex_unlock( &p_input->stream.stream_lock );
msg_Err( p_input, "cannot init stream" );
return VLC_EGENERIC;
}
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 );
p_sys->p_es = es_out_Add( p_demux->out, &fmt );
return VLC_SUCCESS;
}
......@@ -171,8 +157,8 @@ static int Open( vlc_object_t * p_this )
*****************************************************************************/
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 );
......@@ -191,12 +177,12 @@ static void Close( vlc_object_t * p_this )
*****************************************************************************
* 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;
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;
}
......@@ -218,15 +204,10 @@ static int Demux( input_thread_t * p_input )
{
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 );
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 );
/* set PCR */
es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block_out->i_dts );
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;
}
......@@ -234,3 +215,16 @@ static int Demux( input_thread_t * p_input )
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 */
return demux2_vaControlHelper( p_demux->s,
0, -1,
8*0, 1, i_query, args );
}
modules/demux/wav.c
View file @ 08ece243
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment