Merge "[ML][Pipeline] Change CustomFilter interface and implementation" into tizen

[platform/core/api/webapi-plugins.git] / src / ml / ml_instance.cc

diff --git a/src/ml/ml_instance.cc b/src/ml/ml_instance.cc
index 85d96dd..98dd285 100644 (file)
--- a/src/ml/ml_instance.cc
+++ b/src/ml/ml_instance.cc
@@ -564,6 +564,12 @@ void MlInstance::MLTensorsDataDispose(const picojson::value& args, picojson::obj
                       ("Could not find TensorsData handle with given id: %d", tensors_data_id));
     return;
   }
+
+  if (!tensors_data->DisposableFromJS()) {
+    ReportSuccess(out);
+    return;
+  }
+
   // Dispose underlying tensorsInfo
   PlatformResult result = GetTensorsInfoManager().DisposeTensorsInfo(tensors_data->TensorsInfoId());
   if (!result) {
@@ -1304,17 +1310,12 @@ void MlInstance::MLPipelineManagerCustomFilterOutput(const picojson::value& args
   CHECK_ARGS(args, kName, std::string, out);
   CHECK_ARGS(args, kStatus, double, out);
   CHECK_ARGS(args, kRequestId, double, out);
-  CHECK_ARGS(args, kDataId, double, out);
-  CHECK_ARGS(args, kCallbackId, double, out);
 
   const auto& custom_filter_name = args.get(kName).get<std::string>();
   auto status = static_cast<int>(args.get(kStatus).get<double>());
   auto request_id = static_cast<int>(args.get(kRequestId).get<double>());
-  auto data_id = static_cast<int>(args.get(kDataId).get<double>());
-  auto callback_id = static_cast<int>(args.get(kCallbackId).get<double>());
 
-  auto ret = pipeline_manager_.CustomFilterOutput(custom_filter_name, request_id, status, data_id,
-                                                  callback_id);
+  auto ret = pipeline_manager_.CustomFilterOutput(custom_filter_name, request_id, status);
   if (!ret) {
     LogAndReportError(ret, &out);
     return;