From patchwork Tue Mar 5 14:46:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 46812 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3944:b0:19e:cdac:8cce with SMTP id ac4csp439898pzc; Tue, 5 Mar 2024 06:46:46 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVLpl8tmuUQNW/e9arO57EnotU9DW2JOfcDfAMn/LdUBDSDRgLV8w+9qCqa9TAShwUjH/fXRpB15eMzrXrfe32evSJDx92I8IW+Jg== X-Google-Smtp-Source: AGHT+IF3mpJk4lpQVl1eisYicXUnIMhdtyKfn//0DmOadHWIIznNckQlo36lvrTMUeAZL3vLIpt2 X-Received: by 2002:a50:85c6:0:b0:565:9fff:6046 with SMTP id q6-20020a5085c6000000b005659fff6046mr9687225edh.3.1709650005975; Tue, 05 Mar 2024 06:46:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709650005; cv=none; d=google.com; s=arc-20160816; b=HAJKBSkXldl+XqXoRa5jYlCih0PakXALJSyGEoBsElpEbx876orJecEslIjssmZUUD 9bX/mcKm1yOsAs08adpKy00bFCmrcFxVy29KE9te0iczmntcu0cTxCZSnj7QXMH9xAYb mUy6IH4mZ5wk4K0GWKnG3YwJXbpGsXgAaNcxT3x5YokX9dOnP6swDTF3Uz71Mf6xKG/j tpiOqhvOerroIPg3exiOl4pBAVrTSw43WzmdZgrHtjbH/SRMaUpzsMY5+nCw3Riugb97 dvyhR4oQqcuIMmdvaJck0mX6+HBBd+V+rgSMK/VmEM2M9zPPXCiGnWtUhcK4n2VThe4G HmgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=9gS9He4WarlubAn4sA1SKlrzoayqbJhrrH0BsGoGyNw=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=QhII0mFKU0pbjTTNnoadJ70v7Wbt2Rm8pQ5pm5TLZuof6AmT9PdO7WmldWCwjlEnBv Kn+OXFAr6JL7FIdZ7UafM30ZFMVQ8P5ckBbGSaFTQ3xe8cBDoS3ZX8HNlQC7rXUll3oE qdfWTxhmQEhWBFM9dKSFriXcZFb2cVtreJ8/te1EhvOPEvB1IJt6tA8/GEZw6ETKaMuB Y1bvVVWSjyVCxoigH7ocYcXwMxsaiEo1m4/kBjlPZDSGVi74Qw+NUT6bCFxt4cd3qki/ ZW11el+qLpGbNULJcwjSfovl7nQw6MngcMpxqsQ7qqxduY3HfDFg7nP/i6EOcGE/ld8Q qVwQ==; 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=B1+a4Wxc; 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 bl10-20020a056402210a00b00567c99811b0si46122edb.427.2024.03.05.06.46.45; Tue, 05 Mar 2024 06:46:45 -0800 (PST) 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=B1+a4Wxc; 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 0C00568CFCE; Tue, 5 Mar 2024 16:46:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AD69D68CEE5 for ; Tue, 5 Mar 2024 16:46:36 +0200 (EET) Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1dc09556599so54440235ad.1 for ; Tue, 05 Mar 2024 06:46:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709649993; x=1710254793; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=yy0H0O/NTgjeKphDkrWMxriZ89YghE1sw8R/KXs3vyo=; b=B1+a4Wxc+IzDR7dNeCVLq4TWicLEQzXYQY1MkLapx2QQqXRXOQMATwiWNnGYdVZAG0 4V9cy4MyjUBaV0H0G4t1HVSKkI2U4GQpL+kUA49cDky6d2VqlOmBsI8+BboO/BDSOfZq J0JluupkIGvI5mPVvc2altLuGbhhaiLh2e2466yYf3HsjKrtGiLUNK3cw8ky19WmRJE0 oLs9ixTftuPlOzJidBJ2hUGqv+d/oQUjbu1SscnJJlYVSSGCzIptLfzKo3lZooFd3ESI 864c4E8voo5yP05CExtUSEIP5z57cDMCTCAnY1cVkKAa1U8Gd9Rr6ZCi9+OMZKFtaja2 TIew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709649993; x=1710254793; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=yy0H0O/NTgjeKphDkrWMxriZ89YghE1sw8R/KXs3vyo=; b=cuMw1uhS4hO7CO/+hijbzZ5EGq/E2L61UgDKjpXPKbqNGva2qzTSXZitdBdUTIXVOM 4+F55UgxsgrdI/W8WNVi6sWyiA+zAKi9+hetLCtSX1Y9pXGzGIB/EsbGHQq131EpMfka tlwv3iYrAQPz615Oa2I88mZkVu6d+1+2rw5T3+evOnK7h3+Qa/ED9IApSlqz3m1a+1RJ VSViu8hBpDqMtWAifDw9Z/flTGc22ZLbdInAumrzGWd2cQOuV9QAjfGFkw14ZtyHGvW7 d23reGO2YbOUqlwJT5Zm0SPwv8gOOcV/QDjVsY7eJ4lYEG+NCCKi1qsvJLdCHfFdn9T7 IsGA== X-Gm-Message-State: AOJu0Yw35BsKvKarDVM7IVSr+VQbBOPKxZoAXd3QEPqjpHOQ8Snnxgzr ktJUUiEp3lox9RH7qxTDLky/Xzfz73H5BHAIR0P7d3h5lNmkzRwREg6/JGzQ X-Received: by 2002:a17:902:f685:b0:1db:ff7b:d202 with SMTP id l5-20020a170902f68500b001dbff7bd202mr2734334plg.11.1709649993275; Tue, 05 Mar 2024 06:46:33 -0800 (PST) Received: from localhost.localdomain ([190.194.169.124]) by smtp.gmail.com with ESMTPSA id j6-20020a170903024600b001db608107ecsm10593560plh.167.2024.03.05.06.46.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Mar 2024 06:46:32 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Mar 2024 11:46:32 -0300 Message-ID: <20240305144632.58731-1-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/decode: remove HDR10+ from the global side data array 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" X-TUID: BJOu9a/IVW3K It's a per packet/frame side data type. Signed-off-by: James Almer --- libavcodec/decode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 7c67b18bc4..cd483528c5 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1433,7 +1433,6 @@ static const struct { { AV_PKT_DATA_MASTERING_DISPLAY_METADATA, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA }, { AV_PKT_DATA_CONTENT_LIGHT_LEVEL, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL }, { AV_PKT_DATA_ICC_PROFILE, AV_FRAME_DATA_ICC_PROFILE }, - { AV_PKT_DATA_DYNAMIC_HDR10_PLUS, AV_FRAME_DATA_DYNAMIC_HDR_PLUS }, { AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT,AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT }, }; @@ -1446,6 +1445,7 @@ int ff_decode_frame_props_from_pkt(const AVCodecContext *avctx, } sd[] = { { AV_PKT_DATA_A53_CC, AV_FRAME_DATA_A53_CC }, { AV_PKT_DATA_AFD, AV_FRAME_DATA_AFD }, + { AV_PKT_DATA_DYNAMIC_HDR10_PLUS, AV_FRAME_DATA_DYNAMIC_HDR_PLUS }, { AV_PKT_DATA_S12M_TIMECODE, AV_FRAME_DATA_S12M_TIMECODE }, { AV_PKT_DATA_SKIP_SAMPLES, AV_FRAME_DATA_SKIP_SAMPLES }, };