From b5b5bac8b23ebdc18b26cd7bddb8c05f5e4a9d5a Mon Sep 17 00:00:00 2001
From: Sajina PK <Sajina.PuthalathKandy@amd.com>
Date: Wed, 16 Apr 2025 17:12:21 -0400
Subject: [PATCH] Updates to rocDecode and rocJPEG samples (#166)

* Edit CMakeList files and include paths for library headers.


[ROCm/rocprofiler-systems commit: e805c0f3e7a063558bef1b64c856131187af2221]
---
 .../examples/jpegdecode/CMakeLists.txt        |  1 +
 .../jpegdecode/rocjpeg_samples_utils.h        |  4 ++--
 .../examples/videodecode/CMakeLists.txt       | 20 ++-----------------
 .../examples/videodecode/roc_video_dec.h      |  8 ++++----
 .../examples/videodecode/video_demuxer.h      |  2 +-
 .../examples/videodecode/videodecodebatch.cpp |  2 +-
 6 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/projects/rocprofiler-systems/examples/jpegdecode/CMakeLists.txt b/projects/rocprofiler-systems/examples/jpegdecode/CMakeLists.txt
index a76269d194..56bb7d9a7f 100644
--- a/projects/rocprofiler-systems/examples/jpegdecode/CMakeLists.txt
+++ b/projects/rocprofiler-systems/examples/jpegdecode/CMakeLists.txt
@@ -43,6 +43,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED On)
 
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake)
 list(APPEND CMAKE_PREFIX_PATH ${ROCmVersion_DIR}/lib/cmake ${ROCmVersion_DIR})
+list(APPEND CMAKE_PREFIX_PATH ${ROCmVersion_DIR}/hip ${ROCmVersion_DIR})
 list(APPEND CMAKE_MODULE_PATH ${ROCmVersion_DIR}/share/rocjpeg/cmake)
 
 set(CMAKE_BUILD_TYPE "RelWithDebInfo")
diff --git a/projects/rocprofiler-systems/examples/jpegdecode/rocjpeg_samples_utils.h b/projects/rocprofiler-systems/examples/jpegdecode/rocjpeg_samples_utils.h
index 1bad7af2dc..1bcafb18a2 100644
--- a/projects/rocprofiler-systems/examples/jpegdecode/rocjpeg_samples_utils.h
+++ b/projects/rocprofiler-systems/examples/jpegdecode/rocjpeg_samples_utils.h
@@ -41,8 +41,8 @@ namespace fs = std::filesystem;
 #    include <experimental/filesystem>
 namespace fs = std::experimental::filesystem;
 #endif
-#include "rocjpeg.h"
 #include <chrono>
+#include <rocjpeg/rocjpeg.h>
 
 #define CHECK_ROCJPEG(call)                                                              \
     {                                                                                    \
@@ -900,4 +900,4 @@ protected:
     std::queue<std::function<void()>> decode_jobs_queue_;
     std::vector<std::thread>          threads_;
 };
-#endif  // ROC_JPEG_SAMPLES_COMMON
\ No newline at end of file
+#endif  // ROC_JPEG_SAMPLES_COMMON
diff --git a/projects/rocprofiler-systems/examples/videodecode/CMakeLists.txt b/projects/rocprofiler-systems/examples/videodecode/CMakeLists.txt
index 6551da4f22..9e85555507 100644
--- a/projects/rocprofiler-systems/examples/videodecode/CMakeLists.txt
+++ b/projects/rocprofiler-systems/examples/videodecode/CMakeLists.txt
@@ -20,6 +20,7 @@ endif()
 set(CMAKE_CXX_STANDARD 17)
 
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake)
+list(APPEND CMAKE_PREFIX_PATH ${ROCmVersion_DIR}/lib/cmake ${ROCmVersion_DIR})
 list(APPEND CMAKE_PREFIX_PATH ${ROCmVersion_DIR}/hip ${ROCmVersion_DIR})
 list(APPEND CMAKE_MODULE_PATH ${ROCmVersion_DIR}/share/rocdecode/cmake)
 
@@ -49,29 +50,12 @@ function(videodecode_message _MSG_TYPE)
 endfunction()
 
 # Find RocDecode
-find_package(rocDecode QUIET)
+find_package(ROCDECODE QUIET)
 if(NOT ROCDECODE_FOUND)
     videodecode_message(AUTHOR_WARNING "${PROJECT_NAME} skipped. Missing RocDecode...")
     return()
 endif()
 
-find_path(
-    ROCDECODE_INCLUDE_DIR
-    NAMES rocdecode.h
-    PATHS ${ROCmVersion_DIR}/include/rocdecode)
-find_library(
-    ROCDECODE_LIBRARY
-    NAMES rocdecode
-    HINTS ${ROCmVersion_DIR}/lib)
-
-mark_as_advanced(ROCDECODE_INCLUDE_DIR ROCDECODE_LIBRARY)
-
-if(ROCDECODE_INCLUDE_DIR AND ROCDECODE_LIBRARY)
-    set(ROCDECODE_FOUND TRUE)
-else()
-    videodecode_message(AUTHOR_WARNING "${PROJECT_NAME} skipped. Missing RocDecode ...")
-endif()
-
 # Copy video files to build directory
 if(EXISTS "${ROCmVersion_DIR}/share/rocdecode/video")
     if(NOT EXISTS "${CMAKE_BINARY_DIR}/videos")
diff --git a/projects/rocprofiler-systems/examples/videodecode/roc_video_dec.h b/projects/rocprofiler-systems/examples/videodecode/roc_video_dec.h
index 40684d610a..7af20f380d 100644
--- a/projects/rocprofiler-systems/examples/videodecode/roc_video_dec.h
+++ b/projects/rocprofiler-systems/examples/videodecode/roc_video_dec.h
@@ -40,11 +40,11 @@ THE SOFTWARE.
 #include <vector>
 extern "C"
 {
-#include "libavutil/md5.h"
-#include "libavutil/mem.h"
+#include <libavutil/md5.h>
+#include <libavutil/mem.h>
 }
-#include "rocdecode.h"
-#include "rocparser.h"
+#include <rocdecode/rocdecode.h>
+#include <rocdecode/rocparser.h>
 
 /*!
  * \file
diff --git a/projects/rocprofiler-systems/examples/videodecode/video_demuxer.h b/projects/rocprofiler-systems/examples/videodecode/video_demuxer.h
index c8f24eb50d..5d02dc9a82 100644
--- a/projects/rocprofiler-systems/examples/videodecode/video_demuxer.h
+++ b/projects/rocprofiler-systems/examples/videodecode/video_demuxer.h
@@ -32,7 +32,7 @@ extern "C"
 #endif
 }
 
-#include "rocdecode.h"
+#include <rocdecode/rocdecode.h>
 
 /*!
  * \file
diff --git a/projects/rocprofiler-systems/examples/videodecode/videodecodebatch.cpp b/projects/rocprofiler-systems/examples/videodecode/videodecodebatch.cpp
index 89920f35a7..15436583ad 100644
--- a/projects/rocprofiler-systems/examples/videodecode/videodecodebatch.cpp
+++ b/projects/rocprofiler-systems/examples/videodecode/videodecodebatch.cpp
@@ -726,4 +726,4 @@ main(int argc, char** argv)
     }
 
     return 0;
-}
\ No newline at end of file
+}