[Multimedia] Fix VD SVACE issues (#5445)

diff --git a/src/Tizen.Multimedia.AudioIO/WavPlayer/WavPlayerError.cs b/src/Tizen.Multimedia.AudioIO/WavPlayer/WavPlayerError.cs
index 4570b22fe1cd50b80b73e6822f5b5981398b4bd7..037bcef211dcc1a493986572a6a3229f7f08d10a 100644 (file)
--- a/src/Tizen.Multimedia.AudioIO/WavPlayer/WavPlayerError.cs
+++ b/src/Tizen.Multimedia.AudioIO/WavPlayer/WavPlayerError.cs
@@ -51,8 +51,10 @@ namespace Tizen.Multimedia
 
                 case WavPlayerError.InvalidOperation:
                     throw new InvalidOperationException(message);
+
+                default:
+                    break;
             }
         }
     }
-
 }

diff --git a/src/Tizen.Multimedia.MediaPlayer/Player/PlayerError.cs b/src/Tizen.Multimedia.MediaPlayer/Player/PlayerError.cs
index 7bc6eee8ff7c4c01bcc3bce94b299c05082683f2..3a21db007a0ed86c745f0606b5811397fb286a7e 100644 (file)
--- a/src/Tizen.Multimedia.MediaPlayer/Player/PlayerError.cs
+++ b/src/Tizen.Multimedia.MediaPlayer/Player/PlayerError.cs
@@ -54,36 +54,36 @@ namespace Tizen.Multimedia
 
     internal static class PlayerErrorCodeExtensions
     {
-        internal static void ThrowIfFailed(this PlayerErrorCode err, Player player, string message)
+        internal static void ThrowIfFailed(this PlayerErrorCode errorCode, Player player, string message)
         {
-            if (err == PlayerErrorCode.None)
+            if (errorCode == PlayerErrorCode.None)
             {
                 return;
             }
 
-            var ex = err.GetException(message);
+            var ex = errorCode.GetException(message);
 
             if (ex == null)
             {
                 // Notify only when it can't be handled.
-                player?.NotifyError((int)err, message);
+                player?.NotifyError((int)errorCode, message);
 
-                throw new InvalidOperationException($"{message} : Unknown error({err.ToString()}).");
+                throw new InvalidOperationException($"{message} : Unknown error({errorCode.ToString()}).");
             }
 
             throw ex;
         }
 
-        internal static Exception GetException(this PlayerErrorCode err, string message)
+        internal static Exception GetException(this PlayerErrorCode errorCode, string message)
         {
-            if (err == PlayerErrorCode.None)
+            if (errorCode == PlayerErrorCode.None)
             {
                 return null;
             }
 
-            string msg = $"{ (message ?? "Operation failed") } : { err.ToString() }.";
+            string msg = $"{ (message ?? "Operation failed") } : { errorCode.ToString() }.";
 
-            switch (err)
+            switch (errorCode)
             {
                 case PlayerErrorCode.InvalidArgument:
                 case PlayerErrorCode.InvalidUri:
@@ -133,6 +133,10 @@ namespace Tizen.Multimedia
 
                 case PlayerErrorCode.NotAvailable:
                     throw new NotAvailableException(msg);
+
+                default:
+                    Log.Info(PlayerLog.Tag, "Unknow error: " + errorCode);
+                    break;
             }
 
             return null;

diff --git a/src/Tizen.Multimedia.Metadata/MetadataEditor/MetadataEditorError.cs b/src/Tizen.Multimedia.Metadata/MetadataEditor/MetadataEditorError.cs
index 9256900363c1bda14f53b7798b969aff1efa734a..c3c53777123a34faf49ce70b78b78e11cd20df1f 100644 (file)
--- a/src/Tizen.Multimedia.Metadata/MetadataEditor/MetadataEditorError.cs
+++ b/src/Tizen.Multimedia.Metadata/MetadataEditor/MetadataEditorError.cs
@@ -67,6 +67,10 @@ namespace Tizen.Multimedia
                 case MetadataEditorError.OperationFailed:
                 case MetadataEditorError.UpdateNotPossible:
                     throw new InvalidOperationException(errorMessages);
+
+                default:
+                    Log.Error(typeof(MetadataEditor).FullName, $"Unknown error : {errorCode.ToString()}");
+                    break;
             }
         }
     }

