avutil: remove deprecated FF_API_HDR_VIVID_THREE_SPLINE

Deprecated since 2023-03-17.

James Almer committed 1 year ago

Commit 10f199c1 parent a9d9f463 files · +0 −66Browse files

Unified · Split

3 files

libavcodec/dynamic_hdr_vivid.c +0 −11
libavutil/hdr_dynamic_vivid_metadata.h +0 −54
libavutil/version.h +0 −1

@@ -116,17 +116,6 @@ int ff_parse_itu_t_t35_to_dynamic_hdr_vivid(AVDynamicHDRVivid *s, const uint8_t · 115 unmodified lines
116	three_spline->th_delta2 = (AVRational){get_bits(gb, 10), 1023};	116	three_spline->th_delta2 = (AVRational){get_bits(gb, 10), 1023};
117	three_spline->enable_strength = (AVRational){get_bits(gb, 8), 255};	117	three_spline->enable_strength = (AVRational){get_bits(gb, 8), 255};
118	}	118	}
119	#if FF_API_HDR_VIVID_THREE_SPLINE
120	three_spline = &tm_params->three_spline[0];
121	FF_DISABLE_DEPRECATION_WARNINGS
122	tm_params->three_Spline_TH_mode = three_spline->th_mode;
123	tm_params->three_Spline_TH_enable_MB = three_spline->th_enable_mb;
124	tm_params->three_Spline_TH_enable = three_spline->th_enable;
125	tm_params->three_Spline_TH_Delta1 = three_spline->th_delta1;
126	tm_params->three_Spline_TH_Delta2 = three_spline->th_delta2;
127	tm_params->three_Spline_enable_Strength = three_spline->enable_strength;
128	FF_ENABLE_DEPRECATION_WARNINGS
129	#endif
130	}	119	}
131	}	120	}
132	}	121	}

libavutil/hdr_dynamic_vivid_metadata.h+0−54

@@ -168,60 +168,6 @@ typedef struct AVHDRVividColorToneMappingParams { · 167 unmodified lines
168	*/	168	*/
169	int three_Spline_num;	169	int three_Spline_num;
170		170
171	#if FF_API_HDR_VIVID_THREE_SPLINE
172	/**
173	* The mode of three Spline. the value shall be in the range
174	* of 0 to 3, inclusive.
175	* @deprecated Use three_spline instead
176	*/
177	attribute_deprecated
178	int three_Spline_TH_mode;
179
180	/**
181	* three_Spline_TH_enable_MB is in the range of 0.0 to 1.0, inclusive
182	* and in multiples of 1.0/255.
183	* @deprecated Use three_spline instead
184	*/
185	attribute_deprecated
186	AVRational three_Spline_TH_enable_MB;
187
188	/**
189	* 3Spline_TH_enable of three Spline.
190	* The value shall be in the range of 0.0 to 1.0, inclusive.
191	* and in multiples of 1.0/4095.
192	* @deprecated Use three_spline instead
193	*/
194	attribute_deprecated
195	AVRational three_Spline_TH_enable;
196
197	/**
198	* 3Spline_TH_Delta1 of three Spline.
199	* The value shall be in the range of 0.0 to 0.25, inclusive,
200	* and in multiples of 0.25/1023.
201	* @deprecated Use three_spline instead
202	*/
203	attribute_deprecated
204	AVRational three_Spline_TH_Delta1;
205
206	/**
207	* 3Spline_TH_Delta2 of three Spline.
208	* The value shall be in the range of 0.0 to 0.25, inclusive,
209	* and in multiples of 0.25/1023.
210	* @deprecated Use three_spline instead
211	*/
212	attribute_deprecated
213	AVRational three_Spline_TH_Delta2;
214
215	/**
216	* 3Spline_enable_Strength of three Spline.
217	* The value shall be in the range of 0.0 to 1.0, inclusive,
218	* and in multiples of 1.0/255.
219	* @deprecated Use three_spline instead
220	*/
221	attribute_deprecated
222	AVRational three_Spline_enable_Strength;
223	#endif
224
225	AVHDRVivid3SplineParams three_spline[2];	171	AVHDRVivid3SplineParams three_spline[2];
226	} AVHDRVividColorToneMappingParams;	172	} AVHDRVividColorToneMappingParams;
227		173

libavutil/version.h+0−1

@@ -105,7 +105,6 @@ · 104 unmodified lines
105	* @{	105	* @{
106	*/	106	*/
107		107
108	#define FF_API_HDR_VIVID_THREE_SPLINE (LIBAVUTIL_VERSION_MAJOR < 60)
109	#define FF_API_FRAME_PKT (LIBAVUTIL_VERSION_MAJOR < 60)	108	#define FF_API_FRAME_PKT (LIBAVUTIL_VERSION_MAJOR < 60)
110	#define FF_API_INTERLACED_FRAME (LIBAVUTIL_VERSION_MAJOR < 60)	109	#define FF_API_INTERLACED_FRAME (LIBAVUTIL_VERSION_MAJOR < 60)
111	#define FF_API_FRAME_KEY (LIBAVUTIL_VERSION_MAJOR < 60)	110	#define FF_API_FRAME_KEY (LIBAVUTIL_VERSION_MAJOR < 60)

avutil: remove deprecated FF_API_HDR_VIVID_THREE_SPLINE

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code