X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fsmf.c;h=2785cec366009b88920f2e9ecb83b33ef7d2ef29;hb=e4f2a44d6587a115c56d40335a52b5ca7d864444;hp=a806b18599b18b5a3be547baf20f7b14cec68fe3;hpb=b398bb791544788bdf6b0bd2d4750f9f6eab3e62;p=vlc diff --git a/modules/demux/smf.c b/modules/demux/smf.c index a806b18599..2785cec366 100644 --- a/modules/demux/smf.c +++ b/modules/demux/smf.c @@ -19,21 +19,31 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include #include #include #include #include +#include + +#define TEMPO_MIN 20 +#define TEMPO_MAX 250 /* Beats per minute */ + static int Open (vlc_object_t *); static void Close (vlc_object_t *); vlc_module_begin (); - set_description (_("SMF demuxer")); + set_description (N_("SMF demuxer")); set_category (CAT_INPUT); set_subcategory (SUBCAT_INPUT_DEMUX); - set_capability ("demux2", 20); + set_capability ("demux", 20); set_callbacks (Open, Close); vlc_module_end (); @@ -73,13 +83,51 @@ static int Open (vlc_object_t * p_this) demux_sys_t *p_sys; const uint8_t *peek; unsigned tracks, ppqn; - vlc_bool_t multitrack; + bool multitrack; /* (Try to) parse the SMF header */ /* Header chunk always has 6 bytes payload */ if (stream_Peek (stream, &peek, 14) < 14) return VLC_EGENERIC; + /* Skip RIFF MIDI header if present */ + if (!memcmp (peek, "RIFF", 4) && !memcmp (peek + 8, "RMID", 4)) + { + uint32_t riff_len = GetDWLE (peek + 4); + + msg_Dbg (p_this, "detected RIFF MIDI file (%u bytes)", + (unsigned)riff_len); + if ((stream_Read (stream, NULL, 12) < 12)) + return VLC_EGENERIC; + + /* Look for the RIFF data chunk */ + for (;;) + { + char chnk_hdr[8]; + uint32_t chnk_len; + + if ((riff_len < 8) + || (stream_Read (stream, chnk_hdr, 8) < 8)) + return VLC_EGENERIC; + + riff_len -= 8; + chnk_len = GetDWLE (chnk_hdr + 4); + if (riff_len < chnk_len) + return VLC_EGENERIC; + riff_len -= chnk_len; + + if (!memcmp (chnk_hdr, "data", 4)) + break; /* found! */ + + if (stream_Read (stream, NULL, chnk_len) < (ssize_t)chnk_len) + return VLC_EGENERIC; + } + + /* Read real SMF header. Assume RIFF data chunk length is proper. */ + if (stream_Peek (stream, &peek, 14) < 14) + return VLC_EGENERIC; + } + if (memcmp (peek, "MThd\x00\x00\x00\x06", 8)) return VLC_EGENERIC; peek += 8; @@ -88,10 +136,10 @@ static int Open (vlc_object_t * p_this) switch (GetWBE (peek)) { case 0: - multitrack = VLC_FALSE; + multitrack = false; break; case 1: - multitrack = VLC_TRUE; + multitrack = true; break; default: /* We don't implement SMF2 (as do many) */ @@ -183,6 +231,10 @@ static int Open (vlc_object_t * p_this) es_format_t fmt; es_format_Init (&fmt, AUDIO_ES, VLC_FOURCC('M', 'I', 'D', 'I')); + fmt.audio.i_channels = 2; + fmt.audio.i_original_channels = fmt.audio.i_physical_channels = + AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT; + fmt.audio.i_rate = 44100; /* dummy value */ p_sys->es = es_out_Add (p_demux->out, &fmt); return VLC_SUCCESS; @@ -288,7 +340,7 @@ int HandleMeta (demux_t *p_demux, mtrk_t *tr) case 0x00: /* Sequence Number */ break; - case 0x01: /* Test (comment) */ + case 0x01: /* Text (comment) */ EnsureUTF8 ((char *)payload); msg_Info (p_demux, "Text : %s", (char *)payload); break; @@ -348,16 +400,16 @@ int HandleMeta (demux_t *p_demux, mtrk_t *tr) msg_Dbg (p_demux, "tempo: %uus/qn -> %u BPM", (unsigned)uspqn, tempo); - if (tempo < 20) + if (tempo < TEMPO_MIN) { - msg_Warn (p_demux, "tempo too slow -> 20 BPM"); - tempo = 20; + msg_Warn (p_demux, "tempo too slow -> %u BPM", TEMPO_MIN); + tempo = TEMPO_MIN; } else - if (tempo > 240) + if (tempo > TEMPO_MAX) { - msg_Warn (p_demux, "tempo too fast -> 240 BPM"); - tempo = 240; + msg_Warn (p_demux, "tempo too fast -> %u BPM", TEMPO_MAX); + tempo = TEMPO_MAX; } date_Change (&p_sys->pts, p_sys->ppqn * tempo, 60); } @@ -433,11 +485,12 @@ int HandleMessage (demux_t *p_demux, mtrk_t *tr) if (c == 0xF7) goto skip; } + /* never reached */ } case 0xFF: /* SMF Meta Event */ if (HandleMeta (p_demux, tr)) return -1; - /* We MUST NOT pass this event to forward. It would be + /* We MUST NOT pass this event forward. It would be * confused as a MIDI Reset real-time event. */ goto skip; case 0xF1: @@ -543,7 +596,7 @@ static int Demux (demux_t *p_demux) else last_tick = cur_tick + 1; - /* MIDI Tick emulation (ping the decider every 10ms) */ + /* MIDI Tick emulation (ping the decoder every 10ms) */ while (cur_tick < last_tick) { block_t *tick = block_New (p_demux, 1); @@ -566,5 +619,22 @@ static int Demux (demux_t *p_demux) *****************************************************************************/ static int Control (demux_t *p_demux, int i_query, va_list args) { - return demux2_vaControlHelper (p_demux->s, 0, -1, 0, 1, i_query, args); + demux_sys_t *p_sys = p_demux->p_sys; + + switch (i_query) + { + case DEMUX_GET_TIME: + { + *(va_arg (args, int64_t *)) = date_Get (&p_sys->pts); + return 0; + } +#if 0 + /* TODO: */ + case DEMUX_SET_TIME: + case DEMUX_GET_POSITION: + case DEMUX_SET_POSITION: + case DEMUX_GET_LENGTH: +#endif + } + return VLC_EGENERIC; }