/*****************************************************************************
* real.c: Real demuxer.
*****************************************************************************
- * Copyright (C) 2004 the VideoLAN team
+ * Copyright (C) 2004, 2006-2007 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* 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
*****************************************************************************/
-#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_subpacket;
int i_subpackets;
block_t **p_subpackets;
+ int i_out_subpacket;
} real_track_t;
uint32_t i_data_packets;
int64_t i_data_offset_next;
+ 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;
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;
for( i = 0; i < p_sys->i_track; i++ )
{
real_track_t *tk = p_sys->track[i];
+ int j = tk->i_subpackets;
if( tk->p_frame ) block_Release( tk->p_frame );
es_format_Clean( &tk->fmt );
- while( tk->i_subpackets-- )
+ while( j-- )
{
- if( tk->p_subpackets[tk->i_subpackets] )
- block_Release( tk->p_subpackets[tk->i_subpackets] );
- if( !tk->i_subpackets ) free( tk->p_subpackets );
+ if( tk->p_subpackets[ j ] )
+ block_Release( tk->p_subpackets[ j ] );
}
+ 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 );
}
{
demux_sys_t *p_sys = p_demux->p_sys;
uint8_t header[18];
- int i_size;
- int i_id;
+ int i_size, i_id, i_flags, i;
int64_t i_pts;
- int i;
real_track_t *tk = NULL;
vlc_bool_t b_selected;
i_id = GetWBE( &header[4] );
i_pts = 1000 * GetDWBE( &header[6] );
i_pts += 1000; /* Avoid 0 pts */
-
- /* header[11] -> flags 0x02 -> keyframe */
+ i_flags= header[11]; /* flags 0x02 -> keyframe */
#if 0
msg_Dbg( p_demux, "packet %d size=%d id=%d pts=%u",
}
}
}
- else if( tk->fmt.i_codec == VLC_FOURCC( 'c', 'o', 'o', 'k' ) )
+ else 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( '2', '8', '_', '8') )
{
uint8_t *p_buf = p_sys->buffer;
- int h = tk->i_subpacket_h;
- int y = tk->i_subpacket / (tk->i_frame_size /tk->i_subpacket_size);
- int i;
+ 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' ) ||
+ 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 );
memcpy( p_block->p_buffer, p_buf, tk->i_subpacket_size );
p_buf += tk->i_subpacket_size;
+ i_index = tk->i_subpacket_h * i +
+ ((tk->i_subpacket_h + 1) / 2) * (y&1) + (y>>1);
+
p_block->i_dts = p_block->i_pts = i_pts;
- tk->p_subpackets[(h*i+((h+1)/2)*(y&1)+(y>>1))] = p_block;
+ tk->p_subpackets[i_index] = p_block;
tk->i_subpacket++;
}
- if( tk->i_subpacket == tk->i_subpackets )
+ if( tk->fmt.i_codec == VLC_FOURCC( '2', '8', '_', '8' ) )
+ for( i = 0; i < tk->i_subpacket_h / 2; i++ )
{
- for( i = 0; i < tk->i_subpackets; i++ )
- {
- block_t *p_block = tk->p_subpackets[i];
- tk->p_subpackets[i] = 0;
+ block_t *p_block = block_New( p_demux, tk->i_coded_frame_size);
+ memcpy( p_block->p_buffer, p_buf, tk->i_coded_frame_size );
+ p_buf += tk->i_coded_frame_size;
- if( i ) p_block->i_dts = p_block->i_pts = 0;
- es_out_Send( p_demux->out, tk->p_es, p_block );
- }
+ i_index = (i * 2 * tk->i_frame_size) /
+ tk->i_coded_frame_size + y;
+
+ p_block->i_dts = p_block->i_pts = i_pts;
+ tk->p_subpackets[i_index] = p_block;
+ tk->i_subpacket++;
+ }
+
+ while( tk->i_out_subpacket != tk->i_subpackets &&
+ tk->p_subpackets[tk->i_out_subpacket] )
+ {
+ block_t *p_block = tk->p_subpackets[tk->i_out_subpacket];
+ tk->p_subpackets[tk->i_out_subpacket] = 0;
+
+ if( tk->i_out_subpacket ) p_block->i_dts = p_block->i_pts = 0;
+ es_out_Send( p_demux->out, tk->p_es, p_block );
+
+ tk->i_out_subpacket++;
+ }
+
+ if( tk->i_subpacket == tk->i_subpackets &&
+ tk->i_out_subpacket != tk->i_subpackets )
+ {
+ msg_Warn( p_demux, "i_subpacket != i_out_subpacket, "
+ "this shouldn't happen" );
+ }
+
+ if( tk->i_subpacket == tk->i_subpackets )
+ {
tk->i_subpacket = 0;
+ tk->i_out_subpacket = 0;
}
}
else
*****************************************************************************/
static int Control( demux_t *p_demux, int i_query, va_list args )
{
-#if 0
demux_sys_t *p_sys = p_demux->p_sys;
+#if 0
double f, *pf;
- int64_t i64, *pi64;
+ int64_t i64;
+#endif
+ int64_t *pi64;
switch( i_query )
{
+#if 0
case DEMUX_GET_POSITION:
pf = (double*) va_arg( args, double* );
i64 = stream_Size( p_demux->s );
*pf = 0.0;
}
return VLC_SUCCESS;
+
case DEMUX_SET_POSITION:
f = (double) va_arg( args, double );
i64 = stream_Size( p_demux->s );
}
*pi64 = 0;
return VLC_EGENERIC;
+#endif
case DEMUX_GET_LENGTH:
pi64 = (int64_t*)va_arg( args, int64_t * );
- if( p_sys->i_mux_rate > 0 )
+
+ /* 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 )
{
*pi64 = (int64_t)1000000 * ( stream_Size( p_demux->s ) / 50 ) / p_sys->i_mux_rate;
+ return VLC_SUCCESS;
+ }*/
+ if( p_sys->i_our_duration > 0 )
+ {
+ /* our stored duration is in ms, so... */
+ *pi64 = (int64_t)1000 * p_sys->i_our_duration;
+
return VLC_SUCCESS;
}
*pi64 = 0;
return VLC_EGENERIC;
+ case DEMUX_GET_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;
+ }
+
case DEMUX_SET_TIME:
case DEMUX_GET_FPS:
default:
return VLC_EGENERIC;
}
-#endif
return VLC_EGENERIC;
}
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, header, 2 );
if( ( i_len = GetWBE( header ) ) > 0 )
psz[i_len] = '\0';
msg_Dbg( p_demux, " - title=`%s'", psz );
+ EnsureUTF8( psz );
+ asprintf( &p_sys->psz_title, psz );
free( psz );
i_skip -= i_len;
}
psz[i_len] = '\0';
msg_Dbg( p_demux, " - author=`%s'", psz );
+ EnsureUTF8( psz );
+ asprintf( &p_sys->psz_artist, psz );
free( psz );
i_skip -= i_len;
}
psz[i_len] = '\0';
msg_Dbg( p_demux, " - copyright=`%s'", psz );
+ EnsureUTF8( psz );
+ asprintf( &p_sys->psz_copyright, psz );
free( psz );
i_skip -= i_len;
}
psz[i_len] = '\0';
msg_Dbg( p_demux, " - comment=`%s'", psz );
+ EnsureUTF8( 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] ) );
(char*)&fmt.i_codec, fmt.video.i_width, fmt.video.i_height );
tk = malloc( sizeof( real_track_t ) );
+ tk->i_out_subpacket = 0;
+ tk->i_subpacket = 0;
+ tk->i_subpackets = 0;
+ tk->p_subpackets = NULL;
tk->i_id = i_num;
tk->fmt = fmt;
tk->i_frame = 0;
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 );
memcpy( fmt.p_extra, p_peek + 4, fmt.i_extra );
break;
+ case VLC_FOURCC('2','8','_','8'):
+ fmt.audio.i_blockalign = i_coded_frame_size;
+ break;
+
default:
msg_Dbg( p_demux, " - unknown audio codec=%4.4s",
(char*)&fmt.i_codec );
if( fmt.i_codec != 0 )
{
+ int i;
+
msg_Dbg( p_demux, " - extra data=%d", fmt.i_extra );
tk = malloc( sizeof( real_track_t ) );
tk->i_coded_frame_size = i_coded_frame_size;
tk->i_frame_size = i_frame_size;
+ tk->i_out_subpacket = 0;
tk->i_subpacket = 0;
tk->i_subpackets = 0;
tk->p_subpackets = NULL;
if( fmt.i_codec == VLC_FOURCC('c','o','o','k') )
{
- int i;
-
tk->i_subpackets =
i_subpacket_h * i_frame_size / tk->i_subpacket_size;
tk->p_subpackets =
malloc( tk->i_subpackets * sizeof(block_t *) );
-
- for( i = 0; i < tk->i_subpackets; i++ )
- tk->p_subpackets[i] = NULL;
}
+ 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 *) );
+ }
+
+ for( i = 0; i < tk->i_subpackets; i++ ) tk->p_subpackets[i] = NULL;
tk->p_es = es_out_Add( p_demux->out, &fmt );