mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 23:06:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

video-color: Fix for missing clipping in PQ EOTF function

Browse source 
* Add missing clipping in EOTF
* Use pre-calculated values
* Update variable names to specification's defined ones

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1629>
This commit is contained in:
Seungha Yang 2022-02-03 01:04:40 +09:00 committed by GStreamer Marge Bot
parent 265878c4ba
commit 334e29ebbd
1 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
subprojects/gst-plugins-base/gst-libs/gst/video/video-color.c
View file

@ -496,16 +496,16 @@ gst_video_transfer_function_encode (GstVideoTransferFunction func, gdouble val)
break; break;
case GST_VIDEO_TRANSFER_SMPTE2084: case GST_VIDEO_TRANSFER_SMPTE2084:
{ {
gdouble c1 = 3424.0 / 4096.0; /* c3 - c2 + 1 */ gdouble c1 = 0.8359375;
gdouble c2 = 32 * 2413 / 4096.0; gdouble c2 = 18.8515625;
gdouble c3 = 32 * 2392 / 4096.0; gdouble c3 = 18.6875;
gdouble m = 128 * 2523 / 4096.0; gdouble m1 = 0.1593017578125;
gdouble n = 0.25 * 2610 / 4096.0; gdouble m2 = 78.84375;
gdouble Ln = pow (val, n); gdouble Ln = pow (val, m1);
/* val equal to 1 for peak white is ordinarily intended to /* val equal to 1 for peak white is ordinarily intended to
* correspond to a reference output luminance level of 10000 cd/m^2 */ * correspond to a reference output luminance level of 10000 cd/m^2 */
res = pow ((c1 + c2 * Ln) / (1.0 + c3 * Ln), m); res = pow ((c1 + c2 * Ln) / (1.0 + c3 * Ln), m2);
break; break;
} }
case GST_VIDEO_TRANSFER_ARIB_STD_B67: case GST_VIDEO_TRANSFER_ARIB_STD_B67:
@ -629,14 +629,15 @@ gst_video_transfer_function_decode (GstVideoTransferFunction func, gdouble val)
break; break;
case GST_VIDEO_TRANSFER_SMPTE2084: case GST_VIDEO_TRANSFER_SMPTE2084:
{ {
gdouble c1 = 3424.0 / 4096.0; /* c3 - c2 + 1 */ gdouble c1 = 0.8359375;
gdouble c2 = 32 * 2413 / 4096.0; gdouble c2 = 18.8515625;
gdouble c3 = 32 * 2392 / 4096.0; gdouble c3 = 18.6875;
gdouble mi = 1 / (128 * 2523 / 4096.0); gdouble m1 = 0.1593017578125;
gdouble ni = 1 / (0.25 * 2610 / 4096.0); gdouble m2 = 78.84375;
gdouble nm = pow (val, mi); gdouble tmp = pow (val, 1 / m2);
gdouble tmp2 = MAX (tmp - c1, 0.0f);
res = pow ((nm - c1) / (c2 - c3 * nm), ni); res = pow (tmp2 / (c2 - c3 * tmp), 1 / m1);
break; break;
} }
case GST_VIDEO_TRANSFER_ARIB_STD_B67: case GST_VIDEO_TRANSFER_ARIB_STD_B67: