AcademySoftwareFoundation
diff --git a/‎include/OpenColorIO/OpenColorIO.h‎
Lines changed: 96 additions & 1 deletion b/‎include/OpenColorIO/OpenColorIO.h‎
Lines changed: 96 additions & 1 deletion
diff --git a/‎src/OpenColorIO/CMakeLists.txt‎
Lines changed: 44 additions & 0 deletions b/‎src/OpenColorIO/CMakeLists.txt‎
Lines changed: 44 additions & 0 deletions
diff --git a/‎src/OpenColorIO/Config.cpp‎
Lines changed: 34 additions & 0 deletions b/‎src/OpenColorIO/Config.cpp‎
Lines changed: 34 additions & 0 deletions
@@ -257,15 +257,40 @@ class OCIOEXPORT Config
     /**
      * \brief Create a configuration using the OCIO environment variable.
      * 
+     * Also support OCIO URI format. See CreateFromFile.
+     * 
      * If the variable is missing or empty, returns the same result as 
      * \ref Config::CreateRaw .
      */
     static ConstConfigRcPtr CreateFromEnv();
-    /// Create a configuration using a specific config file.
+    /**
+     * \brief Create a configuration using a specific config file.
+     * 
+     * Also support the following OCIO URI format :
+     *  "ocio://default"    - Default Built-in config.
+     *  "ocio://configName" - Built-in config named configName
+     * 
+     */
     static ConstConfigRcPtr CreateFromFile(const char * filename);
     /// Create a configuration using a stream.
     static ConstConfigRcPtr CreateFromStream(std::istream & istream);
 
+    /**
+     * \brief Create a configuration using an OCIO built-in config.
+     * 
+     * \param configName Built-in config name
+     * 
+     * The available configNames are:
+     * "cg-config-v0.1.0_aces-v1.3_ocio-v2.1.1" -- ACES CG config, basic color spaces for computer
+     * graphics apps. More information is available at: 
+     * %https://github.com/AcademySoftwareFoundation/OpenColorIO-Config-ACES
+     * 
+     * \throw Exception If the configName is not recognized.
+     * 
+     * \return one of the configs built into OCIO library
+     */
+    static ConstConfigRcPtr CreateFromBuiltinConfig(const char * configName);
+
     ConfigRcPtr createEditableCopy() const;
 
     /// Get the configuration major version.
@@ -3294,6 +3319,76 @@ class OCIOEXPORT BuiltinTransformRegistry
     virtual ~BuiltinTransformRegistry() = default;
 };
 
+///////////////////////////////////////////////////////////////////////////
+// BuiltinConfigRegistry
+
+/**
+ * The built-in configs registry contains information about all the existing built-in configs.
+ */
+class OCIOEXPORT BuiltinConfigRegistry
+{
+public:
+    BuiltinConfigRegistry(const BuiltinConfigRegistry &) = delete;
+    BuiltinConfigRegistry & operator= (const BuiltinConfigRegistry &) = delete;
+
+    /// Get the current built-in configs registry.
+    static const BuiltinConfigRegistry & Get() noexcept;
+
+    /// Get the number of built-in configs available.
+    virtual size_t getNumBuiltinConfigs() const noexcept = 0;
+
+    /// Get the name of the config at the specified (zero-based) index. 
+    /// Throws for illegal index.
+    virtual const char * getBuiltinConfigName(size_t configIndex) const = 0;
+
+    // Get a user-friendly name for a built-in config, appropriate for displaying in a user interface.
+    /// Throws for illegal index.
+    virtual const char * getBuiltinConfigUIName(size_t configIndex) const = 0;
+
+    /// Get Yaml text of the built-in config at the specified index.
+    /// Throws for illegal index.
+    virtual const char * getBuiltinConfig(size_t configIndex) const = 0;
+    
+    /// Get the Yaml text of the built-in config with the specified name. 
+    /// Throws if the name is not found.
+    virtual const char * getBuiltinConfigByName(const char * configName) const = 0;
+
+    /**
+     * @brief Check if a specific built-in config is recommended.
+     * 
+     * For backwards compatibility reasons, configs will remain in the registry even if they have
+     * been superseded. If an app is presenting a list of configs to users, it should not include 
+     * configs that are no longer recommended.
+     * 
+     * Throws if the name is not found.
+     * 
+     * @param configIndex Index of built-in config.
+     * @return true if the config is recommended.
+     */
+    virtual bool isBuiltinConfigRecommended(size_t configIndex) const = 0;
+
+    /**
+     * @brief Get the default recommended built-in config.
+     * 
+     * Get the name of the built-in config that is currently recommended as the default config 
+     * to use for applications looking for basic color management. 
+     * 
+     * As the built-in config collection evolves, the default config name will change in future
+     * releases. 
+     * 
+     * For backwards compatibility, the name provided here will always work as an argument 
+     * to other methods so that any previous default config may be recovered.
+     * 
+     * Throws if the name is not found.
+     * 
+     * @return Default's built-in config name.
+     */
+    virtual const char * getDefaultBuiltinConfigName() const = 0;
+protected:
+    BuiltinConfigRegistry() = default;
+    virtual ~BuiltinConfigRegistry() = default;
+};
+
 
 ///////////////////////////////////////////////////////////////////////////
 // SystemMonitors
 
