MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-28 08:05:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

[xcode] Explicitly set the frame duration of OPUS packets to 20 ms

Browse Source 
Protect against errors in case future versions of ffmpeg change default
This commit is contained in:
ejurgensen 2020-11-03 23:32:15 +01:00
parent ad4b886a11
commit db43d51568
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/transcode.c
View File

@ -283,7 +283,7 @@ init_settings(struct settings_ctx *settings, enum transcode_profile profile, str
if (quality && quality->bits_per_sample && (quality->bits_per_sample != 8 * av_get_bytes_per_sample(settings->sample_format))) if (quality && quality->bits_per_sample && (quality->bits_per_sample != 8 * av_get_bytes_per_sample(settings->sample_format)))
{ {
DPRINTF(E_LOG, L_XCODE, "Bug! Mismatch between profile and media quality\n"); DPRINTF(E_LOG, L_XCODE, "Bug! Mismatch between profile (%d bps) and media quality (%d bps)\n", 8 * av_get_bytes_per_sample(settings->sample_format), quality->bits_per_sample);
return -1; return -1;
} }
@ -449,6 +449,12 @@ stream_add(struct encode_ctx *ctx, struct stream_ctx *s, enum AVCodecID codec_id
if (codec_id == AV_CODEC_ID_MJPEG) if (codec_id == AV_CODEC_ID_MJPEG)
av_dict_set(&options, "huffman", "default", 0); av_dict_set(&options, "huffman", "default", 0);
// 20 ms frames is the current ffmpeg default, but we set it anyway, so that
// we don't risk issues if future versions change the default (it would become
// an issue because outputs/cast.c relies on 20 ms frames)
if (codec_id == AV_CODEC_ID_OPUS)
av_dict_set(&options, "frame_duration", "20", 0);
ret = avcodec_open2(s->codec, NULL, &options); ret = avcodec_open2(s->codec, NULL, &options);
if (ret < 0) if (ret < 0)
{ {