From c8301a986860b8a4565345f081a63f9924b82606 Mon Sep 17 00:00:00 2001 From: Christopher Snowhill Date: Sun, 9 Jan 2022 17:05:10 -0800 Subject: [PATCH] CoreAudio input takes priority over FFmpeg on 10.14.x and older --- Plugins/CoreAudio/CoreAudioDecoder.m | 5 ++++- Plugins/FFMPEG/FFMPEGDecoder.m | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Plugins/CoreAudio/CoreAudioDecoder.m b/Plugins/CoreAudio/CoreAudioDecoder.m index 02d2fa560..90c48c902 100644 --- a/Plugins/CoreAudio/CoreAudioDecoder.m +++ b/Plugins/CoreAudio/CoreAudioDecoder.m @@ -312,7 +312,10 @@ static SInt64 getSizeProc(void* clientData) { + (float)priority { - return 1.0; + if (@available(macOS 10.15, *)) + return 1.0; + else + return 1.5; } - (NSDictionary *)properties diff --git a/Plugins/FFMPEG/FFMPEGDecoder.m b/Plugins/FFMPEG/FFMPEGDecoder.m index ba7285e03..77fbe4d14 100644 --- a/Plugins/FFMPEG/FFMPEGDecoder.m +++ b/Plugins/FFMPEG/FFMPEGDecoder.m @@ -589,7 +589,10 @@ int lockmgr_callback(void ** mutex, enum AVLockOp op) + (float)priority { - return 1.5; + if (@available(macOS 10.15, *)) + return 1.5; + else + return 1.0; }