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 C2F0747961 for ; Sat, 28 Oct 2023 06:34:02 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4798B68CBB4; Sat, 28 Oct 2023 09:33:59 +0300 (EEST) Received: from out162-62-58-211.mail.qq.com (out162-62-58-211.mail.qq.com [162.62.58.211]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6E11768C985 for ; Sat, 28 Oct 2023 09:33:50 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1698474816; bh=WKQObHQq39ucwU7TPObBG/SO6Wl/LQbTX03+RN5jhbw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hZ10+kjvofTVt3WZQGJEfo2oTHiyPJIP4V+e5xZ2zNClGft5yFfgdmftp0VsB26Qk AE9yk1hh3V4P5sm2DbSQDPSLSgQqg4owvzvpSIwJHZqIWIuxcNauKsRA1Wc42g9XfV Fq1sk2/VU9D31bwOu7rM7vUd8nGiKlsq5JV7oOFs= Received: from localhost.localdomain ([121.34.200.120]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id 863BE4C5; Sat, 28 Oct 2023 14:33:35 +0800 X-QQ-mid: xmsmtpt1698474815teogs2aeh Message-ID: X-QQ-XMAILINFO: OQ59tfF64tJLD9BMCGhUiK7k6CTiXXlPn+XR5wfdp1jVwQQmNFGsSn4mzPnHgr PAGaGd+vJbTNByeMo0BMmptQ2mxI0otNVTojT0wBEfe4u5D0Jl+z3sVlzxX131OncE9+oWEL9K2z YcK1gQmrHey01PGx5BxQWzcJ91+T8JfmxTo4DF20qnJJ/Q5ldb6c+NjjpTwPapuuW2KATv/tczpH XIb/nvZ6hXAO4cEQOcwxZYEkTNJAF91OXCn/xBNiF/6Z/q4w7/uXClUTh41lJCgRJgB2YAPjotcC 1axJ298eAmAwFD5IUiHWHzlMGOBZSuRnqqX3PhhdoAsUGMn4CShSROsLbI/t0dvH4YZJzxC/re7u /fuWi5tkIkd+5o7wkBLybXIVNks78mXW3GSQEI+YYCzpxW+SYuMM/tzffBKvaBhJ4aeG4sa/iESF t/WYoprbmze9AX8JE1bpa1G+ejTpIiMiz2f735SRX68YTExNO+mFOtM+RcCeIqqIkAjqz5XRdNRA ApHQvms9y/VEG+F1nOY/6xhNwhQBvwqS8RjxHRyZ/Cit9A8OfxH/3wjwkPU9o47FMeGfUF+CWgmP vl8DP34blRFRWFulyRLs9OmkZ65ekjR4DP6dFqbsTkpaL8/gQSFaM/257n5bHQtADOG5FEfYgmXk dEs957jY4RpCyVUVPbQuPID4tcGFBF6VU3txVXDz5hWpYODMSqtizaCXIYKdhb4xnq9QhV9BNhy6 Aw7vEFc2tgjgTXwBqUaa1UZ+eWvrix3KYO0RPkn0hnrerLFfNaTpgRpE0KHqnZdCC9mWxSqwAiCv vR83Ep+BkTJ+FX9pXBsDP0NNfXpNn2cRCyeF/yD2LLwYNCkI1YO2ZStcRwWIb1lydZTmoEgaGUky l/oor36GwF4Itc7aABhxmOqzni4uDuP8vultQhpd2wyAzSvA8lneGRf/QKwo5Ts7EVnJkmRTC7hU HIncA1agRt/TMfIEo7p86828X3lrpQ X-QQ-XMRINFO: NS+P29fieYNw95Bth2bWPxk= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 28 Oct 2023 14:33:31 +0800 X-OQ-MSGID: <20231028063331.30060-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/2] avutil/hwcontext_vaapi: return ENOSYS for unsupported operation 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 Cc: Zhao Zhili Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Zhao Zhili av_hwframe_transfer_data try with src_ctx first. If the operation failed with AVERROR(ENOSYS), it will try again with dst_ctx. Return AVERROR(EINVAL) makes the second step being skipped. --- libavutil/hwcontext_vaapi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index 558fed94c6..12bc95119a 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -217,7 +217,7 @@ static int vaapi_get_image_format(AVHWDeviceContext *hwdev, return 0; } } - return AVERROR(EINVAL); + return AVERROR(ENOSYS); } static int vaapi_frames_get_constraints(AVHWDeviceContext *hwdev, @@ -817,7 +817,7 @@ static int vaapi_map_frame(AVHWFramesContext *hwfc, err = vaapi_get_image_format(hwfc->device_ctx, dst->format, &image_format); if (err < 0) { // Requested format is not a valid output format. - return AVERROR(EINVAL); + return err; } map = av_malloc(sizeof(*map)); @@ -992,7 +992,7 @@ static int vaapi_map_to_memory(AVHWFramesContext *hwfc, AVFrame *dst, if (dst->format != AV_PIX_FMT_NONE) { err = vaapi_get_image_format(hwfc->device_ctx, dst->format, NULL); if (err < 0) - return AVERROR(ENOSYS); + return err; } err = vaapi_map_frame(hwfc, dst, src, flags); -- 2.34.1 _______________________________________________ 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".