[ITC/UTC][media-vision-dl/capi-media-vision-dl][Non-ACR] Change od model to a lite one

Change-Id: I0882b7890ea7bf7821b9ecc91645615727f5fe51
Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>

diff --git a/src/itc/media-vision-dl/res/inference/models/od_label.txt b/src/itc/media-vision-dl/res/inference/models/od_label.txt
index 029bab8f7ecd56d03bc44e87ba79a8762ec86afa..7a5597ea5dcf6aa9bd5b75be1f6ffab46d14e4de 100644 (file)
--- a/src/itc/media-vision-dl/res/inference/models/od_label.txt
+++ b/src/itc/media-vision-dl/res/inference/models/od_label.txt
@@ -9,7 +9,7 @@ truck
 boat
 traffic light
 fire hydrant
-street sign
+Unknown label
 stop sign
 parking meter
 bench
@@ -23,11 +23,11 @@ elephant
 bear
 zebra
 giraffe
-hat
+Unknown label
 backpack
 umbrella
-shoe
-eye glasses
+Unknown label
+Unknown label
 handbag
 tie
 suitcase
@@ -42,7 +42,7 @@ skateboard
 surfboard
 tennis racket
 bottle
-plate
+Unknown label
 wine glass
 cup
 fork
@@ -63,12 +63,12 @@ chair
 couch
 potted plant
 bed
-mirror
+Unknown label
 dining table
-window
-desk
+Unknown label
+Unknown label
 toilet
-door
+Unknown label
 tv
 laptop
 mouse
@@ -80,12 +80,11 @@ oven
 toaster
 sink
 refrigerator
-blender
+Unknown label
 book
 clock
 vase
 scissors
 teddy bear
 hair drier
-toothbrush
-hair brush
+toothbrush
\ No newline at end of file

diff --git a/src/itc/media-vision-dl/res/inference/models/od_tflite_model.tflite b/src/itc/media-vision-dl/res/inference/models/od_tflite_model.tflite
index aee1d318ee59617ee6d8393f08e678f506fd3efa..f9779d7577adc3e0311e449010df0a4ca6bdbac1 100644 (file)
Binary files a/src/itc/media-vision-dl/res/inference/models/od_tflite_model.tflite and b/src/itc/media-vision-dl/res/inference/models/od_tflite_model.tflite differ

diff --git a/src/itc/media-vision-dl/res/inference/models/od_tflite_model_meta.json b/src/itc/media-vision-dl/res/inference/models/od_tflite_model_meta.json
index 0d7837326adc13fa9faea058e2c16ec75015bca1..1b4c4b1fa504b8decdb87ec8cf90412c865b63c2 100644 (file)
--- a/src/itc/media-vision-dl/res/inference/models/od_tflite_model_meta.json
+++ b/src/itc/media-vision-dl/res/inference/models/od_tflite_model_meta.json
@@ -25,7 +25,7 @@
           "score": {
             "index": [ -1, 1 ],
             "top_number": 5,
-            "threshold": 0.3,
+            "threshold": 0.6,
             "score_type": "NORMAL"
           }
         }

diff --git a/src/utc/capi-media-vision-dl/res/object_detection/models/od_mobilenet_v1_ssd_postop_300x300.json b/src/utc/capi-media-vision-dl/res/object_detection/models/od_mobilenet_v1_ssd_postop_300x300.json
index 0d7837326adc13fa9faea058e2c16ec75015bca1..1b4c4b1fa504b8decdb87ec8cf90412c865b63c2 100644 (file)
--- a/src/utc/capi-media-vision-dl/res/object_detection/models/od_mobilenet_v1_ssd_postop_300x300.json
+++ b/src/utc/capi-media-vision-dl/res/object_detection/models/od_mobilenet_v1_ssd_postop_300x300.json
@@ -25,7 +25,7 @@
           "score": {
             "index": [ -1, 1 ],
             "top_number": 5,
-            "threshold": 0.3,
+            "threshold": 0.6,
             "score_type": "NORMAL"
           }
         }

diff --git a/src/utc/capi-media-vision-dl/res/object_detection/models/od_mobilenet_v1_ssd_postop_300x300.tflite b/src/utc/capi-media-vision-dl/res/object_detection/models/od_mobilenet_v1_ssd_postop_300x300.tflite
index aee1d318ee59617ee6d8393f08e678f506fd3efa..f9779d7577adc3e0311e449010df0a4ca6bdbac1 100644 (file)
Binary files a/src/utc/capi-media-vision-dl/res/object_detection/models/od_mobilenet_v1_ssd_postop_300x300.tflite and b/src/utc/capi-media-vision-dl/res/object_detection/models/od_mobilenet_v1_ssd_postop_300x300.tflite differ

