Skip to content

V
vlc-1.1
Commit cd1904bb authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* modules/demux/ogg.c: fixed reading extra data for oggds audio header (needed for WMA). 

* modules/mux/ogg.c: generate proper oggds audio header.
parent 06f5e605
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 104 deletions
modules/demux/ogg.c
View file @ cd1904bb
...@@ -278,21 +278,21 @@ static int Demux( demux_t * p_demux ) ...@@ -278,21 +278,21 @@ static int Demux( demux_t * p_demux )
/* Read info from any secondary header packets, if there are any */ /* Read info from any secondary header packets, if there are any */
if( p_stream->secondary_header_packets > 0 ) if( p_stream->secondary_header_packets > 0 )
{ {
if( p_stream->fmt.i_codec == VLC_FOURCC( 't','h','e','o' ) && if( p_stream->fmt.i_codec == VLC_FOURCC('t','h','e','o') &&
oggpacket.bytes >= 7 && oggpacket.bytes >= 7 &&
! strncmp( &oggpacket.packet[1], "theora", 6 ) ) ! strncmp( &oggpacket.packet[1], "theora", 6 ) )
{ {
Ogg_ReadTheoraHeader( p_stream, &oggpacket ); Ogg_ReadTheoraHeader( p_stream, &oggpacket );
p_stream->secondary_header_packets = 0; p_stream->secondary_header_packets = 0;
} }
else if( p_stream->fmt.i_codec == VLC_FOURCC( 'v','o','r','b' ) && else if( p_stream->fmt.i_codec == VLC_FOURCC('v','o','r','b') &&
oggpacket.bytes >= 7 && oggpacket.bytes >= 7 &&
! strncmp( &oggpacket.packet[1], "vorbis", 6 ) ) ! strncmp( &oggpacket.packet[1], "vorbis", 6 ) )
{ {
Ogg_ReadVorbisHeader( p_stream, &oggpacket ); Ogg_ReadVorbisHeader( p_stream, &oggpacket );
p_stream->secondary_header_packets = 0; p_stream->secondary_header_packets = 0;
} }
else if ( p_stream->fmt.i_codec == VLC_FOURCC( 'c','m','m','l' ) ) else if ( p_stream->fmt.i_codec == VLC_FOURCC('c','m','m','l') )
{ {
p_stream->secondary_header_packets = 0; p_stream->secondary_header_packets = 0;
} }
...@@ -979,30 +979,12 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) ...@@ -979,30 +979,12 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux )
p_stream->fmt.audio.i_bitspersample = p_stream->fmt.audio.i_bitspersample =
GetWLE((oggpacket.packet+138)); GetWLE((oggpacket.packet+138));
switch( i_format_tag ) wf_tag_to_fourcc( i_format_tag,
&p_stream->fmt.i_codec, 0 );
if( p_stream->fmt.i_codec ==
VLC_FOURCC('u','n','d','f') )
{ {
case WAVE_FORMAT_PCM:
p_stream->fmt.i_codec =
VLC_FOURCC( 'a', 'r', 'a', 'w' );
break;
case WAVE_FORMAT_MPEG:
case WAVE_FORMAT_MPEGLAYER3:
p_stream->fmt.i_codec =
VLC_FOURCC( 'm', 'p', 'g', 'a' );
break;
case WAVE_FORMAT_A52:
p_stream->fmt.i_codec =
VLC_FOURCC( 'a', '5', '2', ' ' );
break;
case WAVE_FORMAT_WMA1:
p_stream->fmt.i_codec =
VLC_FOURCC( 'w', 'm', 'a', '1' );
break;
case WAVE_FORMAT_WMA2:
p_stream->fmt.i_codec =
VLC_FOURCC( 'w', 'm', 'a', '2' );
break;
default:
p_stream->fmt.i_codec = VLC_FOURCC( 'm', 's', p_stream->fmt.i_codec = VLC_FOURCC( 'm', 's',
( i_format_tag >> 8 ) & 0xff, ( i_format_tag >> 8 ) & 0xff,
i_format_tag & 0xff ); i_format_tag & 0xff );
...@@ -1074,6 +1056,16 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) ...@@ -1074,6 +1056,16 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux )
/* We need to get rid of the header packet */ /* We need to get rid of the header packet */
ogg_stream_packetout( &p_stream->os, &oggpacket ); ogg_stream_packetout( &p_stream->os, &oggpacket );
p_stream->fmt.i_extra = GetQWLE(&st->size) -
sizeof(stream_header);
if( p_stream->fmt.i_extra )
{
p_stream->fmt.p_extra =
malloc( p_stream->fmt.i_extra );
memcpy( p_stream->fmt.p_extra, st + 1,
p_stream->fmt.i_extra );
}
memcpy( p_buffer, st->subtype, 4 ); memcpy( p_buffer, st->subtype, 4 );
p_buffer[4] = '\0'; p_buffer[4] = '\0';
i_format_tag = strtol(p_buffer,NULL,16); i_format_tag = strtol(p_buffer,NULL,16);
...@@ -1088,30 +1080,12 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux ) ...@@ -1088,30 +1080,12 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux )
p_stream->fmt.audio.i_bitspersample = p_stream->fmt.audio.i_bitspersample =
GetWLE(&st->bits_per_sample); GetWLE(&st->bits_per_sample);
switch( i_format_tag ) wf_tag_to_fourcc( i_format_tag,
&p_stream->fmt.i_codec, 0 );
if( p_stream->fmt.i_codec ==
VLC_FOURCC('u','n','d','f') )
{ {
case WAVE_FORMAT_PCM:
p_stream->fmt.i_codec =
VLC_FOURCC( 'a', 'r', 'a', 'w' );
break;
case WAVE_FORMAT_MPEG:
case WAVE_FORMAT_MPEGLAYER3:
p_stream->fmt.i_codec =
VLC_FOURCC( 'm', 'p', 'g', 'a' );
break;
case WAVE_FORMAT_A52:
p_stream->fmt.i_codec =
VLC_FOURCC( 'a', '5', '2', ' ' );
break;
case WAVE_FORMAT_WMA1:
p_stream->fmt.i_codec =
VLC_FOURCC( 'w', 'm', 'a', '1' );
break;
case WAVE_FORMAT_WMA2:
p_stream->fmt.i_codec =
VLC_FOURCC( 'w', 'm', 'a', '2' );
break;
default:
p_stream->fmt.i_codec = VLC_FOURCC( 'm', 's', p_stream->fmt.i_codec = VLC_FOURCC( 'm', 's',
( i_format_tag >> 8 ) & 0xff, ( i_format_tag >> 8 ) & 0xff,
i_format_tag & 0xff ); i_format_tag & 0xff );
......
modules/mux/ogg.c
View file @ cd1904bb
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