@@ -10,6 +10,8 @@ set(SOURCES
     Baker.cpp
     BakingUtils.cpp
     BitDepthUtils.cpp
+    builtinconfigs/BuiltinConfigRegistry.cpp
+    builtinconfigs/CGConfig.cpp
     Caching.cpp
     ColorSpace.cpp
     ColorSpaceSet.cpp
@@ -209,6 +211,46 @@ set(ABI_HEADER_LOCATION "${CMAKE_BINARY_DIR}/include/OpenColorIO")
 list(APPEND INSTALL_HEADERS ${ABI_HEADER_LOCATION}/OpenColorABI.h)
 configure_file("${HEADER_LOCATION}/OpenColorABI.h.in" "${ABI_HEADER_LOCATION}/OpenColorABI.h" @ONLY)
 
+# Built-in configs
+set(CONFIGS_HEADER_LOCATION "${CMAKE_BINARY_DIR}/generated_include")
+file(GLOB CONFIGS_PATHS "builtinconfigs/configs/*.ocio")
+# Loop through the .ocio config files.
+foreach(C ${CONFIGS_PATHS})
+    get_filename_component(CONFIG_FULLNAME "${C}" NAME)
+    string(REGEX MATCH "^(.*)\\.ocio$" tempvar ${CONFIG_FULLNAME})
+    set(CONFIG_NAME ${CMAKE_MATCH_1})
+    list(APPEND CONFIGS_ALL ${CONFIG_NAME})
+
+    file(READ builtinconfigs/configs/${CONFIG_FULLNAME} HEX_CONTENTS HEX)
+    # Separate into individual bytes.
+    string(REGEX MATCHALL "([A-Za-z0-9][A-Za-z0-9])" SEPARATED_HEX "${HEX_CONTENTS}")
+
+    # Prepend the "0x" to each byte.
+    list(JOIN SEPARATED_HEX ",0x" FORMATTED_HEX)
+
+    # Prepend "0x" to the first byte.
+    string(PREPEND FORMATTED_HEX "0x")
+
+    # Append 0x00 to null-terminated the string.
+    string(APPEND FORMATTED_HEX ",0x00")
+    
+    # Set the dynamically named variable "${CONFIG_NAME}" to the config in HEX.
+    set(${CONFIG_NAME} ${FORMATTED_HEX})
+endforeach()
+
+file(GLOB TEMPLATE_HEADER_CONFIG_FILES "builtinconfigs/*.cpp.in")
+foreach(C ${TEMPLATE_HEADER_CONFIG_FILES})
+    get_filename_component(TEMPLATE_HEADER_FULLNAME "${C}" NAME)
+
+    string(LENGTH ${TEMPLATE_HEADER_FULLNAME} TEMPLATE_HEADER_LENGTH)
+    MATH(EXPR TEMPLATE_HEADER_LENGTH "${TEMPLATE_HEADER_LENGTH}-3")
+    # Get TEMPLATE_HEADER_FULLNAME without .in extension.
+    string(SUBSTRING ${TEMPLATE_HEADER_FULLNAME} 0 ${TEMPLATE_HEADER_LENGTH} TEMPLATE_HEADER_FULLNAME_H)
+
+    configure_file(builtinconfigs/${TEMPLATE_HEADER_FULLNAME} ${CONFIGS_HEADER_LOCATION}/${TEMPLATE_HEADER_FULLNAME_H} @ONLY)
+endforeach()
+
+
 set(BUILD_INCLUDES
     ${HEADER_LOCATION}/..
     ${HEADER_LOCATION}
@@ -220,6 +262,8 @@ target_include_directories(OpenColorIO
     PUBLIC
         "$<BUILD_INTERFACE:${BUILD_INCLUDES}>"
         "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
+    PRIVATE
+        "${CONFIGS_HEADER_LOCATION}"
 )
 
 target_link_libraries(OpenColorIO
 
@@ -9,6 +9,7 @@
 #include <fstream>
 #include <utility>
 #include <vector>
+#include <regex>
 
 #include <OpenColorIO/OpenColorIO.h>
 
@@ -33,6 +34,8 @@
 #include "ViewingRules.h"
 #include "SystemMonitor.h"
 
+#include "builtinconfigs/BuiltinConfigRegistry.h"
+
 
 namespace OCIO_NAMESPACE
 {
@@ -1100,6 +1103,8 @@ ConstConfigRcPtr Config::CreateFromEnv()
 {
     std::string file;
     Platform::Getenv(OCIO_CONFIG_ENVVAR, file);
+
+    // File can be a filename/path or an URI to a default configuration (ocio://<config name>).
     if(!file.empty()) return CreateFromFile(file.c_str());
 
     static const char err[] =
@@ -1117,6 +1122,21 @@ ConstConfigRcPtr Config::CreateFromFile(const char * filename)
         throw ExceptionMissingFile ("The config filepath is missing.");
     }
 
+    // Check for URI Pattern: ocio://<config name>
+    static const std::regex uriPattern(R"(ocio:\/\/([^\s]+))");
+    std::smatch match;
+    const std::string uri = filename;
+    if (std::regex_search(uri, match, uriPattern))
+    {
+        if (Platform::Strcasecmp(match.str(1).c_str(), "default") == 0)
+        {
+            // Processing ocio://default
+            const BuiltinConfigRegistry & reg = BuiltinConfigRegistry::Get();
+            return CreateFromBuiltinConfig(reg.getDefaultBuiltinConfigName());
+        }
+        return CreateFromBuiltinConfig(match.str(1).c_str());
+    }
+
     std::ifstream istream = Platform::CreateInputFileStream(filename, std::ios_base::in);
     if (istream.fail())
     {
@@ -1134,6 +1154,20 @@ ConstConfigRcPtr Config::CreateFromStream(std::istream & istream)
     return Config::Impl::Read(istream, nullptr);
 }
 
+ConstConfigRcPtr Config::CreateFromBuiltinConfig(const char * configName)
+{
+    ConstConfigRcPtr builtinConfig;
+    const BuiltinConfigRegistry & reg = BuiltinConfigRegistry::Get();
+
+    // getBuiltinConfigByName will throw if config name not found.
+    const char * builtinConfigStr = reg.getBuiltinConfigByName(configName);
+    std::istringstream iss;
+    iss.str(builtinConfigStr);
+    builtinConfig = Config::CreateFromStream(iss);
+
+    return builtinConfig;
+}
+
 ///////////////////////////////////////////////////////////////////////////
 
 Config::Config()