From: kwangson Date: Mon, 25 May 2020 01:01:26 +0000 (+0900) Subject: [Vision] Change DLLImport file (#1618) X-Git-Tag: accepted/tizen/unified/20210219.040944~734 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8a82e5c1fd54d4833d58ab2a2e16dc8667cfbd65;hp=efc1e72c333fcdfc822bd8fb1a27cee627c8b32c;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git [Vision] Change DLLImport file (#1618) libcapi-media-vision.so.0 is replaced by sub-libraries. Signed-off-by: Kwang Son --- diff --git a/src/Tizen.Multimedia.Vision/Interop/Interop.Libraries.cs b/src/Tizen.Multimedia.Vision/Interop/Interop.Libraries.cs index c48de1c..5e94dcc 100644 --- a/src/Tizen.Multimedia.Vision/Interop/Interop.Libraries.cs +++ b/src/Tizen.Multimedia.Vision/Interop/Interop.Libraries.cs @@ -18,6 +18,12 @@ internal static partial class Interop { internal static partial class Libraries { - public const string MediaVision = "libcapi-media-vision.so.0"; + public const string MediaVisionCommon = "libmv_common.so"; + public const string MediaVisionFace = "libmv_face.so"; + public const string MediaVisionInference = "libmv_inference.so"; + public const string MediaVisionImage = "libmv_image.so"; + public const string MediaVisionSurveillance = "libmv_surveillance.so"; + public const string MediaVisionBarcodeDetector = "libmv_barcode_detector.so"; + public const string MediaVisionBarcodeGenerator = "libmv_barcode_generator.so"; } } diff --git a/src/Tizen.Multimedia.Vision/Interop/Interop.MediaVision.BarCode.cs b/src/Tizen.Multimedia.Vision/Interop/Interop.MediaVision.BarCode.cs index 0d7d134..4df628f 100644 --- a/src/Tizen.Multimedia.Vision/Interop/Interop.MediaVision.BarCode.cs +++ b/src/Tizen.Multimedia.Vision/Interop/Interop.MediaVision.BarCode.cs @@ -33,7 +33,7 @@ internal static partial class Interop /// internal static partial class BarcodeDetector { - [DllImport(Libraries.MediaVision, EntryPoint = "mv_barcode_detect")] + [DllImport(Libraries.MediaVisionBarcodeDetector, EntryPoint = "mv_barcode_detect")] internal static extern MediaVisionError Detect(IntPtr source, IntPtr engineCfg, Rectangle roi, DetectedCallback detectCb, IntPtr userData = default(IntPtr)); @@ -55,11 +55,11 @@ internal static partial class Interop /// internal static partial class BarcodeGenerator { - [DllImport(Libraries.MediaVision, EntryPoint = "mv_barcode_generate_source")] + [DllImport(Libraries.MediaVisionBarcodeGenerator, EntryPoint = "mv_barcode_generate_source")] internal static extern MediaVisionError GenerateSource(IntPtr engineCfg, string message, BarcodeType type, int qrEncMode, int qrEcc, int qrVersion, IntPtr source); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_barcode_generate_image")] + [DllImport(Libraries.MediaVisionBarcodeGenerator, EntryPoint = "mv_barcode_generate_image")] internal static extern MediaVisionError GenerateImage(IntPtr engineCfg, string message, int imageWidth, int imageHeight, BarcodeType type, int qrEncMode, int qrEcc, int qrVersion, string imagePath, BarcodeImageFormat imageFormat); diff --git a/src/Tizen.Multimedia.Vision/Interop/Interop.MediaVision.Common.cs b/src/Tizen.Multimedia.Vision/Interop/Interop.MediaVision.Common.cs index a6e1645..02ddb26 100644 --- a/src/Tizen.Multimedia.Vision/Interop/Interop.MediaVision.Common.cs +++ b/src/Tizen.Multimedia.Vision/Interop/Interop.MediaVision.Common.cs @@ -135,32 +135,32 @@ internal static partial class Interop /// internal static partial class MediaSource { - [DllImport(Libraries.MediaVision, EntryPoint = "mv_create_source")] + [DllImport(Libraries.MediaVisionCommon, EntryPoint = "mv_create_source")] internal static extern MediaVisionError Create(out IntPtr source); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_destroy_source")] + [DllImport(Libraries.MediaVisionCommon, EntryPoint = "mv_destroy_source")] internal static extern int Destroy(IntPtr /* mv_source_h */ source); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_source_fill_by_media_packet")] + [DllImport(Libraries.MediaVisionCommon, EntryPoint = "mv_source_fill_by_media_packet")] internal static extern MediaVisionError FillMediaPacket(IntPtr source, IntPtr mediaPacket); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_source_fill_by_buffer")] + [DllImport(Libraries.MediaVisionCommon, EntryPoint = "mv_source_fill_by_buffer")] internal static extern MediaVisionError FillBuffer(IntPtr source, byte[] buffer, int bufferSize, uint imageWidth, uint imageHeight, VisionColorSpace colorspace); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_source_clear")] + [DllImport(Libraries.MediaVisionCommon, EntryPoint = "mv_source_clear")] internal static extern int Clear(IntPtr /* mv_source_h */ source); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_source_get_buffer")] + [DllImport(Libraries.MediaVisionCommon, EntryPoint = "mv_source_get_buffer")] internal static extern MediaVisionError GetBuffer(IntPtr source, out IntPtr buffer, out int bufferSize); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_source_get_height")] + [DllImport(Libraries.MediaVisionCommon, EntryPoint = "mv_source_get_height")] internal static extern int GetHeight(IntPtr source, out uint imageHeight); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_source_get_width")] + [DllImport(Libraries.MediaVisionCommon, EntryPoint = "mv_source_get_width")] internal static extern int GetWidth(IntPtr source, out uint imageWidth); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_source_get_colorspace")] + [DllImport(Libraries.MediaVisionCommon, EntryPoint = "mv_source_get_colorspace")] internal static extern int GetColorspace(IntPtr /* mv_source_h */ source, out VisionColorSpace colorspace); } @@ -169,41 +169,41 @@ internal static partial class Interop /// internal static partial class EngineConfig { - [DllImport(Libraries.MediaVision, EntryPoint = "mv_create_engine_config")] + [DllImport(Libraries.MediaVisionCommon, EntryPoint = "mv_create_engine_config")] internal static extern MediaVisionError Create(out IntPtr handle); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_destroy_engine_config")] + [DllImport(Libraries.MediaVisionCommon, EntryPoint = "mv_destroy_engine_config")] internal static extern int Destroy(IntPtr handle); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_engine_config_set_double_attribute")] + [DllImport(Libraries.MediaVisionCommon, EntryPoint = "mv_engine_config_set_double_attribute")] internal static extern MediaVisionError SetDouble(IntPtr handle, string name, double value); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_engine_config_set_int_attribute")] + [DllImport(Libraries.MediaVisionCommon, EntryPoint = "mv_engine_config_set_int_attribute")] internal static extern MediaVisionError SetInt(IntPtr handle, string name, int value); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_engine_config_set_bool_attribute")] + [DllImport(Libraries.MediaVisionCommon, EntryPoint = "mv_engine_config_set_bool_attribute")] internal static extern MediaVisionError SetBool(IntPtr handle, string name, bool value); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_engine_config_set_string_attribute")] + [DllImport(Libraries.MediaVisionCommon, EntryPoint = "mv_engine_config_set_string_attribute")] internal static extern MediaVisionError SetString(IntPtr handle, string name, string value); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_engine_config_set_array_string_attribute")] + [DllImport(Libraries.MediaVisionCommon, EntryPoint = "mv_engine_config_set_array_string_attribute")] internal static extern MediaVisionError SetStringArray(IntPtr handle, string name, [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 3)] string[] value, int size); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_engine_config_get_double_attribute")] + [DllImport(Libraries.MediaVisionCommon, EntryPoint = "mv_engine_config_get_double_attribute")] internal static extern MediaVisionError GetDouble(IntPtr handle, string name, out double value); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_engine_config_get_int_attribute")] + [DllImport(Libraries.MediaVisionCommon, EntryPoint = "mv_engine_config_get_int_attribute")] internal static extern MediaVisionError GetInt(IntPtr handle, string name, out int value); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_engine_config_get_bool_attribute")] + [DllImport(Libraries.MediaVisionCommon, EntryPoint = "mv_engine_config_get_bool_attribute")] internal static extern MediaVisionError GetBool(IntPtr handle, string name, out bool value); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_engine_config_get_string_attribute")] + [DllImport(Libraries.MediaVisionCommon, EntryPoint = "mv_engine_config_get_string_attribute")] internal static extern MediaVisionError GetString(IntPtr handle, string name, out IntPtr value); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_engine_config_get_array_string_attribute")] + [DllImport(Libraries.MediaVisionCommon, EntryPoint = "mv_engine_config_get_array_string_attribute")] internal static extern MediaVisionError GetStringArray(IntPtr handle, string name, out IntPtr value, out int size); } diff --git a/src/Tizen.Multimedia.Vision/Interop/Interop.MediaVision.Face.cs b/src/Tizen.Multimedia.Vision/Interop/Interop.MediaVision.Face.cs index 8ce61f8..7c3374a 100755 --- a/src/Tizen.Multimedia.Vision/Interop/Interop.MediaVision.Face.cs +++ b/src/Tizen.Multimedia.Vision/Interop/Interop.MediaVision.Face.cs @@ -33,27 +33,27 @@ internal static partial class Interop /// internal static partial class Face { - [DllImport(Libraries.MediaVision, EntryPoint = "mv_face_detect")] + [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_detect")] internal static extern MediaVisionError Detect(IntPtr source, IntPtr engineCfg, DetectedCallback detectedCb, IntPtr userData = default(IntPtr)); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_face_recognize")] + [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)); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_face_recognize")] + [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)); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_face_track")] + [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)); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_face_eye_condition_recognize")] + [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)); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_face_facial_expression_recognize")] + [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_facial_expression_recognize")] internal static extern MediaVisionError RecognizeFacialExpression(IntPtr source, IntPtr engineCfg, Rectangle faceLocation, MvFaceFacialExpressionRecognizedCallback expressionRecognizedCb, IntPtr userData = default(IntPtr)); @@ -85,39 +85,39 @@ internal static partial class Interop /// internal static partial class FaceRecognitionModel { - [DllImport(Libraries.MediaVision, EntryPoint = "mv_face_recognition_model_create")] + [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_recognition_model_create")] internal static extern MediaVisionError Create(out IntPtr handle); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_face_recognition_model_destroy")] + [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_recognition_model_destroy")] internal static extern int Destroy(IntPtr handle); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_face_recognition_model_clone")] + [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_recognition_model_clone")] internal static extern int Clone(IntPtr src, out IntPtr dst); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_face_recognition_model_save")] + [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_recognition_model_save")] internal static extern MediaVisionError Save(string fileName, IntPtr handle); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_face_recognition_model_load")] + [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_recognition_model_load")] internal static extern MediaVisionError Load(string fileName, out IntPtr handle); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_face_recognition_model_add")] + [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_recognition_model_add")] internal static extern MediaVisionError Add(IntPtr source, IntPtr recognitionModel, ref Rectangle exampleLocation, int faceLabel); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_face_recognition_model_add")] + [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_recognition_model_add")] internal static extern MediaVisionError Add(IntPtr source, IntPtr recognitionModel, IntPtr exampleLocation, int faceLabel); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_face_recognition_model_reset")] + [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_recognition_model_reset")] internal static extern MediaVisionError Reset(IntPtr recognitionModel, IntPtr faceLabel = default(IntPtr)); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_face_recognition_model_reset")] + [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_recognition_model_reset")] internal static extern MediaVisionError Remove(IntPtr recognitionModel, ref int faceLabel); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_face_recognition_model_learn")] + [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_recognition_model_learn")] internal static extern MediaVisionError Learn(IntPtr engineCfg, IntPtr handle); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_face_recognition_model_query_labels")] + [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_recognition_model_query_labels")] internal static extern MediaVisionError QueryLabels(IntPtr handle, out IntPtr labels, out uint numberOfLabels); } @@ -126,27 +126,27 @@ internal static partial class Interop /// internal static partial class FaceTrackingModel { - [DllImport(Libraries.MediaVision, EntryPoint = "mv_face_tracking_model_create")] + [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_tracking_model_create")] internal static extern MediaVisionError Create(out IntPtr handle); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_face_tracking_model_destroy")] + [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_tracking_model_destroy")] internal static extern int Destroy(IntPtr handle); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_face_tracking_model_prepare")] + [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_tracking_model_prepare")] internal static extern MediaVisionError Prepare(IntPtr trackingModel, IntPtr engineCfg, IntPtr source, ref Quadrangle location); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_face_tracking_model_prepare")] + [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_tracking_model_prepare")] internal static extern MediaVisionError Prepare(IntPtr trackingModel, IntPtr engineCfg, IntPtr source, IntPtr location); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_face_tracking_model_clone")] + [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_tracking_model_clone")] internal static extern int Clone(IntPtr src, out IntPtr dst); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_face_tracking_model_save")] + [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_tracking_model_save")] internal static extern MediaVisionError Save(string fileName, IntPtr handle); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_face_tracking_model_load")] + [DllImport(Libraries.MediaVisionFace, EntryPoint = "mv_face_tracking_model_load")] internal static extern MediaVisionError Load(string fileName, out IntPtr handle); } } diff --git a/src/Tizen.Multimedia.Vision/Interop/Interop.MediaVision.Image.cs b/src/Tizen.Multimedia.Vision/Interop/Interop.MediaVision.Image.cs index ebf59ed..36bebd2 100755 --- a/src/Tizen.Multimedia.Vision/Interop/Interop.MediaVision.Image.cs +++ b/src/Tizen.Multimedia.Vision/Interop/Interop.MediaVision.Image.cs @@ -33,42 +33,42 @@ internal static partial class Interop /// internal static partial class Image { - [DllImport(Libraries.MediaVision, EntryPoint = "mv_image_recognize")] + [DllImport(Libraries.MediaVisionImage, EntryPoint = "mv_image_recognize")] internal static extern MediaVisionError Recognize(IntPtr source, IntPtr[] imageObjects, int numberOfObjects, IntPtr engineCfg, RecognizedCallback recognizedCb, IntPtr userData = default(IntPtr)); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_image_track")] + [DllImport(Libraries.MediaVisionImage, EntryPoint = "mv_image_track")] internal static extern MediaVisionError Track(IntPtr source, IntPtr imageTrackingModel, IntPtr engineCfg, TrackedCallback trackedCb, IntPtr userData = default(IntPtr)); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_image_object_create")] + [DllImport(Libraries.MediaVisionImage, EntryPoint = "mv_image_object_create")] internal static extern MediaVisionError Create(out IntPtr handle); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_image_object_destroy")] + [DllImport(Libraries.MediaVisionImage, EntryPoint = "mv_image_object_destroy")] internal static extern int Destroy(IntPtr handle); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_image_object_fill")] + [DllImport(Libraries.MediaVisionImage, EntryPoint = "mv_image_object_fill")] internal static extern MediaVisionError Fill(IntPtr handle, IntPtr engineCfg, IntPtr source, ref Rectangle location); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_image_object_fill")] + [DllImport(Libraries.MediaVisionImage, EntryPoint = "mv_image_object_fill")] internal static extern MediaVisionError Fill(IntPtr handle, IntPtr engineCfg, IntPtr source, IntPtr location); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_image_object_get_recognition_rate")] + [DllImport(Libraries.MediaVisionImage, EntryPoint = "mv_image_object_get_recognition_rate")] internal static extern MediaVisionError GetRecognitionRate(IntPtr handle, out double recognitionRate); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_image_object_set_label")] + [DllImport(Libraries.MediaVisionImage, EntryPoint = "mv_image_object_set_label")] internal static extern MediaVisionError SetLabel(IntPtr handle, int label); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_image_object_get_label")] + [DllImport(Libraries.MediaVisionImage, EntryPoint = "mv_image_object_get_label")] internal static extern MediaVisionError GetLabel(IntPtr handle, out int label); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_image_object_clone")] + [DllImport(Libraries.MediaVisionImage, EntryPoint = "mv_image_object_clone")] internal static extern int Clone(IntPtr src, out IntPtr dst); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_image_object_save")] + [DllImport(Libraries.MediaVisionImage, EntryPoint = "mv_image_object_save")] internal static extern MediaVisionError Save(string fileName, IntPtr handle); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_image_object_load")] + [DllImport(Libraries.MediaVisionImage, EntryPoint = "mv_image_object_load")] internal static extern MediaVisionError Load(string fileName, out IntPtr handle); [UnmanagedFunctionPointer(CallingConvention.Cdecl)] @@ -86,25 +86,25 @@ internal static partial class Interop /// internal static partial class ImageTrackingModel { - [DllImport(Libraries.MediaVision, EntryPoint = "mv_image_tracking_model_create")] + [DllImport(Libraries.MediaVisionImage, EntryPoint = "mv_image_tracking_model_create")] internal static extern MediaVisionError Create(out IntPtr imageTrackingModel); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_image_tracking_model_set_target")] + [DllImport(Libraries.MediaVisionImage, EntryPoint = "mv_image_tracking_model_set_target")] internal static extern MediaVisionError SetTarget(IntPtr handle, IntPtr imageTrackingModel); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_image_tracking_model_destroy")] + [DllImport(Libraries.MediaVisionImage, EntryPoint = "mv_image_tracking_model_destroy")] internal static extern int Destroy(IntPtr imageTrackingModel); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_image_tracking_model_refresh")] + [DllImport(Libraries.MediaVisionImage, EntryPoint = "mv_image_tracking_model_refresh")] internal static extern MediaVisionError Refresh(IntPtr imageTrackingModel, IntPtr engineCfg); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_image_tracking_model_clone")] + [DllImport(Libraries.MediaVisionImage, EntryPoint = "mv_image_tracking_model_clone")] internal static extern int Clone(IntPtr src, out IntPtr dest); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_image_tracking_model_save")] + [DllImport(Libraries.MediaVisionImage, EntryPoint = "mv_image_tracking_model_save")] internal static extern MediaVisionError Save(string fileName, IntPtr imageTrackingModel); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_image_tracking_model_load")] + [DllImport(Libraries.MediaVisionImage, EntryPoint = "mv_image_tracking_model_load")] internal static extern MediaVisionError Load(string fileName, out IntPtr imageTrackingModel); } } diff --git a/src/Tizen.Multimedia.Vision/Interop/Interop.MediaVision.Inference.cs b/src/Tizen.Multimedia.Vision/Interop/Interop.MediaVision.Inference.cs index 9f93b0e..f9406c8 100644 --- a/src/Tizen.Multimedia.Vision/Interop/Interop.MediaVision.Inference.cs +++ b/src/Tizen.Multimedia.Vision/Interop/Interop.MediaVision.Inference.cs @@ -64,35 +64,35 @@ internal static partial class Interop IntPtr userData = default(IntPtr)); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_inference_create")] + [DllImport(Libraries.MediaVisionInference, EntryPoint = "mv_inference_create")] internal static extern MediaVisionError Create(out IntPtr handle); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_inference_destroy")] + [DllImport(Libraries.MediaVisionInference, EntryPoint = "mv_inference_destroy")] internal static extern MediaVisionError Destroy(IntPtr handle); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_inference_configure")] + [DllImport(Libraries.MediaVisionInference, EntryPoint = "mv_inference_configure")] internal static extern MediaVisionError Configure(IntPtr handle, IntPtr engineConfig); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_inference_prepare")] + [DllImport(Libraries.MediaVisionInference, EntryPoint = "mv_inference_prepare")] internal static extern MediaVisionError Load(IntPtr handle); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_inference_foreach_supported_engine")] + [DllImport(Libraries.MediaVisionInference, EntryPoint = "mv_inference_foreach_supported_engine")] internal static extern MediaVisionError ForeachSupportedBackend(IntPtr handle, SupportedBackendCallback callback, IntPtr userData = default(IntPtr)); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_inference_image_classify")] + [DllImport(Libraries.MediaVisionInference, EntryPoint = "mv_inference_image_classify")] internal static extern MediaVisionError ClassifyImage(IntPtr source, IntPtr inference, IntPtr roi, ImageClassifedCallback callback, IntPtr userData = default(IntPtr)); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_inference_object_detect")] + [DllImport(Libraries.MediaVisionInference, EntryPoint = "mv_inference_object_detect")] internal static extern MediaVisionError DetectObject(IntPtr source, IntPtr inference, ObjectDetectedCallback callback, IntPtr userData = default(IntPtr)); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_inference_face_detect")] + [DllImport(Libraries.MediaVisionInference, EntryPoint = "mv_inference_face_detect")] internal static extern MediaVisionError DetectFace(IntPtr source, IntPtr inference, FaceDetectedCallback callback, IntPtr userData = default(IntPtr)); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_inference_facial_landmark_detect")] + [DllImport(Libraries.MediaVisionInference, EntryPoint = "mv_inference_facial_landmark_detect")] internal static extern MediaVisionError DetectFacialLandmark(IntPtr source, IntPtr inference, IntPtr roi, FacialLandmarkDetectedCallback callback, IntPtr userData = default(IntPtr)); } diff --git a/src/Tizen.Multimedia.Vision/Interop/Interop.MediaVision.Surveillance.cs b/src/Tizen.Multimedia.Vision/Interop/Interop.MediaVision.Surveillance.cs index d63c6a0..89f0d31 100755 --- a/src/Tizen.Multimedia.Vision/Interop/Interop.MediaVision.Surveillance.cs +++ b/src/Tizen.Multimedia.Vision/Interop/Interop.MediaVision.Surveillance.cs @@ -33,48 +33,48 @@ internal static partial class Interop /// internal static partial class Surveillance { - [DllImport(Libraries.MediaVision, EntryPoint = "mv_surveillance_event_trigger_create")] + [DllImport(Libraries.MediaVisionSurveillance, EntryPoint = "mv_surveillance_event_trigger_create")] internal static extern MediaVisionError EventTriggerCreate(string eventType, out IntPtr trigger); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_surveillance_event_trigger_destroy")] + [DllImport(Libraries.MediaVisionSurveillance, EntryPoint = "mv_surveillance_event_trigger_destroy")] internal static extern int EventTriggerDestroy(IntPtr trigger); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_surveillance_get_event_trigger_type")] + [DllImport(Libraries.MediaVisionSurveillance, EntryPoint = "mv_surveillance_get_event_trigger_type")] internal static extern int GetEventTriggerType(IntPtr trigger, out string eventType); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_surveillance_set_event_trigger_roi")] + [DllImport(Libraries.MediaVisionSurveillance, EntryPoint = "mv_surveillance_set_event_trigger_roi")] internal static extern MediaVisionError SetEventTriggerRoi(IntPtr trigger, int numberOfPoints, Point[] roi); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_surveillance_get_event_trigger_roi")] + [DllImport(Libraries.MediaVisionSurveillance, EntryPoint = "mv_surveillance_get_event_trigger_roi")] internal static extern MediaVisionError GetEventTriggerRoi(IntPtr trigger, out int numberOfPoints, out IntPtr roi); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_surveillance_subscribe_event_trigger")] + [DllImport(Libraries.MediaVisionSurveillance, EntryPoint = "mv_surveillance_subscribe_event_trigger")] internal static extern MediaVisionError SubscribeEventTrigger(IntPtr trigger, int videoStreamId, IntPtr engineCfg, EventOccurredCallback callback, IntPtr userData = default(IntPtr)); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_surveillance_unsubscribe_event_trigger")] + [DllImport(Libraries.MediaVisionSurveillance, EntryPoint = "mv_surveillance_unsubscribe_event_trigger")] internal static extern MediaVisionError UnsubscribeEventTrigger(IntPtr trigger, int videoStreamId); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_surveillance_push_source")] + [DllImport(Libraries.MediaVisionSurveillance, EntryPoint = "mv_surveillance_push_source")] internal static extern MediaVisionError PushSource(IntPtr source, int videoStreamId); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_surveillance_foreach_supported_event_type")] + [DllImport(Libraries.MediaVisionSurveillance, EntryPoint = "mv_surveillance_foreach_supported_event_type")] internal static extern int ForeachSupportedEventType(EventTypeCallback callback, IntPtr userData); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_surveillance_foreach_event_result_name")] + [DllImport(Libraries.MediaVisionSurveillance, EntryPoint = "mv_surveillance_foreach_event_result_name")] internal static extern int ForeachEventResultName(string eventType, EventResultNameCallback callback, IntPtr userData); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_surveillance_get_result_value")] + [DllImport(Libraries.MediaVisionSurveillance, EntryPoint = "mv_surveillance_get_result_value")] internal static extern MediaVisionError GetResultValue(IntPtr result, string name, out int value); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_surveillance_get_result_value")] + [DllImport(Libraries.MediaVisionSurveillance, EntryPoint = "mv_surveillance_get_result_value")] internal static extern MediaVisionError GetResultValue(IntPtr result, string name, [Out] int[] value); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_surveillance_get_result_value")] + [DllImport(Libraries.MediaVisionSurveillance, EntryPoint = "mv_surveillance_get_result_value")] internal static extern MediaVisionError GetResultValue(IntPtr result, string name, [Out] double[] value); - [DllImport(Libraries.MediaVision, EntryPoint = "mv_surveillance_get_result_value")] + [DllImport(Libraries.MediaVisionSurveillance, EntryPoint = "mv_surveillance_get_result_value")] internal static extern MediaVisionError GetResultValue(IntPtr result, string name, [Out] Rectangle[] value); [UnmanagedFunctionPointer(CallingConvention.Cdecl)]