From patchwork Thu May 30 01:16:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 49379 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:5c1:0:b0:460:55fa:d5ed with SMTP id 184csp6702vqf; Wed, 29 May 2024 18:21:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVy5lLGRKPwlAFDy9+/XLXA+lGd/1y5p3x3EUzAae5z8isHZA5/14i9SfiPv9kgWWlHJp2TRiJuEjXG0EhkxOhBtV9iSrNXIN8Tpg== X-Google-Smtp-Source: AGHT+IE/xBrIJzL1NNPw2mSYXem/YE1OsHsntUXu6E0CKE4dHQwyD0tpeSYS4oIInUjpgejmw71P X-Received: by 2002:a50:d79a:0:b0:579:c2d2:fa4c with SMTP id 4fb4d7f45d1cf-57a177b5325mr345804a12.3.1717032091573; Wed, 29 May 2024 18:21:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717032091; cv=none; d=google.com; s=arc-20160816; b=yIO0fsxId5EP4q3+3tMqG+AtE/E7Mx79OiQlaKqq3GqDmcxi7BveGBRy7cNrGo6V3x wXnZMQOQ4UDCGjhHb/Ecyy7RQock0AR/0cs3eiu3QJzbUyWu1hHaOIpfRufXd1zWfigO zXzjUSVQf7vRAIP57SzxKeFFuAkGoS9tg55fE0cIIDAn4XXfIZW60CTx8dN8SvTly4QX IdebPYOInBTrM1eiSeB/7hsxprt1zu2ByvciLKYUU0PaKOsdqxDamBl/ZEZMzoaqH3IK 6HyQOKE1WrP0oDC9TmU9+RA8NFy0Ti3iJDvOplezFRd3jjl3Dx58a/cOfcCo9sUU0Ksp /F2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:date:from:to:message-id:in-reply-to :dkim-signature:delivered-to; bh=ZYZNPL3NqgTpOpj5ABdPWfB3LrOEqz0iNQZCtsmyIcc=; fh=5IeVwzS1vbVKjIV8MP3mnmnRtZGb8uteQ9r4QD2keV0=; b=ANMMMOIEbAgKeN154UjaK+8t2w00a25btFu7IU8ivwH2WK0NoZ7J3bEFm+vjDV5Fi0 I0jzGDZ5gxLU3cakvw+0RP/tHtY4sDm84/lbfrjyumtBN9wUoBZor0saL5nEJWgk2C04 3u4NQqtj/Hp2BoZRVd8pTLclbXqZ28FCnbSyT1TfWjyIrm5vdC8ItD9jDquaBAz2rp6F umffMNBmRqZvb1jnCxQTpJqnkES+V1OUijITL61gJroKR0SJLPjwkvPa+DqxLrFq8tDF AxymDYgcFzmjRg+QzUAmmqnH1NTdeYp1BNCFnDxieUhC4rrLBGyHfp6OO3a/hl5ejlRA Pt7g==; 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=GGY47lIm; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-5785247b875si6370891a12.380.2024.05.29.18.21.30; Wed, 29 May 2024 18:21:31 -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=GGY47lIm; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CDDA968D509; Thu, 30 May 2024 04:21:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EE4E068D0AD for ; Thu, 30 May 2024 04:21:12 +0300 (EEST) Received: by mail-ed1-f41.google.com with SMTP id 4fb4d7f45d1cf-578517c7ae9so276737a12.3 for ; Wed, 29 May 2024 18:21:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717032072; x=1717636872; darn=ffmpeg.org; h=subject:date:from:to:message-id:in-reply-to:from:to:cc:subject:date :message-id:reply-to; bh=C2gNout6Y2AN9003hXqSFyJ8BCKIfshELKwLmdlTDA0=; b=GGY47lImyvQBdBmqz6pCOtcmbnLv0e/Q9Ngh3YMV7VKGdj/o8s0zybKyZriTrzheOX krgAUQdzxhW7Gh9OgDLQ111faFW+yp3E19BJSP1Ypzyq7g3JCVTX2oXpnyAi9xj4QBoX MQzgfAWWFtDEuFZ1lDFL2GzF5f3DymJ8ek6TupqUPP4ZvcPQVK7n5B4L/Uq54ommjxXA ZyHlQ6eY3V3IQXKj2Yk1WHwVC3eBGTHMpHBc9/iLjIGLS3/9+0hEQPykIXFSKgRk/2El 5k3KuHz0fIWn2Ga8XAW1qSpQvFqClvFRyuZS0z5BmBCdYMiymm0jIiUf+53Y7cYZOXkn v3dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717032072; x=1717636872; h=subject:date:from:to:message-id:in-reply-to:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=C2gNout6Y2AN9003hXqSFyJ8BCKIfshELKwLmdlTDA0=; b=i8+2N7Al9lRJAAG7O5gZVXgJaXaIt8dbPAc5YFsoe8HqtG9r4rJ9VYl7Q1dv7zmPz1 KaZRCupwEYIX9cqBa+DX+i3lAfbioe5YJzKM+QNhr2zBqM1i4Fd3xJhMSOjrYh1/qhDz RoMNgk8PDXh4GDwyL35sB57vdFK6+IEvj/2dJO9coNEfqCrh/IWKRBEg1MoKM4Urnq25 44E1J152Ilq7ZGq93XOdvcgnhwWYGUTDwVov8T3DafEk1s5qFiIAf8QUONisxERmuaS/ zVRNDLOOzZsCcenNpqf+BxuTJ9WClcRgV8jdBSirmhmVUMVIjHRk4tS7DUNlg6BKKLUW 8XWQ== X-Gm-Message-State: AOJu0Yyrk8/oiVZiRkwouqU+y+tzvxbD6V9TyWzW/ObVI1K6AqzeWovS v/cpycrgkFHTQV+mrwUXlNdOp3/ix6rodzelf3aj008oo3D+R9mkc8pWEw== X-Received: by 2002:a50:bb42:0:b0:578:c161:525d with SMTP id 4fb4d7f45d1cf-57a17871cd6mr346950a12.25.1717032072074; Wed, 29 May 2024 18:21:12 -0700 (PDT) Received: from localhost (p200300cccf0f49001441a6a3c951ef29.dip0.t-ipconnect.de. [2003:cc:cf0f:4900:1441:a6a3:c951:ef29]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-578523cba01sm9160400a12.35.2024.05.29.18.21.11 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 29 May 2024 18:21:11 -0700 (PDT) In-Reply-To: Message-Id: To: From: "Marvin Scholz" Date: Thu, 30 May 2024 03:16:56 +0200 Subject: [FFmpeg-devel] [PATCH v3 2/3] avutil/hwcontext_videotoolbox: Update documentation 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: hAU0Xjx/d5n4 The documentation was not clear at all what specifically the function does, so it was left unspecified if it will unset or not touch attachments it could not map from the AVFrame. The documentation of the return value was wrong as well. --- libavutil/hwcontext_videotoolbox.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/libavutil/hwcontext_videotoolbox.h b/libavutil/hwcontext_videotoolbox.h index 600e9f2c8d..d35cfbb6c1 100644 --- a/libavutil/hwcontext_videotoolbox.h +++ b/libavutil/hwcontext_videotoolbox.h @@ -90,8 +90,15 @@ CFStringRef av_map_videotoolbox_color_primaries_from_av(enum AVColorPrimaries pr CFStringRef av_map_videotoolbox_color_trc_from_av(enum AVColorTransferCharacteristic trc); /** - * Update a CVPixelBufferRef's metadata to based on an AVFrame. - * Returns 0 if no known equivalent was found. + * Set CVPixelBufferRef's metadata based on an AVFrame. + * + * Sets/unsets the CVPixelBuffer attachments to match as closely as possible the + * AVFrame metadata. To prevent inconsistent attachments, the attachments for properties + * that could not be matched or are unspecified in the given AVFrame are unset. So if + * any attachments already covered by AVFrame metadata need to be set to a specific + * value, this should happen after calling this function. + * + * Returns < 0 in case of an error. */ int av_vt_pixbuf_set_attachments(void *log_ctx, CVPixelBufferRef pixbuf, const struct AVFrame *src);