Commit aedd9391 authored by Laurent Aimar's avatar Laurent Aimar

Cosmetics real demux reorganization.

parent 35c7cda7
......@@ -111,7 +111,7 @@ typedef struct
uint32_t i_file_offset;
uint32_t i_time_offset;
uint32_t i_frame_index;
} rm_index_t;
} real_index_t;
struct demux_sys_t
{
......@@ -141,18 +141,22 @@ struct demux_sys_t
int64_t i_index_offset;
bool b_seek;
rm_index_t *p_index;
real_index_t *p_index;
};
static int Demux( demux_t *p_demux );
static int Control( demux_t *p_demux, int i_query, va_list args );
static int Demux( demux_t * );
static int Control( demux_t *, int i_query, va_list args );
static void DemuxVideo( demux_t *, real_track_t *tk, mtime_t i_dts, unsigned i_flags );
static void DemuxAudio( demux_t *, real_track_t *tk, mtime_t i_pts, unsigned i_flags );
static int ControlSeekByte( demux_t *, int64_t i_bytes );
static int ControlSeekTime( demux_t *, mtime_t i_time );
static int HeaderRead( demux_t *p_demux );
static int CodecParse( demux_t *p_demux, int i_len, int i_num );
static char *StreamReadString2( stream_t *s );
static char *MemoryReadString1( const uint8_t **pp_data, int *pi_data );
static void RVoid( const uint8_t **pp_data, int *pi_data, int i_size );
static int RLength( const uint8_t **pp_data, int *pi_data );
static uint8_t R8( const uint8_t **pp_data, int *pi_data );
......@@ -277,6 +281,208 @@ static void Close( vlc_object_t *p_this )
/*****************************************************************************
* Demux:
*****************************************************************************/
static int Demux( demux_t *p_demux )
{
demux_sys_t *p_sys = p_demux->p_sys;
uint8_t header[18];
if( p_sys->i_data_packets >= p_sys->i_data_packets_count &&
p_sys->i_data_packets_count )
{
if( stream_Read( p_demux->s, header, 18 ) < 18 )
return 0;
if( memcmp( header, "DATA", 4 ) )
return 0;
p_sys->i_data_offset = stream_Tell( p_demux->s ) - 18;
p_sys->i_data_size = GetDWBE( &header[4] );
p_sys->i_data_packets_count = GetDWBE( &header[10] );
p_sys->i_data_packets = 0;
p_sys->i_data_offset_next = GetDWBE( &header[14] );
msg_Dbg( p_demux, "entering new DATA packets=%d next=%u",
p_sys->i_data_packets_count,
(unsigned int)p_sys->i_data_offset_next );
}
/* Read Packet Header */
if( stream_Read( p_demux->s, header, 12 ) < 12 )
return 0;
//const int i_version = GetWBE( &header[0] );
const int i_size = GetWBE( &header[2] ) - 12;
const int i_id = GetWBE( &header[4] );
const int64_t i_pts = 1 + 1000 * GetDWBE( &header[6] );
const int i_flags= header[11]; /* flags 0x02 -> keyframe */
p_sys->i_data_packets++;
if( i_size <= 0 )
{
msg_Err( p_demux, "Got a NUKK size to read. (Invalid format?)" );
return 1;
}
assert( i_size <= sizeof(p_sys->buffer) );
p_sys->i_buffer = stream_Read( p_demux->s, p_sys->buffer, i_size );
if( p_sys->i_buffer < i_size )
return 0;
real_track_t *tk = NULL;
for( int i = 0; i < p_sys->i_track; i++ )
{
if( p_sys->track[i]->i_id == i_id )
tk = p_sys->track[i];
}
if( !tk )
{
msg_Warn( p_demux, "unknown track id(0x%x)", i_id );
return 1;
}
if( tk->fmt.i_cat == VIDEO_ES )
{
DemuxVideo( p_demux, tk, i_pts, i_flags );
}
else
{
assert( tk->fmt.i_cat == AUDIO_ES );
DemuxAudio( p_demux, tk, i_pts, i_flags );
}
/* Update PCR */
mtime_t i_pcr = 0;
for( int i = 0; i < p_sys->i_track; i++ )
{
real_track_t *tk = p_sys->track[i];
if( i_pcr <= 0 || ( tk->i_last_dts > 0 && tk->i_last_dts > i_pcr ) )
i_pcr = tk->i_last_dts;
}
if( i_pcr > 0 && i_pcr != p_sys->i_pcr )
{
p_sys->i_pcr = i_pcr;
es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_pcr );
}
return 1;
}
/*****************************************************************************
* Control:
*****************************************************************************/
static int Control( demux_t *p_demux, int i_query, va_list args )
{
demux_sys_t *p_sys = p_demux->p_sys;
double f, *pf;
int64_t i64;
int64_t *pi64;
switch( i_query )
{
case DEMUX_GET_POSITION:
pf = (double*) va_arg( args, double* );
/* read stream size maybe failed in rtsp streaming,
so use duration to determin the position at first */
if( p_sys->i_our_duration > 0 )
{
*pf = (double)p_sys->i_pcr / 1000.0 / p_sys->i_our_duration;
return VLC_SUCCESS;
}
*pf = 0.0;
i64 = stream_Size( p_demux->s );
if( i64 > 0 )
*pf = (double)1.0*stream_Tell( p_demux->s ) / (double)i64;
return VLC_SUCCESS;
case DEMUX_GET_TIME:
pi64 = (int64_t*)va_arg( args, int64_t * );
if( p_sys->i_our_duration > 0 )
{
*pi64 = p_sys->i_pcr;
return VLC_SUCCESS;
}
/* same as GET_POSTION */
i64 = stream_Size( p_demux->s );
if( p_sys->i_our_duration > 0 && i64 > 0 )
{
*pi64 = (int64_t)( 1000.0 * p_sys->i_our_duration * stream_Tell( p_demux->s ) / i64 );
return VLC_SUCCESS;
}
*pi64 = 0;
return VLC_EGENERIC;
case DEMUX_SET_POSITION:
f = (double) va_arg( args, double );
i64 = (int64_t) ( stream_Size( p_demux->s ) * f );
if( !p_sys->p_index && i64 != 0 )
{
/* TODO seek */
msg_Err( p_demux,"Seek No Index Real File failed!" );
return VLC_EGENERIC; // no index!
}
else if( i64 == 0 )
{
/* it is a rtsp stream , it is specials in access/rtsp/... */
msg_Dbg(p_demux, "Seek in real rtsp stream!");
p_sys->i_pcr = INT64_C(1000) * ( p_sys->i_our_duration * f );
p_sys->b_seek = true;
return stream_Seek( p_demux->s, p_sys->i_pcr );
}
return ControlSeekByte( p_demux, i64 );
case DEMUX_SET_TIME:
if( !p_sys->p_index )
return VLC_EGENERIC;
i64 = (int64_t) va_arg( args, int64_t );
return ControlSeekTime( p_demux, i64 );
case DEMUX_GET_LENGTH:
pi64 = (int64_t*)va_arg( args, int64_t * );
*pi64 = 0;
if( p_sys->i_our_duration <= 0 )
return VLC_EGENERIC;
/* our stored duration is in ms, so... */
*pi64 = INT64_C(1000) * p_sys->i_our_duration;
return VLC_SUCCESS;
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_GET_FPS:
default:
return VLC_EGENERIC;
}
return VLC_EGENERIC;
}
/*****************************************************************************
* Helpers: demux
*****************************************************************************/
static void CheckPcr( demux_t *p_demux, real_track_t *tk, mtime_t i_dts )
{
demux_sys_t *p_sys = p_demux->p_sys;
......@@ -591,7 +797,7 @@ static void DemuxAudioMethod3( demux_t *p_demux, real_track_t *tk, mtime_t i_pts
es_out_Send( p_demux->out, tk->p_es, p_block );
}
static void DemuxAudio( demux_t *p_demux, real_track_t *tk, mtime_t i_pts, unsigned int i_flags )
static void DemuxAudio( demux_t *p_demux, real_track_t *tk, mtime_t i_pts, unsigned i_flags )
{
switch( tk->fmt.i_codec )
{
......@@ -610,328 +816,127 @@ static void DemuxAudio( demux_t *p_demux, real_track_t *tk, mtime_t i_pts, unsig
}
}
static int Demux( demux_t *p_demux )
{
demux_sys_t *p_sys = p_demux->p_sys;
uint8_t header[18];
if( p_sys->i_data_packets >= p_sys->i_data_packets_count &&
p_sys->i_data_packets_count )
{
if( stream_Read( p_demux->s, header, 18 ) < 18 )
return 0;
if( memcmp( header, "DATA", 4 ) )
return 0;
p_sys->i_data_offset = stream_Tell( p_demux->s ) - 18;
p_sys->i_data_size = GetDWBE( &header[4] );
p_sys->i_data_packets_count = GetDWBE( &header[10] );
p_sys->i_data_packets = 0;
p_sys->i_data_offset_next = GetDWBE( &header[14] );
msg_Dbg( p_demux, "entering new DATA packets=%d next=%u",
p_sys->i_data_packets_count,
(unsigned int)p_sys->i_data_offset_next );
}
/* Read Packet Header */
if( stream_Read( p_demux->s, header, 12 ) < 12 )
return 0;
//const int i_version = GetWBE( &header[0] );
const int i_size = GetWBE( &header[2] ) - 12;
const int i_id = GetWBE( &header[4] );
const int64_t i_pts = 1 + 1000 * GetDWBE( &header[6] );
const int i_flags= header[11]; /* flags 0x02 -> keyframe */
p_sys->i_data_packets++;
if( i_size <= 0 )
{
msg_Err( p_demux, "Got a NUKK size to read. (Invalid format?)" );
return 1;
}
assert( i_size <= sizeof(p_sys->buffer) );
p_sys->i_buffer = stream_Read( p_demux->s, p_sys->buffer, i_size );
if( p_sys->i_buffer < i_size )
return 0;
real_track_t *tk = NULL;
for( int i = 0; i < p_sys->i_track; i++ )
{
if( p_sys->track[i]->i_id == i_id )
tk = p_sys->track[i];
}
if( !tk )
{
msg_Warn( p_demux, "unknown track id(0x%x)", i_id );
return 1;
}
if( tk->fmt.i_cat == VIDEO_ES )
{
DemuxVideo( p_demux, tk, i_pts, i_flags );
}
else
{
assert( tk->fmt.i_cat == AUDIO_ES );
DemuxAudio( p_demux, tk, i_pts, i_flags );
}
/* Update PCR */
mtime_t i_pcr = 0;
for( int i = 0; i < p_sys->i_track; i++ )
{
real_track_t *tk = p_sys->track[i];
if( i_pcr <= 0 || ( tk->i_last_dts > 0 && tk->i_last_dts > i_pcr ) )
i_pcr = tk->i_last_dts;
}
if( i_pcr > 0 && i_pcr != p_sys->i_pcr )
{
p_sys->i_pcr = i_pcr;
es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_pcr );
}
return 1;
}
/*****************************************************************************
* Control:
* Helpers: seek/control
*****************************************************************************/
static int ControlGoToIndex( demux_t *p_demux, rm_index_t *p_index )
{
demux_sys_t *p_sys = p_demux->p_sys;
p_sys->b_seek = true;
p_sys->i_pcr = INT64_C(1000) * p_index->i_time_offset;
for( int i = 0; i < p_sys->i_track; i++ )
p_sys->track[i]->i_last_dts = 0;
return stream_Seek( p_demux->s, p_index->i_file_offset );
}
static int ControlSeekTime( demux_t *p_demux, mtime_t i_time )
{
demux_sys_t *p_sys = p_demux->p_sys;
rm_index_t *p_index = p_sys->p_index;
while( p_index->i_file_offset != 0 )
{
if( p_index->i_time_offset * INT64_C(1000) > i_time )
{
if( p_index != p_sys->p_index )
p_index--;
break;
}
p_index++;
}
if( p_index->i_file_offset == 0 )
return VLC_EGENERIC;
return ControlGoToIndex( p_demux, p_index );
}
static int ControlSeekByte( demux_t *p_demux, int64_t i_bytes )
{
demux_sys_t *p_sys = p_demux->p_sys;
rm_index_t *p_index = p_sys->p_index;
while( p_index->i_file_offset != 0 )
{
if( p_index->i_file_offset > i_bytes )
{
if( p_index != p_sys->p_index )
p_index--;
break;
}
p_index++;
}
if( p_index->i_file_offset == 0 )
return VLC_EGENERIC;
return ControlGoToIndex( p_demux, p_index );
}
static int Control( demux_t *p_demux, int i_query, va_list args )
static int ControlGoToIndex( demux_t *p_demux, real_index_t *p_index )
{
demux_sys_t *p_sys = p_demux->p_sys;
double f, *pf;
int64_t i64;
int64_t *pi64;
switch( i_query )
{
case DEMUX_GET_POSITION:
pf = (double*) va_arg( args, double* );
/* read stream size maybe failed in rtsp streaming,
so use duration to determin the position at first */
if( p_sys->i_our_duration > 0 )
{
*pf = (double)p_sys->i_pcr / 1000.0 / p_sys->i_our_duration;
return VLC_SUCCESS;
}
*pf = 0.0;
i64 = stream_Size( p_demux->s );
if( i64 > 0 )
*pf = (double)1.0*stream_Tell( p_demux->s ) / (double)i64;
return VLC_SUCCESS;
case DEMUX_GET_TIME:
pi64 = (int64_t*)va_arg( args, int64_t * );
if( p_sys->i_our_duration > 0 )
{
*pi64 = p_sys->i_pcr;
return VLC_SUCCESS;
}
/* same as GET_POSTION */
i64 = stream_Size( p_demux->s );
if( p_sys->i_our_duration > 0 && i64 > 0 )
{
*pi64 = (int64_t)( 1000.0 * p_sys->i_our_duration * stream_Tell( p_demux->s ) / i64 );
return VLC_SUCCESS;
}
*pi64 = 0;
return VLC_EGENERIC;
case DEMUX_SET_POSITION:
f = (double) va_arg( args, double );
i64 = (int64_t) ( stream_Size( p_demux->s ) * f );
if( !p_sys->p_index && i64 != 0 )
{
/* TODO seek */
msg_Err( p_demux,"Seek No Index Real File failed!" );
return VLC_EGENERIC; // no index!
}
else if( i64 == 0 )
{
/* it is a rtsp stream , it is specials in access/rtsp/... */
msg_Dbg(p_demux, "Seek in real rtsp stream!");
p_sys->i_pcr = INT64_C(1000) * ( p_sys->i_our_duration * f );
p_sys->b_seek = true;
return stream_Seek( p_demux->s, p_sys->i_pcr );
}
return ControlSeekByte( p_demux, i64 );
case DEMUX_SET_TIME:
if( !p_sys->p_index )
return VLC_EGENERIC;
i64 = (int64_t) va_arg( args, int64_t );
return ControlSeekTime( p_demux, i64 );
case DEMUX_GET_LENGTH:
pi64 = (int64_t*)va_arg( args, int64_t * );
*pi64 = 0;
if( p_sys->i_our_duration <= 0 )
return VLC_EGENERIC;
/* our stored duration is in ms, so... */
*pi64 = INT64_C(1000) * p_sys->i_our_duration;
return VLC_SUCCESS;
p_sys->b_seek = true;
p_sys->i_pcr = INT64_C(1000) * p_index->i_time_offset;
for( int i = 0; i < p_sys->i_track; i++ )
p_sys->track[i]->i_last_dts = 0;
return stream_Seek( p_demux->s, p_index->i_file_offset );
}
static int ControlSeekTime( demux_t *p_demux, mtime_t i_time )
{
demux_sys_t *p_sys = p_demux->p_sys;
real_index_t *p_index = p_sys->p_index;
case DEMUX_GET_META:
while( p_index->i_file_offset != 0 )
{
if( p_index->i_time_offset * INT64_C(1000) > i_time )
{
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;
if( p_index != p_sys->p_index )
p_index--;
break;
}
case DEMUX_GET_FPS:
default:
return VLC_EGENERIC;
p_index++;
}
return VLC_EGENERIC;
if( p_index->i_file_offset == 0 )
return VLC_EGENERIC;
return ControlGoToIndex( p_demux, p_index );
}
/*****************************************************************************
* ReadRealIndex:
*****************************************************************************/
static void ReadRealIndex( demux_t *p_demux )
static int ControlSeekByte( demux_t *p_demux, int64_t i_bytes )
{
demux_sys_t *p_sys = p_demux->p_sys;
uint8_t buffer[100];
uint32_t i_id;
uint32_t i_size;
int i_version;
unsigned int i;
real_index_t *p_index = p_sys->p_index;
uint32_t i_index_count;
while( p_index->i_file_offset != 0 )
{
if( p_index->i_file_offset > i_bytes )
{
if( p_index != p_sys->p_index )
p_index--;
break;
}
p_index++;
}
if( p_index->i_file_offset == 0 )
return VLC_EGENERIC;
return ControlGoToIndex( p_demux, p_index );
}
if ( p_sys->i_index_offset == 0 )
return;
/*****************************************************************************
* Helpers: header reading
*****************************************************************************/
stream_Seek( p_demux->s, p_sys->i_index_offset );
/**
* This function will read a pascal string with size stored in 2 bytes from
* a stream_t.
*
* FIXME what is the right charset ?
*/
static char *StreamReadString2( stream_t *s )
{
uint8_t p_tmp[2];
if ( stream_Read( p_demux->s, buffer, 20 ) < 20 )
return ;
if( stream_Read( s, p_tmp, 2 ) < 2 )
return NULL;
i_id = VLC_FOURCC( buffer[0], buffer[1], buffer[2], buffer[3] );
i_size = GetDWBE( &buffer[4] );
i_version = GetWBE( &buffer[8] );
const int i_length = GetWBE( p_tmp );
if( i_length <= 0 )
return NULL;
msg_Dbg( p_demux, "Real index %4.4s size=%d version=%d",
(char*)&i_id, i_size, i_version );
char *psz_string = calloc( 1, i_length + 1 );
if( (i_size < 20) && (i_id != VLC_FOURCC('I','N','D','X')) )
return;
stream_Read( s, psz_string, i_length ); /* Valid even if !psz_string */
i_index_count = GetDWBE( &buffer[10] );
if( psz_string )
EnsureUTF8( psz_string );
return psz_string;
}
msg_Dbg( p_demux, "Real Index : num : %d ", i_index_count );
/**
* This function will read a pascal string with size stored in 1 byte from a
* memory buffer.
*
* FIXME what is the right charset ?
*/
static char *MemoryReadString1( const uint8_t **pp_data, int *pi_data )
{
const uint8_t *p_data = *pp_data;
int i_data = *pi_data;
if( i_index_count >= ( 0xffffffff / sizeof( rm_index_t ) ) )
return;
char *psz_string = NULL;
if( GetDWBE( &buffer[16] ) > 0 )
msg_Dbg( p_demux, "Real Index: Does next index exist? %d ",
GetDWBE( &buffer[16] ) );
if( i_data < 1 )
goto exit;
p_sys->p_index = malloc( ( i_index_count + 1 ) * sizeof( rm_index_t ) );
if( p_sys->p_index == NULL )
return;
int i_length = *p_data++; i_data--;
if( i_length > i_data )
i_length = i_data;
for( i = 0; i < i_index_count; i++ )
if( i_length > 0 )
{
if( stream_Read( p_demux->s, buffer, 14 ) < 14 )
return ;
if( GetWBE( &buffer[0] ) != 0 )
{
msg_Dbg( p_demux, "Real Index: invaild version of index entry %d ",
GetWBE( &buffer[0] ) );
return;
}
psz_string = strndup( (const char*)p_data, i_length );
if( psz_string )
EnsureUTF8( psz_string );
p_sys->p_index[i].i_time_offset = GetDWBE( &buffer[2] );
p_sys->p_index[i].i_file_offset = GetDWBE( &buffer[6] );
p_sys->p_index[i].i_frame_index = GetDWBE( &buffer[10] );
msg_Dbg( p_demux,
"Real Index: time %"PRIu32" file %"PRIu32" frame %"PRIu32,
p_sys->p_index[i].i_time_offset,
p_sys->p_index[i].i_file_offset,
p_sys->p_index[i].i_frame_index );
p_data += i_length;
i_data -= i_length;
}
memset( p_sys->p_index + i_index_count, 0, sizeof( rm_index_t ) );
exit:
*pp_data = p_data;
*pi_data = i_data;
return psz_string;
}
/*****************************************************************************
* HeaderRead:
*****************************************************************************/
/**
* This function parses(skip) the .RMF identification chunk.
*/
static int HeaderRMF( demux_t *p_demux )
{
uint8_t p_buffer[8];
......@@ -943,6 +948,9 @@ static int HeaderRMF( demux_t *p_demux )
GetDWBE( &p_buffer[0] ), GetDWBE( &p_buffer[4] ) );
return VLC_SUCCESS;
}
/**
* This function parses the PROP properties chunk.
*/
static int HeaderPROP( demux_t *p_demux )
{
demux_sys_t *p_sys = p_demux->p_sys;
......@@ -978,6 +986,9 @@ static int HeaderPROP( demux_t *p_demux )
return VLC_SUCCESS;
}
/**
* This functions parses the CONT commentairs chunk.
*/
static int HeaderCONT( demux_t *p_demux )
{
demux_sys_t *p_sys = p_demux->p_sys;
......@@ -1004,11 +1015,13 @@ static int HeaderCONT( demux_t *p_demux )
return VLC_SUCCESS;
}
/**
* This function parses the MDPR (Media properties) chunk.
*/
static int HeaderMDPR( demux_t *p_demux )
{
uint8_t p_buffer[30];
/* Media properties header */
if( stream_Read( p_demux->s, p_buffer, 30 ) < 30 )
return VLC_EGENERIC;
......@@ -1058,6 +1071,9 @@ static int HeaderMDPR( demux_t *p_demux )
}
return VLC_SUCCESS;
}
/**
* This function parses DATA chunk (it contains the actual movie data).