X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fsmf.c;h=baaf5aebb475e9b04ee17546a9c4ffe7401dd70f;hb=4239976f2b6aa0dd6a497d564eddab5a62165d6f;hp=7482724d24123187d4d8a3a49d8e9f0509e70cb9;hpb=a8907dbc0305bacf050c856919ba89060502aaf0;p=vlc diff --git a/modules/demux/smf.c b/modules/demux/smf.c index 7482724d24..baaf5aebb4 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) */ @@ -137,8 +185,8 @@ static int Open (vlc_object_t * p_this) p_demux->pf_control = Control; p_demux->p_sys = p_sys; - /* SMF expresses tempo in Beats-Per-Minute, default is 120 */ - date_Init (&p_sys->pts, ppqn * 120, 60); + /* Default SMF tempo is 120BPM, i.e. half a second per quarter note */ + date_Init (&p_sys->pts, ppqn * 2, 1); date_Set (&p_sys->pts, 1); p_sys->pulse = 0; p_sys->ppqn = ppqn; @@ -260,9 +308,11 @@ static int HandleMeta (demux_t *p_demux, mtrk_t *tr) { stream_t *s = p_demux->s; + demux_sys_t *p_sys = p_demux->p_sys; uint8_t *payload; uint8_t type; int32_t length; + int ret = 0; if (stream_Read (s, &type, 1) != 1) return -1; @@ -286,7 +336,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; @@ -333,26 +383,60 @@ int HandleMeta (demux_t *p_demux, mtrk_t *tr) if (tr->end != stream_Tell (s)) { msg_Err (p_demux, "misplaced end of track"); - stream_Seek (s, tr->end); + ret = -1; } break; case 0x51: /* Tempo */ - { - uint32_t tempo = (payload[0] << 16) | (payload[1] << 8) | payload[2]; - /* FIXME: change date */ - msg_Dbg (p_demux, "new tempo: %u", (unsigned)tempo); + if (length == 3) + { + uint32_t uspqn = (payload[0] << 16) + | (payload[1] << 8) | payload[2]; + unsigned tempo = 60 * 1000000 / (uspqn ? uspqn : 1); + msg_Dbg (p_demux, "tempo: %uus/qn -> %u BPM", + (unsigned)uspqn, tempo); + + if (tempo < TEMPO_MIN) + { + msg_Warn (p_demux, "tempo too slow -> %u BPM", TEMPO_MIN); + tempo = TEMPO_MIN; + } + else + if (tempo > TEMPO_MAX) + { + msg_Warn (p_demux, "tempo too fast -> %u BPM", TEMPO_MAX); + tempo = TEMPO_MAX; + } + date_Change (&p_sys->pts, p_sys->ppqn * tempo, 60); + } + else + ret = -1; break; - } case 0x54: /* SMPTE offset */ + if (length == 5) + msg_Warn (p_demux, "SMPTE offset not implemented"); + else + ret = -1; + break; + case 0x58: /* Time signature */ + if (length == 4) + ; + else + ret = -1; + break; + case 0x59: /* Key signature */ - msg_Warn (p_demux, "unimplemented SMF Meta Event type 0x%02X (%d bytes)", - type, length); + if (length == 2) + ; + else + ret = -1; break; case 0x7f: /* Proprietary event */ + msg_Dbg (p_demux, "ignored proprietary SMF Meta Event (%d bytes)", + length); break; default: @@ -397,11 +481,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: @@ -501,8 +586,24 @@ static int Demux (demux_t *p_demux) next_pulse = track->next; } + mtime_t cur_tick = (date_Get (&p_sys->pts) + 9999) / 10000, last_tick; if (next_pulse != UINT64_MAX) - date_Increment (&p_sys->pts, next_pulse - pulse); + last_tick = date_Increment (&p_sys->pts, next_pulse - pulse) / 10000; + else + last_tick = cur_tick + 1; + + /* MIDI Tick emulation (ping the decoder every 10ms) */ + while (cur_tick < last_tick) + { + block_t *tick = block_New (p_demux, 1); + if (tick == NULL) + break; + + tick->p_buffer[0] = 0xF9; + tick->i_dts = tick->i_pts = cur_tick++ * 10000; + es_out_Send (p_demux->out, p_sys->es, tick); + } + p_sys->pulse = next_pulse; return 1; @@ -514,5 +615,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; }