Commit 6a5c7b98 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

aout: fix missing S/PDIF encapsulation

parent 73cc7aaa
...@@ -141,11 +141,7 @@ static int aout_FiltersPipelineCreate(vlc_object_t *obj, filter_t **filters, ...@@ -141,11 +141,7 @@ static int aout_FiltersPipelineCreate(vlc_object_t *obj, filter_t **filters,
if (n == max) if (n == max)
goto overflow; goto overflow;
filter_t *f = NULL; filter_t *f = TryFormat (obj, VLC_CODEC_FI32, &input);
if (!AOUT_FMT_LINEAR(outfmt))
f = TryFormat (obj, outfmt->i_format, &input);
if (f == NULL)
f = TryFormat (obj, VLC_CODEC_FI32, &input);
if (f == NULL) if (f == NULL)
f = TryFormat (obj, VLC_CODEC_FL32, &input); f = TryFormat (obj, VLC_CODEC_FL32, &input);
if (f == NULL) if (f == NULL)
...@@ -485,7 +481,20 @@ int aout_FiltersNew (audio_output_t *aout, ...@@ -485,7 +481,20 @@ int aout_FiltersNew (audio_output_t *aout,
var_AddCallback (aout, "equalizer", EqualizerCallback, NULL); var_AddCallback (aout, "equalizer", EqualizerCallback, NULL);
if (!AOUT_FMT_LINEAR(outfmt)) if (!AOUT_FMT_LINEAR(outfmt))
{ /* Non-linear output: just convert formats, no filters/visu */
if (!AOUT_FMTS_IDENTICAL(infmt, outfmt))
{
aout_FormatsPrint (aout, "pass-through:", infmt, outfmt);
owner->filters[0] = FindConverter(VLC_OBJECT(aout), infmt, outfmt);
if (owner->filters[0] == NULL)
{
msg_Err (aout, "cannot setup pass-through");
goto error;
}
owner->nb_filters++;
}
return 0; return 0;
}
const char *scaletempo = const char *scaletempo =
var_InheritBool (aout, "audio-time-stretch") ? "scaletempo" : NULL; var_InheritBool (aout, "audio-time-stretch") ? "scaletempo" : NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment