[dali_2.3.24] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-scene3d / public-api / loader / facial-animation-loader.h

diff --git a/dali-scene3d/public-api/loader/facial-animation-loader.h b/dali-scene3d/public-api/loader/facial-animation-loader.h
index b61d0a0..fb96446 100644 (file)
--- a/dali-scene3d/public-api/loader/facial-animation-loader.h
+++ b/dali-scene3d/public-api/loader/facial-animation-loader.h
@@ -2,7 +2,7 @@
 #define DALI_SCENE3D_LOADER_FACIAL_ANIMATION_LOADER_H\r
 \r
 /*\r
- * Copyright (c) 2022 Samsung Electronics Co., Ltd.\r
+ * Copyright (c) 2023 Samsung Electronics Co., Ltd.\r
  *\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
@@ -28,11 +28,25 @@ namespace Dali::Scene3D::Loader
  *\r
  * Throws a DaliException on error.\r
  *\r
+ * @SINCE_2_1.30\r
  * @param[in] url The url of the file containing the facial animation.\r
  *\r
  * @return An animation definition.\r
  */\r
 DALI_SCENE3D_API AnimationDefinition LoadFacialAnimation(const std::string& url);\r
+\r
+/**\r
+ * @brief Loads a facial animation encoded in a json file in the given data stream.\r
+ *\r
+ * Throws a DaliException on error.\r
+ *\r
+ * @SINCE_2_2.23\r
+ * @param[in] rawBuffer The raw buffer containing the facial animation.\r
+ * @param[in] rawBufferLength The length of raw buffer.\r
+ *\r
+ * @return An animation definition.\r
+ */\r
+DALI_SCENE3D_API AnimationDefinition LoadFacialAnimationFromBuffer(const uint8_t* rawBuffer, int rawBufferLength);\r
 } // namespace Dali::Scene3D::Loader\r
 \r
 #endif // DALI_SCENE3D_LOADER_FACIAL_ANIMATION_LOADER_H\r