mirror of
https://github.com/videolan/vlc.git
synced 2024-12-04 15:26:23 +08:00
* nsv: clean up, added seek support.
This commit is contained in:
Laurent Aimar
parent
bcf186fd8e
commit
20275a0bb7
@ -2,7 +2,7 @@
|
||||
* nsv.c: NullSoft Video demuxer.
|
||||
*****************************************************************************
|
||||
* Copyright (C) 2004 VideoLAN
|
||||
* $Id: nsv.c,v 1.1 2004/01/04 14:28:11 fenrir Exp $
|
||||
* $Id: nsv.c,v 1.2 2004/01/05 03:19:00 fenrir Exp $
|
||||
*
|
||||
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
|
||||
*
|
||||
@ -29,6 +29,12 @@
|
||||
#include <vlc/vlc.h>
|
||||
#include <vlc/input.h>
|
||||
|
||||
/* TODO:
|
||||
* - implement NSVf parsing (to get meta data)
|
||||
* - implement missing Control (and in the right way)
|
||||
* - ...
|
||||
*/
|
||||
|
||||
/*****************************************************************************
|
||||
* Module descriptor
|
||||
*****************************************************************************/
|
||||
@ -37,7 +43,7 @@ static void Close ( vlc_object_t * );
|
||||
|
||||
vlc_module_begin();
|
||||
set_description( _("NullSoft demuxer" ) );
|
||||
set_capability( "demux2", 1 );
|
||||
set_capability( "demux2", 10 );
|
||||
set_callbacks( Open, Close );
|
||||
add_shortcut( "nsv" );
|
||||
vlc_module_end();
|
||||
@ -55,12 +61,18 @@ struct demux_sys_t
|
||||
es_out_id_t *p_video;
|
||||
|
||||
int64_t i_pcr;
|
||||
int64_t i_time;
|
||||
int64_t i_pcr_inc;
|
||||
};
|
||||
|
||||
static int Demux ( demux_t *p_demux );
|
||||
static int Control( demux_t *p_demux, int i_query, va_list args );
|
||||
|
||||
static int ReSynch( demux_t *p_demux );
|
||||
|
||||
static int ReadNSVf( demux_t *p_demux );
|
||||
static int ReadNSVs( demux_t *p_demux );
|
||||
|
||||
/*****************************************************************************
|
||||
* Open
|
||||
*****************************************************************************/
|
||||
@ -79,14 +91,19 @@ static int Open( vlc_object_t *p_this )
|
||||
}
|
||||
if( strncmp( p_peek, "NSVf", 4 ) && strncmp( p_peek, "NSVs", 4 ))
|
||||
{
|
||||
msg_Warn( p_demux, "NSV module discarded" );
|
||||
return VLC_EGENERIC;
|
||||
/* In case we had force this demuxer we try to resynch */
|
||||
if( strcmp( p_demux->psz_demux, "nsv" ) || ReSynch( p_demux ) )
|
||||
{
|
||||
msg_Warn( p_demux, "NSV module discarded" );
|
||||
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 ) );
|
||||
|
||||
es_format_Init( &p_sys->fmt_audio, AUDIO_ES, 0 );
|
||||
p_sys->p_audio = NULL;
|
||||
|
||||
@ -94,18 +111,9 @@ static int Open( vlc_object_t *p_this )
|
||||
p_sys->p_video = NULL;
|
||||
|
||||
p_sys->i_pcr = 1;
|
||||
p_sys->i_time = 0;
|
||||
p_sys->i_pcr_inc = 0;
|
||||
|
||||
/* Parse the headers */
|
||||
if( !strncmp( p_peek, "NSVf", 4 ) )
|
||||
{
|
||||
int i_size = GetDWLE( &p_peek[4] );
|
||||
|
||||
/* For now skip it */
|
||||
stream_Read( p_demux->s, NULL, i_size );
|
||||
}
|
||||
|
||||
|
||||
return VLC_SUCCESS;
|
||||
}
|
||||
|
||||
@ -128,129 +136,53 @@ static int Demux( demux_t *p_demux )
|
||||
{
|
||||
demux_sys_t *p_sys = p_demux->p_sys;
|
||||
|
||||
uint8_t header[19];
|
||||
uint8_t header[5];
|
||||
uint8_t *p_peek;
|
||||
|
||||
int i_size;
|
||||
block_t *p_frame;
|
||||
|
||||
if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 )
|
||||
for( ;; )
|
||||
{
|
||||
msg_Warn( p_demux, "cannot peek" );
|
||||
return 0;
|
||||
}
|
||||
|
||||
if( GetWLE( p_peek ) == 0xbeef )
|
||||
{
|
||||
if( stream_Read( p_demux->s, NULL, 2 ) < 2 )
|
||||
if( stream_Peek( p_demux->s, &p_peek, 8 ) < 8 )
|
||||
{
|
||||
msg_Warn( p_demux, "cannot read" );
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
else if( !strncmp( p_peek, "NSVs", 4 ) )
|
||||
{
|
||||
vlc_fourcc_t fcc;
|
||||
|
||||
if( stream_Read( p_demux->s, header, 19 ) < 19 )
|
||||
{
|
||||
msg_Warn( p_demux, "cannot read" );
|
||||
msg_Warn( p_demux, "cannot peek" );
|
||||
return 0;
|
||||
}
|
||||
|
||||
msg_Dbg( p_demux, "New NSVs chunk" );
|
||||
/* Video */
|
||||
switch( ( fcc = VLC_FOURCC( header[4], header[5], header[6], header[7] ) ) )
|
||||
if( !strncmp( p_peek, "NSVf", 4 ) )
|
||||
{
|
||||
case VLC_FOURCC( 'V', 'P', '3', ' ' ):
|
||||
case VLC_FOURCC( 'V', 'P', '3', '1' ):
|
||||
fcc = VLC_FOURCC( 'V', 'P', '3', '1' );
|
||||
break;
|
||||
case VLC_FOURCC( 'N', 'O', 'N', 'E' ):
|
||||
break;
|
||||
default:
|
||||
msg_Warn( p_demux, "unknow codec" );
|
||||
break;
|
||||
}
|
||||
if( fcc != VLC_FOURCC( 'N', 'O', 'N', 'E' ) && fcc != p_sys->fmt_video.i_codec )
|
||||
{
|
||||
es_format_Init( &p_sys->fmt_video, VIDEO_ES, fcc );
|
||||
p_sys->fmt_video.video.i_width = GetWLE( &header[12] );
|
||||
p_sys->fmt_video.video.i_height = GetWLE( &header[14] );
|
||||
if( p_sys->p_video )
|
||||
if( ReadNSVf( p_demux ) )
|
||||
{
|
||||
es_out_Del( p_demux->out, p_sys->p_video );
|
||||
}
|
||||
p_sys->p_video = es_out_Add( p_demux->out, &p_sys->fmt_video );
|
||||
|
||||
msg_Dbg( p_demux, " - video `%4.4s' %dx%d",
|
||||
(char*)&fcc,
|
||||
p_sys->fmt_video.video.i_width,
|
||||
p_sys->fmt_video.video.i_height );
|
||||
}
|
||||
|
||||
/* Audio */
|
||||
switch( ( fcc = VLC_FOURCC( header[8], header[9], header[10], header[11] ) ) )
|
||||
{
|
||||
case VLC_FOURCC( 'M', 'P', '3', ' ' ):
|
||||
fcc = VLC_FOURCC( 'm', 'p', 'g', 'a' );
|
||||
break;
|
||||
case VLC_FOURCC( 'P', 'C', 'M', ' ' ):
|
||||
fcc = VLC_FOURCC( 'a', 'r', 'a', 'w' );
|
||||
break;
|
||||
case VLC_FOURCC( 'N', 'O', 'N', 'E' ):
|
||||
break;
|
||||
default:
|
||||
msg_Warn( p_demux, "unknow codec" );
|
||||
break;
|
||||
}
|
||||
|
||||
if( fcc != VLC_FOURCC( 'N', 'O', 'N', 'E' ) && fcc != p_sys->fmt_audio.i_codec )
|
||||
{
|
||||
msg_Dbg( p_demux, " - audio `%4.4s'", (char*)&fcc );
|
||||
|
||||
if( p_sys->p_audio )
|
||||
{
|
||||
es_out_Del( p_demux->out, p_sys->p_audio );
|
||||
p_sys->p_audio = NULL;
|
||||
}
|
||||
es_format_Init( &p_sys->fmt_audio, AUDIO_ES, fcc );
|
||||
}
|
||||
|
||||
if( header[16]&0x80 )
|
||||
{
|
||||
switch( header[16]&0x7f )
|
||||
{
|
||||
case 1: /* 29.97 fps */
|
||||
p_sys->i_pcr_inc = 33367;
|
||||
break;
|
||||
case 3: /* 23.976 fps */
|
||||
p_sys->i_pcr_inc = 41708;
|
||||
break;
|
||||
case 5: /* 14.98 fps */
|
||||
p_sys->i_pcr_inc = 66755;
|
||||
break;
|
||||
default:
|
||||
msg_Dbg( p_demux, "unknow fps (0x%x)", header[16] );
|
||||
p_sys->i_pcr_inc = 40000;
|
||||
break;
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
else if( header[16] != 0 )
|
||||
else if( !strncmp( p_peek, "NSVs", 4 ) )
|
||||
{
|
||||
p_sys->i_pcr_inc = 1000000 / header[16];
|
||||
if( ReadNSVs( p_demux ) )
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
break;
|
||||
}
|
||||
else if( GetWLE( p_peek ) == 0xbeef )
|
||||
{
|
||||
/* Next frame of the current NSVs chunk */
|
||||
if( stream_Read( p_demux->s, NULL, 2 ) < 2 )
|
||||
{
|
||||
msg_Warn( p_demux, "cannot read" );
|
||||
return 0;
|
||||
}
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
msg_Dbg( p_demux, "invalid fps (0x00)" );
|
||||
p_sys->i_pcr_inc = 40000;
|
||||
msg_Err( p_demux, "invalid signature 0x%x (%4.4s)", *(uint32_t*)p_peek, (char*)p_peek );
|
||||
if( ReSynch( p_demux ) )
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
msg_Dbg( p_demux, " - fps=%.3f", 1000000.0 / (double)p_sys->i_pcr_inc );
|
||||
}
|
||||
else
|
||||
{
|
||||
msg_Err( p_demux, "invalid signature 0x%x (%4.4s)", *(uint32_t*)p_peek, (char*)p_peek );
|
||||
return -1;
|
||||
}
|
||||
|
||||
if( stream_Read( p_demux->s, header, 5 ) < 5 )
|
||||
@ -279,7 +211,6 @@ static int Demux( demux_t *p_demux )
|
||||
if( i_size > 0 )
|
||||
{
|
||||
/* msg_Dbg( p_demux, "frame audio size=%d", i_size ); */
|
||||
|
||||
if( p_sys->fmt_audio.i_codec == VLC_FOURCC( 'a', 'r', 'a', 'w' ) )
|
||||
{
|
||||
uint8_t h[4];
|
||||
@ -304,6 +235,10 @@ static int Demux( demux_t *p_demux )
|
||||
}
|
||||
|
||||
p_sys->i_pcr += p_sys->i_pcr_inc;
|
||||
if( p_sys->i_time >= 0 )
|
||||
{
|
||||
p_sys->i_time += p_sys->i_pcr_inc;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
@ -331,25 +266,30 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
|
||||
*pf = 0.0;
|
||||
}
|
||||
return VLC_SUCCESS;
|
||||
#if 0
|
||||
|
||||
case DEMUX_SET_POSITION:
|
||||
f = (double) va_arg( args, double );
|
||||
i64 = stream_Size( p_demux->s );
|
||||
|
||||
es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
|
||||
|
||||
return stream_Seek( p_demux->s, (int64_t)(i64 * f) );
|
||||
if( stream_Seek( p_demux->s, (int64_t)(i64 * f) ) || ReSynch( p_demux ) )
|
||||
{
|
||||
return VLC_EGENERIC;
|
||||
}
|
||||
p_sys->i_time = -1; /* Invalidate time display */
|
||||
return VLC_SUCCESS;
|
||||
|
||||
case DEMUX_GET_TIME:
|
||||
pi64 = (int64_t*)va_arg( args, int64_t * );
|
||||
if( p_sys->i_mux_rate > 0 )
|
||||
if( p_sys->i_time < 0 )
|
||||
{
|
||||
*pi64 = (int64_t)1000000 * ( stream_Tell( p_demux->s ) / 50 ) / p_sys->i_mux_rate;
|
||||
return VLC_SUCCESS;
|
||||
*pi64 = 0;
|
||||
return VLC_EGENERIC;
|
||||
}
|
||||
*pi64 = 0;
|
||||
return VLC_EGENERIC;
|
||||
*pi64 = p_sys->i_time;
|
||||
return VLC_SUCCESS;
|
||||
|
||||
#if 0
|
||||
case DEMUX_GET_LENGTH:
|
||||
pi64 = (int64_t*)va_arg( args, int64_t * );
|
||||
if( p_sys->i_mux_rate > 0 )
|
||||
@ -372,4 +312,166 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
|
||||
}
|
||||
}
|
||||
|
||||
/*****************************************************************************
|
||||
* ReSynch:
|
||||
*****************************************************************************/
|
||||
static int ReSynch( demux_t *p_demux )
|
||||
{
|
||||
uint8_t *p_peek;
|
||||
int i_skip;
|
||||
int i_peek;
|
||||
|
||||
while( !p_demux->b_die )
|
||||
{
|
||||
if( ( i_peek = stream_Peek( p_demux->s, &p_peek, 1024 ) ) < 8 )
|
||||
{
|
||||
return VLC_EGENERIC;
|
||||
}
|
||||
i_skip = 0;
|
||||
|
||||
while( i_skip < i_peek - 4 )
|
||||
{
|
||||
if( !strncmp( p_peek, "NSVf", 4 ) || !strncmp( p_peek, "NSVs", 4 ) )
|
||||
{
|
||||
if( i_skip > 0 )
|
||||
{
|
||||
stream_Read( p_demux->s, NULL, i_skip );
|
||||
}
|
||||
return VLC_SUCCESS;
|
||||
}
|
||||
p_peek++;
|
||||
i_skip++;
|
||||
}
|
||||
|
||||
stream_Read( p_demux->s, NULL, i_skip );
|
||||
}
|
||||
return VLC_EGENERIC;
|
||||
}
|
||||
|
||||
/*****************************************************************************
|
||||
* ReadNSVf:
|
||||
*****************************************************************************/
|
||||
static int ReadNSVf( demux_t *p_demux )
|
||||
{
|
||||
demux_sys_t *p_sys = p_demux->p_sys;
|
||||
uint8_t *p;
|
||||
int i_size;
|
||||
|
||||
msg_Dbg( p_demux, "New NSVf chunk" );
|
||||
if( stream_Peek( p_demux->s, &p, 8 ) < 8 )
|
||||
{
|
||||
return VLC_EGENERIC;
|
||||
}
|
||||
|
||||
i_size = GetDWLE( &p[4] );
|
||||
msg_Dbg( p_demux, " - size=%d", i_size );
|
||||
|
||||
return stream_Read( p_demux->s, NULL, i_size ) == i_size ? VLC_SUCCESS : VLC_EGENERIC;
|
||||
}
|
||||
/*****************************************************************************
|
||||
* ReadNSVf:
|
||||
*****************************************************************************/
|
||||
static int ReadNSVs( demux_t *p_demux )
|
||||
{
|
||||
demux_sys_t *p_sys = p_demux->p_sys;
|
||||
uint8_t header[19];
|
||||
vlc_fourcc_t fcc;
|
||||
|
||||
if( stream_Read( p_demux->s, header, 19 ) < 19 )
|
||||
{
|
||||
msg_Warn( p_demux, "cannot read" );
|
||||
return VLC_EGENERIC;
|
||||
}
|
||||
|
||||
msg_Dbg( p_demux, "New NSVs chunk" );
|
||||
/* Video */
|
||||
switch( ( fcc = VLC_FOURCC( header[4], header[5], header[6], header[7] ) ) )
|
||||
{
|
||||
case VLC_FOURCC( 'V', 'P', '3', ' ' ):
|
||||
case VLC_FOURCC( 'V', 'P', '3', '1' ):
|
||||
fcc = VLC_FOURCC( 'V', 'P', '3', '1' );
|
||||
break;
|
||||
case VLC_FOURCC( 'N', 'O', 'N', 'E' ):
|
||||
break;
|
||||
default:
|
||||
msg_Warn( p_demux, "unknow codec" );
|
||||
break;
|
||||
}
|
||||
if( fcc != VLC_FOURCC( 'N', 'O', 'N', 'E' ) && fcc != p_sys->fmt_video.i_codec )
|
||||
{
|
||||
es_format_Init( &p_sys->fmt_video, VIDEO_ES, fcc );
|
||||
p_sys->fmt_video.video.i_width = GetWLE( &header[12] );
|
||||
p_sys->fmt_video.video.i_height = GetWLE( &header[14] );
|
||||
if( p_sys->p_video )
|
||||
{
|
||||
es_out_Del( p_demux->out, p_sys->p_video );
|
||||
}
|
||||
p_sys->p_video = es_out_Add( p_demux->out, &p_sys->fmt_video );
|
||||
|
||||
msg_Dbg( p_demux, " - video `%4.4s' %dx%d",
|
||||
(char*)&fcc,
|
||||
p_sys->fmt_video.video.i_width,
|
||||
p_sys->fmt_video.video.i_height );
|
||||
}
|
||||
|
||||
/* Audio */
|
||||
switch( ( fcc = VLC_FOURCC( header[8], header[9], header[10], header[11] ) ) )
|
||||
{
|
||||
case VLC_FOURCC( 'M', 'P', '3', ' ' ):
|
||||
fcc = VLC_FOURCC( 'm', 'p', 'g', 'a' );
|
||||
break;
|
||||
case VLC_FOURCC( 'P', 'C', 'M', ' ' ):
|
||||
fcc = VLC_FOURCC( 'a', 'r', 'a', 'w' );
|
||||
break;
|
||||
case VLC_FOURCC( 'N', 'O', 'N', 'E' ):
|
||||
break;
|
||||
default:
|
||||
msg_Warn( p_demux, "unknow codec" );
|
||||
break;
|
||||
}
|
||||
|
||||
if( fcc != VLC_FOURCC( 'N', 'O', 'N', 'E' ) && fcc != p_sys->fmt_audio.i_codec )
|
||||
{
|
||||
msg_Dbg( p_demux, " - audio `%4.4s'", (char*)&fcc );
|
||||
|
||||
if( p_sys->p_audio )
|
||||
{
|
||||
es_out_Del( p_demux->out, p_sys->p_audio );
|
||||
p_sys->p_audio = NULL;
|
||||
}
|
||||
es_format_Init( &p_sys->fmt_audio, AUDIO_ES, fcc );
|
||||
}
|
||||
|
||||
if( header[16]&0x80 )
|
||||
{
|
||||
switch( header[16]&0x7f )
|
||||
{
|
||||
case 1: /* 29.97 fps */
|
||||
p_sys->i_pcr_inc = 33367;
|
||||
break;
|
||||
case 3: /* 23.976 fps */
|
||||
p_sys->i_pcr_inc = 41708;
|
||||
break;
|
||||
case 5: /* 14.98 fps */
|
||||
p_sys->i_pcr_inc = 66755;
|
||||
break;
|
||||
default:
|
||||
msg_Dbg( p_demux, "unknow fps (0x%x)", header[16] );
|
||||
p_sys->i_pcr_inc = 40000;
|
||||
break;
|
||||
}
|
||||
}
|
||||
else if( header[16] != 0 )
|
||||
{
|
||||
p_sys->i_pcr_inc = 1000000 / header[16];
|
||||
}
|
||||
else
|
||||
{
|
||||
msg_Dbg( p_demux, "invalid fps (0x00)" );
|
||||
p_sys->i_pcr_inc = 40000;
|
||||
}
|
||||
msg_Dbg( p_demux, " - fps=%.3f", 1000000.0 / (double)p_sys->i_pcr_inc );
|
||||
|
||||
return VLC_SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user