Skip to content

V
vlc-1.1
Commit 4cd852f3 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

a52sys.c: completely rewritten a52 stream demuxer. Now you should be able 

 to play such file.
parent aabedc34
Hide whitespace changes
Inline Side-by-side
Showing with 291 additions and 87 deletions
modules/demux/a52sys.c
View file @ 4cd852f3
/***************************************************************************** /*****************************************************************************
* a52sys.c : A/52 input module for vlc * a52.c : Raw a52 Stream input module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: a52sys.c,v 1.3 2003/05/05 22:23:34 gbazin Exp $ * $Id: a52sys.c,v 1.4 2003/08/01 00:04:28 fenrir Exp $
* *
* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
...@@ -25,96 +25,189 @@ ...@@ -25,96 +25,189 @@
* Preamble * Preamble
*****************************************************************************/ *****************************************************************************/
#include <stdlib.h> /* malloc(), free() */ #include <stdlib.h> /* malloc(), free() */
#include <string.h> /* strdup() */
#include <errno.h>
#include <vlc/vlc.h> #include <vlc/vlc.h>
#include <vlc/input.h> #include <vlc/input.h>
#include <sys/types.h> #include <ninput.h>
/***************************************************************************** /*****************************************************************************
* Constants * Module descriptor
*****************************************************************************/ *****************************************************************************/
#define A52_PACKET_SIZE 16384 static int Open ( vlc_object_t * );
#define MAX_PACKETS_IN_FIFO 3 static void Close ( vlc_object_t * );
vlc_module_begin();
set_description( _("A52 demuxer" ) );
set_capability( "demux", 100 );
set_callbacks( Open, Close );
add_shortcut( "a52" );
vlc_module_end();
/* TODO:
*
*/
/***************************************************************************** /*****************************************************************************
* Local prototypes * Local prototypes
*****************************************************************************/ *****************************************************************************/
static int Init ( vlc_object_t * ); static int Demux ( input_thread_t * );
static int Demux ( input_thread_t * );
/***************************************************************************** struct demux_sys_t
* Module descriptor {
*****************************************************************************/ stream_t *s;
vlc_module_begin(); mtime_t i_time;
set_description( _("A52 demuxer") );
set_capability( "demux", 155 ); es_descriptor_t *p_es;
set_callbacks( Init, NULL ); };
add_shortcut( "a52" );
vlc_module_end(); static inline int HeaderCheck( const uint8_t * p )
{
if( (p[0] != 0x0b) || (p[1] != 0x77) || /* syncword */
(p[5] >= 0x60) || /* bsid >= 12 */
(p[4] & 63) >= 38 || /* frmsizecod */
( (p[4] & 0xc0) != 0 && (p[4] & 0xc0) != 0x40 && (p[4] & 0xc0) != 0x80 ) )
{
return VLC_FALSE;
}
return VLC_TRUE;
}
static int HeaderInfo( const uint8_t * p,
int *pi_channels,
int *pi_sample_rate,
int *pi_frame_size );
/***************************************************************************** /*****************************************************************************
* Init: initializes ES structures * Open: initializes AAC demux 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; input_thread_t *p_input = (input_thread_t *)p_this;
es_descriptor_t * p_es; demux_sys_t *p_sys;
byte_t * p_peek; int b_forced = VLC_FALSE;
uint8_t *p_peek;
/* Initialize access plug-in structures. */ module_t *p_id3;
if( p_input->i_mtu == 0 )
if( p_input->psz_demux && !strncmp( p_input->psz_demux, "a52", 3 ) )
{ {
/* Improve speed. */ b_forced = VLC_TRUE;
p_input->i_bufsize = INPUT_DEFAULT_BUFSIZE;
} }
if( p_input->psz_name )
{
int i_len = strlen( p_input->psz_name );
p_input->pf_demux = Demux; if( i_len > 4 && !strcasecmp( &p_input->psz_name[i_len - 4], ".a52" ) )
p_input->pf_rewind = NULL; {
b_forced = VLC_TRUE;
}
}
/* Have a peep at the show. */ /* skip possible id3 header */
if( input_Peek( p_input, &p_peek, 2 ) < 2 ) p_id3 = module_Need( p_input, "id3", NULL );
if ( p_id3 )
{ {
/* Stream shorter than 4 bytes... */ module_Unneed( p_input, p_id3 );
msg_Err( p_input, "cannot peek()" );
return( -1 );
} }
if( *p_peek != 0x0b || *(p_peek + 1) != 0x77 ) /* see if it could be 52 */
if( !b_forced )
{ {
if( *p_input->psz_demux && !strncmp( p_input->psz_demux, "a52", 3 ) ) if( input_Peek( p_input, &p_peek, 6 ) < 6 )
{ {
/* User forced */ msg_Err( p_input, "cannot peek" );
msg_Err( p_input, "this doesn't look like an a52 stream, continuing" ); return VLC_EGENERIC;
} }
else if( !HeaderCheck( p_peek ) )
{ {
msg_Warn( p_input, "a52 module discarded (no startcode)" ); msg_Warn( p_input, "A52 module discarded" );
return( -1 ); return VLC_EGENERIC;
} }
} }
if( input_InitStream( p_input, 0 ) == -1 ) p_input->pf_demux = Demux;
p_input->p_demux_data = p_sys = malloc( sizeof( demux_sys_t ) );
p_sys->i_time = 0;
if( ( p_sys->s = stream_OpenInput( p_input ) ) == NULL )
{ {
return( -1 ); msg_Err( p_input, "cannot create stream" );
goto error;
} }
input_AddProgram( p_input, 0, 0 );
p_input->stream.p_selected_program = p_input->stream.pp_programs[0]; if( stream_Peek( p_sys->s, &p_peek, 6 ) < 6 )
{
msg_Err( p_input, "cannot peek" );
goto error;
}
if( HeaderCheck( p_peek ) )
{
int i_channels, i_sample_rate, i_frame_size;
input_info_category_t * p_category;
HeaderInfo( p_peek, &i_channels, &i_sample_rate, &i_frame_size );
msg_Dbg( p_input,
"a52 channels=%d sample_rate=%d",
i_channels, i_sample_rate );
vlc_mutex_lock( &p_input->stream.stream_lock );
p_category = input_InfoCategory( p_input, _("A52") );
input_AddInfo( p_category, _("Input Type"), "A52" );
input_AddInfo( p_category, _("Channels"), "%d", i_channels );
input_AddInfo( p_category, _("Sample Rate"), "%dHz", i_sample_rate );
vlc_mutex_unlock( &p_input->stream.stream_lock );
}
vlc_mutex_lock( &p_input->stream.stream_lock ); vlc_mutex_lock( &p_input->stream.stream_lock );
p_es = input_AddES( p_input, p_input->stream.p_selected_program, 0xBD, if( input_InitStream( p_input, 0 ) == -1)
AUDIO_ES, NULL, 0 ); {
p_es->i_stream_id = 0xBD; vlc_mutex_unlock( &p_input->stream.stream_lock );
p_es->i_fourcc = VLC_FOURCC('a','5','2',' '); msg_Err( p_input, "cannot init stream" );
input_SelectES( p_input, p_es ); goto error;
p_input->stream.p_selected_area->i_tell = 0; }
if( input_AddProgram( p_input, 0, 0) == NULL )
{
vlc_mutex_unlock( &p_input->stream.stream_lock );
msg_Err( p_input, "cannot add program" );
goto error;
}
p_input->stream.pp_programs[0]->b_is_ok = 0;
p_input->stream.p_selected_program = p_input->stream.pp_programs[0];
p_input->stream.i_mux_rate = 0 / 50;
p_sys->p_es = input_AddES( p_input,
p_input->stream.p_selected_program,
1 , AUDIO_ES, NULL, 0 );
p_sys->p_es->i_stream_id = 1;
p_sys->p_es->i_fourcc = VLC_FOURCC( 'a', '5', '2', ' ' );
input_SelectES( p_input, p_sys->p_es );
p_input->stream.p_selected_program->b_is_ok = 1; p_input->stream.p_selected_program->b_is_ok = 1;
vlc_mutex_unlock( &p_input->stream.stream_lock ); vlc_mutex_unlock( &p_input->stream.stream_lock );
return( 0 ); return VLC_SUCCESS;
error:
if( p_sys->s )
{
stream_Release( p_sys->s );
}
free( p_sys );
return VLC_EGENERIC;
} }
/***************************************************************************** /*****************************************************************************
* Demux: reads and demuxes data packets * Demux: reads and demuxes data packets
***************************************************************************** *****************************************************************************
...@@ -122,58 +215,169 @@ static int Init( vlc_object_t * p_this ) ...@@ -122,58 +215,169 @@ static int Init( vlc_object_t * p_this )
*****************************************************************************/ *****************************************************************************/
static int Demux( input_thread_t * p_input ) static int Demux( input_thread_t * p_input )
{ {
ssize_t i_read; demux_sys_t *p_sys = p_input->p_demux_data;
decoder_fifo_t * p_fifo = pes_packet_t *p_pes;
p_input->stream.p_selected_program->pp_es[0]->p_decoder_fifo;
pes_packet_t * p_pes;
data_packet_t * p_data;
if( p_fifo == NULL ) int i_channels, i_sample_rate, i_frame_size;
uint8_t *p_peek;
if( stream_Peek( p_sys->s, &p_peek, 6 ) < 6 )
{ {
return -1; msg_Warn( p_input, "cannot peek" );
return 0;
} }
i_read = input_SplitBuffer( p_input, &p_data, A52_PACKET_SIZE ); if( !HeaderCheck( p_peek ) )
{
/* we need to resynch */
vlc_bool_t b_ok = VLC_FALSE;
int i_skip = 0;
int i_peek;
i_peek = stream_Peek( p_sys->s, &p_peek, 8096 );
if( i_peek < 8 )
{
msg_Warn( p_input, "cannot peek" );
return 0;
}
while( i_peek >= 8 )
{
if( HeaderCheck( p_peek ) )
{
b_ok = VLC_TRUE;
break;
}
p_peek++;
i_peek--;
i_skip++;
}
msg_Warn( p_input, "garbage=%d bytes", i_skip );
stream_Read( p_sys->s, NULL, i_skip );
return 1;
}
if ( i_read <= 0 ) HeaderInfo( p_peek, &i_channels, &i_sample_rate, &i_frame_size );
input_ClockManageRef( p_input,
p_input->stream.p_selected_program,
p_sys->i_time * 9 / 100 );
if( ( p_pes = stream_PesPacket( p_sys->s, i_frame_size ) ) == NULL )
{ {
return i_read; msg_Warn( p_input, "cannot read data" );
return 0;
} }
p_pes = input_NewPES( p_input->p_method_data ); p_pes->i_dts =
p_pes->i_pts = input_ClockGetTS( p_input,
p_input->stream.p_selected_program,
p_sys->i_time * 9 / 100 );
if( p_pes == NULL ) if( !p_sys->p_es->p_decoder_fifo )
{ {
msg_Err( p_input, "out of memory" ); msg_Err( p_input, "no audio decoder" );
input_DeletePacket( p_input->p_method_data, p_data ); input_DeletePES( p_input->p_method_data, p_pes );
return( -1 ); return( -1 );
} }
p_pes->i_rate = p_input->stream.control.i_rate; input_DecodePES( p_sys->p_es->p_decoder_fifo, p_pes );
p_pes->p_first = p_pes->p_last = p_data; p_sys->i_time += (mtime_t)1000000 *
p_pes->i_nb_data = 1; (mtime_t)1536 /
(mtime_t)i_sample_rate;
return( 1 );
}
/*****************************************************************************
* Close: frees unused data
*****************************************************************************/
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;
vlc_mutex_lock( &p_fifo->data_lock ); if( p_sys->s )
if( p_fifo->i_depth >= MAX_PACKETS_IN_FIFO )
{ {
/* Wait for the decoder. */ stream_Release( p_sys->s );
vlc_cond_wait( &p_fifo->data_wait, &p_fifo->data_lock );
} }
vlc_mutex_unlock( &p_fifo->data_lock ); free( p_sys );
}
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, * SyncInfo: parse A/52 sync info
p_input->stream.p_selected_program, *****************************************************************************
(mtime_t)0 ) == PAUSE_S) ) * This code is borrowed from liba52 by Aaron Holtzman & Michel Lespinasse,
*****************************************************************************/
static int HeaderInfo( const uint8_t * p,
int *pi_channels,
int *pi_sample_rate,
int *pi_frame_size )
{
static const uint8_t halfrate[12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3 };
static const int rate[] = { 32, 40, 48, 56, 64, 80, 96, 112,
128, 160, 192, 224, 256, 320, 384, 448,
512, 576, 640 };
static const uint8_t lfeon[8] = { 0x10, 0x10, 0x04, 0x04,
0x04, 0x01, 0x04, 0x01 };
int frmsizecod;
int bitrate;
int half;
int acmod;
if ((p[0] != 0x0b) || (p[1] != 0x77)) /* syncword */
return VLC_FALSE;
if (p[5] >= 0x60) /* bsid >= 12 */
return VLC_FALSE;
half = halfrate[p[5] >> 3];
/* acmod, dsurmod and lfeon */
acmod = p[6] >> 5;
if ( (p[6] & 0xf8) == 0x50 )
{ {
msg_Warn( p_input, "synchro reinit" ); /* Dolby surround = stereo + Dolby */
p_pes->i_pts = mdate() + DEFAULT_PTS_DELAY; *pi_channels = 2;
p_input->stream.p_selected_program->i_synchro_state = SYNCHRO_OK; }
else
{
static const int acmod_to_channels[8] =
{
2 /* dual mono */, 1 /* mono */, 2 /* stereo */,
3 /* 3F */, 3 /* 2f1R */,
4 /* 3F1R */, 4, /* 2F2R */
5 /* 3F2R */
};
*pi_channels = acmod_to_channels[acmod];
} }
input_DecodePES( p_fifo, p_pes ); if ( p[6] & lfeon[acmod] ) (*pi_channels)++; /* LFE */
return 1; frmsizecod = p[4] & 63;
if (frmsizecod >= 38)
return VLC_FALSE;
bitrate = rate[frmsizecod >> 1];
switch (p[4] & 0xc0) {
case 0:
*pi_sample_rate = 48000 >> half;
*pi_frame_size = 4 * bitrate;
return VLC_TRUE;
case 0x40:
*pi_sample_rate = 44100 >> half;
*pi_frame_size = 2 * (320 * bitrate / 147 + (frmsizecod & 1));
return VLC_TRUE;
case 0x80:
*pi_sample_rate = 32000 >> half;
*pi_frame_size =6 * bitrate;
return VLC_TRUE;
default:
return VLC_FALSE;
}
} }
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