Merge branch 'master' into api12.audiomanager.AddSoundEffect

.github/workflows/deploy-documents-for-tizen-docs.yml

@@ -6,7 +6,6 @@ on:
   workflow_dispatch:
 
 env:
-  DOCFX_FILE: docfx_tizen_docs.json
   DEPLOY_BRANCH: tizen-docs-pages
   CACHE_NAME: docfx-tizen-docs-pages-site
 
@@ -15,7 +14,7 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     container:
-      image: tizendotnet/tizenfx-build-worker:2.4
+      image: tizendotnet/tizenfx-build-worker:2.5
       options: --ulimit nofile=10240:10240
 
     steps:
@@ -37,7 +36,6 @@ jobs:
     - name: Build Documents
       if: steps.cache-site.outputs.cache-hit != 'true'
       run: |
-        cp docfx_config/docfx.json docfx.json
         ./build.sh restore
         ./build.sh build
 

.github/workflows/deploy-documents.yml

@@ -10,7 +10,7 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     container:
-      image: tizendotnet/tizenfx-build-worker:2.4
+      image: tizendotnet/tizenfx-build-worker:2.5
       options: --ulimit nofile=10240:10240
 
     steps:
@@ -31,7 +31,6 @@ jobs:
     - name: Build Documents
       if: steps.cache-site.outputs.cache-hit != 'true'
       run: |
-        cp docfx_config/docfx.json docfx.json
         ./build.sh restore
         ./build.sh build
         ./build.sh index

packaging/csapi-tizenfx.spec

@@ -1,7 +1,7 @@
 # Auto-generated from csapi-tizenfx.spec.in by makespec.sh
 
 %define TIZEN_NET_API_VERSION 12
-%define TIZEN_NET_RPM_VERSION 12.0.0.999+nui22336
+%define TIZEN_NET_RPM_VERSION 12.0.0.999+nui22339
 %define TIZEN_NET_NUGET_VERSION 12.0.0.99999
 
 %define DOTNET_ASSEMBLY_PATH /usr/share/dotnet.tizen/framework

packaging/version.txt

@@ -6,4 +6,4 @@ RPM_VERSION=12.0.0.999
 NUGET_VERSION=12.0.0.99999
 
 # RPM Version Suffix
-RPM_VERSION_SUFFIX=nui22336
+RPM_VERSION_SUFFIX=nui22339

src/Tizen.AIAvatar/src/Lipsync/LipSyncer.cs

@@ -132,13 +132,16 @@ private void PlayLipSync(byte[] audio, int sampleRate)
         {
             DestroyLipAnimation();
             var lipKeyFrames = CreateKeyFrame(audio, sampleRate);
-            var lipAnimation = CreatedKeyFrameAnimation?.Invoke(lipKeyFrames, false);
-            if (lipAnimation != null)
+            if (lipKeyFrames != null)
             {
-                ResetLipAnimation(lipAnimation);
-                PlayLipAnimation();
+                var lipAnimation = CreatedKeyFrameAnimation?.Invoke(lipKeyFrames, false);
+                if (lipAnimation != null)
+                {
+                    ResetLipAnimation(lipAnimation);
+                    PlayLipAnimation();
+                }
+                audioPlayer.Play(audio, sampleRate);
             }
-            audioPlayer.Play(audio, sampleRate);
         }
 
         private void PlayLipSync(string path)

src/Tizen.AIAvatar/src/Lipsync/VowelConverter/VowelConverter.cs

