Modularize the script to single script which works for all the Decoders and encodersAdd Video Decode Testcases for H265

Add Video Decode Testcases for VP9
Add Video Encode Testcases for H265

Signed-off-by: Abhishek Bajaj <[email protected]>

Author: abbajaj806

Runner/suites/Multimedia/Video/Video_V4L2_Runner/run.sh

@@ -34,10 +34,8 @@ fi
 
 TESTNAME="Video_V4L2_Runner"
 RES_FILE="./${TESTNAME}.res"
-LOG_DIR="./logs_${TESTNAME}"
-mkdir -p "$LOG_DIR"
 TAR_URL="https://github.com/qualcomm-linux/qcom-linux-testkit/releases/download/IRIS-Video-Files-v1.0/video_clips_iris.tar.gz"
-extract_tar_from_url "$TAR_URL"
+
 
 ###############################################################################
 # Knobs (override by env or CLI)
@@ -49,6 +47,7 @@ PATTERN="" # glob to filter configs
 MAX="${MAX:-0}" # run at most N tests (0=all)
 STOP_ON_FAIL="${STOP_ON_FAIL:-0}" # bail on first fail
 DRY=0 # 1=dry-run
+EXTRACT_INPUT_CLIPS="${EXTRACT_INPUT_CLIPS:-true}" # true/false, controls extract_tar_from_url
 SUCCESS_RE="${SUCCESS_RE:-SUCCESS}" # success marker regex in tool log
 LOGLEVEL="${LOGLEVEL:-15}" # iris_v4l2_test --loglevel
 
@@ -62,12 +61,13 @@ usage() {
     cat <<EOF
 Usage: $0 [--config path.json] [--dir DIR] [--pattern GLOB]
           [--timeout S] [--strict] [--no-dmesg] [--max N] [--stop-on-fail]
-          [--loglevel N]
+          [--loglevel N] [--extract-input-clips true|false]
           [--repeat N] [--repeat-delay S] [--repeat-policy all|any]
           [--junit FILE] [--dry-run]
 EOF
 }
 
+
 CFG="" ; DIR=""
 while [ $# -gt 0 ]; do
     case "$1" in
@@ -85,25 +85,33 @@ while [ $# -gt 0 ]; do
         --repeat-policy) shift; REPEAT_POLICY="$1" ;;
         --junit) shift; JUNIT_OUT="$1" ;;
         --dry-run) DRY=1 ;;
+        --extract-input-clips) shift; EXTRACT_INPUT_CLIPS="$1" ;;
         --help|-h) usage; exit 0 ;;
         *) log_warn "Unknown arg: $1" ;;
     esac
     shift
 done
 
-test_path="$(find_test_case_by_name "$TESTNAME" 2>/dev/null || echo "")"
-[ -n "$test_path" ] || test_path="$SCRIPT_DIR"
+if [ "$EXTRACT_INPUT_CLIPS" = "true" ]; then
+    extract_tar_from_url "$TAR_URL"
+fi
+test_path="$(find_test_case_by_name "$TESTNAME" 2>/dev/null || echo "$SCRIPT_DIR")"
+# Run from the testcase directory so relative outputs (logs, .res) land next to run.sh
+cd "$test_path" || { log_error "cd failed: $test_path"; echo "$TESTNAME FAIL" >"$RES_FILE"; exit 1; }
+
+LOG_DIR="./logs_${TESTNAME}"
+mkdir -p "$LOG_DIR"
 
 log_info "----------------------------------------------------------------------"
 log_info "------------------ Starting $TESTNAME (generic runner) ----------------"
 log_info "=== Initialization ==="
 log_info "TIMEOUT=${TIMEOUT}s STRICT=$STRICT DMESG_SCAN=$DMESG_SCAN SUCCESS_RE=$SUCCESS_RE"
-log_info "LOGLEVEL=$LOGLEVEL"
+log_info "LOGLEVEL=$LOGLEVEL EXTRACT_INPUT_CLIPS=$EXTRACT_INPUT_CLIPS"
 log_info "REPEAT=$REPEAT REPEAT_DELAY=${REPEAT_DELAY}s REPEAT_POLICY=$REPEAT_POLICY"
 
 # Required binaries (no external 'timeout' needed)
 check_dependencies iris_v4l2_test grep sed awk find sort || {
-    log_skip "$TESTNAME SKIP – required tools missing"
+    log_skip "$TESTNAME SKIP – required tools missing"
     echo "$TESTNAME SKIP" >"$RES_FILE"
     exit 0
 }
