Merge branch 'main' into test_report

Signed-off-by: KarolinaPomian <[email protected]>

Author: KarolinaPomian

docs/sphinx/conf.py

@@ -14,57 +14,57 @@
 import os
 import sys
 
-project = 'Media Communications Mesh'
-copyright = '2023-2024, Intel Corporation'
-author = 'Intel Corporation'
+project = "Media Communications Mesh"
+copyright = "2023-2025, Intel Corporation"
+author = "Intel Corporation"
 
 extensions = [
-    'myst_parser',
-    'sphinx.ext.graphviz',
-    'sphinxcontrib.mermaid',
-    'sphinx_copybutton'
+    "myst_parser",
+    "sphinx.ext.graphviz",
+    "sphinxcontrib.mermaid",
+    "sphinx_copybutton",
 ]
 
 coverage_statistics_to_report = coverage_statistics_to_stdout = True
 
 inline_highlight_respect_highlight = False
 inline_highlight_literals = False
 
-templates_path = ['_templates']
+templates_path = ["_templates"]
 exclude_patterns = [
-    '_build/*',
-    'tests/*',
-    'patches/*',
-    'Thumbs.db',
-    '.DS_Store',
-    '**/CMakeLists.txt',
-    '*CMakeLists.txt',
-    '**/requirements.txt'
+    "_build/*",
+    "tests/*",
+    "patches/*",
+    "Thumbs.db",
+    ".DS_Store",
+    "**/CMakeLists.txt",
+    "*CMakeLists.txt",
+    "**/requirements.txt",
 ]
 
 # -- Options for HTML output -------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output
 
-html_theme = 'sphinx_book_theme'
-html_static_path = ['../_static']
+html_theme = "sphinx_book_theme"
+html_static_path = ["../_static"]
 language = "en_US"
 
 # Options for myst_html_meta output -------------------------------------------------
 
 myst_html_meta = {
     "description lang=en": "Media Communications Mesh",
     "keywords": "Intel®, Intel, Media Communications Mesh, MCM, MTL, Tiber, st20, st22, ST 2110, ST2110",
-    "property=og:locale":  "en_US"
+    "property=og:locale": "en_US",
 }
-myst_enable_extensions = [ "strikethrough" ]
-myst_fence_as_directive = [ "mermaid" ]
+myst_enable_extensions = ["strikethrough"]
+myst_fence_as_directive = ["mermaid"]
 
 suppress_warnings = ["myst.xref_missing", "myst.strikethrough"]
 
 source_suffix = {
-    '.rst': 'restructuredtext',
-    '.md': 'markdown',
+    ".rst": "restructuredtext",
+    ".md": "markdown",
 }
 
-sys.path.insert(0, os.path.abspath('..'))
-sys.path.insert(0, os.path.abspath('../../'))
+sys.path.insert(0, os.path.abspath(".."))
+sys.path.insert(0, os.path.abspath("../../"))

scripts/common.sh

@@ -21,6 +21,7 @@ MTL_VERSIONS_FILE_PATH="${MTL_VERSIONS_FILE:-${MTL_DIR}/versions.env}"
 if [[ -f "${MTL_VERSIONS_FILE_PATH}" ]]; then
     MTL_VERSIONS_FILE_PATH="$(readlink -f "${MTL_VERSIONS_FILE_PATH}")"
     export MTL_VERSIONS_FILE_PATH
+# shellcheck source=/dev/null
     . "${MTL_VERSIONS_FILE_PATH}"    
 fi
 
@@ -32,6 +33,7 @@ export JPEGXS_DIR="${BUILD_DIR}/jpegxs"
 export LIBFABRIC_DIR="${BUILD_DIR}/libfabric"
 export LIBFDT_DIR="${BUILD_DIR}/libfdt"
 export JSONC_DIR="${BUILD_DIR}/json-c"
+export CMAKE_DIR="${BUILD_DIR}/cmake"
 export NASM_DIR="${BUILD_DIR}/nasm"
 
 export ICE_DIR="${DRIVERS_DIR}/ice/${ICE_VER}"

scripts/setup_build_env.sh

@@ -74,7 +74,7 @@ function install_ubuntu_package_dependencies()
         llvm \
         m4 \
         meson \
