From patchwork Tue Sep 10 01:14:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cameron Gutman X-Patchwork-Id: 51482 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:41b1:b0:48e:c0f8:d0de with SMTP id le49csp122687vqb; Mon, 9 Sep 2024 18:24:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXfKsttlz1jDA2Ta0Soz5VsEbRDypmQnQKYkRMicXPrsN+BOp37HNafyKtDy+ntmWnt60DvKbFN5d5+kMxvG8/A@gmail.com X-Google-Smtp-Source: AGHT+IGpyVmQTlhQ4sLM0w2a6ewJzebINjvjNw4JlOXTuUMNmSvj6fJu2QUf5Ek7aBd4gvVVXmYD X-Received: by 2002:a05:651c:b12:b0:2ef:29fc:f950 with SMTP id 38308e7fff4ca-2f751f4fd38mr39849551fa.6.1725931451392; Mon, 09 Sep 2024 18:24:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725931451; cv=none; d=google.com; s=arc-20240605; b=ev+d4gF0Gtsk5UTOQrzfP7hJ4UQD7TwBatS8vvcUoTuCa4hN7dGLugFDEVOQV1Wwpp JImrn1ObFc0usAW5xJpu2cN6AcBxVvl5qf4PX5zdAFh+lM0n2UBUJwWje5CRB+XQu4wl oP2uwpAZkXmuYSUYq+jprmo5sUNZbWiikTAAsLq+h8oDIkOiBsVDMoKpY4jAssI7JlW7 5ElKfZI+Npf5maumcOS0aY58o8ih7nZyI1CxBNS57J5LqKa1iie70qDi9UdZP2H6KN7x NKayKeRgaRFdD3i/GlJnAWvG1ep0XdeF1Vtm0Qt2Y4JsMENOrk3kQQsE4jxZT2NVYctl X7Hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=Aa6HRGeBbo9Yy9RmFH6uJ9niX6OGDuavcG5G3Xv8Q24=; fh=ojNBnpj0zpT76yL3ht0RJoGb7zeeIrfYAfgAXalD5xc=; b=hsWUhk+T2PhKvG3NtRAPbla8/tHps6DsfIHGe166+0oVana1gM+2mNkmXekthW9iHU fO2BT3RDXqGXZxWGOtZmezA/nubskWBAyNcS2NvX6NsE4N+fbHBiL+n6PlZLU+3pjh2Q xV0j8imjXtMHYsrzCjLoonsIolu4/j/Nbyi72ozrMx0lZjEbpC7YMVcMj2Hx25H/CVbf ljOvPCndWz2zzgGyJ7/WN5iuJ3YppjS256M2wJSPF7I+dKiFrd218J51dcMejy71DNgU YK/feuqMKCsHHeFkHTJNgEiudP3PAIQNJCjWYVm1C2sl3uKFR/TAR+VkmagIRY6JO0h9 JwJg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=JN57v+XT; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 38308e7fff4ca-2f75c086896si18572241fa.331.2024.09.09.18.24.10; Mon, 09 Sep 2024 18:24:11 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=JN57v+XT; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0819E68E0A2; Tue, 10 Sep 2024 04:14:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f41.google.com (mail-ot1-f41.google.com [209.85.210.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9E90668E08A for ; Tue, 10 Sep 2024 04:14:39 +0300 (EEST) Received: by mail-ot1-f41.google.com with SMTP id 46e09a7af769-710e910dd7dso982218a34.2 for ; Mon, 09 Sep 2024 18:14:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725930877; x=1726535677; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=bmV6t31msi3NW4zd90/fiPCxd2xGnJcjqfQfNlvBRHI=; b=JN57v+XTO0yrB+gT/FsG18dttPzTncGUQ9OWDgFZBObM/l9rrsW94G81VT+P1mPMmQ ZKvizXVhZMOMgFSlbWbBKrOwNdDOg+5sXGjoZZOe5O+jf8mn94O9WPRV6M5wBXRWcy77 C9ZhMWJMIQ3sqmM9q3vCMmS8dExR29AxV2RncnsCMZGrSMtIAP6OwmJPdhASMdoPtqq0 VEZ5HiWdqR/mLOlAgpU/+g4MOyB+Y+CX6IwsnAx56rJAMnwVOPgkdw/dHYXm1o1PAiEo PI1ZK3sK6ha+9kWVkaqWSKJguqti/uYtfqxesaW6t+9Kx7QsFHwhaH9nWV6icDAu6Nkx bgAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725930877; x=1726535677; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=bmV6t31msi3NW4zd90/fiPCxd2xGnJcjqfQfNlvBRHI=; b=aErSXjY+htwHD+7F/XnEvGfnHrNqRRccP+qyfiGr95MHj6bTXO4qGSJP6wsXeWPoI+ tZgR7Z/6OkRGIT3BY2kumGEIEQ1wKhwamHgCkZC+jA1KJ69bzO3cIP2vrDTwuCglpwlX NrrQ7iDghfFLJeuSj9wuajvAf5GxapvyuHDRpJXIiU1oS2IzqYQZCks3X1booYTYIXn9 ylP5qqedPdfdnbaj+YIQszIQiCztD844XnGkbEMp0pbqXtyd+PzNDD976ENGrsSo4Uxn Q8tmRBqIizQjEKdFJ9XR3EKkdrSC/RCoPcLTrrJGfJStF5CvzKLGVV7YkX2tM5PsUVsL UFmg== X-Gm-Message-State: AOJu0YyJNFmuzP6OeSieHIIQD7ZsOl7aI1J0VdtW1W0DnbWfRH/I7GL2 FU+bZx/riM1SdHHpeJcT7Uz7nvXEhIwhCP7D/7pSCCA5C1Bi0uF3hJ3ukQ== X-Received: by 2002:a05:6830:348d:b0:709:3fb0:3bee with SMTP id 46e09a7af769-710cc2716demr7636612a34.27.1725930877537; Mon, 09 Sep 2024 18:14:37 -0700 (PDT) Received: from localhost.localdomain ([2600:1702:50c6:cf1f:35bb:e3d9:ec14:1d0c]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-710d9d3ca57sm1681486a34.22.2024.09.09.18.14.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2024 18:14:37 -0700 (PDT) From: Cameron Gutman To: ffmpeg-devel@ffmpeg.org Date: Mon, 9 Sep 2024 20:14:15 -0500 Message-ID: <20240910011426.85-1-aicommander@gmail.com> X-Mailer: git-send-email 2.43.0.windows.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/amfenc: Fix AV1 HDR metadata for delayed surfaces 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: lucenticus@gmail.com, ovchinnikov.dmitrii@gmail.com, primeadvice@gmail.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Xjb0nZ7qPACk AMF_VIDEO_ENCODER_AV1_INPUT_HDR_METADATA was set above in the normal input case but forgotten for the same in the delayed surface codepath. Signed-off-by: Cameron Gutman --- libavcodec/amfenc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c index 41eaef9758..a47aea6108 100644 --- a/libavcodec/amfenc.c +++ b/libavcodec/amfenc.c @@ -832,6 +832,8 @@ int ff_amf_receive_packet(AVCodecContext *avctx, AVPacket *avpkt) AMF_ASSIGN_PROPERTY_INTERFACE(res, ctx->encoder, AMF_VIDEO_ENCODER_INPUT_HDR_METADATA, hdrmeta_buffer); break; case AV_CODEC_ID_HEVC: AMF_ASSIGN_PROPERTY_INTERFACE(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_INPUT_HDR_METADATA, hdrmeta_buffer); break; + case AV_CODEC_ID_AV1: + AMF_ASSIGN_PROPERTY_INTERFACE(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_INPUT_HDR_METADATA, hdrmeta_buffer); break; } hdrmeta_buffer->pVtbl->Release(hdrmeta_buffer); }