/*****************************************************************************
* nsv.c: NullSoft Video demuxer.
*****************************************************************************
- * Copyright (C) 2004 VideoLAN
+ * 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 int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
-vlc_module_begin();
- set_description( _("NullSoft demuxer" ) );
- set_capability( "demux2", 10 );
- set_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_DEMUX );
- set_callbacks( Open, Close );
- add_shortcut( "nsv" );
-vlc_module_end();
+vlc_module_begin ()
+ 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 ()
/*****************************************************************************
* Local prototypes
int64_t i_pcr;
int64_t i_time;
int64_t i_pcr_inc;
+
+ bool b_start_record;
};
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, 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 */
p_sys->i_time = 0;
p_sys->i_pcr_inc = 0;
+ p_sys->b_start_record = false;
+
return VLC_SUCCESS;
}
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 ) )
+ if( p_sys->b_start_record )
{
- return -1;
+ /* Enable recording once synchronized */
+ stream_Control( p_demux->s, STREAM_SET_RECORD_STATE, true, "nsv" );
+ p_sys->b_start_record = false;
}
+
+ if( ReadNSVs( p_demux ) )
+ return -1;
break;
}
else if( GetWLE( p_peek ) == 0xbeef )
}
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;
- }
}
}
{
demux_sys_t *p_sys = p_demux->p_sys;
double f, *pf;
+ bool b_bool, *pb_bool;
int64_t i64, *pi64;
switch( i_query )
f = (double) va_arg( args, double );
i64 = stream_Size( p_demux->s );
- es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
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;
*pf = (double)1000000.0 / (double)p_sys->i_pcr_inc;
return VLC_SUCCESS;
+ case DEMUX_CAN_RECORD:
+ pb_bool = (bool*)va_arg( args, bool * );
+ *pb_bool = true;
+ return VLC_SUCCESS;
+
+ case DEMUX_SET_RECORD_STATE:
+ b_bool = (bool)va_arg( args, int );
+
+ if( !b_bool )
+ stream_Control( p_demux->s, STREAM_SET_RECORD_STATE, false );
+ p_sys->b_start_record = b_bool;
+ 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;
+ 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 )
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