Revert "encapp: add os walk and regexp search to video file path"

This reverts commit 69713a7.

scripts/encapp.py

@@ -152,15 +152,13 @@
     ".raw",
     ".yuv",
     ".ivf",
-    ".mkv",
 ]
 
 
 def isVideoExtension(filename):
     ending = f".{filename.rsplit('.')[-1]}"
     if ending is not None and ending in video_extensions:
         return True
-
     return False
 
 
@@ -816,27 +814,20 @@ def createTestsFromDefinitionExpansion(testsuite):
 
 
 def expand_filepath(path):
-    # Check if path is a folder
-    basename = ""
-    folder = ""
-    path = os.path.expanduser(path)
-    if os.path.isdir(path):
-        folder = path
-    else:
-        basename = os.path.basename(path)
-        folder = os.path.dirname(path)
+    # Allow regexp on filenam
+    basename = os.path.basename(path)
+    folder = os.path.dirname(path)
+    folder = os.path.expanduser(folder)
     video_files = []
     for root, _dirs, files in os.walk(folder):
         for file in files:
             if isVideoExtension(file):
                 if len(basename) > 0:
                     m = re.search(basename, file)
                     if m:
-                        file = f"{root}/{m.group(0)}"
+                        file = f"{folder}/{m.group(0)}"
                     else:
                         continue
-                else:
-                    file = f"{root}/{file}"
                 video_files.append(file)
 
     return video_files