From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id EF3024444F for ; Sat, 10 Sep 2022 17:13:08 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3CCAA68BB29; Sat, 10 Sep 2022 20:13:07 +0300 (EEST) Received: from mout.web.de (mout.web.de [212.227.15.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6ABA068BA11 for ; Sat, 10 Sep 2022 20:13:00 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1662829979; bh=T6jJn2NBm5OgMuFcOKmGxsUEDdawTFrry8LMXbpmcZY=; h=X-UI-Sender-Class:Date:From:Subject:To; b=aUthEYQPeWI1I4A0mAnsYZmEQ4X42/W/maGM8gvzKsV3YITOeEjLR/CSj7TTqa7r2 h74NEgbZln9VlaTPi58UtmHIXAMaTmJwC4T4EEiwA8aJ6A+lkF9zFkK5aWfcxCt0mV qQVtREJiwEmiVToW5tHuIdU043n1/zSYDzWALyzg= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from [192.168.178.2] ([87.169.96.88]) by smtp.web.de (mrweb005 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MECGX-1of4GM2Tyv-00ANxV for ; Sat, 10 Sep 2022 19:12:59 +0200 Content-Type: multipart/mixed; boundary="------------d18pS7vF4LJwzNqCd0F1RBMq" Message-ID: <91efc26f-85a3-ceaa-c5ad-a2e23659c60f@web.de> Date: Sat, 10 Sep 2022 19:12:59 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.13.0 From: Andreas Kies To: FFmpeg development discussions and patches Content-Language: en-US X-Provags-ID: V03:K1:01WBGmw+zpICTmEGJ5W6ZVz1NcvWWO33b1uvN8TwAVZYHfWFZfZ z3QfiAhZYXhWHlQDcIdDU5XpN9MpeBBmUPWIWmJw4PpOaQKrAH82+Pe2k0GcXioMC3BwJJp pR3cdgYi/8Xs4/NvKjXzpRvyBqfy08XOXGll0qfWjEPQikcUyiEDSPe/Yk10PAkfJxF/Gb9 9BBzPdoCMourGcYPTQ17A== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:Lv0/FIeiNug=:y8vY3/VS844qQqIcF++v4V +PjuJWycmkWkBGnfV1b10VfAhDXqxTC+DxPCWur2zJeLaq6Z9iIYX3d/LI/faVPI99zbCfbp+ 7paNpWxtTY10UsCEaqow9dr9m57UqZVtoIOR3Rdq7bhl8nbEz9l5jUPMoXAtgh4uJva+uAy2I efYkTvnNxmmkaF+l3jD04qqZqYgtWMlLPjQ+uW2oaQDT6W0K32sO0VE2L9FxBhP5+zE4F+3ix aQ4dgAZRdVBiWNvuA7YGD+8pNsr/DFNFQC8OHunATF+B3zqAYkOntDsKv8JBJLpdaEdrxPXYe JQQSTszEtBE6qwe4m8OAoavFDT4bo4vFWoMlrp4i+PIJ50mKNGGm/wEvH2+ITF3PIkjJSAoht 86n4kC1DZ0F4TtzJrOmvTuMoLSdHSBKmteaU77DVZEPN/Ry88d57AV4GRTpbefPxgA1PlUJ3p tCcnDeWXhOMUJV1OMMvgZRsPCfWpivufD+JrMCX6kCgQKQhx/jZ5nbGYdte+b9gW0dnFRXuge J6Yh3fxFIi6aLBc1a3R6FCkWl2/Ybk9SuFIa/gmPHIjyy2dmsuMzWDDlNHwBj0+K4cT4zFcR6 KxiiRBd19yKmlkgqNGT0PDrTTVgSfRZg8vQHk3WW7F/FP7kE0DYImGSBApdXEHYxl74zAaeE7 9HyDhDBGTD8CruxOTR6i/vqlmdo+cweVIb7rwfHiXmUPMB4AQBAqEpWKi9+ATanc6Z617oh1i 2/Aipkg9nFvAESsw59IWHr+N39nDuxAp5KNCkDQttCmTRwkGGp/bGNCB3OwoPBCMawBx94YEJ CWfU/GL+u+e+vt8/ZIRLloPzvaDpr5m9QYoDuY1zy1RiuKlQ6w1BSROZs1AeKgrqwHRAj6cD2 ohm2OHgRVMMzPsL+UeBE6vpgSS/bm4Cz9+OOCrTuZ4YX4l4iDYZvxTyITYbalQS44/Qg5/MlR goir/I3YxWLFluVRqSD/ya8WpgrKMUHpyrIDhrHCdzXTkjpUfp/t+WBJO+BqrX/SPDWu4w796 DR6OHasB4Ml0BS/eKo5GqrqrYB6VK1H/oekjUcnbndJIVN+XVvXzhw1jMjfS1VtvkCDnHBOdh MllWQ6obt59Z+6/1mg0tYJ55zsEEd8FDkQdBykLspZg3Fv4QekEGKYod/ZtJCdEHzQZ+bm6Za RUcb0= Subject: [FFmpeg-devel] [PATCH] improve VAAPI error handling X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: This is a multi-part message in MIME format. --------------d18pS7vF4LJwzNqCd0F1RBMq Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit In case something is wrong in vaapi_device_create() you usually just get EINVAL, but not the real cause. This patch allows to return the cause as set in errno. EINVAL is used for kernel driver name mismatch. ENODEV in case vaGetDisplayDRM() fails. Also changed: Try X11 interface in case vaGetDisplayDRM() fails. Try to open any of the possible 8 devices. --------------d18pS7vF4LJwzNqCd0F1RBMq Content-Type: text/x-patch; charset=UTF-8; name="0001-improve-VAAPI-error-handling.patch" Content-Disposition: attachment; filename="0001-improve-VAAPI-error-handling.patch" Content-Transfer-Encoding: base64 RnJvbSAwOWMxMWViYmE2ODA3NmM1YzE3MjU0ZWE0MjE4M2U2MDMxYTlhNDRmIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBBbmRpayA8YW5kaWtAbG9jYWxob3N0PgpEYXRlOiBT YXQsIDEwIFNlcCAyMDIyIDE4OjIyOjAzICswMjAwClN1YmplY3Q6IFtQQVRDSF0gaW1wcm92 ZSBWQUFQSSBlcnJvciBoYW5kbGluZwoKLS0tCiBsaWJhdnV0aWwvaHdjb250ZXh0X3ZhYXBp LmMgfCAxMyArKysrKysrKysrLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTAgaW5zZXJ0aW9ucygr KSwgMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saWJhdnV0aWwvaHdjb250ZXh0X3Zh YXBpLmMgYi9saWJhdnV0aWwvaHdjb250ZXh0X3ZhYXBpLmMKaW5kZXggOWJhNTIyNWFkMi4u ODIyMThjNGM5YyAxMDA2NDQKLS0tIGEvbGliYXZ1dGlsL2h3Y29udGV4dF92YWFwaS5jCisr KyBiL2xpYmF2dXRpbC9od2NvbnRleHRfdmFhcGkuYwpAQCAtMTY1NSw2ICsxNjU1LDcgQEAg c3RhdGljIGludCB2YWFwaV9kZXZpY2VfY3JlYXRlKEFWSFdEZXZpY2VDb250ZXh0ICpjdHgs IGNvbnN0IGNoYXIgKmRldmljZSwKICAgICBWQURpc3BsYXkgZGlzcGxheSA9IE5VTEw7CiAg ICAgY29uc3QgQVZEaWN0aW9uYXJ5RW50cnkgKmVudDsKICAgICBpbnQgdHJ5X2RybSwgdHJ5 X3gxMSwgdHJ5X2FsbDsKKyAgICBpbnQgZGV2X2Vycm5vID0gRU5PRU5UOwogCiAgICAgcHJp diA9IGF2X21hbGxvY3ooc2l6ZW9mKCpwcml2KSk7CiAgICAgaWYgKCFwcml2KQpAQCAtMTY5 Miw2ICsxNjkzLDcgQEAgc3RhdGljIGludCB2YWFwaV9kZXZpY2VfY3JlYXRlKEFWSFdEZXZp Y2VDb250ZXh0ICpjdHgsIGNvbnN0IGNoYXIgKmRldmljZSwKICAgICAgICAgaWYgKGRldmlj ZSkgewogICAgICAgICAgICAgcHJpdi0+ZHJtX2ZkID0gb3BlbihkZXZpY2UsIE9fUkRXUik7 CiAgICAgICAgICAgICBpZiAocHJpdi0+ZHJtX2ZkIDwgMCkgeworICAgICAgICAgICAgICAg IGRldl9lcnJubyA9IGVycm5vOwogICAgICAgICAgICAgICAgIGF2X2xvZyhjdHgsIGxvZ2xl dmVsLCAiRmFpbGVkIHRvIG9wZW4gJXMgYXMgIgogICAgICAgICAgICAgICAgICAgICAgICAi RFJNIGRldmljZSBub2RlLlxuIiwgZGV2aWNlKTsKICAgICAgICAgICAgICAgICBicmVhazsK QEAgLTE3MDgsMTUgKzE3MTAsMTggQEAgc3RhdGljIGludCB2YWFwaV9kZXZpY2VfY3JlYXRl KEFWSFdEZXZpY2VDb250ZXh0ICpjdHgsIGNvbnN0IGNoYXIgKmRldmljZSwKICAgICAgICAg ICAgICAgICAgICAgICAgICAiL2Rldi9kcmkvcmVuZGVyRCVkIiwgMTI4ICsgbik7CiAgICAg ICAgICAgICAgICAgcHJpdi0+ZHJtX2ZkID0gb3BlbihwYXRoLCBPX1JEV1IpOwogICAgICAg ICAgICAgICAgIGlmIChwcml2LT5kcm1fZmQgPCAwKSB7CisgICAgICAgICAgICAgICAgICAg IGlmIChlcnJubyAhPSBFTk9FTlQpCisgICAgICAgICAgICAgICAgICAgICAgICBkZXZfZXJy bm8gPSBlcnJubzsKICAgICAgICAgICAgICAgICAgICAgYXZfbG9nKGN0eCwgQVZfTE9HX1ZF UkJPU0UsICJDYW5ub3Qgb3BlbiAiCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAiRFJN IHJlbmRlciBub2RlIGZvciBkZXZpY2UgJWQuXG4iLCBuKTsKLSAgICAgICAgICAgICAgICAg ICAgYnJlYWs7CisgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAg ICAgIH0KICNpZiBDT05GSUdfTElCRFJNCiAgICAgICAgICAgICAgICAgaWYgKGtlcm5lbF9k cml2ZXIpIHsKICAgICAgICAgICAgICAgICAgICAgZHJtVmVyc2lvbiAqaW5mbzsKICAgICAg ICAgICAgICAgICAgICAgaW5mbyA9IGRybUdldFZlcnNpb24ocHJpdi0+ZHJtX2ZkKTsKICAg ICAgICAgICAgICAgICAgICAgaWYgKHN0cmNtcChrZXJuZWxfZHJpdmVyLT52YWx1ZSwgaW5m by0+bmFtZSkpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGRldl9lcnJubyA9IEVJTlZB TDsKICAgICAgICAgICAgICAgICAgICAgICAgIGF2X2xvZyhjdHgsIEFWX0xPR19WRVJCT1NF LCAiSWdub3JpbmcgZGV2aWNlICVkICIKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAid2l0aCBub24tbWF0Y2hpbmcga2VybmVsIGRyaXZlciAoJXMpLlxuIiwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBuLCBpbmZvLT5uYW1lKTsKQEAgLTE3NDQsOSArMTc0 OSw5IEBAIHN0YXRpYyBpbnQgdmFhcGlfZGV2aWNlX2NyZWF0ZShBVkhXRGV2aWNlQ29udGV4 dCAqY3R4LCBjb25zdCBjaGFyICpkZXZpY2UsCiAKICAgICAgICAgZGlzcGxheSA9IHZhR2V0 RGlzcGxheURSTShwcml2LT5kcm1fZmQpOwogICAgICAgICBpZiAoIWRpc3BsYXkpIHsKKyAg ICAgICAgICAgIGRldl9lcnJubyA9IEVOT0RFVjsKICAgICAgICAgICAgIGF2X2xvZyhjdHgs IEFWX0xPR19WRVJCT1NFLCAiQ2Fubm90IG9wZW4gYSBWQSBkaXNwbGF5ICIKICAgICAgICAg ICAgICAgICAgICAiZnJvbSBEUk0gZGV2aWNlICVzLlxuIiwgZGV2aWNlKTsKLSAgICAgICAg ICAgIHJldHVybiBBVkVSUk9SX0VYVEVSTkFMOwogICAgICAgICB9CiAgICAgICAgIGJyZWFr OwogICAgIH0KQEAgLTE3NTcsNiArMTc2Miw4IEBAIHN0YXRpYyBpbnQgdmFhcGlfZGV2aWNl X2NyZWF0ZShBVkhXRGV2aWNlQ29udGV4dCAqY3R4LCBjb25zdCBjaGFyICpkZXZpY2UsCiAg ICAgICAgIC8vIFRyeSB0byBvcGVuIHRoZSBkZXZpY2UgYXMgYW4gWDExIGRpc3BsYXkuCiAg ICAgICAgIHByaXYtPngxMV9kaXNwbGF5ID0gWE9wZW5EaXNwbGF5KGRldmljZSk7CiAgICAg ICAgIGlmICghcHJpdi0+eDExX2Rpc3BsYXkpIHsKKyAgICAgICAgICAgIGlmIChlcnJubyAh PSBFTk9FTlQpCisgICAgICAgICAgICAgICAgZGV2X2Vycm5vID0gZXJybm87CiAgICAgICAg ICAgICBhdl9sb2coY3R4LCBBVl9MT0dfVkVSQk9TRSwgIkNhbm5vdCBvcGVuIFgxMSBkaXNw bGF5ICIKICAgICAgICAgICAgICAgICAgICAiJXMuXG4iLCBYRGlzcGxheU5hbWUoZGV2aWNl KSk7CiAgICAgICAgIH0gZWxzZSB7CkBAIC0xNzgwLDcgKzE3ODcsNyBAQCBzdGF0aWMgaW50 IHZhYXBpX2RldmljZV9jcmVhdGUoQVZIV0RldmljZUNvbnRleHQgKmN0eCwgY29uc3QgY2hh ciAqZGV2aWNlLAogICAgICAgICBlbHNlCiAgICAgICAgICAgICBhdl9sb2coY3R4LCBBVl9M T0dfRVJST1IsICJObyBWQSBkaXNwbGF5IGZvdW5kIGZvciAiCiAgICAgICAgICAgICAgICAg ICAgImFueSBkZWZhdWx0IGRldmljZS5cbiIpOwotICAgICAgICByZXR1cm4gQVZFUlJPUihF SU5WQUwpOworICAgICAgICByZXR1cm4gQVZFUlJPUihkZXZfZXJybm8pOwogICAgIH0KIAog ICAgIGVudCA9IGF2X2RpY3RfZ2V0KG9wdHMsICJkcml2ZXIiLCBOVUxMLCAwKTsKLS0gCjIu MzQuMQoK --------------d18pS7vF4LJwzNqCd0F1RBMq Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". --------------d18pS7vF4LJwzNqCd0F1RBMq--