Merge pull request #1594 from fzhar/image_inpainting_gui_refactoring_2

Command line  and mask processign are changed for image_inpainting_demo.

Author: Roman Donchenko

demos/python_demos/image_inpainting_demo/README.md

@@ -7,16 +7,16 @@ to fill holes in images.
 This demo can work in 2 modes: 
 
 * GUI mode: areas for inpainting can be marked interactively using mouse painting
-* Auto mode (use -a option for it): image will be processed automatically using randomly applied mask (-r option) or using specific color-based mask (-mc option to set mask color)
+* Auto mode (use -ac or -ar option for it): image will be processed automatically using randomly applied mask (-ar option) or using specific color-based mask (-ac option)
 
 Running the application with the `-h` option yields the following usage message:
 
 ```
-usage: image_inpainting_demo.py [-h] -m MODEL [-i INPUT] [-d DEVICE] [-r]
+usage: image_inpainting_demo.py [-h] -m MODEL [-i INPUT] [-d DEVICE]
                                 [-p PARTS] [-mbw MAX_BRUSH_WIDTH]
-                                [-ml MAX_LENGTH] [-mv MAX_VERTEX]
-                                [-mc MASK_COLOR [MASK_COLOR ...]] [--no_show]
-                                [-o OUTPUT] [-a]
+                                [-ml MAX_LENGTH] [-mv MAX_VERTEX] [--no_show]
+                                [-o OUTPUT] [-ac C C C] [-ar]
+
 Options:
   -h, --help            Show this help message and exit.
   -m MODEL, --model MODEL
@@ -28,31 +28,32 @@ Options:
                         GPU, FPGA, HDDL or MYRIAD is acceptable. The demo will
                         look for a suitable plugin for device specified.
                         Default value is CPU
-  -r, --rnd             Optional. Use random mask for inpainting (with
-                        parameters set by -p, -mbw, -mk and -mv).Skipped in
-                        GUI mode
   -p PARTS, --parts PARTS
-                        Optional. Number of parts to draw mask. Skipped in GUI
+                        Optional. Number of parts to draw mask. Ignored in GUI
                         mode
   -mbw MAX_BRUSH_WIDTH, --max_brush_width MAX_BRUSH_WIDTH
-                        Optional. Max width of brush to draw mask. Skipped in
+                        Optional. Max width of brush to draw mask. Ignored in
                         GUI mode
   -ml MAX_LENGTH, --max_length MAX_LENGTH
-                        Optional. Max strokes length to draw mask. Skipped in
+                        Optional. Max strokes length to draw mask. Ignored in
                         GUI mode
   -mv MAX_VERTEX, --max_vertex MAX_VERTEX
-                        Optional. Max number of vertex to draw mask. Skipped
+                        Optional. Max number of vertex to draw mask. Ignored
                         in GUI mode
-  -mc MASK_COLOR [MASK_COLOR ...], --mask_color MASK_COLOR [MASK_COLOR ...]
-                        Optional. Color to be treated as mask (provide 3 RGB
-                        components in range of 0...255). Default is 0 0 0.
-                        Skipped in GUI mode
-  --no_show             Optional. Don't show output. Cannot be used in GUI mode
+  --no_show             Optional. Don't show output. Cannot be used in GUI
+                        mode
   -o OUTPUT, --output OUTPUT
                         Optional. Save output to the file with provided
-                        filename. Skipped in GUI mode
-  -a, --auto            Optional. Use automatic (non-interactive) mode instead
-                        of GUI
+                        filename. Ignored in GUI mode
+  -ac C C C, --auto_mask_color C C C
+                        Optional. Use automatic (non-interactive) mode with
+                        color mask.Provide color to be treated as mask (3 RGB
+                        components in range of 0...255). Cannot be used
+                        together with -ar.
+  -ar, --auto_mask_random
+                        Optional. Use automatic (non-interactive) mode with
+                        random mask for inpainting (with parameters set by -p,
+                        -mbw, -mk and -mv). Cannot be used together with -ac.
 ```
 
 To run the demo, you can use public or pretrained models. You can download the pretrained models with the OpenVINO™ [Model Downloader](../../../tools/downloader/README.md).

demos/python_demos/image_inpainting_demo/image_inpainting_demo.py

