mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-05-20 08:27:07 +08:00
avutil: remove deprecated FF_API_HDR_VIVID_THREE_SPLINE
Deprecated since 2023-03-17. Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
@ -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->th_delta2 = (AVRational){get_bits(gb, 10), 1023};
|
||||||
three_spline->enable_strength = (AVRational){get_bits(gb, 8), 255};
|
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
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -168,60 +168,6 @@ typedef struct AVHDRVividColorToneMappingParams {
|
|||||||
*/
|
*/
|
||||||
int three_Spline_num;
|
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];
|
AVHDRVivid3SplineParams three_spline[2];
|
||||||
} AVHDRVividColorToneMappingParams;
|
} AVHDRVividColorToneMappingParams;
|
||||||
|
|
||||||
|
@ -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_FRAME_PKT (LIBAVUTIL_VERSION_MAJOR < 60)
|
||||||
#define FF_API_INTERLACED_FRAME (LIBAVUTIL_VERSION_MAJOR < 60)
|
#define FF_API_INTERLACED_FRAME (LIBAVUTIL_VERSION_MAJOR < 60)
|
||||||
#define FF_API_FRAME_KEY (LIBAVUTIL_VERSION_MAJOR < 60)
|
#define FF_API_FRAME_KEY (LIBAVUTIL_VERSION_MAJOR < 60)
|
||||||
|
Reference in New Issue
Block a user