/*****************************************************************************
* 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>
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-
#include <vlc/vlc.h>
-#include <vlc/input.h>
+
+
+#include <vlc_demux.h>
+#include <vlc_charset.h>
+#include <vlc_meta.h>
/*****************************************************************************
* Module descriptor
int i_our_duration;
int i_mux_rate;
+ char* psz_title;
+ char* psz_artist;
+ char* psz_copyright;
+ char* psz_description;
+
int i_track;
real_track_t **track;
uint8_t buffer[65536];
int64_t i_pcr;
-
- vlc_meta_t *p_meta;
};
static int Demux( demux_t *p_demux );
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, ".RMF", 4 ) ) return VLC_EGENERIC;
/* Fill p_demux field */
p_demux->pf_demux = Demux;
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 );
}
+ if( p_sys->psz_title ) free( p_sys->psz_title );
+ if( p_sys->psz_artist ) free( p_sys->psz_artist );
+ if( p_sys->psz_copyright ) free( p_sys->psz_copyright );
+ if( p_sys->psz_description ) free( p_sys->psz_description );
+
if( p_sys->i_track > 0 ) free( p_sys->track );
free( p_sys );
}
}
}
else if( tk->fmt.i_codec == VLC_FOURCC( 'c', 'o', 'o', 'k' ) ||
- tk->fmt.i_codec == VLC_FOURCC('2','8','_','8') )
+ tk->fmt.i_codec == VLC_FOURCC( 'a', 't', 'r', 'c') ||
+ 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' ) )
for( i = 0; i < tk->i_subpacket_h / 2; i++ )
{
block_t *p_block = block_New( p_demux, tk->i_coded_frame_size);
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;
case DEMUX_GET_META:
{
- vlc_meta_t **pp_meta = (vlc_meta_t**)va_arg( args, vlc_meta_t** );
- *pp_meta = p_sys->p_meta;
+ 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
+ * every string first */
+ if( p_sys->psz_title )
+ vlc_meta_SetTitle( p_meta, p_sys->psz_title );
+ if( p_sys->psz_artist )
+ vlc_meta_SetArtist( p_meta, p_sys->psz_artist );
+ if( p_sys->psz_copyright )
+ vlc_meta_SetCopyright( p_meta, p_sys->psz_copyright );
+ if( p_sys->psz_description )
+ vlc_meta_SetDescription( p_meta, p_sys->psz_description );
return VLC_SUCCESS;
}
uint32_t i_size;
int64_t i_skip;
int i_version;
-
- p_sys->p_meta = vlc_meta_New();
for( ;; )
{
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. */
msg_Dbg( p_demux, " - title=`%s'", psz );
EnsureUTF8( psz );
- vlc_meta_SetTitle( p_sys->p_meta, psz );
+ asprintf( &p_sys->psz_title, psz );
free( psz );
i_skip -= i_len;
}
msg_Dbg( p_demux, " - author=`%s'", psz );
EnsureUTF8( psz );
- vlc_meta_SetArtist( p_sys->p_meta, psz );
+ asprintf( &p_sys->psz_artist, psz );
free( psz );
i_skip -= i_len;
}
msg_Dbg( p_demux, " - copyright=`%s'", psz );
EnsureUTF8( psz );
- vlc_meta_SetCopyright( p_sys->p_meta, psz );
+ asprintf( &p_sys->psz_copyright, psz );
free( psz );
i_skip -= i_len;
}
msg_Dbg( p_demux, " - comment=`%s'", psz );
EnsureUTF8( psz );
- vlc_meta_SetDescription( p_sys->p_meta, psz );
+ asprintf( &p_sys->psz_description, psz );
free( psz );
i_skip -= i_len;
}
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] ) );
break;
case VLC_FOURCC('c','o','o','k'):
+ case VLC_FOURCC('a','t','r','c'):
fmt.audio.i_blockalign = i_subpacket_size;
if( !(fmt.i_extra = GetDWBE( p_peek )) ) break;
fmt.p_extra = malloc( fmt.i_extra );
projects / vlc / blobdiff