/*****************************************************************************
* real.c: Real demuxer.
*****************************************************************************
- * Copyright (C) 2004, 2006 the VideoLAN team
+ * Copyright (C) 2004, 2006-2007 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+/**
+ * Status of this demuxer:
+ * Real Media format
+ * -----------------
+ *
+ * version v3 w/ 14_4/lpcJ is ok.
+ * version v4/5: - atrac3 is ok.
+ * - cook is ok.
+ * - raac, racp are ok.
+ * - dnet is twisted "The byte order of the data is reversed
+ * from standard AC3"
+ * - 28_8 seem problematic.
+ * - sipr should be fine, but our decoder suxx :)
+ * - ralf is unsupported, but hardly any sample exist.
+ * - mp3 is unsupported, one sample exists...
+ *
+ * Real Audio Only
+ * ---------------
+ * Not supported...
+ */
+
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include "charset.h"
+
+
+#include <vlc_demux.h>
+#include <vlc_charset.h>
+#include <vlc_meta.h>
/*****************************************************************************
* Module descriptor
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
- uint8_t *p_peek;
+ const uint8_t *p_peek;
if( stream_Peek( p_demux->s, &p_peek, 10 ) < 10 ) return VLC_EGENERIC;
- if( strncmp( (char *)p_peek, ".RMF", 4 ) ) return VLC_EGENERIC;
+ if( !memcmp( p_peek, ".ra", 3 ) )
+ {
+ msg_Warn( p_demux, ".ra files unsuported" );
+ return VLC_EGENERIC;
+ }
+ if( memcmp( p_peek, ".RMF", 4 ) ) return VLC_EGENERIC;
/* Fill p_demux field */
p_demux->pf_demux = Demux;
p_demux->pf_control = Control;
+
p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
+ if( p_sys == NULL )
+ {
+ return VLC_ENOMEM;
+ }
memset( p_sys, 0, sizeof( demux_sys_t ) );
+
p_sys->i_data_offset = 0;
p_sys->i_track = 0;
p_sys->track = NULL;
if( tk->p_subpackets[ j ] )
block_Release( tk->p_subpackets[ j ] );
}
- if( !tk->i_subpackets ) free( tk->p_subpackets );
+ if( tk->i_subpackets ) free( tk->p_subpackets );
free( tk );
}
+ free( p_sys->psz_title );
+ free( p_sys->psz_artist );
+ free( p_sys->psz_copyright );
+ free( p_sys->psz_description );
+
if( p_sys->i_track > 0 ) free( p_sys->track );
free( p_sys );
}
{
msg_Dbg( p_demux, "sending size=%d", tk->p_frame->i_buffer );
- if( p_sys->i_pcr < tk->p_frame->i_dts )
- {
- p_sys->i_pcr = tk->p_frame->i_dts;
-
- es_out_Control( p_demux->out, ES_OUT_SET_PCR,
- (int64_t)p_sys->i_pcr );
- }
es_out_Send( p_demux->out, tk->p_es, tk->p_frame );
tk->i_frame = 0;
msg_Dbg( p_demux, "copying new buffer n=%d offset=%d copy=%d",
i_ck, i_offset, i_copy );
- ((uint32_t*)(tk->p_frame->p_buffer+i_len+8))[i_ck] = i_offset;
+ ((uint32_t*)(tk->p_frame->p_buffer+i_len+8))[i_ck*2 +0 ] = 1;
+ ((uint32_t*)(tk->p_frame->p_buffer+i_len+8))[i_ck*2 +1 ] = i_offset;
+
memcpy( &tk->p_frame->p_buffer[i_offset + 8], p, i_copy );
}
}
else if( tk->fmt.i_cat == AUDIO_ES && b_selected )
{
- /* Set PCR */
- if( p_sys->i_pcr < i_pts )
- {
- p_sys->i_pcr = i_pts;
- es_out_Control( p_demux->out, ES_OUT_SET_PCR,
- (int64_t)p_sys->i_pcr );
- }
-
- if( tk->fmt.i_codec == VLC_FOURCC( 'm', 'p', '4', 'a' ) )
- {
- int i_sub = (p_sys->buffer[1] >> 4)&0x0f;
- uint8_t *p_sub = &p_sys->buffer[2+2*i_sub];
-
- int i;
- for( i = 0; i < i_sub; i++ )
- {
- int i_sub_size = GetWBE( &p_sys->buffer[2+i*2]);
- block_t *p_block = block_New( p_demux, i_sub_size );
- if( p_block )
- {
- memcpy( p_block->p_buffer, p_sub, i_sub_size );
- p_sub += i_sub_size;
-
- p_block->i_dts =
- p_block->i_pts = ( i == 0 ? i_pts : 0 );
-
- es_out_Send( p_demux->out, tk->p_es, p_block );
- }
- }
- }
- else if( tk->fmt.i_codec == VLC_FOURCC( 'c', 'o', 'o', 'k' ) ||
- tk->fmt.i_codec == VLC_FOURCC('2','8','_','8') )
+ if( tk->fmt.i_codec == VLC_FOURCC( 'c', 'o', 'o', 'k' ) ||
+ tk->fmt.i_codec == VLC_FOURCC( 'a', 't', 'r', 'c') ||
+ tk->fmt.i_codec == VLC_FOURCC( 's', 'i', 'p', 'r') ||
+ tk->fmt.i_codec == VLC_FOURCC( '2', '8', '_', '8') )
{
uint8_t *p_buf = p_sys->buffer;
- int y = tk->i_subpacket / (tk->i_frame_size /tk->i_subpacket_size);
+ int y = tk->i_subpacket / ( tk->i_frame_size /tk->i_subpacket_size);
int i_index, i;
/* Sanity check */
if( i_flags & 2 ) y = tk->i_subpacket = 0;
- if( tk->fmt.i_codec == VLC_FOURCC( 'c', 'o', 'o', 'k' ) )
+ if( tk->fmt.i_codec == VLC_FOURCC( 'c', 'o', 'o', 'k' ) ||
+ tk->fmt.i_codec == VLC_FOURCC( 'a', 't', 'r', 'c' ))
for( i = 0; i < tk->i_frame_size / tk->i_subpacket_size; i++ )
{
block_t *p_block = block_New( p_demux, tk->i_subpacket_size );
tk->i_subpacket++;
}
- if( tk->fmt.i_codec == VLC_FOURCC('2','8','_','8') )
+ if( tk->fmt.i_codec == VLC_FOURCC( '2', '8', '_', '8' ) ||
+ tk->fmt.i_codec == VLC_FOURCC( 's', 'i', 'p', 'r' ) )
for( i = 0; i < tk->i_subpacket_h / 2; i++ )
{
block_t *p_block = block_New( p_demux, tk->i_coded_frame_size);
while( tk->i_out_subpacket != tk->i_subpackets &&
tk->p_subpackets[tk->i_out_subpacket] )
{
+ /* Set the PCR */
+ if (tk->i_out_subpacket == 0)
+ {
+ p_sys->i_pcr = tk->p_subpackets[tk->i_out_subpacket]->i_dts;
+ es_out_Control( p_demux->out, ES_OUT_SET_PCR,
+ (int64_t)p_sys->i_pcr );
+ }
+
block_t *p_block = tk->p_subpackets[tk->i_out_subpacket];
tk->p_subpackets[tk->i_out_subpacket] = 0;
}
else
{
- block_t *p_block = block_New( p_demux, i_size );
+ /* Set PCR */
+ if( p_sys->i_pcr < i_pts )
+ {
+ p_sys->i_pcr = i_pts;
+ es_out_Control( p_demux->out, ES_OUT_SET_PCR,
+ (int64_t)p_sys->i_pcr );
+ }
- if( tk->fmt.i_codec == VLC_FOURCC( 'a', '5', '2', ' ' ) )
+ if( tk->fmt.i_codec == VLC_FOURCC( 'm','p','4','a' ) )
{
- uint8_t *src = p_sys->buffer;
- uint8_t *dst = p_block->p_buffer;
+ int i_sub = (p_sys->buffer[1] >> 4)&0x0f;
+ uint8_t *p_sub = &p_sys->buffer[2+2*i_sub];
- /* byte swap data */
- while( dst < &p_block->p_buffer[i_size- 1])
+ int i;
+ for( i = 0; i < i_sub; i++ )
{
- *dst++ = src[1];
- *dst++ = src[0];
+ int i_sub_size = GetWBE( &p_sys->buffer[2+i*2]);
+ block_t *p_block = block_New( p_demux, i_sub_size );
+ if( p_block )
+ {
+ memcpy( p_block->p_buffer, p_sub, i_sub_size );
+ p_sub += i_sub_size;
- src += 2;
+ p_block->i_dts =
+ p_block->i_pts = ( i == 0 ? i_pts : 0 );
+
+ es_out_Send( p_demux->out, tk->p_es, p_block );
+ }
}
}
else
{
- memcpy( p_block->p_buffer, p_sys->buffer, i_size );
+ block_t *p_block = block_New( p_demux, i_size );
+
+ if( tk->fmt.i_codec == VLC_FOURCC( 'a', '5', '2', ' ' ) )
+ {
+ uint8_t *src = p_sys->buffer;
+ uint8_t *dst = p_block->p_buffer;
+
+ /* byte swap data */
+ while( dst < &p_block->p_buffer[i_size- 1])
+ {
+ *dst++ = src[1];
+ *dst++ = src[0];
+
+ src += 2;
+ }
+ }
+ else
+ {
+ memcpy( p_block->p_buffer, p_sys->buffer, i_size );
+ }
+ p_block->i_dts = p_block->i_pts = i_pts;
+ es_out_Send( p_demux->out, tk->p_es, p_block );
}
- p_block->i_dts = p_block->i_pts = i_pts;
- es_out_Send( p_demux->out, tk->p_es, p_block );
}
}
case DEMUX_GET_LENGTH:
pi64 = (int64_t*)va_arg( args, int64_t * );
-
+
/* the commented following lines are fen's implementation, which doesn't seem to
* work for one reason or another -- FK */
/*if( p_sys->i_mux_rate > 0 )
{
/* our stored duration is in ms, so... */
*pi64 = (int64_t)1000 * p_sys->i_our_duration;
-
+
return VLC_SUCCESS;
}
*pi64 = 0;
{
vlc_meta_t *p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t* );
- /* the core will crash if we provide NULL strings, so check
+ /* the core will crash if we provide NULL strings, so check
* every string first */
if( p_sys->psz_title )
vlc_meta_SetTitle( p_meta, p_sys->psz_title );
msg_Dbg( p_demux, "object %4.4s size=%d version=%d",
(char*)&i_id, i_size, i_version );
- if( i_size < 10 )
+ if( i_size < 10 && i_id != VLC_FOURCC('D','A','T','A') )
{
msg_Dbg( p_demux, "invalid size for object %4.4s", (char*)&i_id );
return VLC_EGENERIC;
msg_Dbg( p_demux, " - index offset=%d", GetDWBE(&header[28]) );
msg_Dbg( p_demux, " - data offset=%d", GetDWBE(&header[32]) );
msg_Dbg( p_demux, " - num streams=%d", GetWBE(&header[36]) );
-
+
/* set the duration for export in control */
p_sys->i_our_duration = (int)GetDWBE(&header[20]);
-
+
i_flags = GetWBE(&header[38]);
msg_Dbg( p_demux, " - flags=0x%x %s%s%s",
i_flags,
{
int i_len;
char *psz;
-
+
/* FIXME FIXME: should convert from whatever the character
* encoding of the input meta data is to UTF-8. */
stream_Read( p_demux->s, psz, i_len );
psz[i_len] = '\0';
- msg_Dbg( p_demux, " - title=`%s'", psz );
EnsureUTF8( psz );
- asprintf( &p_sys->psz_title, psz );
- free( psz );
+ msg_Dbg( p_demux, " - title=`%s'", psz );
+ p_sys->psz_title = psz;
i_skip -= i_len;
}
i_skip -= 2;
stream_Read( p_demux->s, psz, i_len );
psz[i_len] = '\0';
- msg_Dbg( p_demux, " - author=`%s'", psz );
EnsureUTF8( psz );
- asprintf( &p_sys->psz_artist, psz );
- free( psz );
+ msg_Dbg( p_demux, " - author=`%s'", psz );
+ p_sys->psz_artist = psz;
i_skip -= i_len;
}
i_skip -= 2;
stream_Read( p_demux->s, psz, i_len );
psz[i_len] = '\0';
- msg_Dbg( p_demux, " - copyright=`%s'", psz );
EnsureUTF8( psz );
- asprintf( &p_sys->psz_copyright, psz );
- free( psz );
+ msg_Dbg( p_demux, " - copyright=`%s'", psz );
+ p_sys->psz_copyright = psz;
i_skip -= i_len;
}
i_skip -= 2;
stream_Read( p_demux->s, psz, i_len );
psz[i_len] = '\0';
- msg_Dbg( p_demux, " - comment=`%s'", psz );
EnsureUTF8( psz );
- asprintf( &p_sys->psz_description, psz );
- free( psz );
+ msg_Dbg( p_demux, " - comment=`%s'", psz );
+ p_sys->psz_description = psz;
i_skip -= i_len;
}
i_skip -= 2;
msg_Dbg( p_demux, " - start time=%d", GetDWBE(&header[18]) );
msg_Dbg( p_demux, " - preroll=%d", GetDWBE(&header[22]) );
msg_Dbg( p_demux, " - duration=%d", GetDWBE(&header[26]) );
-
+
i_skip -= 30;
stream_Read( p_demux->s, header, 1 );
demux_sys_t *p_sys = p_demux->p_sys;
es_format_t fmt;
real_track_t *tk;
- uint8_t *p_peek;
+ const uint8_t *p_peek;
msg_Dbg( p_demux, " - specific data len=%d", i_len );
if( stream_Peek(p_demux->s, &p_peek, i_len) < i_len ) return VLC_EGENERIC;
- if( !strncmp( (char *)&p_peek[4], "VIDO", 4 ) )
+ if( ( i_len >= 8 ) && !memcmp( &p_peek[4], "VIDO", 4 ) )
{
es_format_Init( &fmt, VIDEO_ES, VLC_FOURCC( p_peek[8], p_peek[9],
p_peek[10], p_peek[11] ) );
}
else if( !strncmp( (char *)p_peek, ".ra\xfd", 4 ) )
{
- int i_version = GetWBE( &p_peek[4] );
int i_header_size, i_flavor, i_coded_frame_size, i_subpacket_h;
int i_frame_size, i_subpacket_size;
-
+ char p_genr[4];
+ int i_version = GetWBE( &p_peek[4] ); /* [0..3] = '.','r','a',0xfd */
msg_Dbg( p_demux, " - audio version=%d", i_version );
- p_peek += 6;
+ p_peek += 6; /* 4 + version */
es_format_Init( &fmt, AUDIO_ES, 0 );
if( i_version == 3 )
{
- msg_Dbg( p_demux, " - audio version 3 is not supported!" );
- return VLC_EGENERIC;
- }
+ int i_len;
+ char *psz;
- p_peek += 2; /* 00 00 */
- p_peek += 4; /* .ra4 or .ra5 */
- p_peek += 4; /* ?? */
- p_peek += 2; /* version (4 or 5) */
- i_header_size = GetDWBE( p_peek ); p_peek += 4; /* header size */
- i_flavor = GetWBE( p_peek ); p_peek += 2; /* codec flavor */
- i_coded_frame_size = GetDWBE( p_peek ); p_peek += 4;
- p_peek += 4; /* ?? */
- p_peek += 4; /* ?? */
- p_peek += 4; /* ?? */
- i_subpacket_h = GetWBE( p_peek ); p_peek += 2;
- i_frame_size = GetWBE( p_peek ); p_peek += 2;
- i_subpacket_size = GetWBE( p_peek ); p_peek += 2;
- p_peek += 2; /* ?? */
-
- if( i_version == 5 ) p_peek += 6; /* 0, srate, 0 */
-
- fmt.audio.i_rate = GetWBE( p_peek ); p_peek += 2;
- p_peek += 2; /* ?? */
- fmt.audio.i_bitspersample = GetWBE( p_peek ); p_peek += 2;
- fmt.audio.i_channels = GetWBE( p_peek ); p_peek += 2;
- fmt.audio.i_blockalign = i_frame_size;
-
- if( i_version == 5 )
- {
- p_peek += 4; /* genr */
+ i_header_size = GetWBE( p_peek ); p_peek += 2; /* Size from now */
+ p_peek += 10; /* Unknown */
+
+ p_peek += 4; /* Data Size */
+
+ /* Title */
+ i_len = *p_peek ; p_peek++;
+ if( i_len > 0 )
+ {
+ psz = malloc( i_len + 1 );
+ memcpy( psz, p_peek, i_len );
+ psz[i_len] = '\0';
+
+ EnsureUTF8( psz );
+ msg_Dbg( p_demux, " - title=`%s'", psz );
+ p_sys->psz_title = psz;
+ }
+ p_peek += i_len;
+
+ /* Authors */
+ i_len = *p_peek ; p_peek++;
+ if( i_len > 0 )
+ {
+ psz = malloc( i_len + 1 );
+ memcpy( psz, p_peek, i_len );
+ psz[i_len] = '\0';
+
+ EnsureUTF8( psz );
+ msg_Dbg( p_demux, " - artist=`%s'", psz );
+ p_sys->psz_artist = psz;
+ }
+ p_peek += i_len;
+
+ /* Copyright */
+ i_len = *p_peek ; p_peek++;
+ if( i_len > 0 )
+ {
+ psz = malloc( i_len + 1 );
+ memcpy( psz, p_peek, i_len );
+ psz[i_len] = '\0';
+
+ EnsureUTF8( psz );
+ msg_Dbg( p_demux, " - Copyright=`%s'", psz );
+ p_sys->psz_copyright = psz;
+ }
+ p_peek += i_len;
+
+ /* Comment */
+ i_len = *p_peek ; p_peek++;
+ if( i_len > 0 )
+ {
+ psz = malloc( i_len + 1 );
+ memcpy( psz, p_peek, i_len );
+ psz[i_len] = '\0';
+
+ EnsureUTF8( psz );
+ msg_Dbg( p_demux, " - Comment=`%s'", psz );
+ p_sys->psz_description = psz;
+ }
+ /* This might be unusefull */
+ p_peek += i_len;
+
+ p_peek ++; /* Unknown */
+ p_peek ++; /* FourCC length = 4 */
memcpy( (char *)&fmt.i_codec, p_peek, 4 ); p_peek += 4;
+ /* Up to here :) */
+
+ fmt.audio.i_channels = 1; /* This is always the case in rm3 */
+ fmt.audio.i_rate = 8000;
+
+ msg_Dbg( p_demux, " - audio codec=%4.4s channels=%d rate=%dHz",
+ (char*)&fmt.i_codec, fmt.audio.i_channels, fmt.audio.i_rate );
}
- else
+ else /* RMF version 4/5 */
{
- p_peek += p_peek[0] + 1; /* descr 1 */
- memcpy( (char *)&fmt.i_codec, p_peek + 1, 4 ); /* descr 2 */
- p_peek += p_peek[0] + 1;
- }
+ p_peek += 2; /* 00 00 */
+ p_peek += 4; /* .ra4 or .ra5 */
+ p_peek += 4; /* data size */
+ p_peek += 2; /* version (4 or 5) */
+ i_header_size = GetDWBE( p_peek ); p_peek += 4; /* header size */
+ i_flavor = GetWBE( p_peek ); p_peek += 2; /* codec flavor */
+ i_coded_frame_size = GetDWBE( p_peek ); p_peek += 4; /* coded frame size*/
+ p_peek += 4; /* ?? */
+ p_peek += 4; /* ?? */
+ p_peek += 4; /* ?? */
+ i_subpacket_h = GetWBE( p_peek ); p_peek += 2; /* 1 */
+ i_frame_size = GetWBE( p_peek ); p_peek += 2; /* frame size */
+ i_subpacket_size = GetWBE( p_peek ); p_peek += 2; /* subpacket_size */
+ if( !i_subpacket_size || !i_frame_size || !i_coded_frame_size )
+ return VLC_EGENERIC;
+ p_peek += 2; /* ?? */
+
+ if( i_version == 5 ) p_peek += 6; /* 0, srate, 0 */
+
+ fmt.audio.i_rate = GetWBE( p_peek ); p_peek += 2; /* Sample Rate */
+ p_peek += 2; /* ?? */
+ fmt.audio.i_bitspersample = GetWBE( p_peek ); p_peek += 2;/* Sure?*/
+ fmt.audio.i_channels = GetWBE( p_peek ); p_peek += 2; /* Channels */
+ fmt.audio.i_blockalign = i_frame_size;
+
+ if( i_version == 5 )
+ {
+ memcpy( (char *)p_genr, p_peek, 4 ); p_peek += 4; /* genr */
+ memcpy( (char *)&fmt.i_codec, p_peek, 4 ); p_peek += 4;
+ }
+ else
+ {
+ p_peek += p_peek[0] + 1; /* descr 1 */
+ memcpy( (char *)&fmt.i_codec, p_peek + 1, 4 ); /* descr 2 */
+ p_peek += p_peek[0] + 1;
+ }
- msg_Dbg( p_demux, " - audio codec=%4.4s channels=%d rate=%dHz",
+ msg_Dbg( p_demux, " - audio codec=%4.4s channels=%d rate=%dHz",
(char*)&fmt.i_codec, fmt.audio.i_channels, fmt.audio.i_rate );
- p_peek += 3; /* ?? */
- if( i_version == 5 ) p_peek++;
+ p_peek += 3; /* ?? */
+ if( i_version == 5 ) p_peek++;
+ /* Extra Data then: DWord + byte[] */
+ fmt.i_extra = GetDWBE( p_peek ); p_peek += 4;
+ }
switch( fmt.i_codec )
{
- case VLC_FOURCC( 'd', 'n', 'e', 't' ):
- fmt.i_codec = VLC_FOURCC( 'a', '5', '2', ' ' );
+ case VLC_FOURCC('1','4','_','4'):
+ /* fmt.audio.i_blockalign = 0x14 */
+ break;
+ case VLC_FOURCC('l','p','c','J'):
+ /* fmt.audio.i_blockalign = 0x14 */
+ fmt.i_codec = VLC_FOURCC( '1','4','_','4' );
break;
- case VLC_FOURCC( 'r', 'a', 'a', 'c' ):
- case VLC_FOURCC( 'r', 'a', 'c', 'p' ):
- fmt.i_extra = GetDWBE( p_peek ); p_peek += 4;
+ case VLC_FOURCC('2','8','_','8'):
+ fmt.i_extra = 0;
+ fmt.audio.i_blockalign = i_coded_frame_size;
+ break;
+
+ case VLC_FOURCC( 'd','n','e','t' ):
+ fmt.i_codec = VLC_FOURCC( 'a','5','2',' ' );
+ break;
+
+ case VLC_FOURCC( 'r','a','a','c' ):
+ case VLC_FOURCC( 'r','a','c','p' ):
+ fmt.i_codec = VLC_FOURCC( 'm','p','4','a' );
+
if( fmt.i_extra > 0 ) { fmt.i_extra--; p_peek++; }
if( fmt.i_extra > 0 )
{
fmt.p_extra = malloc( fmt.i_extra );
+ if( fmt.p_extra == NULL )
+ {
+ msg_Err( p_demux, "Error in the extra data" );
+ return VLC_EGENERIC;
+ }
memcpy( fmt.p_extra, p_peek, fmt.i_extra );
}
-
- fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'a' );
break;
+ case VLC_FOURCC('s','i','p','r'):
+ fmt.audio.i_flavor = i_flavor;
case VLC_FOURCC('c','o','o','k'):
- fmt.audio.i_blockalign = i_subpacket_size;
- if( !(fmt.i_extra = GetDWBE( p_peek )) ) break;
- fmt.p_extra = malloc( fmt.i_extra );
- memcpy( fmt.p_extra, p_peek + 4, fmt.i_extra );
+ case VLC_FOURCC('a','t','r','c'):
+ if( !memcmp( p_genr, "genr", 4 ) )
+ fmt.audio.i_blockalign = i_subpacket_size;
+ else
+ fmt.audio.i_blockalign = i_coded_frame_size;
+
+ if( fmt.i_extra > 0 )
+ {
+ fmt.p_extra = malloc( fmt.i_extra );
+ if( fmt.p_extra == NULL )
+ {
+ msg_Err( p_demux, "Error in the extra data" );
+ return VLC_EGENERIC;
+ }
+ memcpy( fmt.p_extra, p_peek, fmt.i_extra );
+ }
break;
- case VLC_FOURCC('2','8','_','8'):
- fmt.audio.i_blockalign = i_coded_frame_size;
+ case VLC_FOURCC('r','a','l','f'):
+ msg_Dbg( p_demux, " - audio codec not supported=%4.4s",
+ (char*)&fmt.i_codec );
break;
default:
tk->i_subpacket = 0;
tk->i_subpackets = 0;
tk->p_subpackets = NULL;
- if( fmt.i_codec == VLC_FOURCC('c','o','o','k') )
+ if( fmt.i_codec == VLC_FOURCC('c','o','o','k')
+ || fmt.i_codec == VLC_FOURCC('a','t','r','c') )
{
tk->i_subpackets =
i_subpacket_h * i_frame_size / tk->i_subpacket_size;
tk->p_subpackets =
- malloc( tk->i_subpackets * sizeof(block_t *) );
+ calloc( tk->i_subpackets, sizeof(block_t *) );
}
else if( fmt.i_codec == VLC_FOURCC('2','8','_','8') )
{
tk->i_subpackets =
i_subpacket_h * i_frame_size / tk->i_coded_frame_size;
tk->p_subpackets =
- malloc( tk->i_subpackets * sizeof(block_t *) );
+ calloc( tk->i_subpackets, sizeof(block_t *) );
}
- for( i = 0; i < tk->i_subpackets; i++ ) tk->p_subpackets[i] = NULL;
+ /* Check if the calloc went correctly */
+ if( tk->p_subpackets == NULL )
+ {
+ tk->i_subpackets = 0;
+ msg_Err( p_demux, "Can't alloc subpacket" );
+ return VLC_EGENERIC;
+ }
tk->p_es = es_out_Add( p_demux->out, &fmt );
projects / vlc / blobdiff