-        nasm cmake=3.22* \
+        nasm \
         pkg-config \
         python3-dev \
         python3-pyelftools \
@@ -85,6 +85,7 @@ function install_ubuntu_package_dependencies()
         zlib1g-dev \
         "${APT_LINUX_HEADERS}" \
         "${APT_LINUX_MOD_EXTRA}" && \
+    lib_build_and_install_cmake && \
     lib_build_and_install_golang && \
     return 0 || return 1
 }
@@ -103,7 +104,6 @@ function install_yum_package_dependencies()
         curl-minimal \
         ca-certificates \
         clang \
-        cmake=3.22.1-1ubuntu1 \
         dracut \
         dtc \
         elfutils-libelf-devel \
@@ -145,6 +145,7 @@ function install_yum_package_dependencies()
         wget \
         zlib-devel && \
     python3 -m pip install meson ninja && \
+    lib_build_and_install_cmake && \
     lib_install_nasm_from_rpm && \
     lib_build_and_install_libfdt && \
     lib_build_and_install_jsonc && \
@@ -184,6 +185,17 @@ function get_download_unpack_dependencies()
     apply_dpdk_patches
 }
 
+# Download, build and install cmake from source code
+function lib_build_and_install_cmake()
+{
+    git_download_strip_unpack "kitware/cmake" "refs/tags/${CMAKE_VER}" "${CMAKE_DIR}" && \
+    pushd "${CMAKE_DIR}" && \
+    "${CMAKE_DIR}/bootstrap" --prefix=/usr/local && \
+    make -j "${NPROC}" -C "${CMAKE_DIR}" && \
+    as_root make -j "${NPROC}" -C "${CMAKE_DIR}" install && \
+    popd
+}
+
 # Download and install rpm repo for nasm
 function lib_install_nasm_from_rpm()
 {

scripts/text-detection.py

@@ -8,9 +8,11 @@
 from concurrent.futures import ThreadPoolExecutor
 import os
 
+
 def is_display_attached():
     # Check if the DISPLAY environment variable is set
-    return 'DISPLAY' in os.environ
+    return "DISPLAY" in os.environ
+
 
 def extract_text_from_region(image, x, y, font_size, length):
     """
@@ -31,13 +33,14 @@ def extract_text_from_region(image, x, y, font_size, length):
     roi = image[y_adjusted:height, x_adjusted:width]
 
     # Use Tesseract to extract text from the ROI
-    return pytesseract.image_to_string(roi, lang='eng')
+    return pytesseract.image_to_string(roi, lang="eng")
+
 
 def process_frame(frame_idx, frame):
     print("Processing Frame: ", frame_idx)
 
     timestamp_format = "%H:%M:%S:%f"
-    timestamp_pattern = r'\b\d{2}:\d{2}:\d{2}:\d{3}\b'
+    timestamp_pattern = r"\b\d{2}:\d{2}:\d{2}:\d{3}\b"
 
     # Convert frame to grayscale for better OCR performance
     frame = cv.cvtColor(frame, cv.COLOR_BGR2GRAY)
@@ -69,6 +72,7 @@ def process_frame(frame_idx, frame):
     time_difference_ms = time_difference.total_seconds() * 1000
     return time_difference_ms
 
+
 def main():
     if len(sys.argv) < 2:
         print("Usage: python text-detection.py <input_video_file> <output_image_name>")
@@ -79,7 +83,7 @@ def main():
     if not cap.isOpened():
         print("Fatal: Could not open video file.")
         sys.exit(1)
-   
+
     frame_idx = 0
     time_differences = []
 
@@ -105,61 +109,85 @@ def main():
 
         # Filter out anomaly peaks that differ more than 25% from the average for average calculation
         filtered_time_differences = [
-            td for td in non_zero_time_differences if abs(td - average_latency) <= 0.25 * average_latency
+            td
+            for td in non_zero_time_differences
+            if abs(td - average_latency) <= 0.25 * average_latency
         ]
 
         # Calculate the average latency using the filtered data
         filtered_average_latency = np.mean(filtered_time_differences)
     else:
-        print("Fatal: No timestamps recognized in the video. No data for calculating latency.")
+        print(
+            "Fatal: No timestamps recognized in the video. No data for calculating latency."
+        )
         sys.exit(1)
 
     # Plot the non-zero data
-    plt.plot(non_zero_time_differences, marker='o')
-    plt.title('End-to-End Latency — Media Communications Mesh')
-    plt.xlabel('Frame Index')
-    plt.ylabel('Latency, ms')
+    plt.plot(non_zero_time_differences, marker="o")
+    plt.title("End-to-End Latency — Media Communications Mesh")
+    plt.xlabel("Frame Index")
+    plt.ylabel("Latency, ms")
     plt.grid(True)
 
     # Adjust the layout to create more space for the text
     plt.subplots_adjust(bottom=0.5)
 
     # Prepare text for display and stdout
-    average_latency_text = f'Average End-to-End Latency: {filtered_average_latency:.2f} ms'
+    average_latency_text = (
+        f"Average End-to-End Latency: {filtered_average_latency:.2f} ms"
+    )
     file_name = os.path.basename(input_video_file)
-    file_mod_time = datetime.fromtimestamp(os.path.getmtime(input_video_file)).strftime('%Y-%m-%d %H:%M:%S')
-    file_info_text = f'File: {file_name} | Last modified: {file_mod_time} UTC'
+    file_mod_time = datetime.fromtimestamp(os.path.getmtime(input_video_file)).strftime(
+        "%Y-%m-%d %H:%M:%S"
+    )
+    file_info_text = f"File: {file_name} | Last modified: {file_mod_time} UTC"
     width = int(cap.get(cv.CAP_PROP_FRAME_WIDTH))
     height = int(cap.get(cv.CAP_PROP_FRAME_HEIGHT))
     fps = cap.get(cv.CAP_PROP_FPS)
-    video_properties_text = f'Resolution: {width}x{height} | FPS: {fps:.2f}'
+    video_properties_text = f"Resolution: {width}x{height} | FPS: {fps:.2f}"
 
     cap.release()
 
     # Display text on the plot
-    plt.text(0.5, -0.55, average_latency_text, 
-             horizontalalignment='center', verticalalignment='center', 
-             transform=plt.gca().transAxes)
-    plt.text(0.5, -0.85, file_info_text, 
-             horizontalalignment='center', verticalalignment='center', 
-             transform=plt.gca().transAxes)
-    plt.text(0.5, -1, video_properties_text, 
-             horizontalalignment='center', verticalalignment='center', 
-             transform=plt.gca().transAxes)
+    plt.text(
+        0.5,
+        -0.55,
+        average_latency_text,
+        horizontalalignment="center",
+        verticalalignment="center",
+        transform=plt.gca().transAxes,
+    )
+    plt.text(
+        0.5,
+        -0.85,
+        file_info_text,
+        horizontalalignment="center",
+        verticalalignment="center",
+        transform=plt.gca().transAxes,
+    )
+    plt.text(
+        0.5,
+        -1,
+        video_properties_text,
+        horizontalalignment="center",
+        verticalalignment="center",
+        transform=plt.gca().transAxes,
+    )
 
     if is_display_attached():
         plt.show()
 
     if len(sys.argv) == 3:
         filename = sys.argv[2]
-        if not filename.endswith('.jpg'):
-            filename += '.jpg'
+        if not filename.endswith(".jpg"):
+            filename += ".jpg"
         print("Saving the latency chart to: ", filename)
-        plt.savefig(filename, format='jpg', dpi=300)
+        plt.savefig(filename, format="jpg", dpi=300)
 
     # Print text to stdout
     print(file_info_text)
     print(video_properties_text)
     print(average_latency_text)
 
+
 main()

tests/validation/Engine/const.py

@@ -3,15 +3,47 @@
 # Media Communications Mesh
 
 LOG_FOLDER = "logs"
-DEFAULT_OUTPUT_PATH = "/dev/null"
 TESTCMD_LVL = 24  # Custom logging level for test commands
+DEFAULT_MEDIA_PATH = "/mnt/media/"
+DEFAULT_INPUT_PATH = "/opt/intel/input_path/"
+DEFAULT_OUTPUT_PATH = "/opt/intel/output_path/"
 
 # time for establishing connection for example between TX and RX in st2110
 MTL_ESTABLISH_TIMEOUT = 2
 MCM_ESTABLISH_TIMEOUT = 5
 DEFAULT_LOOP_COUNT = 7
 MCM_RXTXAPP_RUN_TIMEOUT = MCM_ESTABLISH_TIMEOUT * DEFAULT_LOOP_COUNT
 MAX_TEST_TIME_DEFAULT = 60
+STOP_GRACEFULLY_PERIOD = 2  # seconds
+
+BUILD_DIR = "_build"
+INTEL_BASE_PATH = "/opt/intel"  # Base path for Intel software
+MCM_PATH = f"{INTEL_BASE_PATH}/mcm"  # Path for MCM repository
+MTL_PATH = f"{INTEL_BASE_PATH}/mtl"  # Path for Media Transport Library repository
+
+# Built binaries paths
+MCM_BUILD_PATH = f"{INTEL_BASE_PATH}/_build/mcm"  # Path for MCM built binaries
+MTL_BUILD_PATH = f"{INTEL_BASE_PATH}/_build/mtl"  # Path for MTL built binaries
+MEDIA_PROXY_PORT = 8002  # Default port for Media Proxy
+
+DEFAULT_FFMPEG_PATH = f"{INTEL_BASE_PATH}/ffmpeg"  # Path for FFmpeg repository
+DEFAULT_OPENH264_PATH = f"{INTEL_BASE_PATH}/openh264"  # Path for OpenH264 installation
+
+OPENH264_VERSION_TAG = "openh264v2.4.0"
+
+ALLOWED_FFMPEG_VERSIONS = ["6.1", "7.0"]
+DEFAULT_MCM_FFMPEG_VERSION = "7.0"
+DEFAULT_MCM_FFMPEG_PATH = f"{INTEL_BASE_PATH}/_build/ffmpeg-{DEFAULT_MCM_FFMPEG_VERSION}/ffmpeg-{DEFAULT_MCM_FFMPEG_VERSION.replace('.', '-')}_mcm_build"
+DEFAULT_MCM_FFMPEG_LD_LIBRARY_PATH = f"{DEFAULT_MCM_FFMPEG_PATH}/lib"
+
+DEFAULT_MTL_FFMPEG_VERSION = "7.0"
+DEFAULT_MTL_FFMPEG_PATH = f"{INTEL_BASE_PATH}/_build/ffmpeg-{DEFAULT_MTL_FFMPEG_VERSION}/ffmpeg-{DEFAULT_MTL_FFMPEG_VERSION.replace('.', '-')}_mtl_build"
+DEFAULT_MTL_FFMPEG_LD_LIBRARY_PATH = f"{DEFAULT_MTL_FFMPEG_PATH}/lib"
+
+# Input/Output paths for media files
+DEFAULT_MEDIA_PATH = "/mnt/media/"
+DEFAULT_INPUT_PATH = f"{INTEL_BASE_PATH}/input_path"
+DEFAULT_OUTPUT_PATH = f"{INTEL_BASE_PATH}/output_path"
 
 MEDIA_PROXY_ERROR_KEYWORDS = ["[ERRO]"]
 MESH_AGENT_ERROR_KEYWORDS = ["[ERRO]"]

tests/validation/Engine/mcm_apps.py

@@ -6,16 +6,15 @@
 
 from Engine.const import (
     LOG_FOLDER,
+    MCM_PATH,
     MEDIA_PROXY_ERROR_KEYWORDS,
+    MEDIA_PROXY_PORT,
     MESH_AGENT_ERROR_KEYWORDS,
+    MTL_PATH,
+    STOP_GRACEFULLY_PERIOD,
 )
 
 logger = logging.getLogger(__name__)
-STOP_GRACEFULLY_PERIOD = 2  # seconds
-
-MCM_PATH = "/opt/intel/mcm"  # Default path for MCM installation
-MTL_PATH = f"{MCM_PATH}/_build/mtl"  # Default path for Media Transport Library
-MEDIA_PROXY_PORT = 8002  # Default port for Media Proxy
 
 
 def get_mtl_path(host) -> str: