From 9c91843d9879bc29854fac5cc304ae8c23b4fc8c Mon Sep 17 00:00:00 2001
From: Kaiwen Xu <kevin@kevxu.net>
Date: Sat, 27 Jun 2020 03:42:26 -0700
Subject: [PATCH] Expose videotoolbox hardware decoder (#261)

---
 gui/include/videodecoder.h | 2 ++
 gui/src/settings.cpp       | 3 ++-
 gui/src/settingsdialog.cpp | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/gui/include/videodecoder.h b/gui/include/videodecoder.h
index 84ccf0a..9fa1d5b 100644
--- a/gui/include/videodecoder.h
+++ b/gui/include/videodecoder.h
@@ -38,6 +38,7 @@ typedef enum {
 	HW_DECODE_NONE = 0,
 	HW_DECODE_VAAPI = 1,
 	HW_DECODE_VDPAU = 2,
+	HW_DECODE_VIDEOTOOLBOX = 3,
 } HardwareDecodeEngine;
 
 
@@ -45,6 +46,7 @@ static const QMap<HardwareDecodeEngine, const char *> hardware_decode_engine_nam
 	{ HW_DECODE_NONE, "none"},
 	{ HW_DECODE_VAAPI, "vaapi"},
 	{ HW_DECODE_VDPAU, "vdpau"},
+	{ HW_DECODE_VIDEOTOOLBOX, "videotoolbox"},
 };
 
 class VideoDecoderException: public Exception
diff --git a/gui/src/settings.cpp b/gui/src/settings.cpp
index 90a5c03..8b23f55 100644
--- a/gui/src/settings.cpp
+++ b/gui/src/settings.cpp
@@ -97,7 +97,8 @@ unsigned int Settings::GetAudioBufferSizeRaw() const
 static const QMap<HardwareDecodeEngine, QString> hw_decode_engine_values = {
 	{ HW_DECODE_NONE, "none" },
 	{ HW_DECODE_VAAPI, "vaapi" },
-	{ HW_DECODE_VDPAU, "vdpau" }
+	{ HW_DECODE_VDPAU, "vdpau" },
+	{ HW_DECODE_VIDEOTOOLBOX, "videotoolbox" }
 };
 
 static const HardwareDecodeEngine hw_decode_engine_default = HW_DECODE_NONE;
diff --git a/gui/src/settingsdialog.cpp b/gui/src/settingsdialog.cpp
index 3b0892a..04352bc 100644
--- a/gui/src/settingsdialog.cpp
+++ b/gui/src/settingsdialog.cpp
@@ -158,7 +158,8 @@ SettingsDialog::SettingsDialog(Settings *settings, QWidget *parent) : QDialog(pa
 	hardware_decode_combo_box = new QComboBox(this);
 	static const QList<QPair<HardwareDecodeEngine, const char *>> hardware_decode_engines = {
 		{ HW_DECODE_NONE, "none"},
-		{ HW_DECODE_VAAPI, "vaapi"}
+		{ HW_DECODE_VAAPI, "vaapi"},
+		{ HW_DECODE_VIDEOTOOLBOX, "videotoolbox"}
 	};
 	auto current_hardware_decode_engine = settings->GetHardwareDecodeEngine();
 	for(const auto &p : hardware_decode_engines)