diff --git a/src/Tizen.Multimedia.Metadata/MetadataExtractor/MetadataExtractorError.cs b/src/Tizen.Multimedia.Metadata/MetadataExtractor/MetadataExtractorError.cs
index 73fd6b47226b8cab238a6c815c53a24ba4723c9c..953f0dddb08130cdcd0a1821d3e6235ce0f6d77a 100644 (file)
--- a/src/Tizen.Multimedia.Metadata/MetadataExtractor/MetadataExtractorError.cs
+++ b/src/Tizen.Multimedia.Metadata/MetadataExtractor/MetadataExtractorError.cs
@@ -36,9 +36,14 @@ namespace Tizen.Multimedia
 
     internal static class MetadataExtractorRetValidator
     {
-        internal static void ThrowIfError(MetadataExtractorError error, string errorMessage)
+        internal static void ThrowIfError(MetadataExtractorError errorCode, string errorMessage)
         {
-            switch (error)
+            if (errorCode == MetadataExtractorError.None)
+            {
+                return;
+            }
+
+            switch (errorCode)
             {
                 case MetadataExtractorError.InvalidParameter:
                     throw new ArgumentException(errorMessage);
@@ -54,6 +59,10 @@ namespace Tizen.Multimedia
 
                 case MetadataExtractorError.OperationFailed:
                     throw new InvalidOperationException(errorMessage);
+
+                default:
+                    Log.Error(typeof(MetadataExtractor).FullName, $"Unknown error : {errorCode.ToString()}");
+                    break;
             }
         }
     }

diff --git a/src/Tizen.Multimedia.Recorder/Recorder/RecorderExtensions.cs b/src/Tizen.Multimedia.Recorder/Recorder/RecorderExtensions.cs
index 19924b104dcff7b727ad9817bd597f218f5cef90..9364d8385347339775c52701c3eb6f07be1e69f6 100644 (file)
--- a/src/Tizen.Multimedia.Recorder/Recorder/RecorderExtensions.cs
+++ b/src/Tizen.Multimedia.Recorder/Recorder/RecorderExtensions.cs
@@ -53,6 +53,9 @@ namespace Tizen.Multimedia
                 case RecorderVideoCodec.Theora:
                     yield return RecorderFileFormat.Ogg;
                     break;
+
+                default:
+                    break;
             }
         }
 
@@ -93,6 +96,9 @@ namespace Tizen.Multimedia
                 case RecorderAudioCodec.Pcm:
                     yield return RecorderFileFormat.Wav;
                     break;
+
+                default:
+                    break;
             }
         }
 

diff --git a/src/Tizen.Multimedia.Remoting/MediaController/MediaControlEnums.cs b/src/Tizen.Multimedia.Remoting/MediaController/MediaControlEnums.cs
index 2797d6dce98f07070330530495e84c18525727f6..ef908a20b3e54dbf1fc2a8c2b72591e4d463bb0d 100644 (file)
--- a/src/Tizen.Multimedia.Remoting/MediaController/MediaControlEnums.cs
+++ b/src/Tizen.Multimedia.Remoting/MediaController/MediaControlEnums.cs
@@ -397,6 +397,7 @@ namespace Tizen.Multimedia.Remoting
                 case MediaControllerNativePlaybackState.Connecting: return MediaControlPlaybackState.Connecting;
                 case MediaControllerNativePlaybackState.Buffering: return MediaControlPlaybackState.Buffering;
                 case MediaControllerNativePlaybackState.Error: return MediaControlPlaybackState.Error;
+                default: break;
             }
 
             Debug.Fail($"Not supported code for playback state{nativeState}.");
