Expose videotoolbox hardware decoder (#261)

thestr4ng3r · Jun 27, 2020 · 9c91843 · 9c91843
1 parent 919d3b1
commit 9c91843
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/gui/include/videodecoder.h b/gui/include/videodecoder.h
@@ -38,13 +38,15 @@ typedef enum {
 	HW_DECODE_NONE = 0,
 	HW_DECODE_VAAPI = 1,
 	HW_DECODE_VDPAU = 2,
+	HW_DECODE_VIDEOTOOLBOX = 3,
 } HardwareDecodeEngine;
 
 
 static const QMap<HardwareDecodeEngine, const char *> hardware_decode_engine_names = {
 	{ 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
@@ -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
@@ -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)