From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id D23BF4C2FD for ; Thu, 4 Sep 2025 01:43:28 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'RmxGSbh7Zav6tjU2uy00DWWOhHuSsdw81CWK6B6bgHA=', expected b'neF1Npxzcr3AjiBmwpPMYsaTGZjrQbF16G1LXjMS4fc=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1756950122; h=mime-version : to : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=RmxGSbh7Zav6tjU2uy00DWWOhHuSsdw81CWK6B6bgHA=; b=u7t76UD4OsWGIi94DVtLIUo4CM5im1JerBet9XAHkiHfCFf561UxrtpP6ebA8xZQaSwKv f2vIayXAQN4BhH6F9gZq2seVoEtZH5iJdDm6m2gK6Y+EBuPBk2C03xlewaHbFK+ToM+H5pK KDO2kYHlvi0Sd88KZvXjqqhw2u2QrKVaH2AUFAqD2LitAhQttyeEt/Y+asB3zffmTVoK2hX Lwp/dLSRrKArV7ULvTQvECxyu2r+9qLBKj9OiJcnkDb/ANp6UzBJ6M6AVnA29kiJrY9miQf oEI6NjVgyRG70SQ3RH8+IThdslY/uGHT4L0iYLw0mbHgq1SIV1FPoTUpCFBQ== Received: from [172.19.0.4] (unknown [172.19.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 30F9168E845; Thu, 4 Sep 2025 04:42:02 +0300 (EEST) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1756950100; b=J0/kVrfyUy9tKVHtsfltiPtAajdv8ixIAt52eZr0QqcRLkACg4UQvFXrHTkbkQHf9L2nG fmXWPM1UCv9wV629AIN2QE5XET5dMmHxUiX2GZDwV4ut4dubfBN4EJ6T3e3FM27v90bGhzh wl0GH20KD604Z2+oFB7BL1jIb7kG3Rgr8t95U2R4xzLvpq0/By7197Ab5raYDKPGdqEen97 1NVWyUAsocSlr13VNG07QdRgF6xsq5qIZqjPEEmtXIceGfkd2YO/aNoNS0PwmqhdcRvAcxW om9RiBUWWmHSVkCdOsHOnTYMQwh2DB41998aPONq8o96qkihsCooT9pM13ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1756950100; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=KWC62TAIOLnunwVQFi6mPDL1hUc1/ui/hzvFXdsarYc=; b=IEpHGpWjrWaKg1sQVPJMIPKvIy/2MorueEmTA9yLc4rpaxLIOTPzLPy19TG+2BF9Bpgh8 QAx6uZUs2YOxsMe+pCWrCruPoQ66GRXeySO0SgJY/E2o1e0Ddbz/hPGAKhEoBzmuCX21oXk E9fC5+zYLqf8Q0R14mfZsSDTNLeQOul7U2CmjomoKGp2kIK+St4uCrqOqqgHfoLu/6lIn+g dTmgfC30sVfEMJMDAPr/uPsdMn+tcUjRJhupfmM/3p1EWKX9bR/rnOgY3Fh3WLRFB8M+FAM H/lGJnOkmdig6dm0+X5CYD1oqTZShFbwWQR+DIE+WKHMNOiDfosj6x6OJkdQ== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=none Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1756950090; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : from; bh=neF1Npxzcr3AjiBmwpPMYsaTGZjrQbF16G1LXjMS4fc=; b=cyEFm/g4wV2GN8am1pgtgN60RrYtnWSPd1qSMg2Uhjwlvfyr2XnJYFtel4xlcLy/k/Mw+ MwbgsgiJDAy5htUVJ8Si5N4pjO8HvDl1WHZGUsIPF3CcJwQo2smjKihH1yOL+dYFBgWwmUY m6IXn3RUFRFnuZS9QGi8BZ2rgi8+6X2vpfQGMoPBH/sbPUm38fNlbvOC6e5I1qTzeSi9UQp pKg9caLPnDg9nIAgiG10Dk9Nm6ne2H6cT+/O2I2ynDE5uC/OKx7QfEPl3Ru9opyaxljLLD3 Cx/Jjl+bF38hIWjAq5CqihaHiGz8YAg6Nlv7FWtqVBZV7If/7DaQ6TovxXog== Received: from 5d8f51c41678 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 9A4A168E746 for ; Thu, 4 Sep 2025 04:41:30 +0300 (EEST) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Message-ID: <175695009077.25.6100128780740842962@463a07221176> Message-ID-Hash: MVXDG4CCS27HIYE6U6FMS7J7N4Q6ISGL X-Message-ID-Hash: MVXDG4CCS27HIYE6U6FMS7J7N4Q6ISGL X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avutil/hwcontext_drm: fix mapping when dst format is unset (PR #20425) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: cgutman via ffmpeg-devel Cc: cgutman Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #20425 opened by cgutman URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20425 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20425.patch `av_hwframe_map()` is documented to work with a blank dst frame, but hwcontext_drm currently fails if `dst->format == AV_PIX_FMT_NONE`. >>From 37f02603b10b33bb5805a1f437680c261738df62 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Wed, 3 Sep 2025 20:21:51 -0500 Subject: [PATCH] avutil/hwcontext_drm: fix mapping when dst format is unset av_hwframe_map() is documented to work with a blank dst frame, but hwcontext_drm currently fails if dst->format == AV_PIX_FMT_NONE. Signed-off-by: Cameron Gutman --- libavutil/hwcontext_drm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavutil/hwcontext_drm.c b/libavutil/hwcontext_drm.c index 0847db09a0..565c02dead 100644 --- a/libavutil/hwcontext_drm.c +++ b/libavutil/hwcontext_drm.c @@ -288,7 +288,9 @@ static int drm_map_from(AVHWFramesContext *hwfc, AVFrame *dst, { int err; - if (hwfc->sw_format != dst->format) + if (dst->format == AV_PIX_FMT_NONE) + dst->format = hwfc->sw_format; + else if (hwfc->sw_format != dst->format) return AVERROR(ENOSYS); err = drm_map_frame(hwfc, dst, src, flags); -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org