/*****************************************************************************
* nsv.c: NullSoft Video demuxer.
*****************************************************************************
- * Copyright (C) 2004 VideoLAN
- * $Id: nsv.c,v 1.7 2004/02/02 10:41:46 fenrir Exp $
+ * Copyright (C) 2004-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>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_demux.h>
/* TODO:
* - implement NSVf parsing (to get meta data)
static void Close ( vlc_object_t * );
vlc_module_begin();
- set_description( _("NullSoft demuxer" ) );
- set_capability( "demux2", 10 );
+ set_description( N_("NullSoft demuxer" ) );
+ set_capability( "demux", 10 );
+ set_category( CAT_INPUT );
+ set_subcategory( SUBCAT_INPUT_DEMUX );
set_callbacks( Open, Close );
add_shortcut( "nsv" );
vlc_module_end();
es_format_t fmt_video;
es_out_id_t *p_video;
+ es_format_t fmt_sub;
+ es_out_id_t *p_sub;
+
int64_t i_pcr;
int64_t i_time;
int64_t i_pcr_inc;
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
- uint8_t *p_peek;
- int i;
+ const uint8_t *p_peek;
if( stream_Peek( p_demux->s, &p_peek, 8 ) < 8 )
- {
- msg_Err( p_demux, "cannot peek" );
return VLC_EGENERIC;
- }
- if( strncmp( p_peek, "NSVf", 4 ) && strncmp( p_peek, "NSVs", 4 ))
+
+ if( memcmp( p_peek, "NSVf", 4 ) && memcmp( p_peek, "NSVs", 4 ) )
{
/* 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" );
+ if( !p_demux->b_force || ReSynch( p_demux ) )
return VLC_EGENERIC;
- }
}
/* Fill p_demux field */
es_format_Init( &p_sys->fmt_video, VIDEO_ES, 0 );
p_sys->p_video = NULL;
+ es_format_Init( &p_sys->fmt_sub, SPU_ES, 0 );
+ p_sys->p_sub = NULL;
+
p_sys->i_pcr = 1;
p_sys->i_time = 0;
p_sys->i_pcr_inc = 0;
demux_sys_t *p_sys = p_demux->p_sys;
uint8_t header[5];
- uint8_t *p_peek;
+ const uint8_t *p_peek;
int i_size;
block_t *p_frame;
return 0;
}
- if( !strncmp( p_peek, "NSVf", 4 ) )
+ if( !memcmp( p_peek, "NSVf", 4 ) )
{
if( ReadNSVf( p_demux ) )
{
return -1;
}
}
- else if( !strncmp( p_peek, "NSVs", 4 ) )
+ else if( !memcmp( p_peek, "NSVs", 4 ) )
{
if( ReadNSVs( p_demux ) )
{
}
else
{
- msg_Err( p_demux, "invalid signature 0x%x (%4.4s)", *(uint32_t*)p_peek, (char*)p_peek );
+ msg_Err( p_demux, "invalid signature 0x%x (%4.4s)", GetDWLE( p_peek ), (const char*)p_peek );
if( ReSynch( p_demux ) )
{
return -1;
i_size = ( header[0] >> 4 ) | ( header[1] << 4 ) | ( header[2] << 12 );
if( i_size > 0 )
{
+ /* extra data ? */
+ if( (header[0]&0x0f) != 0x0 )
+ {
+ uint8_t aux[6];
+ int i_aux;
+ vlc_fourcc_t fcc;
+ if( stream_Read( p_demux->s, aux, 6 ) < 6 )
+ {
+ msg_Warn( p_demux, "cannot read" );
+ return 0;
+ }
+ i_aux = GetWLE( aux );
+ fcc = VLC_FOURCC( aux[2], aux[3], aux[4], aux[5] );
+
+ msg_Dbg( p_demux, "Belekas: %d - size=%d fcc=%4.4s",
+ header[0]&0xf, i_aux, (char*)&fcc );
+
+ if( fcc == VLC_FOURCC( 'S', 'U', 'B', 'T' ) && i_aux > 2 )
+ {
+ if( p_sys->p_sub == NULL )
+ {
+ p_sys->fmt_sub.i_codec = VLC_FOURCC( 's', 'u', 'b', 't' );
+ p_sys->p_sub = es_out_Add( p_demux->out, &p_sys->fmt_sub );
+ es_out_Control( p_demux->out, ES_OUT_SET_ES, p_sys->p_sub );
+ }
+ stream_Read( p_demux->s, NULL, 2 );
+
+ if( ( p_frame = stream_Block( p_demux->s, i_aux - 2 ) ) )
+ {
+ uint8_t *p = p_frame->p_buffer;
+
+ while( p < &p_frame->p_buffer[p_frame->i_buffer] && *p != 0 )
+ {
+ p++;
+ }
+ if( *p == 0 && p + 1 < &p_frame->p_buffer[p_frame->i_buffer] )
+ {
+ p_frame->i_buffer -= p + 1 - p_frame->p_buffer;
+ p_frame->p_buffer = p + 1;
+ }
+
+ /* Skip the first part (it is the language name) */
+ p_frame->i_pts = p_sys->i_pcr;
+ p_frame->i_dts = p_sys->i_pcr + 4000000; /* 4s */
+
+ es_out_Send( p_demux->out, p_sys->p_sub, p_frame );
+ }
+ }
+ else
+ {
+ /* We skip this extra data */
+ if( stream_Read( p_demux->s, NULL, i_aux ) < i_aux )
+ {
+ msg_Warn( p_demux, "cannot read" );
+ return 0;
+ }
+ }
+ i_size -= 6 + i_aux;
+ }
+
/* msg_Dbg( p_demux, "frame video size=%d", i_size ); */
- if( ( p_frame = stream_Block( p_demux->s, i_size ) ) )
+ if( i_size > 0 && ( p_frame = stream_Block( p_demux->s, i_size ) ) )
{
p_frame->i_dts = p_sys->i_pcr;
es_out_Send( p_demux->out, p_sys->p_video, p_frame );
*pi64 = 0;
return VLC_EGENERIC;
- case DEMUX_SET_TIME:
#endif
case DEMUX_GET_FPS:
pf = (double*)va_arg( args, double * );
*pf = (double)1000000.0 / (double)p_sys->i_pcr_inc;
return VLC_SUCCESS;
+ case DEMUX_SET_TIME:
default:
return VLC_EGENERIC;
}
*****************************************************************************/
static int ReSynch( demux_t *p_demux )
{
- uint8_t *p_peek;
+ const uint8_t *p_peek;
int i_skip;
int i_peek;
- while( !p_demux->b_die )
+ while( vlc_object_alive (p_demux) )
{
if( ( i_peek = stream_Peek( p_demux->s, &p_peek, 1024 ) ) < 8 )
{
while( i_skip < i_peek - 4 )
{
- if( !strncmp( p_peek, "NSVf", 4 ) || !strncmp( p_peek, "NSVs", 4 ) )
+ if( !memcmp( p_peek, "NSVf", 4 )
+ || !memcmp( p_peek, "NSVs", 4 ) )
{
if( i_skip > 0 )
{
*****************************************************************************/
static int ReadNSVf( demux_t *p_demux )
{
- demux_sys_t *p_sys = p_demux->p_sys;
- uint8_t *p;
+ /* demux_sys_t *p_sys = p_demux->p_sys; */
+ const uint8_t *p;
int i_size;
msg_Dbg( p_demux, "new NSVf chunk" );
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', '1' ):
fcc = VLC_FOURCC( 'V', 'P', '3', '1' );
break;
+ case VLC_FOURCC( 'V', 'P', '6', '0' ):
+ case VLC_FOURCC( 'V', 'P', '6', '1' ):
+ case VLC_FOURCC( 'V', 'P', '6', '2' ):
+ case VLC_FOURCC( 'H', '2', '6', '4' ):
case VLC_FOURCC( 'N', 'O', 'N', 'E' ):
break;
default:
- msg_Warn( p_demux, "unknown codec" );
+ msg_Warn( p_demux, "unknown codec %4.4s", (char *)&fcc );
break;
}
if( fcc != VLC_FOURCC( 'N', 'O', 'N', 'E' ) && fcc != p_sys->fmt_video.i_codec )
case VLC_FOURCC( 'P', 'C', 'M', ' ' ):
fcc = VLC_FOURCC( 'a', 'r', 'a', 'w' );
break;
+ case VLC_FOURCC( 'A', 'A', 'C', ' ' ):
+ case VLC_FOURCC( 'A', 'A', 'C', 'P' ):
+ fcc = VLC_FOURCC( 'm', 'p', '4', 'a' );
+ break;
case VLC_FOURCC( 'N', 'O', 'N', 'E' ):
break;
default:
- msg_Warn( p_demux, "unknown codec" );
+ msg_Warn( p_demux, "unknown codec %4.4s", (char *)&fcc );
break;
}
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 );
+ //msg_Dbg( p_demux, " - fps=%.3f", 1000000.0 / (double)p_sys->i_pcr_inc );
return VLC_SUCCESS;
}
projects / vlc / blobdiff