summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2020-01-11 16:16:20 +0100
committerwm4 <wm4@nowhere>2020-01-11 16:35:30 +0100
commitf23dcfef82dece48f1e1877a66f2cc6f2a6501cb (patch)
tree8272e41e685e893db2fa38fc0702e6853915889b
parentcfceaec266d4db68bd7f217adc31396e42eaf101 (diff)
downloadmpv-f23dcfef82dece48f1e1877a66f2cc6f2a6501cb.tar.bz2
mpv-f23dcfef82dece48f1e1877a66f2cc6f2a6501cb.tar.xz
vo_gpu: hwdec_vaapi: silence warning during probing
hwdec_vaapi tries to probe all available surface formats in advance. For that, we iterate over _all_ profiles in an attempt to collect possible surface formats. This means we try profiles we normally wouldn't use for decoding or filtering, and which could be "unrelated" services. It seems some drivers report at least one profile, for which vaQueryConfigEntrypoints() fails (because the profile is not supported; not sure why it lists it, then). So turn the error message into a verbose message to avoid confusing output. Fixes: #7347
-rw-r--r--video/out/hwdec/hwdec_vaapi.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/video/out/hwdec/hwdec_vaapi.c b/video/out/hwdec/hwdec_vaapi.c
index 62c66e5b29..57251d5292 100644
--- a/video/out/hwdec/hwdec_vaapi.c
+++ b/video/out/hwdec/hwdec_vaapi.c
@@ -362,8 +362,11 @@ static void determine_working_formats(struct ra_hwdec *hw)
int num_ep = 0;
status = vaQueryConfigEntrypoints(p->display, profile, entrypoints,
&num_ep);
- if (!CHECK_VA_STATUS(hw, "vaQueryConfigEntrypoints()"))
+ if (status != VA_STATUS_SUCCESS) {
+ MP_VERBOSE(hw, "vaQueryConfigEntrypoints(): '%s' for profile %d",
+ vaErrorStr(status), (int)profile);
continue;
+ }
for (int ep = 0; ep < num_ep; ep++) {
VAConfigID config = VA_INVALID_ID;
status = vaCreateConfig(p->display, profile, entrypoints[ep],