summaryrefslogtreecommitdiffstats
path: root/libhb/handbrake
diff options
context:
space:
mode:
authoragalin89 <[email protected]>2020-09-28 18:57:18 +0100
committerScott <[email protected]>2020-10-04 22:49:47 +0100
commitd0049cb0d12a9f3ec6eed6a27fca7cd3e67d31c2 (patch)
treee38d5fcba26890b095ab488e048af5e0adb9957e /libhb/handbrake
parent7d233da7d69a2ddaae8df4fe949c255ef948e285 (diff)
qsv: added hb_qsv_adapters_list function and make proper multiple gpu adapters implementation
Diffstat (limited to 'libhb/handbrake')
-rw-r--r--libhb/handbrake/qsv_common.h4
-rw-r--r--libhb/handbrake/qsv_libav.h3
2 files changed, 3 insertions, 4 deletions
diff --git a/libhb/handbrake/qsv_common.h b/libhb/handbrake/qsv_common.h
index 2fc70eac1..563b01789 100644
--- a/libhb/handbrake/qsv_common.h
+++ b/libhb/handbrake/qsv_common.h
@@ -84,7 +84,7 @@ int hb_qsv_video_encoder_is_enabled(int encoder);
int hb_qsv_audio_encoder_is_enabled(int encoder);
int hb_qsv_info_init();
void hb_qsv_info_print();
-int hb_qsv_query_adapters(hb_job_t *job);
+hb_list_t* hb_qsv_adapters_list();
hb_qsv_info_t* hb_qsv_info_get(int encoder);
int qsv_hardware_generation(int cpu_platform);
@@ -197,10 +197,10 @@ float hb_qsv_atof (const char *str, int *err);
int hb_qsv_param_default_async_depth();
int hb_qsv_param_default_preset (hb_qsv_param_t *param, mfxVideoParam *videoParam, hb_qsv_info_t *info, const char *preset);
int hb_qsv_param_default (hb_qsv_param_t *param, mfxVideoParam *videoParam, hb_qsv_info_t *info);
-int hb_qsv_param_parse_decoder (hb_job_t *job, const char *key, const char *value);
int hb_qsv_param_parse (hb_qsv_param_t *param, hb_qsv_info_t *info, hb_job_t *job, const char *key, const char *value);
int hb_qsv_profile_parse (hb_qsv_param_t *param, hb_qsv_info_t *info, const char *profile_key, const int codec);
int hb_qsv_level_parse (hb_qsv_param_t *param, hb_qsv_info_t *info, const char *level_key);
+int hb_qsv_param_parse_dx_index (hb_job_t *job, const int dx_index);
typedef struct
{
diff --git a/libhb/handbrake/qsv_libav.h b/libhb/handbrake/qsv_libav.h
index 592eeec36..071325c9f 100644
--- a/libhb/handbrake/qsv_libav.h
+++ b/libhb/handbrake/qsv_libav.h
@@ -333,8 +333,7 @@ typedef struct hb_qsv_context {
int num_cpu_filters;
int qsv_filters_are_enabled;
char *qsv_device;
- mfxU32 num_adapters_available;
- mfxAdaptersInfo adapters_info;
+ int dx_index;
AVBufferRef *hb_hw_device_ctx;
HBQSVFramesContext *hb_dec_qsv_frames_ctx;
HBQSVFramesContext *hb_vpp_qsv_frames_ctx;