merge tizen_devel to tizen

merge tizen_devel to tizen

Inki Dae (5):
  mv_machine_learning: code refactoring to face recognition
  mv_machine_learning: face recognition: consider multiple threads
  mv_machine_learning: face recognition: allow 5 set per a label
  mv_machine_learning: tc: fix bugs
  mv_machine_learning: face recognition: drop nntrainer dependency

Kwanghoon Son (4):
  Fix json_to_string memory leak
  Fix LOGE to LOGI
  Fix QRcode error handle
  Delete null check before free

 mv_3d/3d/src/mv_3d_open.cpp                   |  12 +-
 .../src/mv_barcode_generate_open.cpp          |   8 +-
 mv_machine_learning/common/include/context.h  |   4 +-
 .../face_recognition/CMakeLists.txt           |   2 +-
 .../include/face_recognition.h                |  45 ++--
 .../include/face_recognition_adapter.h        |  35 +--
 ...nntrainer_dsm.h => face_recognition_dsm.h} |  11 +-
 ...nntrainer_fvm.h => face_recognition_fvm.h} |  11 +-
 .../include/face_recognition_type.h           |  82 +++++++
 .../face_recognition/include/facenet.h        |  64 ++++++
 .../include/facenet_adapter.h                 |  52 +++++
 .../{face_net_info.h => facenet_parser.h}     |  31 +--
 .../face_recognition/include/simple_shot.h    |   4 +-
 .../meta/face_recognition.json                |  26 ++-
 .../face_recognition/src/face_net_info.cpp    |  61 ------
 .../face_recognition/src/face_recognition.cpp | 204 ++++--------------
 .../src/face_recognition_adapter.cpp          |  37 ++--
 ...ainer_dsm.cpp => face_recognition_dsm.cpp} |  21 +-
 ...ainer_fvm.cpp => face_recognition_fvm.cpp} |  27 +--
 .../face_recognition/src/facenet.cpp          | 147 +++++++++++++
 .../face_recognition/src/facenet_adapter.cpp  |  71 ++++++
 .../face_recognition/src/facenet_parser.cpp   |  49 +++++
 .../src/mv_face_recognition_open.cpp          | 106 ++++++---
 .../face_recognition/src/simple_shot.cpp      |  19 +-
 .../inference/include/Inference.h             |  12 +-
 .../inference/src/Inference.cpp               |  22 +-
 .../inference/src/InputMetadata.cpp           |   8 +-
 .../inference/src/OutputMetadata.cpp          |   4 +-
 .../inference/src/mv_inference_open.cpp       |  18 +-
 mv_machine_learning/meta/src/MetaParser.cpp   |   8 +-
 .../training/include/data_set_manager.h       |   3 +
 .../training/include/feature_vector_manager.h |   5 +-
 .../training/include/training_model.h         |   6 +-
 .../training/src/data_set_manager.cpp         |   1 +
 .../training/src/training_model.cpp           |   7 +-
 .../surveillance/src/EventTrigger.cpp         |   8 +-
 .../src/EventTriggerPersonRecognition.cpp     |  24 +--
 .../surveillance/src/mv_surveillance.c        |   6 +-
 packaging/capi-media-vision.spec              |   1 +
 test/CMakeLists.txt                           |   4 +-
 .../surveillance/assessment_surveillance.cpp  |  12 +-
 test/testsuites/barcode/barcode_test_suite.c  |  40 ++--
 test/testsuites/barcode/test_barcode.cpp      |  52 ++++-
 .../visualizer/src/mv_util_render_2d.cpp      |   3 +-
 .../face_recognition/CMakeLists.txt           |   9 +-
 .../test_face_recognition.cpp                 |  23 +-
 .../test_face_recognition_multi_threads.cpp   | 196 +++++++++++++++++
 47 files changed, 1067 insertions(+), 534 deletions(-)
 rename mv_machine_learning/face_recognition/include/{nntrainer_dsm.h => face_recognition_dsm.h} (80%)
 rename mv_machine_learning/face_recognition/include/{nntrainer_fvm.h => face_recognition_fvm.h} (78%)
 create mode 100644 mv_machine_learning/face_recognition/include/face_recognition_type.h
 create mode 100644 mv_machine_learning/face_recognition/include/facenet.h
 create mode 100644 mv_machine_learning/face_recognition/include/facenet_adapter.h
 rename mv_machine_learning/face_recognition/include/{face_net_info.h => facenet_parser.h} (56%)
 delete mode 100644 mv_machine_learning/face_recognition/src/face_net_info.cpp
 rename mv_machine_learning/face_recognition/src/{nntrainer_dsm.cpp => face_recognition_dsm.cpp} (83%)
 rename mv_machine_learning/face_recognition/src/{nntrainer_fvm.cpp => face_recognition_fvm.cpp} (64%)
 create mode 100644 mv_machine_learning/face_recognition/src/facenet.cpp
 create mode 100644 mv_machine_learning/face_recognition/src/facenet_adapter.cpp
 create mode 100644 mv_machine_learning/face_recognition/src/facenet_parser.cpp
 create mode 100644 test/testsuites/machine_learning/face_recognition/test_face_recognition_multi_threads.cpp

Change-Id: I5e2748553886ab196412b0420f83d686ea5731c0
Signed-off-by: Inki Dae <inki.dae@samsung.com>