diff --git a/plugins/aja/aja-common.cpp b/plugins/aja/aja-common.cpp index 379d4b4e9..d8e191086 100644 --- a/plugins/aja/aja-common.cpp +++ b/plugins/aja/aja-common.cpp @@ -148,7 +148,7 @@ void populate_io_selection_output_list(const std::string &cardID, } void populate_video_format_list(NTV2DeviceID deviceID, obs_property_t *list, - NTV2VideoFormat genlockFormat) + NTV2VideoFormat genlockFormat, bool want4KHFR) { VideoFormatList videoFormats = {}; VideoStandardList orderedStandards = {}; @@ -165,10 +165,12 @@ void populate_video_format_list(NTV2DeviceID deviceID, obs_property_t *list, if (NTV2DeviceCanDo4KVideo(deviceID)) { orderedStandards.push_back(NTV2_STANDARD_3840i); orderedStandards.push_back(NTV2_STANDARD_3840x2160p); - orderedStandards.push_back(NTV2_STANDARD_3840HFR); + if (want4KHFR) + orderedStandards.push_back(NTV2_STANDARD_3840HFR); orderedStandards.push_back(NTV2_STANDARD_4096i); orderedStandards.push_back(NTV2_STANDARD_4096x2160p); - orderedStandards.push_back(NTV2_STANDARD_4096HFR); + if (want4KHFR) + orderedStandards.push_back(NTV2_STANDARD_4096HFR); } aja::GetSortedVideoFormats(deviceID, orderedStandards, videoFormats); diff --git a/plugins/aja/aja-common.hpp b/plugins/aja/aja-common.hpp index 9268c80f7..8fecd3063 100644 --- a/plugins/aja/aja-common.hpp +++ b/plugins/aja/aja-common.hpp @@ -41,7 +41,8 @@ extern void populate_io_selection_output_list(const std::string &cardID, obs_property_t *list); extern void populate_video_format_list(NTV2DeviceID deviceID, obs_property_t *list, - NTV2VideoFormat genlockFormat = NTV2_FORMAT_UNKNOWN); + NTV2VideoFormat genlockFormat = NTV2_FORMAT_UNKNOWN, + bool want4KHFR = false); extern void populate_pixel_format_list(NTV2DeviceID deviceID, obs_property_t *list); extern void populate_sdi_transport_list(obs_property_t *list, IOSelection io); diff --git a/plugins/aja/aja-output.cpp b/plugins/aja/aja-output.cpp index 08b2bba3f..83e8bb8bd 100644 --- a/plugins/aja/aja-output.cpp +++ b/plugins/aja/aja-output.cpp @@ -827,7 +827,8 @@ bool aja_output_device_changed(void *data, obs_properties_t *props, } obs_property_list_clear(vid_fmt_list); - populate_video_format_list(deviceID, vid_fmt_list, videoFormatChannel1); + populate_video_format_list(deviceID, vid_fmt_list, videoFormatChannel1, + false); obs_property_list_clear(pix_fmt_list); populate_pixel_format_list(deviceID, pix_fmt_list); diff --git a/plugins/aja/aja-source.cpp b/plugins/aja/aja-source.cpp index 2a60f1f66..301b069f2 100644 --- a/plugins/aja/aja-source.cpp +++ b/plugins/aja/aja-source.cpp @@ -665,7 +665,8 @@ bool aja_source_device_changed(void *data, obs_properties_t *props, obs_property_list_clear(vid_fmt_list); obs_property_list_add_int(vid_fmt_list, obs_module_text("Auto"), kAutoDetect); - populate_video_format_list(deviceID, vid_fmt_list, videoFormatChannel1); + populate_video_format_list(deviceID, vid_fmt_list, videoFormatChannel1, + true); obs_property_list_clear(pix_fmt_list); obs_property_list_add_int(pix_fmt_list, obs_module_text("Auto"),