#endif
#include <vlc/vlc.h>
+#include <vlc_plugin.h>
#include <vlc_demux.h>
#include <vlc_aout.h>
#include <vlc_codecs.h>
set_description (_("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 ();
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;
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) */
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;
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:
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);