@@ -417,6 +418,7 @@ namespace Tizen.Multimedia.Remoting
                 case MediaControlPlaybackState.Connecting: return MediaControllerNativePlaybackState.Connecting;
                 case MediaControlPlaybackState.Buffering: return MediaControllerNativePlaybackState.Buffering;
                 case MediaControlPlaybackState.Error: return MediaControllerNativePlaybackState.Error;
+                default: break;
             }
             return MediaControllerNativePlaybackState.None;
         }
@@ -433,6 +435,7 @@ namespace Tizen.Multimedia.Remoting
                 case MediaControllerNativePlaybackAction.FastForward: return MediaControlPlaybackCommand.FastForward;
                 case MediaControllerNativePlaybackAction.Rewind: return MediaControlPlaybackCommand.Rewind;
                 case MediaControllerNativePlaybackAction.Toggle: return MediaControlPlaybackCommand.Toggle;
+                default: break;
             }
 
             Debug.Fail($"Not supported code for playback command{nativeAction}.");
@@ -451,6 +454,7 @@ namespace Tizen.Multimedia.Remoting
                 case MediaControlPlaybackCommand.FastForward: return MediaControllerNativePlaybackAction.FastForward;
                 case MediaControlPlaybackCommand.Rewind: return MediaControllerNativePlaybackAction.Rewind;
                 case MediaControlPlaybackCommand.Toggle: return MediaControllerNativePlaybackAction.Toggle;
+                default: break;
             }
             return MediaControllerNativePlaybackAction.Play;
         }
@@ -490,6 +494,8 @@ namespace Tizen.Multimedia.Remoting
                 case MediaControlDisplayMode.CroppedFull:
                     nativeMode = MediaControlNativeDisplayMode.CroppedFull;
                     break;
+                default:
+                    break;
             }
             return nativeMode;
         }
@@ -512,6 +518,8 @@ namespace Tizen.Multimedia.Remoting
                 case MediaControlNativeDisplayMode.CroppedFull:
                     nativeMode = MediaControlDisplayMode.CroppedFull;
                     break;
+                default:
+                    break;
             }
             return nativeMode;
         }
@@ -550,6 +558,8 @@ namespace Tizen.Multimedia.Remoting
                 case Rotation.Rotate270:
                     nativeMode = MediaControlNativeDisplayRotation.Rotate270;
                     break;
+                default:
+                    break;
             }
             return nativeMode;
         }
@@ -572,6 +582,8 @@ namespace Tizen.Multimedia.Remoting
                 case MediaControlNativeDisplayRotation.Rotate270:
                     nativeMode = Rotation.Rotate270;
                     break;
+                default:
+                    break;
             }
             return nativeMode;
         }

diff --git a/src/Tizen.Multimedia.Remoting/MediaController/MediaControllerError.cs b/src/Tizen.Multimedia.Remoting/MediaController/MediaControllerError.cs
index d1b03441991546d7cc0d4aa209843603cce65484..60bceaec757922e07bf4841b529162afd62d7cbe 100644 (file)
--- a/src/Tizen.Multimedia.Remoting/MediaController/MediaControllerError.cs
+++ b/src/Tizen.Multimedia.Remoting/MediaController/MediaControllerError.cs
@@ -56,6 +56,9 @@ namespace Tizen.Multimedia.Remoting
 
                 case MediaControllerError.PermissionDenied:
                     throw new UnauthorizedAccessException(msg);
+
+                default:
+                    break;
             }
 
             throw new InvalidOperationException($"Unknown error({error}) : {message}");

diff --git a/src/Tizen.Multimedia.Remoting/WebRTC/WebRTCDataChannel.cs b/src/Tizen.Multimedia.Remoting/WebRTC/WebRTCDataChannel.cs
index 9a2ded383624cdbd4e9e87406ba3ae4017ee138e..fcb1dc7de8eed6848ec260e438c4b42fb7670595 100755 (executable)
--- a/src/Tizen.Multimedia.Remoting/WebRTC/WebRTCDataChannel.cs
+++ b/src/Tizen.Multimedia.Remoting/WebRTC/WebRTCDataChannel.cs
@@ -76,7 +76,7 @@ namespace Tizen.Multimedia.Remoting
             NativeDataChannel.Create(webRtc.Handle, label, bundle_, out _handle).
                 ThrowIfFailed("Failed to create webrtc data channel");
 
