diff --git a/src/doc/builtinplugins.rst b/src/doc/builtinplugins.rst index d77ee5c652..45f47cdb89 100644 --- a/src/doc/builtinplugins.rst +++ b/src/doc/builtinplugins.rst @@ -60,7 +60,8 @@ tiles. - Version of the BMP file format * - ``oiio:ColorSpace`` - string - - currently, it is always ``"sRGB"`` (we presume all BMP files are sRGB) + - currently, it is always ``"srgb_rec709_display"`` or + ``"srgb_rec709_scene"`` (we presume all BMP files are sRGB) **Configuration settings for BMP input** diff --git a/src/doc/imagebufalgo.rst b/src/doc/imagebufalgo.rst index 6ac43d6fc7..f2798a62f3 100644 --- a/src/doc/imagebufalgo.rst +++ b/src/doc/imagebufalgo.rst @@ -2971,16 +2971,18 @@ Color space conversion .. code-tab:: c++ ImageBuf Src ("tahoe.jpg"); - ImageBuf Dst = ImageBufAlgo::colorconvert (Src, "sRGB", "acescg", true); + ImageBuf Dst = ImageBufAlgo::colorconvert (Src, "srgb_rec709_scene", + "lin_ap1_scene", true); .. code-tab:: py Src = ImageBuf("tahoe.jpg") - Dst = ImageBufAlgo.colorconvert (Src, "sRGB", "acescg", True) + Dst = ImageBufAlgo.colorconvert (Src, "srgb_rec709_scene", + "lin_ap1_scene", True) .. code-tab:: bash oiiotool - oiiotool tahoe.jpg --colorconvert sRGB acescg -o tahoe_acescg.exr + oiiotool tahoe.jpg --colorconvert srgb_rec709_scene lin_ap1_scene -o tahoe_acescg.exr | @@ -3072,18 +3074,18 @@ Color space conversion .. code-tab:: c++ ImageBuf Src ("tahoe.exr"); - ImageBuf Dst = ImageBufAlgo::ociodisplay (Src, "sRGB", "Film", "lnf", - "", true, "SHOT", "pe0012"); + ImageBuf Dst = ImageBufAlgo::ociodisplay (Src, "sRGB - Display", "ACES 2.0 - SDR 100 nits (Rec.709)", + "lin_rec709_scene", "", true, "SHOT", "pe0012"); .. code-tab:: py Src = ImageBuf("tahoe.jpg") - Dst = ImageBufAlgo.ociodisplay (Src, "sRGB", "Film", "lnf", - "", True, "SHOT", "pe0012") + Dst = ImageBufAlgo.ociodisplay (Src, "sRGB - Display", "ACES 2.0 - SDR 100 nits (Rec.709)", + "lin_rec709_scene", "", True, "SHOT", "pe0012") .. code-tab:: bash oiiotool - oiiotool tahoe.jpg --ociodisplay:from=lnf:unpremult=1:key=SHOT:value=pe0012 sRGB Film -o out.exr + oiiotool tahoe.jpg --ociodisplay:from=lin_rec709_scene:unpremult=1:key=SHOT:value=pe0012 sRGB "ACES 2.0 - SDR 100 nits (Rec.709)" -o out.exr | diff --git a/src/doc/pythonbindings.rst b/src/doc/pythonbindings.rst index 9ba85b323f..981a2d9ec5 100644 --- a/src/doc/pythonbindings.rst +++ b/src/doc/pythonbindings.rst @@ -3700,7 +3700,8 @@ Color manipulation .. code-block:: python Src = ImageBuf ("tahoe.jpg") - Dst = ImageBufAlgo.colorconvert (Src, "sRGB", "scene_linear") + Dst = ImageBufAlgo.colorconvert (Src, "srgb_rec709_scene", + "scene_linear") @@ -3750,8 +3751,9 @@ Color manipulation .. code-block:: python Src = ImageBuf ("tahoe.exr") - Dst = ImageBufAlgo.ociodisplay (Src, "sRGB", "Film", "lnf", - context_key="SHOT", context_value="pe0012") + Dst = ImageBufAlgo.ociodisplay (Src, "sRGB - Display", "ACES 2.0 - SDR 100 nits (Rec.709)", + "lin_rec709_scene", + context_key="SHOT", context_value="pe0012") diff --git a/src/doc/stdmetadata.rst b/src/doc/stdmetadata.rst index 17ea3e2a87..2e2fc5edcf 100644 --- a/src/doc/stdmetadata.rst +++ b/src/doc/stdmetadata.rst @@ -149,9 +149,13 @@ Color information - `"lin_ap1_scene"`, `"ACEScg"` : ACEScg color space encoding. - `"lin_ap0_scene"` : ACES2065-1, the recommended ACES space for interchange and archiving. - - `"srgb_rec709_scene"` : Using standard (piecewise) sRGB response and - primaries. The token `"sRGB"` is treated as a synonym. - - `"g22_rec709_scene"` : Rec709/sRGB primaries, but using a response curve + - `"srgb_rec709_display"` : Using standard (piecewise) sRGB response and + primaries. + - `"srgb_rec709_scene"` : Same response and primaries as + `"srgb_rec709_display"` but for scene referred images. The token `"sRGB"` + is treated as a synonym, but it is recommended to use the more specific + interop ID. + - `"g22_rec709_display"` : Rec709/sRGB primaries, but using a response curve corresponding to gamma 2.2. Additionally, `"scene_linear"` is a role that is appropriate for color