Skip to content

V
vlc-gpu
Commit eda87edb authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options 

* modules/demux/a52.c: better detection code.
parent 54d409e4
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 4 deletions
modules/demux/a52.c
View file @ eda87edb
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* a52.c : raw A/52 stream input module for vlc * a52.c : raw A/52 stream input module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: a52.c,v 1.3 2004/02/13 22:14:11 gbazin Exp $ * $Id: a52.c,v 1.4 2004/02/13 22:37:35 gbazin Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -32,7 +32,8 @@ ...@@ -32,7 +32,8 @@
# include <unistd.h> # include <unistd.h>
#endif #endif
#define A52_PACKET_SIZE 16384 #define PCM_FRAME_SIZE (1536 * 4)
#define A52_PACKET_SIZE (4 * PCM_FRAME_SIZE)
#define A52_MAX_HEADER_SIZE 10 #define A52_MAX_HEADER_SIZE 10
/***************************************************************************** /*****************************************************************************
...@@ -61,7 +62,7 @@ struct demux_sys_t ...@@ -61,7 +62,7 @@ struct demux_sys_t
*****************************************************************************/ *****************************************************************************/
vlc_module_begin(); vlc_module_begin();
set_description( _("Raw A/52 demuxer") ); set_description( _("Raw A/52 demuxer") );
set_capability( "demux", 155 ); set_capability( "demux", 145 );
set_callbacks( Open, Close ); set_callbacks( Open, Close );
add_shortcut( "a52" ); add_shortcut( "a52" );
vlc_module_end(); vlc_module_end();
...@@ -123,7 +124,7 @@ static int Open( vlc_object_t * p_this ) ...@@ -123,7 +124,7 @@ static int Open( vlc_object_t * p_this )
/* Some A52 wav files don't begin with a sync code so we do a more /* Some A52 wav files don't begin with a sync code so we do a more
* extensive search */ * extensive search */
i_size = input_Peek( p_input, &p_peek, i_peek + A52_PACKET_SIZE * 2); i_size = input_Peek( p_input, &p_peek, i_peek + A52_PACKET_SIZE * 2);
i_size -= A52_MAX_HEADER_SIZE; i_size -= (PCM_FRAME_SIZE + A52_MAX_HEADER_SIZE);
while( i_peek < i_size ) while( i_peek < i_size )
{ {
...@@ -131,9 +132,19 @@ static int Open( vlc_object_t * p_this ) ...@@ -131,9 +132,19 @@ static int Open( vlc_object_t * p_this )
/* The data is stored in 16 bits words */ /* The data is stored in 16 bits words */
i_peek += 2; i_peek += 2;
else else
{
/* Check following sync code */
if( CheckSync( p_peek + i_peek + PCM_FRAME_SIZE,
&b_big_endian ) != VLC_SUCCESS )
{
i_peek += 2;
continue;
}
break; break;
} }
} }
}
/* Have a peep at the show. */ /* Have a peep at the show. */
if( input_Peek( p_input, &p_peek, i_peek + A52_MAX_HEADER_SIZE * 2 ) < if( input_Peek( p_input, &p_peek, i_peek + A52_MAX_HEADER_SIZE * 2 ) <
......
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