-            Debug.Assert(_handle != null);
+            Debug.Assert(_handle != IntPtr.Zero);
 
             Label = label;
         }
@@ -227,7 +227,7 @@ namespace Tizen.Multimedia.Remoting
                 return;
             }
 
-            if (_handle != null)
+            if (_handle != IntPtr.Zero)
             {
                 NativeDataChannel.Destroy(_handle);
                 _disposed = true;

diff --git a/src/Tizen.Multimedia.Remoting/WebRTC/WebRTCError.cs b/src/Tizen.Multimedia.Remoting/WebRTC/WebRTCError.cs
index a0c4c5dd82db0bf96eaf6bd7d2e81675b987bd22..b072b6e0ef9ec2a6e6f3aa1ce33fcd27d668d0aa 100755 (executable)
--- a/src/Tizen.Multimedia.Remoting/WebRTC/WebRTCError.cs
+++ b/src/Tizen.Multimedia.Remoting/WebRTC/WebRTCError.cs
@@ -59,6 +59,8 @@ namespace Tizen.Multimedia.Remoting
                     throw new ArgumentException(errMessage);
                 case WebRTCErrorCode.PermissionDenied:
                     throw new UnauthorizedAccessException(errMessage);
+                default:
+                    break;
             }
         }
     }

diff --git a/src/Tizen.Multimedia.Remoting/WebRTC/WebRTCSignalingServer.cs b/src/Tizen.Multimedia.Remoting/WebRTC/WebRTCSignalingServer.cs
index 7852c44936c592f555c5936e278f6e9408104cb5..5928867fcee32a065fd75ed1fdf87111bcdff31e 100755 (executable)
--- a/src/Tizen.Multimedia.Remoting/WebRTC/WebRTCSignalingServer.cs
+++ b/src/Tizen.Multimedia.Remoting/WebRTC/WebRTCSignalingServer.cs
@@ -95,7 +95,7 @@ namespace Tizen.Multimedia.Remoting
                 return;
             }
 
-            if (_handle != null)
+            if (_handle != IntPtr.Zero)
             {
                 SignalingServer.Destroy(_handle);
                 _disposed = true;
@@ -243,7 +243,7 @@ namespace Tizen.Multimedia.Remoting
                 return;
             }
 
-            if (_handle != null)
+            if (_handle != IntPtr.Zero)
             {
                 SignalingClient.Disconnect(_handle);
 

diff --git a/src/Tizen.Multimedia.StreamRecorder/StreamRecorder/StreamRecorderEnums.cs b/src/Tizen.Multimedia.StreamRecorder/StreamRecorder/StreamRecorderEnums.cs
index 5b62ee0c1e1a67fa14c017641470ee87d6e4d5e2..a035cc89057b5be9c8415cfd14a43772430a6ee6 100644 (file)
--- a/src/Tizen.Multimedia.StreamRecorder/StreamRecorder/StreamRecorderEnums.cs
+++ b/src/Tizen.Multimedia.StreamRecorder/StreamRecorder/StreamRecorderEnums.cs
@@ -166,6 +166,9 @@ namespace Tizen.Multimedia
 
                 case StreamRecorderVideoCodec.Mpeg4:
                     return RecorderVideoCodec.Mpeg4;
+
+                default:
+                    break;
             }
 
             Debug.Fail("Unknown video codec value.");
@@ -181,6 +184,9 @@ namespace Tizen.Multimedia
 
                 case RecorderVideoCodec.Mpeg4:
                     return StreamRecorderVideoCodec.Mpeg4;
