X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fmod.c;h=b7817a4f87cef1d9a5f33988c723fae7fc2f5ad1;hb=c60652e38ac6afd74bd8225e9dae5406f13aaa4f;hp=1aa49b424f1aa9e8a59b84a5ac8f63c1a64f770e;hpb=37b0b026bbe92b1bda266e6f30ec37c7ceee767d;p=vlc diff --git a/modules/demux/mod.c b/modules/demux/mod.c index 1aa49b424f..b7817a4f87 100644 --- a/modules/demux/mod.c +++ b/modules/demux/mod.c @@ -1,10 +1,11 @@ /***************************************************************************** * mod.c: MOD file demuxer (using libmodplug) ***************************************************************************** - * Copyright (C) 2004 the VideoLAN team + * Copyright (C) 2004-2009 the VideoLAN team * $Id$ * * Authors: Laurent Aimar + * Konstanty Bialkowski * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,10 +25,16 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include +#include +#include #include @@ -61,40 +68,40 @@ static void Close ( vlc_object_t * ); #define SURROUND_DELAY_LONGTEXT N_("Surround delay, in ms. Usual values are " \ "from 5 to 40 ms." ) -vlc_module_begin(); - set_shortname( "MOD"); - set_description( _("MOD demuxer (libmodplug)" ) ); - set_capability( "demux2", 10 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); +vlc_module_begin () + set_shortname( "MOD") + set_description( N_("MOD demuxer (libmodplug)" ) ) + set_capability( "demux", 10 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) - add_bool( "mod-noisereduction", VLC_TRUE, NULL, N_("Noise reduction"), - NOISE_LONGTEXT, VLC_FALSE ); + add_bool( "mod-noisereduction", true, NULL, N_("Noise reduction"), + NOISE_LONGTEXT, false ) - add_bool( "mod-reverb", VLC_FALSE, NULL, N_("Reverb"), - REVERB_LONGTEXT, VLC_FALSE ); + add_bool( "mod-reverb", false, NULL, N_("Reverb"), + REVERB_LONGTEXT, false ) add_integer_with_range( "mod-reverb-level", 0, 0, 100, NULL, - N_("Reverberation level"), REVERB_LEVEL_LONGTEXT, VLC_TRUE ); + N_("Reverberation level"), REVERB_LEVEL_LONGTEXT, true ) add_integer_with_range( "mod-reverb-delay", 40, 0, 1000, NULL, - N_("Reverberation delay"), REVERB_DELAY_LONGTEXT, VLC_TRUE ); + N_("Reverberation delay"), REVERB_DELAY_LONGTEXT, true ) - add_bool( "mod-megabass", VLC_FALSE, NULL, N_("Mega bass"), - MEGABASS_LONGTEXT, VLC_FALSE ); + add_bool( "mod-megabass", false, NULL, N_("Mega bass"), + MEGABASS_LONGTEXT, false ) add_integer_with_range( "mod-megabass-level", 0, 0, 100, NULL, - N_("Mega bass level"), MEGABASS_LEVEL_LONGTEXT, VLC_TRUE ); + N_("Mega bass level"), MEGABASS_LEVEL_LONGTEXT, true ) add_integer_with_range( "mod-megabass-range", 10, 10, 100, NULL, - N_("Mega bass cutoff"), MEGABASS_RANGE_LONGTEXT, VLC_TRUE ); + N_("Mega bass cutoff"), MEGABASS_RANGE_LONGTEXT, true ) - add_bool( "mod-surround", VLC_FALSE, NULL, N_("Surround"), N_("Surround"), - VLC_FALSE ); + add_bool( "mod-surround", false, NULL, N_("Surround"), N_("Surround"), + false ) add_integer_with_range( "mod-surround-level", 0, 0, 100, NULL, - N_("Surround level"), SURROUND_LEVEL_LONGTEXT, VLC_TRUE ); + N_("Surround level"), SURROUND_LEVEL_LONGTEXT, true ) add_integer_with_range( "mod-surround-delay", 5, 0, 1000, NULL, - N_("Surround delay (ms)"), SURROUND_DELAY_LONGTEXT, VLC_TRUE ); + N_("Surround delay (ms)"), SURROUND_DELAY_LONGTEXT, true ) - set_callbacks( Open, Close ); - add_shortcut( "mod" ); -vlc_module_end(); + set_callbacks( Open, Close ) + add_shortcut( "mod" ) +vlc_module_end () /***************************************************************************** * Local prototypes @@ -105,7 +112,7 @@ struct demux_sys_t es_format_t fmt; es_out_id_t *es; - int64_t i_time; + date_t pts; int64_t i_length; int i_data; @@ -116,13 +123,20 @@ struct demux_sys_t static int Demux ( demux_t *p_demux ); static int Control( demux_t *p_demux, int i_query, va_list args ); -static const char* mod_ext[] = +static int Validate( demux_t *p_demux, const char *psz_ext ); + +static const char *ppsz_mod_ext[] = { "mod", "s3m", "xm", "it", "669", "amf", "ams", "dbm", "dmf", "dsm", "far", "mdl", "med", "mtm", "okt", "ptm", "stm", "ult", "umx", "mt2", - "psm", NULL + "psm", "abc", NULL }; + +/* We load the complete file in memory, put a higher bound + * of 500 Mo (which is really big anyway) */ +#define MOD_MAX_FILE_SIZE (500*1000*1000) + /***************************************************************************** * Open *****************************************************************************/ @@ -130,56 +144,58 @@ static int Open( vlc_object_t *p_this ) { demux_t *p_demux = (demux_t*)p_this; demux_sys_t *p_sys; - char *ext; - int i; ModPlug_Settings settings; - vlc_value_t val; /* We accept file based on extension match */ - if( strcasecmp( p_demux->psz_demux, "mod" ) ) + if( !p_demux->b_force ) { - if( ( ext = strrchr( p_demux->psz_path, '.' ) ) == NULL || - stream_Size( p_demux->s ) == 0 ) return VLC_EGENERIC; + if( !p_demux->psz_file ) + return VLC_EGENERIC; + const char *psz_ext = strrchr( p_demux->psz_file, '.' ); + int i; - ext++; /* skip . */ - for( i = 0; mod_ext[i] != NULL; i++ ) + if( !psz_ext ) + return VLC_EGENERIC; + + psz_ext++; /* skip . */ + for( i = 0; ppsz_mod_ext[i] != NULL; i++ ) { - if( !strcasecmp( ext, mod_ext[i] ) ) - { + if( !strcasecmp( psz_ext, ppsz_mod_ext[i] ) ) break; - } } - if( mod_ext[i] == NULL ) return VLC_EGENERIC; - msg_Dbg( p_demux, "running MOD demuxer (ext=%s)", mod_ext[i] ); + if( ppsz_mod_ext[i] == NULL ) + return VLC_EGENERIC; + if( Validate( p_demux, ppsz_mod_ext[i] ) ) + { + msg_Warn( p_demux, "MOD validation failed (ext=%s)", ppsz_mod_ext[i]); + return VLC_EGENERIC; + } + msg_Dbg( p_demux, "running MOD demuxer (ext=%s)", ppsz_mod_ext[i] ); } + const int64_t i_size = stream_Size( p_demux->s ); + if( i_size <= 0 || i_size >= MOD_MAX_FILE_SIZE ) + 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 ) ); + p_demux->p_sys = p_sys = malloc( sizeof( *p_sys ) ); + if( !p_sys ) + return VLC_ENOMEM; msg_Dbg( p_demux, "loading complete file (could be long)" ); - p_sys->i_data = stream_Size( p_demux->s ); + p_sys->i_data = i_size; p_sys->p_data = malloc( p_sys->i_data ); - p_sys->i_data = stream_Read( p_demux->s, p_sys->p_data, p_sys->i_data ); - if( p_sys->i_data <= 0 ) + if( p_sys->p_data ) + p_sys->i_data = stream_Read( p_demux->s, p_sys->p_data, p_sys->i_data ); + if( p_sys->i_data <= 0 || !p_sys->p_data ) { msg_Err( p_demux, "failed to read the complete file" ); free( p_sys->p_data ); free( p_sys ); return VLC_EGENERIC; } - /* Create our config variable */ - var_Create( p_demux, "mod-noisereduction", VLC_VAR_BOOL|VLC_VAR_DOINHERIT ); - var_Create( p_demux, "mod-reverb", VLC_VAR_BOOL|VLC_VAR_DOINHERIT ); - var_Create( p_demux, "mod-reverb-level", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); - var_Create( p_demux, "mod-reverb-delay", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); - var_Create( p_demux, "mod-megabass", VLC_VAR_BOOL|VLC_VAR_DOINHERIT ); - var_Create( p_demux, "mod-megabass-level", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); - var_Create( p_demux, "mod-megabass-range", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); - var_Create( p_demux, "mod-surround", VLC_VAR_BOOL|VLC_VAR_DOINHERIT ); - var_Create( p_demux, "mod-surround-level", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); - var_Create( p_demux, "mod-surround-delay", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); /* Configure modplug before loading the file */ ModPlug_GetSettings( &settings ); @@ -189,29 +205,23 @@ static int Open( vlc_object_t *p_this ) settings.mFrequency = 44100; settings.mResamplingMode = MODPLUG_RESAMPLE_FIR; - var_Get( p_demux, "mod-noisereduction", &val ); - if( val.b_bool) settings.mFlags |= MODPLUG_ENABLE_NOISE_REDUCTION; - - var_Get( p_demux, "mod-reverb", &val ); - if( val.b_bool) settings.mFlags |= MODPLUG_ENABLE_REVERB; - var_Get( p_demux, "mod-reverb-level", &val ); - settings.mReverbDepth = val.i_int; - var_Get( p_demux, "mod-reverb-delay", &val ); - settings.mReverbDelay = val.i_int; - - var_Get( p_demux, "mod-megabass", &val ); - if( val.b_bool) settings.mFlags |= MODPLUG_ENABLE_MEGABASS; - var_Get( p_demux, "mod-megabass-level", &val ); - settings.mBassAmount = val.i_int; - var_Get( p_demux, "mod-megabass-range", &val ); - settings.mBassRange = val.i_int; - - var_Get( p_demux, "mod-surround", &val ); - if( val.b_bool) settings.mFlags |= MODPLUG_ENABLE_SURROUND; - var_Get( p_demux, "mod-surround-level", &val ); - settings.mSurroundDepth = val.i_int; - var_Get( p_demux, "mod-surround-delay", &val ); - settings.mSurroundDelay = val.i_int; + if( var_CreateGetBool( p_demux, "mod-noisereduction" ) ) + settings.mFlags |= MODPLUG_ENABLE_NOISE_REDUCTION; + + if( var_CreateGetBool( p_demux, "mod-reverb" ) ) + settings.mFlags |= MODPLUG_ENABLE_REVERB; + settings.mReverbDepth = var_CreateGetInteger( p_demux, "mod-reverb-level" ); + settings.mReverbDelay = var_CreateGetInteger( p_demux, "mod-reverb-delay" ); + + if( var_CreateGetBool( p_demux, "mod-megabass" ) ) + settings.mFlags |= MODPLUG_ENABLE_MEGABASS; + settings.mBassAmount = var_CreateGetInteger( p_demux, "mod-megabass-level" ); + settings.mBassRange = var_CreateGetInteger( p_demux, "mod-megabass-range" ); + + if( var_CreateGetBool( p_demux, "mod-surround" ) ) + settings.mFlags |= MODPLUG_ENABLE_SURROUND; + settings.mSurroundDepth = var_CreateGetInteger( p_demux, "mod-surround-level" ); + settings.mSurroundDelay = var_CreateGetInteger( p_demux, "mod-surround-delay" ); ModPlug_SetSettings( &settings ); @@ -226,10 +236,11 @@ static int Open( vlc_object_t *p_this ) } /* init time */ - p_sys->i_time = 1; - p_sys->i_length = ModPlug_GetLength( p_sys->f ) * (int64_t)1000; + date_Init( &p_sys->pts, settings.mFrequency, 1 ); + date_Set( &p_sys->pts, 0 ); + p_sys->i_length = ModPlug_GetLength( p_sys->f ) * INT64_C(1000); - msg_Dbg( p_demux, "MOD loaded name=%s lenght="I64Fd"ms", + msg_Dbg( p_demux, "MOD loaded name=%s lenght=%"PRId64"ms", ModPlug_GetName( p_sys->f ), p_sys->i_length ); @@ -267,29 +278,32 @@ static int Demux( demux_t *p_demux ) { demux_sys_t *p_sys = p_demux->p_sys; block_t *p_frame; - int i_bk = ( p_sys->fmt.audio.i_bitspersample / 8 ) * + const int i_bk = ( p_sys->fmt.audio.i_bitspersample / 8 ) * p_sys->fmt.audio.i_channels; p_frame = block_New( p_demux, p_sys->fmt.audio.i_rate / 10 * i_bk ); + if( !p_frame ) + return -1; - p_frame->i_buffer = ModPlug_Read( p_sys->f, p_frame->p_buffer, p_frame->i_buffer ); - if( p_frame->i_buffer <= 0 ) + const int i_read = ModPlug_Read( p_sys->f, p_frame->p_buffer, p_frame->i_buffer ); + if( i_read <= 0 ) { /* EOF */ block_Release( p_frame ); return 0; } + p_frame->i_buffer = i_read; + p_frame->i_dts = + p_frame->i_pts = VLC_TS_0 + date_Get( &p_sys->pts ); /* Set PCR */ - es_out_Control( p_demux->out, ES_OUT_SET_PCR, (int64_t)p_sys->i_time ); - - /* We should use p_frame->i_buffer */ - p_sys->i_time += (int64_t)1000000 * p_frame->i_buffer / i_bk / p_sys->fmt.audio.i_rate; + es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_frame->i_pts ); /* Send data */ - p_frame->i_dts = p_frame->i_pts = p_sys->i_time; es_out_Send( p_demux->out, p_sys->es, p_frame ); + date_Increment( &p_sys->pts, i_read / i_bk ); + return 1; } @@ -304,55 +318,265 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) switch( i_query ) { - case DEMUX_GET_POSITION: - pf = (double*) va_arg( args, double* ); - if( p_sys->i_length > 0 ) + case DEMUX_GET_POSITION: + pf = (double*) va_arg( args, double* ); + if( p_sys->i_length > 0 ) + { + double current = date_Get( &p_sys->pts ); + double length = p_sys->i_length; + *pf = current / length; + return VLC_SUCCESS; + } + return VLC_EGENERIC; + + case DEMUX_SET_POSITION: + f = (double) va_arg( args, double ); + + i64 = f * p_sys->i_length; + if( i64 >= 0 && i64 <= p_sys->i_length ) + { + ModPlug_Seek( p_sys->f, i64 / 1000 ); + date_Set( &p_sys->pts, i64 ); + + return VLC_SUCCESS; + } + return VLC_EGENERIC; + + case DEMUX_GET_TIME: + pi64 = (int64_t*)va_arg( args, int64_t * ); + *pi64 = date_Get( &p_sys->pts ); + return VLC_SUCCESS; + + case DEMUX_GET_LENGTH: + pi64 = (int64_t*)va_arg( args, int64_t * ); + *pi64 = p_sys->i_length; + return VLC_SUCCESS; + + case DEMUX_SET_TIME: + i64 = (int64_t)va_arg( args, int64_t ); + + if( i64 >= 0 && i64 <= p_sys->i_length ) + { + ModPlug_Seek( p_sys->f, i64 / 1000 ); + date_Set( &p_sys->pts, i64 ); + + return VLC_SUCCESS; + } + return VLC_EGENERIC; + + case DEMUX_HAS_UNSUPPORTED_META: + { + bool *pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = false; /* FIXME I am not sure of this one */ + return VLC_SUCCESS; + } + case DEMUX_GET_META: + { + vlc_meta_t *p_meta = (vlc_meta_t *)va_arg( args, vlc_meta_t* ); + unsigned i_num_samples = ModPlug_NumSamples( p_sys->f ), + i_num_instruments = ModPlug_NumInstruments( p_sys->f ); + unsigned i_num_patterns = ModPlug_NumPatterns( p_sys->f ), + i_num_channels = ModPlug_NumChannels( p_sys->f ); + // unsigned modType = ModPlug_GetModuleType( p_sys->f ); + + char psz_temp[2048]; /* 32 * 240 max, but only need start */ + char *psz_module_info, *psz_instrument_info; + unsigned i_temp_index = 0; + const char *psz_name = ModPlug_GetName( p_sys->f ); + if( psz_name && *psz_name ) + vlc_meta_SetTitle( p_meta, psz_name ); + + /* Comment field from artist - not in every type of MOD */ + psz_name = ModPlug_GetMessage( p_sys->f ); + if( psz_name && *psz_name ) + vlc_meta_SetDescription( p_meta, psz_name ); + + /* Instruments only in newer MODs - so don't show if 0 */ + if( asprintf( &psz_instrument_info, ", %i Instruments", + i_num_instruments ) >= 0 ) + { + if( asprintf( &psz_module_info, + "%i Channels, %i Patterns\n" + "%i Samples%s\n", + i_num_channels, i_num_patterns, i_num_samples, + ( i_num_instruments ? psz_instrument_info : "" ) ) >= 0 ) { - *pf = (double)p_sys->i_time / (double)p_sys->i_length; - return VLC_SUCCESS; + vlc_meta_AddExtra( p_meta, "Module Information", + psz_module_info ); + free( psz_module_info ); } - return VLC_EGENERIC; - case DEMUX_SET_POSITION: - f = (double) va_arg( args, double ); + free( psz_instrument_info ); + } - i64 = f * p_sys->i_length; - if( i64 >= 0 && i64 <= p_sys->i_length ) + /* Make list of instruments (XM, IT, etc) */ + if( i_num_instruments ) + { + i_temp_index = 0; + for( unsigned i = 0; i < i_num_instruments && i_temp_index < sizeof(psz_temp); i++ ) { - ModPlug_Seek( p_sys->f, i64 / 1000 ); - p_sys->i_time = i64 + 1; - es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); - - return VLC_SUCCESS; + char lBuffer[33]; + ModPlug_InstrumentName( p_sys->f, i, lBuffer ); + if ( !lBuffer[0] ) continue; // don't add empty fields. + i_temp_index += snprintf( &psz_temp[i_temp_index], sizeof(psz_temp) - i_temp_index, "%s\n", lBuffer ); } - return VLC_EGENERIC; - case DEMUX_GET_TIME: - pi64 = (int64_t*)va_arg( args, int64_t * ); - *pi64 = p_sys->i_time; - return VLC_SUCCESS; + vlc_meta_AddExtra( p_meta, "Instruments", psz_temp ); + } + + /* Make list of samples */ + for( unsigned int i = 0; i < i_num_samples && i_temp_index < sizeof(psz_temp); i++ ) + { + char psz_buffer[33]; + ModPlug_SampleName( p_sys->f, i, psz_buffer ); + if ( !psz_buffer[0] ) continue; // don't add empty fields. + i_temp_index += snprintf( &psz_temp[i_temp_index], sizeof(psz_temp) - i_temp_index, "%s\n", psz_buffer ); + } + + vlc_meta_AddExtra( p_meta, "Samples", psz_temp ); + + return VLC_SUCCESS; + } + + case DEMUX_GET_FPS: /* meaningless */ + default: + return VLC_EGENERIC; + } +} + +/***************************************************************************** + * Validate: try to ensure it is really a mod file. + * The tests are not robust enough to replace extension checks in the general + * cases. + * TODO: maybe it should return a score, which will be used to bypass the + * extension checks when high enough. + *****************************************************************************/ +static int Validate( demux_t *p_demux, const char *psz_ext ) +{ + static const struct + { + int i_offset; + const char *psz_marker; + } p_marker[] = { + { 0, "ziRCONia" }, /* MMCMP files */ + { 0, "Extended Module" }, /* XM */ + { 44, "SCRM" }, /* S3M */ + { 0, "IMPM" }, /* IT */ + { 0, "MThd" }, /* MID */ + { 0, "GF1PATCH110" }, /* PAT */ + { 20, "!SCREAM!" }, /* STM */ + { 20, "!Scream!" }, /* STM */ + { 20, "BMOD2STM" }, /* STM */ + { 0, "MMD0" }, /* MED v0 */ + { 0, "MMD1" }, /* MED v1 */ + { 0, "MMD2" }, /* MED v2 */ + { 0, "MMD3" }, /* MED v3 */ + { 0, "MTM" }, /* MTM */ + { 0, "DMDL" }, /* MDL */ + { 0, "DBM0" }, /* DBM */ + { 0, "if" }, /* 669 */ + { 0, "JN" }, /* 669 */ + { 0, "FAR\xfe" }, /* FAR */ + { 0, "Extreme" }, /* AMS */ + { 0, "OKTASONGCMOD" }, /* OKT */ + { 44, "PTMF" }, /* PTM */ + { 0, "MAS_UTrack_V00" }, /* Ult */ + { 0, "DDMF" }, /* DMF */ + { 8, "DSMFSONG" }, /* DSM */ + { 0, "\xc1\x83\x2a\x9e" }, /* UMX */ + { 0, "ASYLUM Music Format V1.0" }, /* AMF Type 0 */ + { 0, "AMF" }, /* AMF */ + { 0, "PSM\xfe" }, /* PSM */ + { 0, "PSM " }, /* PSM */ + { 0, "MT20" }, /* MT2 */ + + { 1080, "M.K." }, /* MOD */ + { 1080, "M!K!" }, + { 1080, "M&K!" }, + { 1080, "N.T." }, + { 1080, "CD81" }, + { 1080, "OKTA" }, + { 1080, "16CN" }, + { 1080, "32CN" }, + { 1080, "FLT" }, + { 1080, "TDZ" }, + { 1081, "CHN" }, + { 1082, "CH" }, + + { -1, NULL } + }; + + const uint8_t *p_peek; + const int i_peek = stream_Peek( p_demux->s, &p_peek, 2048 ); + if( i_peek < 4 ) + return VLC_EGENERIC; - case DEMUX_GET_LENGTH: - pi64 = (int64_t*)va_arg( args, int64_t * ); - *pi64 = p_sys->i_length; + for( int i = 0; p_marker[i].i_offset >= 0; i++ ) + { + const char *psz_marker = p_marker[i].psz_marker; + const int i_size = strlen( psz_marker ); + const int i_offset = p_marker[i].i_offset; + + if( i_peek < i_offset + i_size ) + continue; + + if( !memcmp( &p_peek[i_offset], psz_marker, i_size ) ) return VLC_SUCCESS; + } + + /* The only two format left untested are ABC and MOD(old version) + * ant they are difficult to test :( */ - case DEMUX_SET_TIME: - i64 = (int64_t)va_arg( args, int64_t ); + /* Check for ABC + * TODO i_peek = 2048 is too big for such files */ + if( !strcasecmp( psz_ext, "abc" ) ) + { + bool b_k = false; + bool b_tx = false; + + for( int i = 0; i < i_peek-1; i++ ) + { + b_k |= p_peek[i+0] == 'K' && p_peek[i+1] == ':'; + b_tx |= ( p_peek[i+0] == 'X' || p_peek[i+0] == 'T') && p_peek[i+1] == ':'; + } + if( !b_k || !b_tx ) + return VLC_EGENERIC; + return VLC_SUCCESS; + } - if( i64 >= 0 && i64 <= p_sys->i_length ) + /* Check for MOD */ + if( !strcasecmp( psz_ext, "mod" ) && i_peek >= 20 + 15 * 30 ) + { + /* Check that the name is correctly null padded */ + const uint8_t *p = memchr( p_peek, '\0', 20 ); + if( p ) + { + for( ; p < &p_peek[20]; p++ ) { - ModPlug_Seek( p_sys->f, i64 / 1000 ); - p_sys->i_time = i64 + 1; - es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); + if( *p ) + return VLC_EGENERIC; + } + } + + for( int i = 0; i < 15; i++ ) + { + const uint8_t *p_sample = &p_peek[20 + i*30]; - return VLC_SUCCESS; + /* Check correct null padding */ + const uint8_t *p = memchr( &p_sample[0], '\0', 22 ); + if( p ) + { + for( ; p < &p_sample[22]; p++ ) + { + if( *p ) + return VLC_EGENERIC; + } } - return VLC_EGENERIC; - case DEMUX_GET_FPS: /* meaningless */ - default: - return VLC_EGENERIC; + if( p_sample[25] > 64 ) /* Volume value */ + return VLC_EGENERIC; + } + return VLC_SUCCESS; } + return VLC_EGENERIC; } -