# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_demux.h>
#include <vlc_aout.h>
-#include <vlc_codecs.h>
#include <vlc_charset.h>
#include <limits.h>
+#include <assert.h>
+
#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_category (CAT_INPUT);
- set_subcategory (SUBCAT_INPUT_DEMUX);
- set_capability ("demux2", 20);
- set_callbacks (Open, Close);
-vlc_module_end ();
+vlc_module_begin ()
+ set_description (N_("SMF demuxer"))
+ set_category (CAT_INPUT)
+ set_subcategory (SUBCAT_INPUT_DEMUX)
+ set_capability ("demux", 20)
+ set_callbacks (Open, Close)
+vlc_module_end ()
static int Demux (demux_t *);
static int Control (demux_t *, int i_query, va_list args);
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;
/* 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);
+ date_Set (&p_sys->pts, 0);
p_sys->pulse = 0;
p_sys->ppqn = ppqn;
}
es_format_t fmt;
- es_format_Init (&fmt, AUDIO_ES, VLC_FOURCC('M', 'I', 'D', 'I'));
+ es_format_Init (&fmt, AUDIO_ES, VLC_CODEC_MIDI);
+ 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;
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;
}
free (payload);
- return 0;
+ return ret;
}
case 0xF0: /* System Exclusive */
switch (event)
{
- case 0xF0: /* System Specific */
+ case 0xF0: /* System Specific start */
+ case 0xF7: /* System Specific continuation */
{
- /* TODO: don't skip these */
- stream_Read (s, NULL, 1); /* Manuf ID */
- for (;;)
- {
- uint8_t c;
- if (stream_Read (s, &c, 1) != 1)
- return -1;
- if (c == 0xF7)
- goto skip;
- }
+ /* Variable length followed by SysEx event data */
+ int32_t len = ReadVarInt (s);
+ if (len == -1)
+ return -1;
+
+ block = stream_Block (s, len);
+ if (block == NULL)
+ return -1;
+ block = block_Realloc (block, 1, len);
+ if (block == NULL)
+ return -1;
+ block->p_buffer[0] = event;
+ goto send;
}
case 0xFF: /* SMF Meta Event */
if (HandleMeta (p_demux, tr))
/* We cannot handle undefined "common" (non-real-time)
* events inside SMF, as we cannot differentiate a
* one byte delta-time (< 0x80) from event data. */
- case 0xF7: /* End of sysex -> should never happen(?) */
- msg_Err (p_demux, "unknown MIDI event 0x%02X", event);
- return -1; /* undefined events */
default:
datalen = 0;
break;
}
+ break;
case 0xC0:
case 0xD0:
datalen = 1;
stream_Read (s, block->p_buffer + 2, datalen - 1);
}
- block->i_dts = block->i_pts = date_Get (&p_demux->p_sys->pts);
+send:
+ block->i_dts = block->i_pts = VLC_TS_0 + date_Get (&p_demux->p_sys->pts);
es_out_Send (p_demux->out, p_demux->p_sys->es, block);
skip:
if (pulse == UINT64_MAX)
return 0; /* all tracks are done */
- es_out_Control (p_demux->out, ES_OUT_SET_PCR, date_Get (&p_sys->pts));
+ es_out_Control (p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + date_Get (&p_sys->pts));
for (unsigned i = 0; i < p_sys->trackc; i++)
{
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);
break;
tick->p_buffer[0] = 0xF9;
- tick->i_dts = tick->i_pts = cur_tick++ * 10000;
+ tick->i_dts = tick->i_pts = VLC_TS_0 + cur_tick++ * 10000;
es_out_Send (p_demux->out, p_sys->es, tick);
}
projects / vlc / blobdiff