@@ -40,13 +40,20 @@ internal AnimationKeyFrame CreateKeyFrames(string[] vowels, int sampleRate, bool
         {
             vowelClassifier = GetVowelClassifier(sampleRate);
 
-            if (isMic)
+            if (vowelClassifier != null)
             {
-                return animationConverter.ConvertVowelsToAnimationMic(vowels, vowelClassifier.GetStepTime());
+                if (isMic)
+                {
+                    return animationConverter.ConvertVowelsToAnimationMic(vowels, vowelClassifier.GetStepTime());
+                }
+                else
+                {
+                    return animationConverter.ConvertVowelsToAnimation(vowels, vowelClassifier.GetStepTime());
+                }
             }
             else
             {
-                return animationConverter.ConvertVowelsToAnimation(vowels, vowelClassifier.GetStepTime());
+                return null;
             }
         }
 

src/Tizen.Applications.Common/Tizen.Applications/AppControl.cs

@@ -102,7 +102,7 @@ public AppControl(bool enableAppStartedResultEvent)
         /// <summary>
         /// Initializes the instance of the AppControl class with the SafeAppControlHandle.
         /// </summary>
-        /// <param name="handle"></param>
+        /// <param name="handle">A reference to the SafeAppControlHandle object.</param>
         /// <since_tizen> 3 </since_tizen>
         public AppControl(SafeAppControlHandle handle)
         {
@@ -169,6 +169,9 @@ private AppControl(IntPtr handle)
         /// <summary>
         /// Gets the SafeAppControlHandle instance.
         /// </summary>
+        /// <value>
+        /// This property returns a reference to the underlying SafeAppControlHandle object.
+        /// </value>
         /// <since_tizen> 3 </since_tizen>
         public SafeAppControlHandle SafeAppControlHandle
         {
@@ -227,7 +230,8 @@ public string Operation
         /// Gets and sets the explicit MIME type of the data.
         /// </summary>
         /// <value>
-        /// (if the mime is null for setter, it clears the previous value.)
+        /// This property returns the explicitly set MIME type of the data. If no explicit MIME type is set, it will return null.
+        /// (Setting this property to null will clear any previously set explicit MIME types.)
         /// </value>
         /// <example>
         /// <code>
@@ -328,7 +332,8 @@ public string Uri
         /// Gets and sets the explicit category.
         /// </summary>
         /// <value>
-        /// (if the category is null for setter, it clears the previous value.)
+        /// This property returns the explicitly set category. If no explicit category is set, it will return null.
+        /// (Setting this property to null will clear any previously set explicit categories.)
         /// </value>
         /// <since_tizen> 3 </since_tizen>
         public string Category
@@ -363,7 +368,8 @@ public string Category
         /// Gets and sets the application ID to explicitly launch.
         /// </summary>
         /// <value>
-        /// (if the application ID is null for setter, it clears the previous value.)
+        /// This property returns the explicitly set application ID. If no explicit application ID is set, it will return null.
+        /// (Setting this property to null will clear any previously set explicit application IDs.)
         /// </value>
         /// <example>
         /// <code>
@@ -446,7 +452,7 @@ public AppControlLaunchMode LaunchMode
         /// Gets the collection of the extra data.
         /// </summary>
         /// <value>
-        /// Extra data for communication between AppControls.
+        /// The ExtraData property provides access to a collection of key-value pairs representing additional data associated with the application control.
         /// </value>
         /// <example>
         /// <code>
@@ -1023,9 +1029,9 @@ public static IEnumerable<string> GetDefaultApplicationIds()
         }
 
         /// <summary>
-        /// Sets the window position.
+        /// Sets the position and size of the window.
         /// </summary>
-        /// <param name="windowPosition">The window position object.</param>
+        /// <param name="windowPosition">A structure containing the coordinates and dimensions of the window.</param>
         /// <exception cref="ArgumentNullException">Thrown when the argument is null.</exception>
         /// <exception cref="ArgumentException">Thrown when the argument is invalid.</exception>
         /// <exception cref="InvalidOperationException">Thrown when the invalid operation error occurs.</exception>
@@ -1054,7 +1060,7 @@ public void SetWindowPosition(WindowPosition windowPosition)
         /// <summary>
         /// Gets the window position.
         /// </summary>
-        /// <returns>The window position.</returns>
+        /// <returns>A structure containing the coordinates and dimensions of the window.</returns>
         /// <exception cref="InvalidOperationException">Thrown when the invalid operation error occurs.</exception>
         /// <since_tizen> 11 </since_tizen>
         public WindowPosition GetWindowPosition()
@@ -1357,9 +1363,13 @@ public bool TryGet(string key, out IEnumerable<string> value)
             }
 
             /// <summary>
-            /// Removes the extra data.
+            /// Deletes a particular piece of extra data from the collection.
             /// </summary>
-            /// <param name="key">The name of the extra data.</param>
+            /// <param name="key">Identifier of the data to remove.</param>
+            /// <remarks>
+            /// This method enables removal of individual items from the ExtraData collection.
+            /// It accepts only non-empty strings as valid input parameters.
+            /// </remarks>
             /// <exception cref="ArgumentNullException">Thrown when the key is a zero-length string.</exception>
             /// <exception cref="KeyNotFoundException">Thrown when the key is not found.</exception>
             /// <exception cref="ArgumentException">Thrown when the key is rejected.</exception>

src/Tizen.Multimedia.Vision/Interop/Interop.MediaVision.Face.cs

@@ -35,49 +35,49 @@ internal static partial class Face
         {
             [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_detect")]
             internal static extern MediaVisionError Detect(IntPtr source, IntPtr engineCfg,
-                DetectedCallback detectedCb, IntPtr userData = default(IntPtr));
+                DetectedCallback detectedCb, IntPtr userData = default(IntPtr)); // Deprecated in API 12
 
             [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_recognize")]
             internal static extern MediaVisionError Recognize(IntPtr source, IntPtr recognitionModel, IntPtr engineCfg,
-                IntPtr faceLocation, RecognizedCallback recognizedCb, IntPtr userData = default(IntPtr));
+                IntPtr faceLocation, RecognizedCallback recognizedCb, IntPtr userData = default(IntPtr)); // Deprecated in API 12
 
             [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_recognize")]
             internal static extern MediaVisionError Recognize(IntPtr source, IntPtr recognitionModel, IntPtr engineCfg,
-                ref Rectangle faceLocation, RecognizedCallback recognizedCb, IntPtr userData = default(IntPtr));
+                ref Rectangle faceLocation, RecognizedCallback recognizedCb, IntPtr userData = default(IntPtr)); // Deprecated in API 12
 
             [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_track")]
             internal static extern MediaVisionError Track(IntPtr source, IntPtr trackingModel, IntPtr engineCfg,
-                TrackedCallback trackedCb, bool doLearn, IntPtr userData = default(IntPtr));
+                TrackedCallback trackedCb, bool doLearn, IntPtr userData = default(IntPtr)); // Deprecated in API 12
 
             [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_eye_condition_recognize")]
             internal static extern MediaVisionError RecognizeEyeCondition(IntPtr source, IntPtr engineCfg,
-                Rectangle faceLocation, EyeConditionRecognizedCallback eyeConditionRecognizedCb, IntPtr userData = default(IntPtr));
+                Rectangle faceLocation, EyeConditionRecognizedCallback eyeConditionRecognizedCb, IntPtr userData = default(IntPtr)); // Deprecated in API 12
 
             [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_facial_expression_recognize")]
             internal static extern MediaVisionError RecognizeFacialExpression(IntPtr source, IntPtr engineCfg,
-                Rectangle faceLocation, MvFaceFacialExpressionRecognizedCallback expressionRecognizedCb,
+                Rectangle faceLocation, MvFaceFacialExpressionRecognizedCallback expressionRecognizedCb, // Deprecated in API 12
                 IntPtr userData = default(IntPtr));
 
             [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
             internal delegate void DetectedCallback(IntPtr source, IntPtr engineCfg,
                 [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 3)] Rectangle[] facesLocations,
-                int numberOfFaces, IntPtr userData);
+                int numberOfFaces, IntPtr userData); // Deprecated in API 12
 
             [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
             internal delegate void RecognizedCallback(IntPtr source, IntPtr recognitionModel,
-                IntPtr engineCfg, IntPtr faceLocation, IntPtr faceLabel, double confidence, IntPtr userData);
+                IntPtr engineCfg, IntPtr faceLocation, IntPtr faceLabel, double confidence, IntPtr userData); // Deprecated in API 12
 
             [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
             internal delegate void TrackedCallback(IntPtr source, IntPtr trackingModel, IntPtr engineCfg,
-                IntPtr location, double confidence, IntPtr userData);
+                IntPtr location, double confidence, IntPtr userData); // Deprecated in API 12
 
             [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
             internal delegate void EyeConditionRecognizedCallback(IntPtr source, IntPtr engineCfg,
-                Rectangle faceLocation, EyeCondition eyeCondition, IntPtr userData);
+                Rectangle faceLocation, EyeCondition eyeCondition, IntPtr userData); // Deprecated in API 12
 
             [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
             internal delegate void MvFaceFacialExpressionRecognizedCallback(IntPtr source,
-                IntPtr engineCfg, Rectangle faceLocation, FacialExpression facialExpression, IntPtr userData);
+                IntPtr engineCfg, Rectangle faceLocation, FacialExpression facialExpression, IntPtr userData); // Deprecated in API 12
         }
 
         /// <summary>
@@ -86,39 +86,39 @@ internal delegate void MvFaceFacialExpressionRecognizedCallback(IntPtr source,
         internal static partial class FaceRecognitionModel
         {
             [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_recognition_model_create")]
-            internal static extern MediaVisionError Create(out IntPtr handle);
+            internal static extern MediaVisionError Create(out IntPtr handle); // Deprecated in API 12
 
             [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_recognition_model_destroy")]
-            internal static extern int Destroy(IntPtr handle);
+            internal static extern int Destroy(IntPtr handle); // Deprecated in API 12
 
             [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_recognition_model_clone")]
-            internal static extern int Clone(IntPtr src, out IntPtr dst);
+            internal static extern int Clone(IntPtr src, out IntPtr dst); // Deprecated in API 12
 
             [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_recognition_model_save")]
-            internal static extern MediaVisionError Save(string fileName, IntPtr handle);
+            internal static extern MediaVisionError Save(string fileName, IntPtr handle); // Deprecated in API 12
 
             [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_recognition_model_load")]
-            internal static extern MediaVisionError Load(string fileName, out IntPtr handle);
+            internal static extern MediaVisionError Load(string fileName, out IntPtr handle); // Deprecated in API 12
 
             [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_recognition_model_add")]
             internal static extern MediaVisionError Add(IntPtr source, IntPtr recognitionModel,
-                ref Rectangle exampleLocation, int faceLabel);
+                ref Rectangle exampleLocation, int faceLabel); // Deprecated in API 12
 
             [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_recognition_model_add")]
             internal static extern MediaVisionError Add(IntPtr source, IntPtr recognitionModel,
-                IntPtr exampleLocation, int faceLabel);
+                IntPtr exampleLocation, int faceLabel); // Deprecated in API 12
 
             [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_recognition_model_reset")]
-            internal static extern MediaVisionError Reset(IntPtr recognitionModel, IntPtr faceLabel = default(IntPtr));
+            internal static extern MediaVisionError Reset(IntPtr recognitionModel, IntPtr faceLabel = default(IntPtr)); // Deprecated in API 12
 
             [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_recognition_model_reset")]
-            internal static extern MediaVisionError Remove(IntPtr recognitionModel, ref int faceLabel);
+            internal static extern MediaVisionError Remove(IntPtr recognitionModel, ref int faceLabel); // Deprecated in API 12
 
             [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_recognition_model_learn")]
-            internal static extern MediaVisionError Learn(IntPtr engineCfg, IntPtr handle);
+            internal static extern MediaVisionError Learn(IntPtr engineCfg, IntPtr handle); // Deprecated in API 12
 
             [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_recognition_model_query_labels")]
-            internal static extern MediaVisionError QueryLabels(IntPtr handle, out IntPtr labels, out uint numberOfLabels);
+            internal static extern MediaVisionError QueryLabels(IntPtr handle, out IntPtr labels, out uint numberOfLabels); // Deprecated in API 12
         }
 
         /// <summary>
@@ -127,27 +127,27 @@ internal static extern MediaVisionError Add(IntPtr source, IntPtr recognitionMod
         internal static partial class FaceTrackingModel
         {
             [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_tracking_model_create")]
-            internal static extern MediaVisionError Create(out IntPtr handle);
+            internal static extern MediaVisionError Create(out IntPtr handle); // Deprecated in API 12
 
             [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_tracking_model_destroy")]
-            internal static extern int Destroy(IntPtr handle);
+            internal static extern int Destroy(IntPtr handle); // Deprecated in API 12
 
             [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_tracking_model_prepare")]
             internal static extern MediaVisionError Prepare(IntPtr trackingModel, IntPtr engineCfg,
-                IntPtr source, ref Quadrangle location);
+                IntPtr source, ref Quadrangle location); // Deprecated in API 12
 
             [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_tracking_model_prepare")]
             internal static extern MediaVisionError Prepare(IntPtr trackingModel, IntPtr engineCfg,
-                IntPtr source, IntPtr location);
+                IntPtr source, IntPtr location); // Deprecated in API 12
 
             [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_tracking_model_clone")]
-            internal static extern int Clone(IntPtr src, out IntPtr dst);
+            internal static extern int Clone(IntPtr src, out IntPtr dst); // Deprecated in API 12
 
             [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_tracking_model_save")]
-            internal static extern MediaVisionError Save(string fileName, IntPtr handle);
+            internal static extern MediaVisionError Save(string fileName, IntPtr handle); // Deprecated in API 12
 
             [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_tracking_model_load")]
-            internal static extern MediaVisionError Load(string fileName, out IntPtr handle);
+            internal static extern MediaVisionError Load(string fileName, out IntPtr handle); // Deprecated in API 12
         }
 
         /// <summary>