diff --git a/src/utc/capi-media-vision-dl/res/object_detection/models/od_mobilenet_v1_ssd_postop_label.txt b/src/utc/capi-media-vision-dl/res/object_detection/models/od_mobilenet_v1_ssd_postop_label.txt
index 0338a616821df394574725c229d7b878df706583..7a5597ea5dcf6aa9bd5b75be1f6ffab46d14e4de 100644 (file)
--- a/src/utc/capi-media-vision-dl/res/object_detection/models/od_mobilenet_v1_ssd_postop_label.txt
+++ b/src/utc/capi-media-vision-dl/res/object_detection/models/od_mobilenet_v1_ssd_postop_label.txt
@@ -1,72 +1,90 @@
-Car
-Wheel
-Suit
-Dog
-Guitar
-Bicycle
-Sunglasses
-Door
-Jacket
-Train
-Desk
-Drum
-Book
-Tie
-Shorts
-Shirt
-Camera
-Wine
-Beer
-Football
-Castle
-Bench
-Coat
-Tent
-Bookcase
-Doll
-Umbrella
-Computer_keyboard
-Couch
-Balloon
-Fountain
-Television
-Necklace
-Canoe
-Scarf
-Cowboy_hat
-Mushroom
-Traffic_light
-Surfboard
-Lamp
-Ice_cream
-Taxi
-Boot
-Frog
-Dragonfly
-Sandal
-Strawberry
-Pizza
-Pillow
-Snake
-Rabbit
-Baseball_bat
-Lipstick
-Apple
-Tank
-Parachute
-Spoon
-Tiger
-Orange
-Saxophone
-Cosmetics
-Cannon
-Camel
-Miniskirt
-Crab
-Jellyfish
-Banana
-Backpack
-Whale
-Sock
-Lemon
-Earrings
+person
+bicycle
+car
+motorcycle
+airplane
+bus
+train
+truck
+boat
+traffic light
+fire hydrant
+Unknown label
+stop sign
+parking meter
+bench
+bird
+cat
+dog
+horse
+sheep
+cow
+elephant
+bear
+zebra
+giraffe
+Unknown label
+backpack
+umbrella
+Unknown label
+Unknown label
+handbag
+tie
+suitcase
+frisbee
+skis
+snowboard
+sports ball
+kite
+baseball bat
+baseball glove
+skateboard
+surfboard
+tennis racket
+bottle
+Unknown label
+wine glass
+cup
+fork
+knife
+spoon
+bowl
+banana
+apple
+sandwich
+orange
+broccoli
+carrot
+hot dog
+pizza
+donut
+cake
+chair
+couch
+potted plant
+bed
+Unknown label
+dining table
+Unknown label
+Unknown label
+toilet
+Unknown label
+tv
+laptop
+mouse
+remote
+keyboard
+cell phone
+microwave
+oven
+toaster
+sink
+refrigerator
+Unknown label
+book
+clock
+vase
+scissors
+teddy bear
+hair drier
+toothbrush
\ No newline at end of file

diff --git a/src/utc/capi-media-vision-dl/utc-mv_object_detection.c b/src/utc/capi-media-vision-dl/utc-mv_object_detection.c
index 231d44b9e5749cea20098202da60111dd79577a6..3ddf35ef8e82bfbae29fc09c6264303720b05b93 100644 (file)
--- a/src/utc/capi-media-vision-dl/utc-mv_object_detection.c
+++ b/src/utc/capi-media-vision-dl/utc-mv_object_detection.c
@@ -43,7 +43,7 @@ static const char *gInferenceExampleDir = NULL;
 static void *object_detection_callback(void *user_data)
 {
        mv_object_detection_h handle = (mv_object_detection_h) user_data;
-       const int coordinate_answers[2][4] = { { 194, 27, 502, 298 }, { 12, 6, 164, 270 } };
+       const int coordinate_answers[2][4] = { { 196, 33, 504, 300 }, { 1, 7, 163, 277 } };
 
        bool is_loop_exit = false;
 
@@ -830,7 +830,7 @@ int utc_mediavision_mv_object_detection_get_bound_box_p(void)
        assert_eq(ret, MEDIA_VISION_ERROR_NONE);
        assert_eq(cnt, 2);
 
-       const int coordinate_answers[2][4] = { { 194, 27, 502, 298 }, { 12, 6, 164, 270 } };
+       const int coordinate_answers[2][4] = { { 196, 33, 504, 300 }, { 1, 7, 163, 277 } };
 
        for (unsigned int idx = 0; idx < cnt; ++idx) {
                int left, top, right, bottom;