+
+                default:
+                    break;
             }
 
             throw new NotSupportedException($"{value.ToString()} is not supported.");
@@ -199,6 +205,9 @@ namespace Tizen.Multimedia
 
                 case StreamRecorderAudioCodec.Pcm:
                     return RecorderAudioCodec.Pcm;
+
+                default:
+                    break;
             }
 
             Debug.Fail("Unknown audio codec value.");
@@ -218,6 +227,9 @@ namespace Tizen.Multimedia
 
                 case RecorderAudioCodec.Pcm:
                     return StreamRecorderAudioCodec.Pcm;
+
+                default:
+                    break;
             }
 
             throw new NotSupportedException($"{value.ToString()} is not supported.");
@@ -242,6 +254,9 @@ namespace Tizen.Multimedia
 
                 case StreamRecorderFileFormat.Wav:
                     return RecorderFileFormat.Wav;
+
+                default:
+                    break;
             }
 
             Debug.Fail("Unknown file format value.");
@@ -267,6 +282,9 @@ namespace Tizen.Multimedia
 
                 case RecorderFileFormat.Wav:
                     return StreamRecorderFileFormat.Wav;
+
+                default:
+                    break;
             }
 
             throw new NotSupportedException($"{value.ToString()} is not supported.");

diff --git a/src/Tizen.Multimedia.StreamRecorder/StreamRecorder/StreamRecorderError.cs b/src/Tizen.Multimedia.StreamRecorder/StreamRecorder/StreamRecorderError.cs
index 3c971de9f7d80ca616ae7de75d96348fd2301ba2..736537880e4f443c9c3bada17bbb67ce842833ce 100644 (file)
--- a/src/Tizen.Multimedia.StreamRecorder/StreamRecorder/StreamRecorderError.cs
+++ b/src/Tizen.Multimedia.StreamRecorder/StreamRecorder/StreamRecorderError.cs
@@ -40,14 +40,14 @@ namespace Tizen.Multimedia
             return (ignore == errorCode) ? StreamRecorderErrorCode.None : errorCode;
         }
 
-        internal static void ThrowIfError(this StreamRecorderErrorCode err, string errorMessage)
+        internal static void ThrowIfError(this StreamRecorderErrorCode errorCode, string errorMessage)
         {
-            if (err == StreamRecorderErrorCode.None)
+            if (errorCode == StreamRecorderErrorCode.None)
             {
                 return;
             }
 
-            switch (err)
+            switch (errorCode)
             {
                 case StreamRecorderErrorCode.InvalidParameter:
                     throw new ArgumentException(errorMessage);
@@ -67,6 +67,10 @@ namespace Tizen.Multimedia
 
                 case StreamRecorderErrorCode.OutOfStorage:
                     throw new IOException(errorMessage);
+
+                default:
+                    Log.Error("Tizen.Multimedia.StreamRecorder", $"Unknown error : {errorCode.ToString()}");
+                    break;
             }
         }
     }

diff --git a/src/Tizen.Multimedia.Util/ImageUtil/ImageUtilEnums.cs b/src/Tizen.Multimedia.Util/ImageUtil/ImageUtilEnums.cs
index c850ea10d5ca840754c96b8dc4a5d739d2d49b5c..37d60822770b92975a84f412dbd953ea04919111 100644 (file)
--- a/src/Tizen.Multimedia.Util/ImageUtil/ImageUtilEnums.cs
+++ b/src/Tizen.Multimedia.Util/ImageUtil/ImageUtilEnums.cs
@@ -196,34 +196,21 @@ namespace Tizen.Multimedia.Util
             switch (value)
             {
                 case ImageColorSpace.YV12: return ColorSpace.YV12;
-
                 case ImageColorSpace.Uyvy: return ColorSpace.Uyvy;
-
                 case ImageColorSpace.Yuyv: return ColorSpace.Yuyv;
-
                 case ImageColorSpace.Yuv422: return ColorSpace.Yuv422P;
-
                 case ImageColorSpace.I420: return ColorSpace.I420;
-
                 case ImageColorSpace.Rgb565: return ColorSpace.Rgb565;
-
                 case ImageColorSpace.Rgb888: return ColorSpace.Rgb888;
-
                 case ImageColorSpace.Argb8888: return ColorSpace.Argb8888;
-
                 case ImageColorSpace.Bgra8888: return ColorSpace.Bgra8888;
-
                 case ImageColorSpace.Rgba8888: return ColorSpace.Rgba8888;
-
                 case ImageColorSpace.Bgrx8888: return ColorSpace.Bgrx8888;
-
                 case ImageColorSpace.NV12: return ColorSpace.NV12;
-
                 case ImageColorSpace.NV16: return ColorSpace.NV16;
-
                 case ImageColorSpace.NV21: return ColorSpace.NV21;
-
                 case ImageColorSpace.NV61: return ColorSpace.NV61;
+                default: break;
             }
 
             Debug.Fail($"Not supported color space : {value.ToString()}!");
