From f0c5857281dfa1187dc6bfb462c500c2c7fdbadf Mon Sep 17 00:00:00 2001
From: daniellegillai <dagillai@amd.com>
Date: Wed, 8 Jul 2026 10:46:23 -0700
Subject: [PATCH 1/3] rocdecode test fix

---
 tests/cpp_api/CMakeLists.txt              | 2 +-
 tests/cpp_api/video_tests/video_tests.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/cpp_api/CMakeLists.txt b/tests/cpp_api/CMakeLists.txt
index 61237b2b7..d9a18ce46 100644
--- a/tests/cpp_api/CMakeLists.txt
+++ b/tests/cpp_api/CMakeLists.txt
@@ -236,7 +236,7 @@ add_test(
 if(rocdecode_FOUND)
   add_test(NAME video_tests_rocdecode
             COMMAND video_tests
-            ${ROCM_PATH}/share/rocal/test/data/videos/AMD_driving_virtual_20.mp4 1 1 2
+            ${ROCM_PATH}/share/rocal/test/data/videos/AMD_driving_virtual_20.mp4 1 1 1
             WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/video_tests)
 endif()
 
diff --git a/tests/cpp_api/video_tests/video_tests.cpp b/tests/cpp_api/video_tests/video_tests.cpp
index 49f5dcec9..9f0271524 100644
--- a/tests/cpp_api/video_tests/video_tests.cpp
+++ b/tests/cpp_api/video_tests/video_tests.cpp
@@ -130,7 +130,7 @@ int main(int argc, const char **argv) {
     if (argc >= argIdx + MIN_ARG_COUNT)
         enable_sequence_rearrange = atoi(argv[++argIdx]) ? true : false;
 
-    auto decoder_mode = ((decoder_type > 0) ? RocalDecodeDevice::ROCAL_HW_DECODE : RocalDecodeDevice::ROCAL_SW_DECODE);
+    auto decoder_mode = ((decoder_type == 1) ? RocalDecodeDevice::ROCAL_HW_DECODE : RocalDecodeDevice::ROCAL_SW_DECODE);
     RocalDecoderType rocal_decoder_type = RocalDecoderType::ROCAL_DECODER_VIDEO_FFMPEG_SW;
     if (decoder_type == 1) {
         rocal_decoder_type = RocalDecoderType::ROCAL_DECODER_VIDEO_ROCDECODE;

From 7bfd879707dbad2749b89731f459cb467d661025 Mon Sep 17 00:00:00 2001
From: daniellegillai <dagillai@amd.com>
Date: Tue, 14 Jul 2026 13:05:57 -0700
Subject: [PATCH 2/3] validate decoder type arg

---
 tests/cpp_api/video_tests/video_tests.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/cpp_api/video_tests/video_tests.cpp b/tests/cpp_api/video_tests/video_tests.cpp
index 9f0271524..ac4b19a33 100644
--- a/tests/cpp_api/video_tests/video_tests.cpp
+++ b/tests/cpp_api/video_tests/video_tests.cpp
@@ -130,6 +130,11 @@ int main(int argc, const char **argv) {
     if (argc >= argIdx + MIN_ARG_COUNT)
         enable_sequence_rearrange = atoi(argv[++argIdx]) ? true : false;
 
+    if (!(decoder_type == 0  || decoder_type == 1)) {
+        std::cout << "Usage: video_tests <video_file/video_dataset_folder/text file> <reader_case> <processing_device=1/cpu=0> <hardware_decode_mode=0/1> <batch_size> <sequence_length> <frame_step> <frame_stride> <gray_scale/rgb> <display_on_off> <shuffle:0/1> <resize_width> <resize_height> <filelist_framenum:0/1> <enable_meta_data:0/1> <enable_framenumber:0/1> <enable_timestamps:0/1> <enable_sequence_rearrange:0/1>\n";
+        std::cout << "hardware_decode_mode must be 0 or 1\n";
+        return -1;
+    }
     auto decoder_mode = ((decoder_type == 1) ? RocalDecodeDevice::ROCAL_HW_DECODE : RocalDecodeDevice::ROCAL_SW_DECODE);
     RocalDecoderType rocal_decoder_type = RocalDecoderType::ROCAL_DECODER_VIDEO_FFMPEG_SW;
     if (decoder_type == 1) {

From 48a2e47359806bd840ad21d07cdb3e7bec81f48c Mon Sep 17 00:00:00 2001
From: daniellegillai <dagillai@amd.com>
Date: Tue, 21 Jul 2026 13:20:50 -0700
Subject: [PATCH 3/3] add rocdecode source install and enable rocdecode in
 rocal

---
 .github/workflows/conformance-hip.yml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/conformance-hip.yml b/.github/workflows/conformance-hip.yml
index 3d9d896ed..95be196d6 100644
--- a/.github/workflows/conformance-hip.yml
+++ b/.github/workflows/conformance-hip.yml
@@ -78,6 +78,18 @@ jobs:
         run: |
           rocminfo
           amd-smi || true
+      - name: Install rocDecode
+        run: |
+          git clone --depth 1 --filter=blob:none --sparse https://github.com/ROCm/rocm-systems.git
+          cd rocm-systems
+          git sparse-checkout set projects/rocdecode
+          cd projects/rocdecode
+          mkdir build
+          cd build
+          cmake ..
+          make -j$(nproc)
+          make install
+          cd ../../../../
       - name: Install RPP
         run: |
           git clone --depth 1 --filter=blob:none --sparse https://github.com/ROCm/rocm-libraries.git
@@ -107,7 +119,7 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake .. -DBUILD_PYPACKAGE=OFF -DCMAKE_DISABLE_FIND_PACKAGE_rocdecode=ON
+          cmake .. -DBUILD_PYPACKAGE=OFF
           make -j$(nproc)
           make install
       - name: Run tests