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 BA4D64D784 for ; Sun, 23 Feb 2025 22:12:28 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9FC8C68CD9F; Mon, 24 Feb 2025 00:07:41 +0200 (EET) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 29B6968CD18 for ; Mon, 24 Feb 2025 00:07:28 +0200 (EET) Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-2f83a8afcbbso6330439a91.1 for ; Sun, 23 Feb 2025 14:07:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740348446; x=1740953246; 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=jAzrnCf6jGDzqcLUN5GG9aDEb5/3gk78/69ogwAKxKk=; b=gyo37uUMHDSJ/AcGO3qPYV6yWkCM2z3u1XI6O6aI4x3UOBNAEOdgjS6qSoClOnVgG6 aCwO+W+LynM+g3tznw4UNS9Zp34JDszWVJhbhmyPrYJXb7GVaRS2A3kzla7mueybVXIw XAhNg4Knjce53glnfzRZ2plYdaef39++ywz3xbTyidTypuwtnndq18Fbn6jtzvb/RQ0l SZpbqoxbRn+1QQikrntaholMuR4Ey+/eJFIvb9/JXK3NC7wP5g0fW6Qmo/mQmZanA0K3 HmxEpnHjIFirG9nbOG3SW2DLXevifD5qurdN3efwegNazWylx/jGd7CGiDSlDl1Oi7J3 l6zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740348446; x=1740953246; 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=jAzrnCf6jGDzqcLUN5GG9aDEb5/3gk78/69ogwAKxKk=; b=f3V+i55mmnuo76o/U9dICT9zjHxXCXpg+D3tCdMo/4UznvGYASdlrMIv30D5zJKvN2 EuQddPde68yxsnYQfiaX+x6vLYZc2SCqVtZMVK0no11brmzQtosUA6XxOoQ2cC+Ml2Ab zsdlOtgyboAlneI8eWOBTR+IhSAtS4lSJ9DKrXbelJa4EW03s1YQ24ug8A7obkJ/pNUx kh398w+dJR+RdJHHHEY3ip8G/MHpla4Rx2M1xIQSwteXWizIVFWJEDnzOSGl3nrOTD7P aEYo3Rp4Z9Lq2E/2NRBcLfNcq18QYOVaeCU65pk/bRhGO6yPYCQOtWK/uPTmmjKvtGJd uFew== X-Gm-Message-State: AOJu0YxX5+IlHnRruCxb22utAbSYC7teKGtlCF3xqwo4NUT4hZ1wZG+e xC1EvxBbq5Iveo3NW5mneiUgluEzLdlJVvWDT/rJrpGgrhkuH76qxSRE3aYX X-Gm-Gg: ASbGncuPJN/moBVGoD3efVzvKpHBTBhKXmH9utRK562Wo/XbXMC0XwPc6M65RAQA3lt +8rn+5uVojZoMdaesp4YYiA+rD14ECwOWnSo8jxJnNpyNmP39mRk4ASqXiO8nQ/HLA6gxiTFCKx rBh3twf1cU2XSUZk3gIa+Tpkq0tioyPMbm45yHPjDAARXqLPBl6+vTmsDSe2MTAGHHhYAKe5cAF 9WGfnVOYQ1Sn+8LPabPceDatnIfT37sCJ3dT0wTbXmyl0UvAo1t9eNsHPyfaprSb7yidZeVnBlG SFYCRlCgCDmYn2erpN7Bx3DZc8WRrxCZCfrF2m1dWQ== X-Google-Smtp-Source: AGHT+IHwUG08Aw4SJps2r50FpMoZ9Adf0eX6OP2aez+ZlJIR4LkU9EOjE7+pRLgW/yTAlRpNnqgmBw== X-Received: by 2002:a17:90a:d60b:b0:2f1:2e10:8160 with SMTP id 98e67ed59e1d1-2fce7b5fd2emr18966904a91.11.1740348446014; Sun, 23 Feb 2025 14:07:26 -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.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Feb 2025 14:07:25 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Feb 2025 19:06:28 -0300 Message-ID: <20250223220630.18756-29-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 28/30] avutil: remove deprecated FF_API_H274_FILM_GRAIN_VCS 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 2024-03-23. Signed-off-by: James Almer --- libavcodec/h2645_sei.c | 11 ------- libavutil/film_grain_params.h | 58 ++++++----------------------------- libavutil/version.h | 1 - 3 files changed, 9 insertions(+), 61 deletions(-) diff --git a/libavcodec/h2645_sei.c b/libavcodec/h2645_sei.c index 2494daaf3c..c7950a4a45 100644 --- a/libavcodec/h2645_sei.c +++ b/libavcodec/h2645_sei.c @@ -875,17 +875,6 @@ FF_ENABLE_DEPRECATION_WARNINGS h274->blending_mode_id = fgc->blending_mode_id; h274->log2_scale_factor = fgc->log2_scale_factor; -#if FF_API_H274_FILM_GRAIN_VCS -FF_DISABLE_DEPRECATION_WARNINGS - h274->bit_depth_luma = fgp->bit_depth_luma; - h274->bit_depth_chroma = fgp->bit_depth_chroma; - h274->color_range = fgp->color_range; - h274->color_primaries = fgp->color_primaries; - h274->color_trc = fgp->color_trc; - h274->color_space = fgp->color_space; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - memcpy(&h274->component_model_present, &fgc->comp_model_present_flag, sizeof(h274->component_model_present)); memcpy(&h274->num_intensity_intervals, &fgc->num_intensity_intervals, diff --git a/libavutil/film_grain_params.h b/libavutil/film_grain_params.h index ccacab88fe..7e8d333777 100644 --- a/libavutil/film_grain_params.h +++ b/libavutil/film_grain_params.h @@ -136,43 +136,6 @@ typedef struct AVFilmGrainH274Params { */ int model_id; -#if FF_API_H274_FILM_GRAIN_VCS - /** - * TODO: On this ABI bump, please also re-order the fields in - * AVFilmGrainParams (see below) - */ - - /** - * Specifies the bit depth used for the luma component. - * - * @deprecated use AVFilmGrainParams.bit_depth_luma. - */ - attribute_deprecated - int bit_depth_luma; - - /** - * Specifies the bit depth used for the chroma components. - * - * @deprecated use AVFilmGrainParams.bit_depth_chroma. - */ - attribute_deprecated - int bit_depth_chroma; - - /** - * Specifies the video signal characteristics. - * - * @deprecated use AVFilmGrainParams.color_{range,primaries,trc,space}. - */ - attribute_deprecated - enum AVColorRange color_range; - attribute_deprecated - enum AVColorPrimaries color_primaries; - attribute_deprecated - enum AVColorTransferCharacteristic color_trc; - attribute_deprecated - enum AVColorSpace color_space; -#endif - /** * Specifies the blending mode used to blend the simulated film grain * with the decoded images. @@ -249,18 +212,6 @@ typedef struct AVFilmGrainParams { */ uint64_t seed; - /** - * Additional fields may be added both here and in any structure included. - * If a codec's film grain structure differs slightly over another - * codec's, fields within may change meaning depending on the type. - * - * TODO: Move this to the end of the structure, at the next ABI bump. - */ - union { - AVFilmGrainAOMParams aom; - AVFilmGrainH274Params h274; - } codec; - /** * Intended display resolution. May be 0 if the codec does not specify * any restrictions. @@ -287,6 +238,15 @@ typedef struct AVFilmGrainParams { int bit_depth_luma; int bit_depth_chroma; + /** + * Additional fields may be added both here and in any structure included. + * If a codec's film grain structure differs slightly over another + * codec's, fields within may change meaning depending on the type. + */ + union { + AVFilmGrainAOMParams aom; + AVFilmGrainH274Params h274; + } codec; } AVFilmGrainParams; /** diff --git a/libavutil/version.h b/libavutil/version.h index 50466c34d9..443b4771f6 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -105,7 +105,6 @@ * @{ */ -#define FF_API_H274_FILM_GRAIN_VCS (LIBAVUTIL_VERSION_MAJOR < 60) #define FF_API_MOD_UINTP2 (LIBAVUTIL_VERSION_MAJOR < 60) #define FF_API_RISCV_FD_ZBA (LIBAVUTIL_VERSION_MAJOR < 60) #define FF_API_VULKAN_FIXED_QUEUES (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".