@@ -240,34 +227,21 @@ namespace Tizen.Multimedia.Util
             switch (colorSpace)
             {
                 case ColorSpace.YV12: return ImageColorSpace.YV12;
-
                 case ColorSpace.Uyvy: return ImageColorSpace.Uyvy;
-
                 case ColorSpace.Yuyv: return ImageColorSpace.Yuyv;
-
                 case ColorSpace.Yuv422: return ImageColorSpace.Yuv422;
-
                 case ColorSpace.I420: return ImageColorSpace.I420;
-
                 case ColorSpace.Rgb565: return ImageColorSpace.Rgb565;
-
                 case ColorSpace.Rgb888: return ImageColorSpace.Rgb888;
-
                 case ColorSpace.Argb8888: return ImageColorSpace.Argb8888;
-
                 case ColorSpace.Bgra8888: return ImageColorSpace.Bgra8888;
-
                 case ColorSpace.Rgba8888: return ImageColorSpace.Rgba8888;
-
                 case ColorSpace.Bgrx8888: return ImageColorSpace.Bgrx8888;
-
                 case ColorSpace.NV12: return ImageColorSpace.NV12;
-
                 case ColorSpace.NV16: return ImageColorSpace.NV16;
-
                 case ColorSpace.NV21: return ImageColorSpace.NV21;
-
                 case ColorSpace.NV61: return ImageColorSpace.NV61;
+                default: break;
             }
 
             throw new NotSupportedException($"The ColorSpace.{colorSpace.ToString()} is not supported.");

diff --git a/src/Tizen.Multimedia.Vision/MediaVision/VisionColorSpace.cs b/src/Tizen.Multimedia.Vision/MediaVision/VisionColorSpace.cs
index 71454287b8e9d0b92812dbaecb5934252902c80d..3211904b635214ece1c1cd52cf921c3a25b945b0 100755 (executable)
--- a/src/Tizen.Multimedia.Vision/MediaVision/VisionColorSpace.cs
+++ b/src/Tizen.Multimedia.Vision/MediaVision/VisionColorSpace.cs
@@ -99,6 +99,10 @@ namespace Tizen.Multimedia.Vision
                 case VisionColorSpace.Rgb888: return ColorSpace.Rgb888;
 
                 case VisionColorSpace.Rgba: return ColorSpace.Rgba8888;
+
+                default:
+                    Log.Error(MediaVisionLog.Tag, "Not supported color format");
+                    break;
             }
 
             throw new NotSupportedException("Implementation does not support the specified value." + value.ToString());
@@ -134,6 +138,10 @@ namespace Tizen.Multimedia.Vision
                 case ColorSpace.Rgb888: return VisionColorSpace.Rgb888;
 
                 case ColorSpace.Rgba8888: return VisionColorSpace.Rgba;
+
+                default:
+                    Log.Error(MediaVisionLog.Tag, "Not supported color format");
+                    break;
             }
 
             throw new NotSupportedException("Implementation does not support the specified value." + colorSpace.ToString());