[MediaTool] Change pinvoke method (#2975)

* [MediaTool] Change pinvoke method
* [MediaTool] Changed AudioChannelMap get logic

diff --git a/src/Tizen.Multimedia/Interop/Interop.MediaTool.cs b/src/Tizen.Multimedia/Interop/Interop.MediaTool.cs
index 3174f14..2eba43e 100644 (file)
--- a/src/Tizen.Multimedia/Interop/Interop.MediaTool.cs
+++ b/src/Tizen.Multimedia/Interop/Interop.MediaTool.cs
@@ -188,7 +188,7 @@ namespace Tizen.Multimedia
 
             [DllImport(Libraries.MediaTool, EntryPoint = "media_format_channel_positions_from_mask")]
             internal static extern int GetChannelPositionFromMask(IntPtr handle, ulong mask,
-                out MediaFormatAudioChannelPosition[] position);
+                ref MediaFormatAudioChannelPosition[] position);
 
             [DllImport(Libraries.MediaTool, EntryPoint = "media_format_channel_positions_to_mask")]
             internal static extern int GetMaskFromChannelPosition(IntPtr handle,

diff --git a/src/Tizen.Multimedia/MediaTool/AudioMediaFormat.cs b/src/Tizen.Multimedia/MediaTool/AudioMediaFormat.cs
index 845f3f7..bac2b43 100644 (file)
--- a/src/Tizen.Multimedia/MediaTool/AudioMediaFormat.cs
+++ b/src/Tizen.Multimedia/MediaTool/AudioMediaFormat.cs
@@ -261,7 +261,7 @@ namespace Tizen.Multimedia
             Bit = bit;
             BitRate = bitRate;
             AacType = IsAacSupportedMimeType(mimeType) ? GetAacType(handle) : MediaFormatAacType.None;
-            AudioChannelMap = GetAudioChannelMap(handle);
+            AudioChannelMap = Channel == 0 ? null : GetAudioChannelMap(handle);
         }
 
         private static ReadOnlyCollection<MediaFormatAudioChannelPosition> GetAudioChannelMap(IntPtr handle)
@@ -269,7 +269,9 @@ namespace Tizen.Multimedia
             var ret = Native.GetAudioChannelMask(handle, out ulong mask);
             MultimediaDebug.AssertNoError(ret);
 
-            ret = Native.GetChannelPositionFromMask(handle, mask, out MediaFormatAudioChannelPosition[] positions);
+            var positions = new MediaFormatAudioChannelPosition[Enum.GetNames(typeof(MediaFormatAudioChannelPosition)).Length];
+
+            ret = Native.GetChannelPositionFromMask(handle, mask, ref positions);
             MultimediaDebug.AssertNoError(ret);
 
             return positions == null ? null :