@@ -33,10 +33,6 @@ def build_arg_parser():
                       help="Optional. Specify the target device to infer on; CPU, GPU, FPGA, HDDL or MYRIAD is "
                            "acceptable. The demo will look for a suitable plugin for device specified. "
                            "Default value is CPU", default="CPU", type=str)
-    args.add_argument("-r", "--rnd",
-                      help="Optional. Use random mask for inpainting (with parameters set by -p, -mbw, -mk and -mv)."
-                      " Ignored in GUI mode",
-                      action='store_true')
     args.add_argument("-p", "--parts", help="Optional. Number of parts to draw mask. Ignored in GUI mode",
                       default=8, type=int)
     args.add_argument("-mbw", "--max_brush_width", help="Optional. Max width of brush to draw mask."
@@ -46,13 +42,16 @@ def build_arg_parser():
                       default=100, type=int)
     args.add_argument("-mv", "--max_vertex", help="Optional. Max number of vertex to draw mask. Ignored in GUI mode",
                       default=20, type=int)
-    args.add_argument("-mc", "--mask_color",
-                      help="Optional. Color to be treated as mask (provide 3 RGB components in range of 0...255)."
-                      " Default is 0 0 0. Ignored in GUI mode", default=[0, 0, 0], type=int, nargs=3)
     args.add_argument("--no_show", help="Optional. Don't show output. Cannot be used in GUI mode", action='store_true')
     args.add_argument("-o", "--output", help="Optional. Save output to the file with provided filename."
                       " Ignored in GUI mode", default="", type=str)
-    args.add_argument("-a", "--auto", help="Optional. Use automatic (non-interactive) mode instead of GUI",
+    args.add_argument("-ac", "--auto_mask_color", help="Optional. Use automatic (non-interactive) mode with color mask."
+                      "Provide color to be treated as mask (3 RGB components in range of 0...255). "
+                      "Cannot be used together with -ar.",
+                      metavar='C', default=None, type=int, nargs=3)
+    args.add_argument("-ar", "--auto_mask_random",
+                      help="Optional. Use automatic (non-interactive) mode with random mask for inpainting"
+                      " (with parameters set by -p, -mbw, -mk and -mv). Cannot be used together with -ac.",
                       action='store_true')
 
     return parser
@@ -82,24 +81,25 @@ def create_random_mask(parts, max_vertex, max_length, max_brush_width, h, w, max
     return mask
 
 
-def inpaint_random_holes(img, args):
-    mask_color = args.mask_color[::-1] # argument comes in RGB mode, but we will use BGR notation below
-
+def inpaint_auto(img, args):
     ie = IECore()
 
     inpainting_processor = ImageInpainting(ie, args.model, args.device)
 
-    #--- Resize to model input and generate random mask
-    img = cv2.resize(img, (inpainting_processor.input_width, inpainting_processor.input_height))
-
-    if args.rnd:
+    #--- Generating mask
+    if args.auto_mask_random:
         mask = create_random_mask(args.parts, args.max_vertex, args.max_length, args.max_brush_width,
                                 inpainting_processor.input_height, inpainting_processor.input_width)
     else:
-        top = np.full(img.shape, mask_color, np.uint8)
-        mask = cv2.inRange(img, top, top) / 255
+        # argument comes in RGB mode, but we will use BGR notation below
+        top = np.full(img.shape, args.auto_mask_color[::-1], np.uint8)
+        mask = cv2.inRange(img, top, top)
+        mask = cv2.resize(mask, (inpainting_processor.input_width, inpainting_processor.input_height))
+        _, mask = cv2.threshold(mask, 1, 1, cv2.THRESH_BINARY)
         mask = np.expand_dims(mask, 2)
 
+    #--- Resizing image and removing masked areas from it
+    img = cv2.resize(img, (inpainting_processor.input_width, inpainting_processor.input_height))
     masked_image = (img * (1 - mask) + 255 * mask).astype(np.uint8)
 
     #--- Inpaint and show results
@@ -117,9 +117,13 @@ def main():
         print("Cannot load image " + args.input)
         return -1
 
-    if args.auto:
+    if args.auto_mask_color and args.auto_mask_random:
+        print("Error: -ar and -ac options cannot be used together...")
+        return -1
+
+    if args.auto_mask_color or args.auto_mask_random:
         # Command-line inpaining for just one image
-        concat_image, result = inpaint_random_holes(img,args)
+        concat_image, result = inpaint_auto(img,args)
         if args.output != "":
             cv2.imwrite(args.output, result)
         if not args.no_show: