#include <vlc_plugin.h>
#include <vlc_aout.h>
#include <vlc_codec.h>
+#include <vlc_cpu.h>
+#include <vlc_dialog.h>
+#include <vlc_charset.h>
+
+/* On Win32, we link statically */
+#ifdef WIN32
+# define FLUIDSYNTH_NOT_A_DLL
+#endif
#include <fluidsynth.h>
fluid_settings_t *settings;
fluid_synth_t *synth;
int soundfont;
- audio_date_t end_date;
+ bool fixed;
+ date_t end_date;
};
if (p_dec->fmt_in.i_codec != VLC_CODEC_MIDI)
return VLC_EGENERIC;
- char *font_path = var_CreateGetNonEmptyString (p_this, "soundfont");
+ char *font_path = var_InheritString (p_this, "soundfont");
if (font_path == NULL)
{
- msg_Err (p_this, "sound fonts file required for synthesis");
+ msg_Err (p_this, "sound font file required for synthesis");
+ dialog_Fatal (p_this, _("MIDI synthesis not set up"),
+ _("A sound font file (.SF2) is required for MIDI synthesis.\n"
+ "Please install a sound font and configure it "
+ "from the VLC preferences (Codecs / Audio / FluidSynth).\n"));
return VLC_EGENERIC;
}
- p_dec->fmt_out.i_cat = AUDIO_ES;
- p_dec->fmt_out.audio.i_rate = 44100;
- p_dec->fmt_out.audio.i_channels = 2;
- p_dec->fmt_out.audio.i_original_channels =
- p_dec->fmt_out.audio.i_physical_channels =
- AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
- p_dec->fmt_out.i_codec = VLC_CODEC_FL32;
- p_dec->fmt_out.audio.i_bitspersample = 32;
-
p_dec->pf_decode_audio = DecodeBlock;
p_sys = p_dec->p_sys = malloc (sizeof (*p_sys));
if (p_sys == NULL)
p_sys->settings = new_fluid_settings ();
p_sys->synth = new_fluid_synth (p_sys->settings);
/* FIXME: I bet this is not thread-safe */
+ const char *lpath = ToLocale (font_path);
p_sys->soundfont = fluid_synth_sfload (p_sys->synth, font_path, 1);
- free (font_path);
+ LocaleFree (lpath);
if (p_sys->soundfont == -1)
{
- msg_Err (p_this, "cannot load sound fonts file");
+ msg_Err (p_this, "cannot load sound fonts file %s", font_path);
Close (p_this);
+ dialog_Fatal (p_this, _("MIDI synthesis not set up"),
+ _("The specified sound font file (%s) is incorrect.\n"
+ "Please install a valid sound font and reconfigure it "
+ "from the VLC preferences (Codecs / Audio / FluidSynth).\n"),
+ font_path);
+ free (font_path);
return VLC_EGENERIC;
}
+ free (font_path);
- aout_DateInit (&p_sys->end_date, p_dec->fmt_out.audio.i_rate);
- aout_DateSet (&p_sys->end_date, 0);
+ p_dec->fmt_out.i_cat = AUDIO_ES;
+ p_dec->fmt_out.audio.i_rate = 44100;
+ p_dec->fmt_out.audio.i_channels = 2;
+ p_dec->fmt_out.audio.i_original_channels =
+ p_dec->fmt_out.audio.i_physical_channels =
+ AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
+ if (HAVE_FPU)
+ {
+ p_dec->fmt_out.i_codec = VLC_CODEC_FL32;
+ p_dec->fmt_out.audio.i_bitspersample = 32;
+ p_sys->fixed = false;
+ }
+ else
+ {
+ p_dec->fmt_out.i_codec = VLC_CODEC_S16N;
+ p_dec->fmt_out.audio.i_bitspersample = 16;
+ p_sys->fixed = true;
+ }
+ date_Init (&p_sys->end_date, p_dec->fmt_out.audio.i_rate, 1);
+ date_Set (&p_sys->end_date, 0);
return VLC_SUCCESS;
}
{
block_t *p_block;
decoder_sys_t *p_sys = p_dec->p_sys;
+ aout_buffer_t *p_out = NULL;
if (pp_block == NULL)
return NULL;
p_block = *pp_block;
if (p_block == NULL)
return NULL;
+ *pp_block = NULL;
- if (p_block->i_pts && !aout_DateGet (&p_sys->end_date))
- aout_DateSet (&p_sys->end_date, p_block->i_pts);
+ if (p_block->i_pts > VLC_TS_INVALID && !date_Get (&p_sys->end_date))
+ date_Set (&p_sys->end_date, p_block->i_pts);
else
- if (p_block->i_pts < aout_DateGet (&p_sys->end_date))
+ if (p_block->i_pts < date_Get (&p_sys->end_date))
{
msg_Warn (p_dec, "MIDI message in the past?");
- block_Release (p_block);
- return NULL;
+ goto drop;
}
if (p_block->i_buffer < 1)
- return NULL;
+ goto drop;
uint8_t channel = p_block->p_buffer[0] & 0xf;
uint8_t p1 = (p_block->i_buffer > 1) ? (p_block->p_buffer[1] & 0x7f) : 0;
fluid_synth_pitch_bend (p_sys->synth, channel, (p1 << 7) | p2);
break;
}
- p_block->p_buffer += p_block->i_buffer;
- p_block->i_buffer = 0;
unsigned samples =
- (p_block->i_pts - aout_DateGet (&p_sys->end_date)) * 441 / 10000;
+ (p_block->i_pts - date_Get (&p_sys->end_date)) * 441 / 10000;
if (samples == 0)
return NULL;
- aout_buffer_t *p_out = decoder_NewAudioBuffer (p_dec, samples);
+ p_out = decoder_NewAudioBuffer (p_dec, samples);
if (p_out == NULL)
- {
- block_Release (p_block);
- return NULL;
- }
-
- p_out->start_date = aout_DateGet (&p_sys->end_date );
- p_out->end_date = aout_DateIncrement (&p_sys->end_date, samples);
- fluid_synth_write_float (p_sys->synth, samples,
- p_out->p_buffer, 0, 2,
- p_out->p_buffer, 1, 2);
+ goto drop;
+
+ p_out->i_pts = date_Get (&p_sys->end_date );
+ p_out->i_length = date_Increment (&p_sys->end_date, samples)
+ - p_out->i_pts;
+ if (!p_sys->fixed)
+ fluid_synth_write_float (p_sys->synth, samples,
+ p_out->p_buffer, 0, 2,
+ p_out->p_buffer, 1, 2);
+ else
+ fluid_synth_write_s16 (p_sys->synth, samples,
+ (int16_t *)p_out->p_buffer, 0, 2,
+ (int16_t *)p_out->p_buffer, 1, 2);
+drop:
+ block_Release (p_block);
return p_out;
}
projects / vlc / blobdiff