/*****************************************************************************
* a52.c : raw A/52 stream input module for vlc
*****************************************************************************
- * Copyright (C) 2001 the VideoLAN team
+ * Copyright (C) 2001-2007 the VideoLAN team
* $Id$
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
* 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
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
-#include <vlc/input.h>
+#include <vlc_plugin.h>
+#include <vlc_demux.h>
#include <vlc_codec.h>
#ifdef HAVE_UNISTD_H
vlc_module_begin();
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_DEMUX );
- set_description( _("Raw A/52 demuxer") );
- set_capability( "demux2", 145 );
+ set_description( N_("Raw A/52 demuxer") );
+ set_capability( "demux", 145 );
set_callbacks( Open, Close );
add_shortcut( "a52" );
vlc_module_end();
struct demux_sys_t
{
- vlc_bool_t b_start;
+ bool b_start;
es_out_id_t *p_es;
/* Packetizer */
decoder_t *p_packetizer;
int i_mux_rate;
- vlc_bool_t b_big_endian;
+ bool b_big_endian;
};
-static int CheckSync( uint8_t *p_peek, vlc_bool_t *p_big_endian );
+static int CheckSync( const uint8_t *p_peek, bool *p_big_endian );
#define PCM_FRAME_SIZE (1536 * 4)
#define A52_PACKET_SIZE (4 * PCM_FRAME_SIZE)
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
- byte_t *p_peek;
+ const uint8_t *p_peek;
int i_peek = 0;
- vlc_bool_t b_big_endian;
+ bool b_big_endian = 0; /* Arbitrary initialisation */
/* Check if we are dealing with a WAV file */
if( stream_Peek( p_demux->s, &p_peek, 12 ) == 12 &&
}
/* Have a peep at the show. */
- if( stream_Peek( p_demux->s, &p_peek, i_peek + A52_MAX_HEADER_SIZE * 2 ) <
- i_peek + A52_MAX_HEADER_SIZE * 2 )
- {
- /* Stream too short */
- msg_Warn( p_demux, "cannot peek()" );
- return VLC_EGENERIC;
- }
+ CHECK_PEEK( p_peek, i_peek + A52_MAX_HEADER_SIZE * 2 );
if( CheckSync( p_peek + i_peek, &b_big_endian ) != VLC_SUCCESS )
{
- if( strncmp( p_demux->psz_demux, "a52", 3 ) )
- {
+ if( !p_demux->b_force )
return VLC_EGENERIC;
- }
/* User forced */
msg_Err( p_demux, "this doesn't look like a A52 audio stream, "
}
/* Fill p_demux fields */
- p_demux->pf_demux = Demux;
- p_demux->pf_control = Control;
- p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
- p_sys->b_start = VLC_TRUE;
+ DEMUX_INIT_COMMON(); p_sys = p_demux->p_sys;
+ p_sys->b_start = true;
p_sys->i_mux_rate = 0;
p_sys->b_big_endian = b_big_endian;
- /*
- * Load the A52 packetizer
- */
- 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;
-
- /* Initialization of decoder structure */
- es_format_Init( &p_sys->p_packetizer->fmt_in, AUDIO_ES,
- VLC_FOURCC( 'a', '5', '2', ' ' ) );
-
- p_sys->p_packetizer->p_module =
- module_Need( p_sys->p_packetizer, "packetizer", NULL, 0 );
- if( !p_sys->p_packetizer->p_module )
- {
- msg_Err( p_demux, "cannot find A52 packetizer" );
- return VLC_EGENERIC;
- }
+ /* Load the A52 packetizer */
+ INIT_APACKETIZER( p_sys->p_packetizer, 'a', '5', '2', ' ' );
+ LOAD_PACKETIZER_OR_FAIL( p_sys->p_packetizer, "A52" );
/* Create one program */
p_sys->p_es = es_out_Add( p_demux->out, &p_sys->p_packetizer->fmt_in );
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 );
-
+ DESTROY_PACKETIZER( p_sys->p_packetizer );
free( p_sys );
}
#else
int i;
- byte_t *p_tmp, tmp;
+ uint8_t *p_tmp, tmp;
p_tmp = p_block_in->p_buffer;
for( i = p_block_in->i_buffer / 2 ; i-- ; )
{
while( (p_block_out = p_sys->p_packetizer->pf_packetize(
p_sys->p_packetizer, &p_block_in )) )
{
- p_sys->b_start = VLC_FALSE;
+ p_sys->b_start = false;
while( p_block_out )
{
if( p_block_out->i_length )
{
p_sys->i_mux_rate =
- p_block_out->i_buffer * I64C(1000000)/p_block_out->i_length;
+ p_block_out->i_buffer * INT64_C(1000000)/p_block_out->i_length;
}
/* set PCR */
{
demux_sys_t *p_sys = p_demux->p_sys;
if( i_query == DEMUX_SET_TIME )
+ {
return VLC_EGENERIC;
+ }
+ else if( i_query == DEMUX_HAS_UNSUPPORTED_META )
+ {
+ bool *pb_bool = (bool*)va_arg( args, bool* );
+ *pb_bool = true;
+ return VLC_SUCCESS;
+ }
else
- return demux2_vaControlHelper( p_demux->s,
+ {
+ return demux_vaControlHelper( p_demux->s,
0, -1,
8*p_sys->i_mux_rate, 1, i_query, args );
+ }
}
/*****************************************************************************
* CheckSync: Check if buffer starts with an A52 sync code
*****************************************************************************/
-static int CheckSync( uint8_t *p_peek, vlc_bool_t *p_big_endian )
+static int CheckSync( const uint8_t *p_peek, bool *p_big_endian )
{
/* Little endian version of the bitstream */
if( p_peek[0] == 0x77 && p_peek[1] == 0x0b &&
p_peek[4] < 0x60 /* bsid < 12 */ )
{
- *p_big_endian = VLC_FALSE;
+ *p_big_endian = false;
return VLC_SUCCESS;
}
/* Big endian version of the bitstream */
else if( p_peek[0] == 0x0b && p_peek[1] == 0x77 &&
p_peek[5] < 0x60 /* bsid < 12 */ )
{
- *p_big_endian = VLC_TRUE;
+ *p_big_endian = true;
return VLC_SUCCESS;
}
projects / vlc / blobdiff