@@ -154,27 +162,35 @@ ensure_clips_present_or_fetch() {
     cfg="$1"; missing=0
     clips="$(extract_input_clips "$cfg")"
     [ -z "$clips" ] && return 0
-    echo "$clips" | while IFS= read -r p; do
-        case "$p" in /*) abs="$p" ;; *) abs="$(cd "$(dirname "$cfg")" && pwd)/$p" ;; esac
+    # Iterate without a subshell so 'missing' persists
+    while IFS= read -r p; do
+        [ -n "$p" ] || continue
+        case "$p" in
+            /*) abs="$p" ;;
+            *)  abs="$(cd "$(dirname "$cfg")" && pwd)/$p" ;;
+        esac
         if [ ! -f "$abs" ]; then
             log_warn "Missing input clip: $abs"
-            if [ -n "$TAR_URL" ]; then
+            if [ "$EXTRACT_INPUT_CLIPS" = "true" ] && [ -n "$TAR_URL" ]; then
                 log_info "Attempting fetch via TAR_URL=$TAR_URL"
                 extract_tar_from_url "$TAR_URL" || log_warn "Fetch/extract failed for TAR_URL"
+            else
+                log_warn "Skipping extraction of input clips as EXTRACT_INPUT_CLIPS is not true."
             fi
-			# shellcheck disable=SC2030
             [ ! -f "$abs" ] && missing=1
         fi
-    done
-	# shellcheck disable=SC2031
+    done <<EOF
+$(printf "%s\n" "$clips")
+EOF
     [ $missing -eq 0 ]
 }
 
 scan_dmesg_if_enabled() {
     [ "$DMESG_SCAN" -eq 1 ] || return 0
     MODS='oom|memory|BUG|hung task|soft lockup|hard lockup|rcu|page allocation failure|I/O error'
     EXCL='using dummy regulator|not found|EEXIST|probe deferred'
-    scan_dmesg_errors "$LOG_DIR" "$MODS" "$EXCL" && return 1 || return 0
+    # Expect scan_dmesg_errors to return 0 when OK, non-zero if errors found.
+    scan_dmesg_errors "$LOG_DIR" "$MODS" "$EXCL"
 }
 
 # JUnit helpers
@@ -199,7 +215,7 @@ append_junit_case() {
 }
 
 ###############################################################################
-# Per-config execution (with repeats) — uses run_with_timeout if available
+# Per-config execution (with repeats) — uses run_with_timeout if available
 ###############################################################################
 have_rwt=0
 if command -v run_with_timeout >/dev/null 2>&1; then
@@ -266,10 +282,12 @@ run_repeated() {
         all|*) [ "$fail_runs" -eq 0 ] && final="PASS" ;;
     esac
 
-    if [ "$STRICT" -eq 1 ]; then
-        if ! scan_dmesg_if_enabled; then :; else final="FAIL"; fi
-    else
-        scan_dmesg_if_enabled || true
+    if [ "$DMESG_SCAN" -eq 1 ]; then
+        if scan_dmesg_if_enabled; then
+            : # OK
+        else
+            [ "$STRICT" -eq 1 ] && final="FAIL"
+        fi
     fi
 
     append_junit_case "$id" "$name" "$mode" "$elapsed" "$final" "$logf"
@@ -293,22 +311,26 @@ CFG_LIST="$LOG_DIR/.cfgs"
 : > "$CFG_LIST"
 
 if [ -z "$CFG" ]; then
-    log_info "No config argument passed, searching for JSON files in the current working directory (from where the script is executed)."
-    find "$test_path" -type f -name "*.json" 2>/dev/null | sort > "$CFG_LIST"
+	log_info "No --config passed, searching for JSON files under testcase dir: $test_path"
+	find "$test_path" -type f -name "*.json" 2>/dev/null | sort > "$CFG_LIST"
 elif [ -n "$CFG" ]; then
     printf "%s\n" "$CFG" > "$CFG_LIST"
 fi
 
 if [ ! -s "$CFG_LIST" ]; then
+    # Try DIR (if provided) or fallback to testcase dir with optional pattern
     [ -n "$DIR" ] || DIR="$test_path"
     if [ -n "$PATTERN" ]; then
         find "$DIR" -type f -name "$PATTERN" 2>/dev/null | sort > "$CFG_LIST"
     else
         find "$DIR" -type f -name "*.json" 2>/dev/null | sort > "$CFG_LIST"
     fi
-    log_skip "$TESTNAME SKIP – no JSON configs found"
-    echo "$TESTNAME SKIP" > "$RES_FILE"
-    exit 0
+    # Re-check after fallback search
+    if [ ! -s "$CFG_LIST" ]; then
+        log_skip "$TESTNAME SKIP - no JSON configs found"
+        echo "$TESTNAME SKIP" > "$RES_FILE"
+        exit 0
+    fi
 fi
 
 ###############################################################################
@@ -338,7 +360,7 @@ while IFS= read -r cfg; do
     fi
 
     if ! devices_present; then
-        log_skip "[$id] SKIP – no /dev/video* nodes"
+        log_skip "[$id] SKIP – no /dev/video* nodes"
         echo "$id SKIP $base" >> "$LOG_DIR/summary.txt"
         echo "$id SKIP $base" >> "$LOG_DIR/summary_${mode}.txt"
         echo "$mode,$id,SKIP,$base,0,0,0" >> "$LOG_DIR/results.csv"