MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-14 08:15:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

[xcode] Change workaround in commit a0ac66e for AIFF issue

Browse Source 
This solution matches what we do for 'in' filter
This commit is contained in:
ejurgensen 2020-04-07 21:24:31 +02:00
parent a0ac66e020
commit a8e6522a3c
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/transcode.c
View File

@ -1022,6 +1022,10 @@ open_filter(struct stream_ctx *out_stream, struct stream_ctx *in_stream)
DPRINTF(E_DBG, L_XCODE, "Created 'in' filter: %s\n", args); DPRINTF(E_DBG, L_XCODE, "Created 'in' filter: %s\n", args);
// For some AIFF files, ffmpeg (3.4.6) will not give us a channel_layout (bug in ffmpeg?)
if (!out_stream->codec->channel_layout)
out_stream->codec->channel_layout = av_get_default_channel_layout(out_stream->codec->channels);
snprintf(args, sizeof(args), snprintf(args, sizeof(args),
"sample_fmts=%s:sample_rates=%d:channel_layouts=0x%"PRIx64, "sample_fmts=%s:sample_rates=%d:channel_layouts=0x%"PRIx64,
av_get_sample_fmt_name(out_stream->codec->sample_fmt), out_stream->codec->sample_rate, av_get_sample_fmt_name(out_stream->codec->sample_fmt), out_stream->codec->sample_rate,
@ -1241,12 +1245,7 @@ transcode_encode_setup(enum transcode_profile profile, struct media_quality *qua
if (!ctx->settings.channels && ctx->settings.encode_audio) if (!ctx->settings.channels && ctx->settings.encode_audio)
{ {
ctx->settings.channels = src_ctx->audio_stream.codec->channels; ctx->settings.channels = src_ctx->audio_stream.codec->channels;
// For some AIF files, ffmpeg (3.4.6) will not give us a channel_layout (bug in ffmpeg?)
if (src_ctx->audio_stream.codec->channel_layout)
ctx->settings.channel_layout = src_ctx->audio_stream.codec->channel_layout; ctx->settings.channel_layout = src_ctx->audio_stream.codec->channel_layout;
else
ctx->settings.channel_layout= av_get_default_channel_layout(ctx->settings.channels);
} }
if (ctx->settings.wavheader) if (ctx->settings.wavheader)