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 ESMTPS id AF3EC4D74D for ; Sun, 23 Feb 2025 22:11:10 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 675A668CCAF; Mon, 24 Feb 2025 00:07:24 +0200 (EET) Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A441768CC0F for ; Mon, 24 Feb 2025 00:07:18 +0200 (EET) Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-2f83a8afcbbso6330359a91.1 for ; Sun, 23 Feb 2025 14:07:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740348436; x=1740953236; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=4EcWYFiXWG5yZtGRyGmHTzjNa8w391N0qLL8MOeHuqc=; b=SS0h6CagaTWdCndhvWMJXgaNFUzL3mbJnrQ/KIU8OPfWtE5OuOncaCJ1o/H1NzsUqW 6DFzpEMBLNy/aCgAfPT301y+TYpQHf30OuU6G4BjJ5bGpe7nQlGQNeY2+ymbMSu5FDGH uZk6eAM9I5GCFGHANs3cC/9rbS//f97ImNO7LX/ACEqWTdKHvg1FgtM+iUTAbRPwHq6J Ipx7aM5vkHtgS9IneXqnVGt5awMDSjdNMVYrceNDcCT+zHhwFMbGTPCgdBzq8EoL940k bS9VYQVM0GQMWO5fyG0DmR6t/RXgLvAhNjCeOcMnFCn/hd2rIMvDSbzmN88iqsWCmsbw EJQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740348436; x=1740953236; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4EcWYFiXWG5yZtGRyGmHTzjNa8w391N0qLL8MOeHuqc=; b=YczVCjM8fD3VAjHZMVVA1SQfPUbsCkByrb1jCVi2mBTPCbGE5EWp/cAoWHS5fJVNoK LEtSm1QsogTRSndQd0ogcqaLMc4va6PWUuuTad4cp6vY+d8m7xs3PQN+IZgWctfbDsVh QnwDZ1c6m5G6L8q3yVqRC4HP5sqvWIaoxZh+pZ7fX63kY/1crp6XUIV9I3hYgjiVZ8Si iC/7yWJPzPYOb+tvIuvV9dBrOZPYD73i2fuTb98oHc8ccJQbVLk/MeIL2yDu8GKLGmHd /NzoXQNBtFAqLT+k4TxL11+rvJR05Msu20mZDAyxtlPcBpW9gNaxpAprqCcm+5M6w87l VDKg== X-Gm-Message-State: AOJu0Yx9NQMRvAolmGG0ljWBSe9dOfweOuDbkCU74lkJL0meC/bu+4FZ Ks+wvo7cww/kcQLgMxD9lT7qsh2jFDVh6UcA20ExTL36rAaa5mrqgYjy0D8b X-Gm-Gg: ASbGncscPgzvqjBt0Z3PXMyDihVW1sZrcXC3oAzaoAjTovHVe3SLJd9RkB2a0FcfSJx fm2mhQ2jIezhNLUcloWRXXocQQB6SFIv27ZrmUsqVMnDWAkwk3NlyqfVdx9i2LwSWV9TOxBsBvO 4hs4t7tGIanuLlxZk58TmwpsB9HDBn0pupHzQK0xeAl0KPfLh0eD7G7JyOAABdZdcMcSs2Kyyut 1OWZ1pThs3A+HJMjle3PirxjgTzjuhsjA53dE4MlzKkIG9MOcWLuStwj4r+HMvVJyWLJA4Bci6d MuFRQIpy50zjY4Zx9UT4js4lBzKAggT3yYvZ2K7x0g== X-Google-Smtp-Source: AGHT+IGF+kAqMLniWduQnEyMXZqIptslIBUeQ8it2hD5C/48UBH0ucTy23gZS/YMYybTRI4lZjqhKw== X-Received: by 2002:a17:90b:350e:b0:2fa:2133:bc87 with SMTP id 98e67ed59e1d1-2fccc1172demr25714409a91.6.1740348435939; Sun, 23 Feb 2025 14:07:15 -0800 (PST) Received: from localhost.localdomain ([2800:2121:b040:c:b49d:85a5:a7d1:4da6]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2fceb04bf70sm5091848a91.16.2025.02.23.14.07.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Feb 2025 14:07:15 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Feb 2025 19:06:22 -0300 Message-ID: <20250223220630.18756-23-jamrial@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250223220630.18756-1-jamrial@gmail.com> References: <20250223220630.18756-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 22/30] avutil: remove deprecated FF_API_HDR_VIVID_THREE_SPLINE 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 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: Deprecated since 2023-03-17. Signed-off-by: James Almer --- libavcodec/dynamic_hdr_vivid.c | 11 ------ libavutil/hdr_dynamic_vivid_metadata.h | 54 -------------------------- libavutil/version.h | 1 - 3 files changed, 66 deletions(-) diff --git a/libavcodec/dynamic_hdr_vivid.c b/libavcodec/dynamic_hdr_vivid.c index a9b6910798..319d13b90a 100644 --- a/libavcodec/dynamic_hdr_vivid.c +++ b/libavcodec/dynamic_hdr_vivid.c @@ -116,17 +116,6 @@ int ff_parse_itu_t_t35_to_dynamic_hdr_vivid(AVDynamicHDRVivid *s, const uint8_t three_spline->th_delta2 = (AVRational){get_bits(gb, 10), 1023}; three_spline->enable_strength = (AVRational){get_bits(gb, 8), 255}; } -#if FF_API_HDR_VIVID_THREE_SPLINE - three_spline = &tm_params->three_spline[0]; -FF_DISABLE_DEPRECATION_WARNINGS - tm_params->three_Spline_TH_mode = three_spline->th_mode; - tm_params->three_Spline_TH_enable_MB = three_spline->th_enable_mb; - tm_params->three_Spline_TH_enable = three_spline->th_enable; - tm_params->three_Spline_TH_Delta1 = three_spline->th_delta1; - tm_params->three_Spline_TH_Delta2 = three_spline->th_delta2; - tm_params->three_Spline_enable_Strength = three_spline->enable_strength; -FF_ENABLE_DEPRECATION_WARNINGS -#endif } } } diff --git a/libavutil/hdr_dynamic_vivid_metadata.h b/libavutil/hdr_dynamic_vivid_metadata.h index 4524a81557..a9d4797f0b 100644 --- a/libavutil/hdr_dynamic_vivid_metadata.h +++ b/libavutil/hdr_dynamic_vivid_metadata.h @@ -168,60 +168,6 @@ typedef struct AVHDRVividColorToneMappingParams { */ int three_Spline_num; -#if FF_API_HDR_VIVID_THREE_SPLINE - /** - * The mode of three Spline. the value shall be in the range - * of 0 to 3, inclusive. - * @deprecated Use three_spline instead - */ - attribute_deprecated - int three_Spline_TH_mode; - - /** - * three_Spline_TH_enable_MB is in the range of 0.0 to 1.0, inclusive - * and in multiples of 1.0/255. - * @deprecated Use three_spline instead - */ - attribute_deprecated - AVRational three_Spline_TH_enable_MB; - - /** - * 3Spline_TH_enable of three Spline. - * The value shall be in the range of 0.0 to 1.0, inclusive. - * and in multiples of 1.0/4095. - * @deprecated Use three_spline instead - */ - attribute_deprecated - AVRational three_Spline_TH_enable; - - /** - * 3Spline_TH_Delta1 of three Spline. - * The value shall be in the range of 0.0 to 0.25, inclusive, - * and in multiples of 0.25/1023. - * @deprecated Use three_spline instead - */ - attribute_deprecated - AVRational three_Spline_TH_Delta1; - - /** - * 3Spline_TH_Delta2 of three Spline. - * The value shall be in the range of 0.0 to 0.25, inclusive, - * and in multiples of 0.25/1023. - * @deprecated Use three_spline instead - */ - attribute_deprecated - AVRational three_Spline_TH_Delta2; - - /** - * 3Spline_enable_Strength of three Spline. - * The value shall be in the range of 0.0 to 1.0, inclusive, - * and in multiples of 1.0/255. - * @deprecated Use three_spline instead - */ - attribute_deprecated - AVRational three_Spline_enable_Strength; -#endif - AVHDRVivid3SplineParams three_spline[2]; } AVHDRVividColorToneMappingParams; diff --git a/libavutil/version.h b/libavutil/version.h index ee4a36cb17..4c8282a35c 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -105,7 +105,6 @@ * @{ */ -#define FF_API_HDR_VIVID_THREE_SPLINE (LIBAVUTIL_VERSION_MAJOR < 60) #define FF_API_FRAME_PKT (LIBAVUTIL_VERSION_MAJOR < 60) #define FF_API_INTERLACED_FRAME (LIBAVUTIL_VERSION_MAJOR < 60) #define FF_API_FRAME_KEY (LIBAVUTIL_VERSION_MAJOR < 60) -- 2.48.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".