diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b343dd7..ca3b11dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ Full documentation for rocDecode is available at [https://rocm.docs.amd.com/projects/rocDecode/en/latest/](https://rocm.docs.amd.com/projects/rocDecode/en/latest/) -## rocDecode 0.14.0 (unreleased) +## rocdecode 1.0.0 for ROCm 7.0.0 ### Added @@ -11,8 +11,8 @@ Full documentation for rocDecode is available at [https://rocm.docs.amd.com/proj * HEVC/AVC/AV1/VP9 stream syntax error handling. * HEVC stream bit depth change handling and DPB buffer size change handling through decoder reconfiguration. * AVC stream DPB buffer size change handling through decoder reconfiguration. -* rocDecode now uses the Cmake CMAKE_PREFIX_PATH directive. -* rocDecode - A new avcodec-based decoder built as a separate "rocdecode-host" library +* rocdecode now uses the Cmake CMAKE_PREFIX_PATH directive. +* rocdecode - A new avcodec-based decoder built as a separate "rocdecode-host" library ### Optimized diff --git a/CMakeLists.txt b/CMakeLists.txt index f616a2d3..28b1949c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,8 +39,8 @@ if (NOT DEFINED CMAKE_CXX_COMPILER) set(CMAKE_CXX_COMPILER ${ROCM_PATH}/bin/amdclang++) endif() -# rocDecode Version -set(VERSION "0.14.0") +# rocdecode Version +set(VERSION "1.0.0") # Set Project Version and Language project(rocdecode VERSION ${VERSION} LANGUAGES CXX) @@ -59,7 +59,7 @@ find_program(DPKG_EXE dpkg) # avoid setting the default installation path to /usr/local if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - set(CMAKE_INSTALL_PREFIX ${ROCM_PATH} CACHE PATH "rocDecode default installation path" FORCE) + set(CMAKE_INSTALL_PREFIX ${ROCM_PATH} CACHE PATH "rocdecode default installation path" FORCE) endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) set(DEFAULT_BUILD_TYPE "Release") @@ -77,15 +77,15 @@ if(ENHANCED_MESSAGE) set(Cyan "${Esc}[36m") set(White "${Esc}[37m") endif() -message("-- ${BoldBlue}rocDecode Version -- ${VERSION}${ColourReset}") -message("-- ${BoldBlue}rocDecode Install Path -- ${CMAKE_INSTALL_PREFIX}${ColourReset}") +message("-- ${BoldBlue}rocdecode Version -- ${VERSION}${ColourReset}") +message("-- ${BoldBlue}rocdecode Install Path -- ${CMAKE_INSTALL_PREFIX}${ColourReset}") list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/lib/cmake) -# rocDecode Build Type +# rocdecode Build Type if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}" CACHE STRING "rocDecode Default Build Type" FORCE) + set(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}" CACHE STRING "rocdecode Default Build Type" FORCE) set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release") endif() if(CMAKE_BUILD_TYPE MATCHES Debug) @@ -98,7 +98,7 @@ else() # -fPIC -- Generate position-independent code if possible set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -DNDEBUG -fPIC") endif() -message("-- ${BoldBlue}rocDecode Build Type -- ${CMAKE_BUILD_TYPE}${ColourReset}") +message("-- ${BoldBlue}rocdecode Build Type -- ${CMAKE_BUILD_TYPE}${ColourReset}") # Add an option for enabling the rocprofiler-register option(ROCDECODE_ENABLE_ROCPROFILER_REGISTER "Enable rocprofiler-register support" ON) @@ -169,20 +169,20 @@ if(HIP_FOUND AND Libva_FOUND AND Libdrm_amdgpu_FOUND) #Generate BUILD_INFO configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/api/rocdecode_version.h.in ${CMAKE_CURRENT_BINARY_DIR}/rocdecode_version.h @ONLY ) - # install rocDecode libs -- {ROCM_PATH}/lib + # install rocdecode libs -- {ROCM_PATH}/lib install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT runtime NAMELINK_SKIP) install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}-targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT dev NAMELINK_ONLY) install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT asan) - # install rocDecode include files -- {ROCM_PATH}/include/rocdecode + # install rocdecode include files -- {ROCM_PATH}/include/rocdecode install(FILES api/rocdecode/rocdecode.h api/rocdecode/rocparser.h api/rocdecode/roc_bitstream_reader.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} COMPONENT dev) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/rocdecode_version.h api/rocdecode/rocdecode_host.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} COMPONENT dev) - # install rocDecode api trace include file -- {ROCM_PATH}/include/rocdecode/amd_detail + # install rocdecode api trace include file -- {ROCM_PATH}/include/rocdecode/amd_detail install(FILES api/amd_detail/rocdecode_api_trace.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/amd_detail COMPONENT dev) - # install rocDecode samples -- {ROCM_PATH}/share/rocdecode + # install rocdecode samples -- {ROCM_PATH}/share/rocdecode install(DIRECTORY cmake DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME} COMPONENT dev) install(DIRECTORY utils/rocvideodecode DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/utils COMPONENT dev) install(DIRECTORY utils/ffmpegvideodecode DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/utils COMPONENT dev) @@ -210,25 +210,32 @@ if(HIP_FOUND AND Libva_FOUND AND Libdrm_amdgpu_FOUND) install(DIRECTORY test/testScripts DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/test COMPONENT test) install(FILES test/rocDecodeNegativeApiTests/CMakeLists.txt test/rocDecodeNegativeApiTests/README.md test/rocDecodeNegativeApiTests/rocdecode_api_negative_tests.cpp test/rocDecodeNegativeApiTests/rocdecode_api_negative_tests.h test/rocDecodeNegativeApiTests/rocdecodenegativetest.cpp DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/test/rocDecodeNegativeApiTests COMPONENT dev) - message("-- ${White}AMD ROCm rocDecode -- CMAKE_CXX_FLAGS:${CMAKE_CXX_FLAGS}${ColourReset}") - message("-- ${White}AMD ROCm rocDecode -- Link Libraries: ${LINK_LIBRARY_LIST}${ColourReset}") + message("-- ${White}AMD ROCm rocdecode -- CMAKE_CXX_FLAGS:${CMAKE_CXX_FLAGS}${ColourReset}") + message("-- ${White}AMD ROCm rocdecode -- Link Libraries: ${LINK_LIBRARY_LIST}${ColourReset}") - ## Cmake module config file configurations + # Cmake module config file configurations set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/" CACHE INTERNAL "Default module path.") - ## Export the package for use from the build-tree + # Export the package for use from the build-tree ## (this registers the build-tree with a global CMake-registry) export(PACKAGE ${PROJECT_NAME}) set(CONF_LIB_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") - ## Create the rocdecode-config.cmake and rocdecode-config-version files + # Create the rocdecode-config.cmake and rocdecode-config-version files include(CMakePackageConfigHelpers) set(CONFIG_PACKAGE_INSTALL_DIR ${CONF_LIB_DIR}/cmake/${PROJECT_NAME}) - set(LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}") - set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}") - set(BIN_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}") + set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") + set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}") + set(BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}") - ## Generate Config File for rocdecode + # Generate config Version File for rocdecode + write_basic_package_version_file( + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake + VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}" + COMPATIBILITY SameMajorVersion + ) + + # Generate Config File for rocdecode configure_package_config_file( ${CMAKE_MODULE_PATH}/${PROJECT_NAME}-config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake @@ -236,14 +243,7 @@ if(HIP_FOUND AND Libva_FOUND AND Libdrm_amdgpu_FOUND) PATH_VARS LIB_INSTALL_DIR INCLUDE_INSTALL_DIR BIN_INSTALL_DIR ) - ## Generate config Version File for rocdecode - write_basic_package_version_file( - ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake - VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}" - COMPATIBILITY SameMajorVersion - ) - - ## Install the rocdecode-config.cmake and rocdecode-config-version.cmake + # Install the rocdecode-config.cmake and rocdecode-config-version.cmake install(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake" "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake" @@ -251,16 +251,21 @@ if(HIP_FOUND AND Libva_FOUND AND Libdrm_amdgpu_FOUND) COMPONENT dev ) - ## Install the export set for use with the install-tree - install(EXPORT ${PROJECT_NAME}-targets DESTINATION - "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" COMPONENT dev + # Install the export set for use with the install-tree + install(EXPORT ${PROJECT_NAME}-targets + FILE ${PROJECT_NAME}-targets.cmake + NAMESPACE ${PROJECT_NAME}:: + DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" + COMPONENT dev ) # make test with CTest + set(BUILD_FROM_SOURCE ON) enable_testing() include(CTest) add_subdirectory(test) + # make rocdecode-host for decoding on HOST only if FFMPEG is available if (ROCDECODE_ENABLE_HOST_DECODER AND FFMPEG_FOUND) add_subdirectory(src/rocdecode-host) @@ -273,17 +278,17 @@ if(HIP_FOUND AND Libva_FOUND AND Libdrm_amdgpu_FOUND) set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") set(CPACK_PACKAGE_LICENSE "MIT") # TBD: Change to generic support email - set(CPACK_PACKAGE_CONTACT "rocDecode Support ") + set(CPACK_PACKAGE_CONTACT "rocdecode Support ") set(CPACK_PACKAGE_VENDOR "AMD ROCm") set(CPACK_PACKAGE_GROUP "Development/Tools") set(CPACK_PACKAGE_HOMEPAGE "https://github.com/ROCm/rocDecode") if(ENABLE_ASAN_PACKAGING) - set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "AMD rocDecode address sanitizer libraries") - set(CPACK_RPM_PACKAGE_SUMMARY "AMD rocDecode address sanitizer libraries") + set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "AMD rocdecode address sanitizer libraries") + set(CPACK_RPM_PACKAGE_SUMMARY "AMD rocdecode address sanitizer libraries") else() - set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "AMD rocDecode is a high performance video decode SDK for AMD GPUs") - set(CPACK_RPM_PACKAGE_SUMMARY "AMD rocDecode is a high performance video decode SDK for AMD GPUs") + set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "AMD rocdecode is a high performance video decode SDK for AMD GPUs") + set(CPACK_RPM_PACKAGE_SUMMARY "AMD rocdecode is a high performance video decode SDK for AMD GPUs") endif() if(DEFINED ENV{ROCM_LIBPATCH_VERSION}) @@ -394,39 +399,39 @@ if(HIP_FOUND AND Libva_FOUND AND Libdrm_amdgpu_FOUND) endif() if(EXISTS ${RPMBUILD_EXE}) list(APPEND CPACK_GENERATOR "RPM") - message("-- ${White}rocDecode .rpm RunTime Package Requirements -- ${CPACK_RPM_RUNTIME_PACKAGE_REQUIRES}${ColourReset}") - message("-- ${White}rocDecode .rpm Devel Package Requirements -- ${CPACK_RPM_DEV_PACKAGE_REQUIRES}${ColourReset}") + message("-- ${White}rocdecode .rpm RunTime Package Requirements -- ${CPACK_RPM_RUNTIME_PACKAGE_REQUIRES}${ColourReset}") + message("-- ${White}rocdecode .rpm Devel Package Requirements -- ${CPACK_RPM_DEV_PACKAGE_REQUIRES}${ColourReset}") endif() if(EXISTS ${DPKG_EXE}) list(APPEND CPACK_GENERATOR "DEB") - message("-- ${White}rocDecode .deb RunTime Package Requirements -- ${CPACK_DEBIAN_RUNTIME_PACKAGE_DEPENDS}${ColourReset}") - message("-- ${White}rocDecode .deb Dev Package Requirements -- ${CPACK_DEBIAN_DEV_PACKAGE_DEPENDS}${ColourReset}") + message("-- ${White}rocdecode .deb RunTime Package Requirements -- ${CPACK_DEBIAN_RUNTIME_PACKAGE_DEPENDS}${ColourReset}") + message("-- ${White}rocdecode .deb Dev Package Requirements -- ${CPACK_DEBIAN_DEV_PACKAGE_DEPENDS}${ColourReset}") endif() include(CPack) cpack_add_component(runtime - DISPLAY_NAME "rocDecode Runtime Package" - DESCRIPTION "AMD rocDecode is a high performance video decode SDK for AMD GPUs. \ -rocDecode runtime package provides rocDecode library and license.txt") + DISPLAY_NAME "rocdecode Runtime Package" + DESCRIPTION "AMD rocdecode is a high performance video decode SDK for AMD GPUs. \ +rocdecode runtime package provides rocdecode library and license.txt") cpack_add_component(dev - DISPLAY_NAME "rocDecode Develop Package" - DESCRIPTION "AMD rocDecode is a high performance video decode SDK for AMD GPUs. \ -rocDecode develop package provides rocDecode header files, and samples") + DISPLAY_NAME "rocdecode Develop Package" + DESCRIPTION "AMD rocdecode is a high performance video decode SDK for AMD GPUs. \ +rocdecode develop package provides rocdecode header files, and samples") cpack_add_component(asan - DISPLAY_NAME "rocDecode ASAN Package" - DESCRIPTION "AMD rocDecode is a high performance video decode SDK for AMD GPUs. \ -rocDecode ASAN package provides rocDecode ASAN libraries") + DISPLAY_NAME "rocdecode ASAN Package" + DESCRIPTION "AMD rocdecode is a high performance video decode SDK for AMD GPUs. \ +rocdecode ASAN package provides rocdecode ASAN libraries") cpack_add_component(test - DISPLAY_NAME "rocDecode Test Package" - DESCRIPTION "AMD rocDecode is a high performance video decode SDK for AMD GPUs. \ -rocDecode Test package provides rocDecode Test Components") + DISPLAY_NAME "rocdecode Test Package" + DESCRIPTION "AMD rocdecode is a high performance video decode SDK for AMD GPUs. \ +rocdecode Test package provides rocdecode Test Components") else() - message("-- ${Red}AMD ROCm rocDecode -- unmet dependencies${ColourReset}") + message("-- ${Red}AMD ROCm rocdecode -- unmet dependencies${ColourReset}") if(NOT HIP_FOUND) message(FATAL_ERROR "-- ERROR!: HIP Not Found! - please install rocm-hip-runtime-dev!") endif() diff --git a/README.md b/README.md index 1eaa29bf..0031b4d4 100644 --- a/README.md +++ b/README.md @@ -230,7 +230,7 @@ You can find rocDecode Docker containers in our * Ubuntu - `22.04` / `24.04` * RHEL - `8` / `9` * SLES - `15 SP5` -* ROCm: `6.3.0` +* ROCm: `7.0.0` * libva-amdgpu-dev - `2.16.0` * mesa-amdgpu-va-drivers - `1:24.3.0` * FFmpeg - `4.4.2` / `6.1.1` diff --git a/cmake_modules/rocdecode-config.cmake.in b/cmake_modules/rocdecode-config.cmake.in index 9bacb011..ef1b0fe1 100644 --- a/cmake_modules/rocdecode-config.cmake.in +++ b/cmake_modules/rocdecode-config.cmake.in @@ -1,22 +1,36 @@ # - Config file for the rocdecode package # It defines the following variables -# ROCDECODE_INCLUDE_DIR - include directory for rocdecode -# ROCDECODE_LIB_DIR - library directory for rocdecode -# ROCDECODE_LIBRARY - library to link against +# use rocdecode_INCLUDE_DIR or ROCDECODE_INCLUDE_DIR - include directory for rocdecode +# use rocdecode_LIB_DIR or ROCDECODE_LIB_DIR - library directory for rocdecode +# use rocdecode_LIBRARY or ROCDECODE_LIBRARY - library to link against +# use rocdecode_LIBRARIES or ROCDECODE_LIBRARIES - library to link against + +# compute paths +get_filename_component(@PROJECT_NAME@_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) + +# version +include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-config-version.cmake) +set(@PROJECT_NAME@_VERSION ${PACKAGE_VERSION}) + +# targets +include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-targets.cmake) @PACKAGE_INIT@ -# Compute paths -set_and_check(rocdecode_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") -set_and_check(ROCDECODE_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") -set_and_check(rocDecode_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") -set_and_check(rocdecode_LIB_DIR "@PACKAGE_LIB_INSTALL_DIR@") -set_and_check(ROCDECODE_LIB_DIR "@PACKAGE_LIB_INSTALL_DIR@") -set_and_check(rocDecode_LIB_DIR "@PACKAGE_LIB_INSTALL_DIR@") -set_and_check(rocdecode_LIBRARY "@PACKAGE_LIB_INSTALL_DIR@/librocdecode.so") -set_and_check(ROCDECODE_LIBRARY "@PACKAGE_LIB_INSTALL_DIR@/librocdecode.so") -set_and_check(rocDecode_LIBRARY "@PACKAGE_LIB_INSTALL_DIR@/librocdecode.so") +set_and_check(@PROJECT_NAME@_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") +set_and_check(@PROJECT_NAME@_LIB_DIR "@PACKAGE_LIB_INSTALL_DIR@") +set_and_check(@PROJECT_NAME@_LIBRARY "@PACKAGE_LIB_INSTALL_DIR@/lib@PROJECT_NAME@.so") +set_and_check(@PROJECT_NAME@_LIBRARIES "@PACKAGE_LIB_INSTALL_DIR@/lib@PROJECT_NAME@.so") +if(NOT TARGET @PROJECT_NAME@::@PROJECT_NAME@) + add_library(@PROJECT_NAME@::@PROJECT_NAME@ INTERFACE IMPORTED) + set_target_properties(@PROJECT_NAME@::@PROJECT_NAME@ PROPERTIES INTERFACE_LINK_LIBRARIES ${@PROJECT_NAME@_LIBRARY}) +endif () -get_filename_component(ROCDECODE_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) -include("${ROCDECODE_CMAKE_DIR}/rocdecode-targets.cmake") +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args( + @PROJECT_NAME@ + FOUND_VAR @PROJECT_NAME@_FOUND + REQUIRED_VARS @PROJECT_NAME@_INCLUDE_DIR @PROJECT_NAME@_LIB_DIR @PROJECT_NAME@_LIBRARY @PROJECT_NAME@_LIBRARIES + VERSION_VAR @PROJECT_NAME@_VERSION + HANDLE_COMPONENTS) diff --git a/samples/rocdecDecode/CMakeLists.txt b/samples/rocdecDecode/CMakeLists.txt index a54531f2..4cd2a826 100644 --- a/samples/rocdecDecode/CMakeLists.txt +++ b/samples/rocdecDecode/CMakeLists.txt @@ -44,10 +44,10 @@ set(CMAKE_CXX_STANDARD 17) list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake) list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/lib/cmake) -# rocDecode sample build type +# rocdecode sample build type set(DEFAULT_BUILD_TYPE "Release") if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}" CACHE STRING "rocDecode Default Build Type" FORCE) + set(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}" CACHE STRING "rocdecode Default Build Type" FORCE) set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release") endif() if(CMAKE_BUILD_TYPE MATCHES Debug) @@ -63,24 +63,24 @@ endif() find_package(HIP QUIET) find_package(FFmpeg QUIET) -find_package(ROCDECODE QUIET) +find_package(rocdecode QUIET) -if(HIP_FOUND AND FFMPEG_FOUND AND ROCDECODE_FOUND) +if(HIP_FOUND AND FFMPEG_FOUND AND rocdecode_FOUND) # HIP - find_library(ROCDECODE_HOST_LIBRARY rocdecodehost PATHS ${ROCM_PATH}/lib) + find_library(rocdecode_HOST_LIBRARY rocdecodehost PATHS ${ROCM_PATH}/lib) set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} hip::host) # FFMPEG include_directories(${AVUTIL_INCLUDE_DIR} ${AVCODEC_INCLUDE_DIR} ${AVFORMAT_INCLUDE_DIR}) set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${FFMPEG_LIBRARIES}) - # rocDecode and utils - include_directories (${ROCDECODE_INCLUDE_DIR} ${ROCM_PATH}/lib) - if(ROCDECODE_HOST_LIBRARY) - set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${ROCDECODE_LIBRARY} ${ROCDECODE_HOST_LIBRARY}) + # rocdecode and utils + include_directories (${rocdecode_INCLUDE_DIR} ${ROCM_PATH}/lib) + if(rocdecode_HOST_LIBRARY) + set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} rocdecode::rocdecode ${rocdecode_HOST_LIBRARY}) else() - message(FATAL_ERROR "Library ROCDECODE_HOST_LIBRARY not found!") + message(FATAL_ERROR "Library rocdecode_HOST_LIBRARY not found!") endif() - # rocDecode + # rocdecode # sample app exe list(APPEND SOURCES ${PROJECT_SOURCE_DIR} rocdecdecode.cpp) add_executable(${PROJECT_NAME} ${SOURCES}) @@ -94,8 +94,8 @@ else() if (NOT FFMPEG_FOUND) message(FATAL_ERROR "-- ERROR!: FFMPEG Not Found! - please install FFMPEG!") endif() - if (NOT ROCDECODE_FOUND) - message(FATAL_ERROR "-- ERROR!: rocDecode Not Found! - please install rocDecode!") + if (NOT rocdecode_FOUND) + message(FATAL_ERROR "-- ERROR!: rocdecode Not Found! - please install rocdecode!") endif() endif() \ No newline at end of file diff --git a/samples/videoDecode/CMakeLists.txt b/samples/videoDecode/CMakeLists.txt index cd3cb346..b6aa182f 100644 --- a/samples/videoDecode/CMakeLists.txt +++ b/samples/videoDecode/CMakeLists.txt @@ -44,10 +44,10 @@ project(videodecode) list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake) list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/lib/cmake) -# rocDecode sample build type +# rocdecode sample build type set(DEFAULT_BUILD_TYPE "Release") if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}" CACHE STRING "rocDecode Default Build Type" FORCE) + set(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}" CACHE STRING "rocdecode Default Build Type" FORCE) set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release") endif() if(CMAKE_BUILD_TYPE MATCHES Debug) @@ -62,21 +62,21 @@ else() endif() find_package(HIP QUIET) -find_package(ROCDECODE QUIET) +find_package(rocdecode QUIET) find_package(rocprofiler-register QUIET) find_package(FFmpeg QUIET) find_package(Threads REQUIRED) -if(HIP_FOUND AND FFMPEG_FOUND AND ROCDECODE_FOUND AND Threads_FOUND AND rocprofiler-register_FOUND) +if(HIP_FOUND AND FFMPEG_FOUND AND rocdecode_FOUND AND Threads_FOUND AND rocprofiler-register_FOUND) # HIP set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} hip::host) # FFMPEG include_directories(${AVUTIL_INCLUDE_DIR} ${AVCODEC_INCLUDE_DIR} ${AVFORMAT_INCLUDE_DIR}) set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${FFMPEG_LIBRARIES}) - # rocDecode and utils - include_directories (${ROCDECODE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../../utils ${CMAKE_CURRENT_SOURCE_DIR}/../../utils/rocvideodecode ${CMAKE_CURRENT_SOURCE_DIR}/../../utils/ffmpegvideodecode) - set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${ROCDECODE_LIBRARY}) + # rocdecode and utils + include_directories (${rocdecode_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../../utils ${CMAKE_CURRENT_SOURCE_DIR}/../../utils/rocvideodecode ${CMAKE_CURRENT_SOURCE_DIR}/../../utils/ffmpegvideodecode) + set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} rocdecode::rocdecode) # threads set(THREADS_PREFER_PTHREAD_FLAG ON) set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} Threads::Threads) @@ -100,11 +100,11 @@ else() if (NOT FFMPEG_FOUND) message(FATAL_ERROR "-- ERROR!: FFMPEG Not Found! - please install FFMPEG!") endif() - if (NOT ROCDECODE_FOUND) - message(FATAL_ERROR "-- ERROR!: rocDecode Not Found! - please install rocDecode!") + if (NOT rocdecode_FOUND) + message(FATAL_ERROR "-- ERROR!: rocdecode Not Found! - please install rocdecode!") endif() if (NOT Threads_FOUND) - message(FATAL_ERROR "-- ERROR!: Threads Not Found! - please insatll Threads!") + message(FATAL_ERROR "-- ERROR!: Threads Not Found! - please install Threads!") endif() if (NOT rocprofiler-register_FOUND) message(FATAL_ERROR "-- ERROR!: rocprofiler-register Not Found! - please install rocprofiler-register!") diff --git a/samples/videoDecodeBatch/CMakeLists.txt b/samples/videoDecodeBatch/CMakeLists.txt index f602e49d..98023334 100644 --- a/samples/videoDecodeBatch/CMakeLists.txt +++ b/samples/videoDecodeBatch/CMakeLists.txt @@ -44,10 +44,10 @@ project(videodecodebatch) list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake) list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/lib/cmake) -# rocDecode sample build type +# rocdecode sample build type set(DEFAULT_BUILD_TYPE "Release") if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}" CACHE STRING "rocDecode Default Build Type" FORCE) + set(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}" CACHE STRING "rocdecode Default Build Type" FORCE) set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release") endif() if(CMAKE_BUILD_TYPE MATCHES Debug) @@ -62,11 +62,11 @@ else() endif() find_package(HIP QUIET) -find_package(ROCDECODE QUIET) +find_package(rocdecode QUIET) find_package(rocprofiler-register QUIET) find_package(FFmpeg QUIET) -if(HIP_FOUND AND FFMPEG_FOUND AND ROCDECODE_FOUND AND rocprofiler-register_FOUND) +if(HIP_FOUND AND FFMPEG_FOUND AND rocdecode_FOUND AND rocprofiler-register_FOUND) # HIP set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} hip::host) # FFMPEG @@ -75,9 +75,9 @@ if(HIP_FOUND AND FFMPEG_FOUND AND ROCDECODE_FOUND AND rocprofiler-register_FOUND set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${FFMPEG_LIBRARIES}) # STD Filesystem set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} stdc++fs) - # rocDecode and utils - include_directories (${ROCDECODE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../../utils ${CMAKE_CURRENT_SOURCE_DIR}/../../utils/rocvideodecode) - set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${ROCDECODE_LIBRARY}) + # rocdecode and utils + include_directories (${rocdecode_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../../utils ${CMAKE_CURRENT_SOURCE_DIR}/../../utils/rocvideodecode) + set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} rocdecode::rocdecode) #threads set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) @@ -102,11 +102,11 @@ else() if (NOT FFMPEG_FOUND) message(FATAL_ERROR "-- ERROR!: FFMPEG Not Found! - please install FFMPEG!") endif() - if (NOT ROCDECODE_FOUND) - message(FATAL_ERROR "-- ERROR!: rocDecode Not Found! - please install rocDecode!") + if (NOT rocdecode_FOUND) + message(FATAL_ERROR "-- ERROR!: rocdecode Not Found! - please install rocdecode!") endif() if (NOT Threads_FOUND) - message(FATAL_ERROR "-- ERROR!: Threads Not Found! - please insatll Threads!") + message(FATAL_ERROR "-- ERROR!: Threads Not Found! - please install Threads!") endif() if (NOT rocprofiler-register_FOUND) message(FATAL_ERROR "-- ERROR!: rocprofiler-register Not Found! - please install rocprofiler-register!") diff --git a/samples/videoDecodeMem/CMakeLists.txt b/samples/videoDecodeMem/CMakeLists.txt index a7860cde..c2c085ac 100644 --- a/samples/videoDecodeMem/CMakeLists.txt +++ b/samples/videoDecodeMem/CMakeLists.txt @@ -45,10 +45,10 @@ project(videodecodemem) list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake) list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/lib/cmake) -# rocDecode sample build type +# rocdecode sample build type set(DEFAULT_BUILD_TYPE "Release") if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}" CACHE STRING "rocDecode Default Build Type" FORCE) + set(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}" CACHE STRING "rocdecode Default Build Type" FORCE) set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release") endif() if(CMAKE_BUILD_TYPE MATCHES Debug) @@ -63,20 +63,20 @@ else() endif() find_package(HIP QUIET) -find_package(ROCDECODE QUIET) +find_package(rocdecode QUIET) find_package(rocprofiler-register QUIET) find_package(FFmpeg QUIET) -if(HIP_FOUND AND FFMPEG_FOUND AND ROCDECODE_FOUND AND rocprofiler-register_FOUND) +if(HIP_FOUND AND FFMPEG_FOUND AND rocdecode_FOUND AND rocprofiler-register_FOUND) # HIP set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} hip::host) # FFMPEG include_directories(${AVUTIL_INCLUDE_DIR} ${AVCODEC_INCLUDE_DIR} ${AVFORMAT_INCLUDE_DIR}) set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${FFMPEG_LIBRARIES}) - # rocDecode and utils - include_directories (${ROCDECODE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../utils ${CMAKE_CURRENT_SOURCE_DIR}/../../utils/rocvideodecode) - set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${ROCDECODE_LIBRARY}) + # rocdecode and utils + include_directories (${rocdecode_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../utils ${CMAKE_CURRENT_SOURCE_DIR}/../../utils/rocvideodecode) + set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} rocdecode::rocdecode) # rocprofiler-register set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} rocprofiler-register::rocprofiler-register) # sample app exe @@ -97,8 +97,8 @@ else() if (NOT FFMPEG_FOUND) message(FATAL_ERROR "-- ERROR!: FFMPEG Not Found! - please install FFMPEG!") endif() - if (NOT ROCDECODE_FOUND) - message(FATAL_ERROR "-- ERROR!: rocDecode Not Found! - please install rocDecode!") + if (NOT rocdecode_FOUND) + message(FATAL_ERROR "-- ERROR!: rocdecode Not Found! - please install rocdecode!") endif() if (NOT rocprofiler-register_FOUND) message(FATAL_ERROR "-- ERROR!: rocprofiler-register Not Found! - please install rocprofiler-register!") diff --git a/samples/videoDecodeMultiFiles/CMakeLists.txt b/samples/videoDecodeMultiFiles/CMakeLists.txt index 9ff2d582..4c1ed672 100644 --- a/samples/videoDecodeMultiFiles/CMakeLists.txt +++ b/samples/videoDecodeMultiFiles/CMakeLists.txt @@ -44,10 +44,10 @@ project(videodecodemultifiles) list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake) list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/lib/cmake) -# rocDecode sample build type +# rocdecode sample build type set(DEFAULT_BUILD_TYPE "Release") if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}" CACHE STRING "rocDecode Default Build Type" FORCE) + set(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}" CACHE STRING "rocdecode Default Build Type" FORCE) set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release") endif() if(CMAKE_BUILD_TYPE MATCHES Debug) @@ -62,20 +62,20 @@ else() endif() find_package(HIP QUIET) -find_package(ROCDECODE QUIET) +find_package(rocdecode QUIET) find_package(rocprofiler-register QUIET) find_package(FFmpeg QUIET) -if(HIP_FOUND AND FFMPEG_FOUND AND ROCDECODE_FOUND AND rocprofiler-register_FOUND) +if(HIP_FOUND AND FFMPEG_FOUND AND rocdecode_FOUND AND rocprofiler-register_FOUND) # HIP set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} hip::host) # FFMPEG include_directories(${AVUTIL_INCLUDE_DIR} ${AVCODEC_INCLUDE_DIR} ${AVFORMAT_INCLUDE_DIR}) set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${FFMPEG_LIBRARIES}) - # rocDecode and utils - include_directories (${ROCDECODE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../../utils ${CMAKE_CURRENT_SOURCE_DIR}/../../utils/rocvideodecode) - set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${ROCDECODE_LIBRARY}) + # rocdecode and utils + include_directories (${rocdecode_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../../utils ${CMAKE_CURRENT_SOURCE_DIR}/../../utils/rocvideodecode) + set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} rocdecode::rocdecode) # rocprofiler-register set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} rocprofiler-register::rocprofiler-register) # sample app exe @@ -96,8 +96,8 @@ else() if (NOT FFMPEG_FOUND) message(FATAL_ERROR "-- ERROR!: FFMPEG Not Found! - please install FFMPEG!") endif() - if (NOT ROCDECODE_FOUND) - message(FATAL_ERROR "-- ERROR!: rocDecode Not Found! - please install rocDecode!") + if (NOT rocdecode_FOUND) + message(FATAL_ERROR "-- ERROR!: rocdecode Not Found! - please install rocdecode!") endif() if (NOT rocprofiler-register_FOUND) message(FATAL_ERROR "-- ERROR!: rocprofiler-register Not Found! - please install rocprofiler-register!") diff --git a/samples/videoDecodePerf/CMakeLists.txt b/samples/videoDecodePerf/CMakeLists.txt index 4779a53c..1eb89155 100644 --- a/samples/videoDecodePerf/CMakeLists.txt +++ b/samples/videoDecodePerf/CMakeLists.txt @@ -44,10 +44,10 @@ project(videodecodeperf) list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake) list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/lib/cmake) -# rocDecode sample build type +# rocdecode sample build type set(DEFAULT_BUILD_TYPE "Release") if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}" CACHE STRING "rocDecode Default Build Type" FORCE) + set(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}" CACHE STRING "rocdecode Default Build Type" FORCE) set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release") endif() if(CMAKE_BUILD_TYPE MATCHES Debug) @@ -62,20 +62,20 @@ else() endif() find_package(HIP QUIET) -find_package(ROCDECODE QUIET) +find_package(rocdecode QUIET) find_package(rocprofiler-register QUIET) find_package(FFmpeg QUIET) -if(HIP_FOUND AND FFMPEG_FOUND AND ROCDECODE_FOUND AND Threads_FOUND AND rocprofiler-register_FOUND) +if(HIP_FOUND AND FFMPEG_FOUND AND rocdecode_FOUND AND Threads_FOUND AND rocprofiler-register_FOUND) # HIP set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} hip::host) # FFMPEG include_directories(${AVUTIL_INCLUDE_DIR} ${AVCODEC_INCLUDE_DIR} ${SWSCALE_INCLUDE_DIR} ${AVFORMAT_INCLUDE_DIR}) set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${FFMPEG_LIBRARIES}) - # rocDecode and utils - include_directories (${ROCDECODE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../utils ${CMAKE_CURRENT_SOURCE_DIR}/../../utils/rocvideodecode ${CMAKE_CURRENT_SOURCE_DIR}/..) - set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${ROCDECODE_LIBRARY}) + # rocdecode and utils + include_directories (${rocdecode_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../utils ${CMAKE_CURRENT_SOURCE_DIR}/../../utils/rocvideodecode ${CMAKE_CURRENT_SOURCE_DIR}/..) + set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} rocdecode::rocdecode) # threads set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) @@ -100,11 +100,11 @@ else() if (NOT FFMPEG_FOUND) message(FATAL_ERROR "-- ERROR!: FFMPEG Not Found! - please install FFMPEG!") endif() - if (NOT ROCDECODE_FOUND) - message(FATAL_ERROR "-- ERROR!: rocDecode Not Found! - please install rocDecode!") + if (NOT rocdecode_FOUND) + message(FATAL_ERROR "-- ERROR!: rocdecode Not Found! - please install rocdecode!") endif() if (NOT Threads_FOUND) - message(FATAL_ERROR "-- ERROR!: Threads Not Found! - please insatll Threads!") + message(FATAL_ERROR "-- ERROR!: Threads Not Found! - please install Threads!") endif() if (NOT rocprofiler-register_FOUND) message(FATAL_ERROR "-- ERROR!: rocprofiler-register Not Found! - please install rocprofiler-register!") diff --git a/samples/videoDecodePicFiles/CMakeLists.txt b/samples/videoDecodePicFiles/CMakeLists.txt index f6053e18..e7cb95c4 100644 --- a/samples/videoDecodePicFiles/CMakeLists.txt +++ b/samples/videoDecodePicFiles/CMakeLists.txt @@ -44,10 +44,10 @@ project(videodecodepicfiles) list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake) list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/lib/cmake) -# rocDecode sample build type +# rocdecode sample build type set(DEFAULT_BUILD_TYPE "Release") if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}" CACHE STRING "rocDecode Default Build Type" FORCE) + set(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}" CACHE STRING "rocdecode Default Build Type" FORCE) set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release") endif() if(CMAKE_BUILD_TYPE MATCHES Debug) @@ -62,21 +62,21 @@ else() endif() find_package(HIP QUIET) -find_package(ROCDECODE QUIET) +find_package(rocdecode QUIET) find_package(rocprofiler-register QUIET) find_package(FFmpeg QUIET) find_package(Threads REQUIRED) -if(HIP_FOUND AND FFMPEG_FOUND AND ROCDECODE_FOUND AND Threads_FOUND AND rocprofiler-register_FOUND) +if(HIP_FOUND AND FFMPEG_FOUND AND rocdecode_FOUND AND Threads_FOUND AND rocprofiler-register_FOUND) # HIP set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} hip::host) # FFMPEG include_directories(${AVUTIL_INCLUDE_DIR} ${AVCODEC_INCLUDE_DIR} ${AVFORMAT_INCLUDE_DIR}) set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${FFMPEG_LIBRARIES}) - # rocDecode and utils - include_directories (${ROCDECODE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../../utils ${CMAKE_CURRENT_SOURCE_DIR}/../../utils/rocvideodecode ${CMAKE_CURRENT_SOURCE_DIR}/../../utils/ffmpegvideodecode) - set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${ROCDECODE_LIBRARY}) + # rocdecode and utils + include_directories (${rocdecode_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../../utils ${CMAKE_CURRENT_SOURCE_DIR}/../../utils/rocvideodecode ${CMAKE_CURRENT_SOURCE_DIR}/../../utils/ffmpegvideodecode) + set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} rocdecode::rocdecode) # threads set(THREADS_PREFER_PTHREAD_FLAG ON) set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} Threads::Threads) @@ -100,11 +100,11 @@ else() if (NOT FFMPEG_FOUND) message(FATAL_ERROR "-- ERROR!: FFMPEG Not Found! - please install FFMPEG!") endif() - if (NOT ROCDECODE_FOUND) - message(FATAL_ERROR "-- ERROR!: rocDecode Not Found! - please install rocDecode!") + if (NOT rocdecode_FOUND) + message(FATAL_ERROR "-- ERROR!: rocdecode Not Found! - please install rocdecode!") endif() if (NOT Threads_FOUND) - message(FATAL_ERROR "-- ERROR!: Threads Not Found! - please insatll Threads!") + message(FATAL_ERROR "-- ERROR!: Threads Not Found! - please install Threads!") endif() if (NOT rocprofiler-register_FOUND) message(FATAL_ERROR "-- ERROR!: rocprofiler-register Not Found! - please install rocprofiler-register!") diff --git a/samples/videoDecodeRGB/CMakeLists.txt b/samples/videoDecodeRGB/CMakeLists.txt index 52b955cd..d93d8a03 100644 --- a/samples/videoDecodeRGB/CMakeLists.txt +++ b/samples/videoDecodeRGB/CMakeLists.txt @@ -44,10 +44,10 @@ project(videodecodergb) list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake) list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/lib/cmake ${ROCM_PATH}/share/rocmcmakebuildtools/cmake) -# rocDecode sample build type +# rocdecode sample build type set(DEFAULT_BUILD_TYPE "Release") if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}" CACHE STRING "rocDecode Default Build Type" FORCE) + set(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}" CACHE STRING "rocdecode Default Build Type" FORCE) set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release") endif() if(CMAKE_BUILD_TYPE MATCHES Debug) @@ -98,19 +98,19 @@ endif() message("-- ${White}${PROJECT_NAME} -- AMD GPU_TARGETS: ${GPU_TARGETS}${ColourReset}") find_package(HIP QUIET) -find_package(ROCDECODE QUIET) +find_package(rocdecode QUIET) find_package(rocprofiler-register QUIET) find_package(FFmpeg QUIET) -if(HIP_FOUND AND FFMPEG_FOUND AND ROCDECODE_FOUND AND rocprofiler-register_FOUND) +if(HIP_FOUND AND FFMPEG_FOUND AND rocdecode_FOUND AND rocprofiler-register_FOUND) # HIP set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} hip::device) # FFMPEG include_directories(${AVUTIL_INCLUDE_DIR} ${AVCODEC_INCLUDE_DIR}) set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${FFMPEG_LIBRARIES}) - # rocDecode and utils - include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../../utils ${ROCDECODE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../utils/rocvideodecode) - set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${ROCDECODE_LIBRARY}) + # rocdecode and utils + include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../../utils ${rocdecode_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../utils/rocvideodecode) + set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} rocdecode::rocdecode) # threads set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) @@ -141,8 +141,8 @@ else() if (NOT FFMPEG_FOUND) message(FATAL_ERROR "-- ERROR!: FFMPEG Not Found! - please install FFMPEG!") endif() - if (NOT ROCDECODE_FOUND) - message(FATAL_ERROR "-- ERROR!: rocDecode Not Found! - please install rocDecode!") + if (NOT rocdecode_FOUND) + message(FATAL_ERROR "-- ERROR!: rocdecode Not Found! - please install rocdecode!") endif() if (NOT rocprofiler-register_FOUND) message(FATAL_ERROR "-- ERROR!: rocprofiler-register Not Found! - please install rocprofiler-register!") diff --git a/samples/videoDecodeRaw/CMakeLists.txt b/samples/videoDecodeRaw/CMakeLists.txt index 0616685f..51407bd0 100644 --- a/samples/videoDecodeRaw/CMakeLists.txt +++ b/samples/videoDecodeRaw/CMakeLists.txt @@ -44,10 +44,10 @@ project(videodecoderaw) list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake) list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/lib/cmake) -# rocDecode sample build type +# rocdecode sample build type set(DEFAULT_BUILD_TYPE "Release") if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}" CACHE STRING "rocDecode Default Build Type" FORCE) + set(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}" CACHE STRING "rocdecode Default Build Type" FORCE) set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release") endif() if(CMAKE_BUILD_TYPE MATCHES Debug) @@ -62,15 +62,15 @@ else() endif() find_package(HIP QUIET) -find_package(ROCDECODE QUIET) +find_package(rocdecode QUIET) find_package(rocprofiler-register QUIET) -if(HIP_FOUND AND ROCDECODE_FOUND AND rocprofiler-register_FOUND) +if(HIP_FOUND AND rocdecode_FOUND AND rocprofiler-register_FOUND) # HIP set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} hip::host) - # rocDecode and utils - include_directories (${ROCDECODE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../../utils ${CMAKE_CURRENT_SOURCE_DIR}/../../utils/rocvideodecode) - set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${ROCDECODE_LIBRARY}) + # rocdecode and utils + include_directories (${rocdecode_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../../utils ${CMAKE_CURRENT_SOURCE_DIR}/../../utils/rocvideodecode) + set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} rocdecode::rocdecode) # rocprofiler-register set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} rocprofiler-register::rocprofiler-register) # sample app exe @@ -82,8 +82,8 @@ else() if (NOT HIP_FOUND) message(FATAL_ERROR "-- ERROR!: HIP Not Found! - please install ROCm and HIP!") endif() - if (NOT ROCDECODE_FOUND) - message(FATAL_ERROR "-- ERROR!: rocDecode Not Found! - please install rocDecode!") + if (NOT rocdecode_FOUND) + message(FATAL_ERROR "-- ERROR!: rocdecode Not Found! - please install rocdecode!") endif() if (NOT rocprofiler-register_FOUND) message(FATAL_ERROR "-- ERROR!: rocprofiler-register Not Found! - please install rocprofiler-register!") diff --git a/samples/videoToSequence/CMakeLists.txt b/samples/videoToSequence/CMakeLists.txt index 26185eb0..b9e0ee32 100644 --- a/samples/videoToSequence/CMakeLists.txt +++ b/samples/videoToSequence/CMakeLists.txt @@ -44,10 +44,10 @@ project(videotosequence) list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake) list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/lib/cmake) -# rocDecode sample build type +# rocdecode sample build type set(DEFAULT_BUILD_TYPE "Release") if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}" CACHE STRING "rocDecode Default Build Type" FORCE) + set(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}" CACHE STRING "rocdecode Default Build Type" FORCE) set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release") endif() if(CMAKE_BUILD_TYPE MATCHES Debug) @@ -62,20 +62,20 @@ else() endif() find_package(HIP QUIET) -find_package(ROCDECODE QUIET) +find_package(rocdecode QUIET) find_package(rocprofiler-register QUIET) find_package(FFmpeg QUIET) -if(HIP_FOUND AND FFMPEG_FOUND AND ROCDECODE_FOUND AND rocprofiler-register_FOUND) +if(HIP_FOUND AND FFMPEG_FOUND AND rocdecode_FOUND AND rocprofiler-register_FOUND) # HIP set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} hip::host) # FFMPEG include_directories(${AVUTIL_INCLUDE_DIR} ${AVCODEC_INCLUDE_DIR} ${AVFORMAT_INCLUDE_DIR}) set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${FFMPEG_LIBRARIES}) - # rocDecode and utils - include_directories (${ROCDECODE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../../utils ${CMAKE_CURRENT_SOURCE_DIR}/../../utils/rocvideodecode) - set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${ROCDECODE_LIBRARY}) + # rocdecode and utils + include_directories (${rocdecode_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../../utils ${CMAKE_CURRENT_SOURCE_DIR}/../../utils/rocvideodecode) + set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} rocdecode::rocdecode) # rocprofiler-register set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} rocprofiler-register::rocprofiler-register) # sample app exe @@ -96,8 +96,8 @@ else() if (NOT FFMPEG_FOUND) message(FATAL_ERROR "-- ERROR!: FFMPEG Not Found! - please install FFMPEG!") endif() - if (NOT ROCDECODE_FOUND) - message(FATAL_ERROR "-- ERROR!: rocDecode Not Found! - please install rocDecode!") + if (NOT rocdecode_FOUND) + message(FATAL_ERROR "-- ERROR!: rocdecode Not Found! - please install rocdecode!") endif() if (NOT rocprofiler-register_FOUND) message(FATAL_ERROR "-- ERROR!: rocprofiler-register Not Found! - please install rocprofiler-register!") diff --git a/src/rocdecode-host/CMakeLists.txt b/src/rocdecode-host/CMakeLists.txt index d53868c0..22f904dc 100644 --- a/src/rocdecode-host/CMakeLists.txt +++ b/src/rocdecode-host/CMakeLists.txt @@ -102,12 +102,12 @@ else() message(FATAL_ERROR "-- ERROR!: FFMPEG Not Found! - please install FFMPEG!") endif() if (NOT Threads_FOUND) - message(FATAL_ERROR "-- ERROR!: Threads Not Found! - please insatll Threads!") + message(FATAL_ERROR "-- ERROR!: Threads Not Found! - please install Threads!") endif() if (NOT rocprofiler-register_FOUND) message(FATAL_ERROR "-- ERROR!: rocprofiler-register Not Found! - please install rocprofiler-register!") endif() endif() - # install rocDecode libs -- {ROCM_PATH}/lib + # install rocdecode libs -- {ROCM_PATH}/lib install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT dev) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index e1566158..34a7f2eb 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -57,22 +57,25 @@ include(CTest) # add ROCm find Config location list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/lib/cmake) -# find rocDecode -find_package(ROCDECODE QUIET) - -if(ROCDECODE_FOUND) - message("-- ${White}${PROJECT_NAME}: rocDecode found with find_package(ROCDECODE QUIET)${ColourReset}") - message("-- \t${White}ROCDECODE_INCLUDE_DIR -- ${ROCDECODE_INCLUDE_DIR}${ColourReset}") - message("-- \t${White}ROCDECODE_LIB_DIR -- ${ROCDECODE_LIB_DIR}${ColourReset}") - message("-- \t${White}ROCDECODE_LIBRARY -- ${ROCDECODE_LIBRARY}${ColourReset}") - message("-- \t${White}ROCDECODE_FOUND -- ${ROCDECODE_FOUND}${ColourReset}") - message("-- \t${White}ROCDECODE_VERSION -- ${ROCDECODE_VERSION}${ColourReset}") - message("-- \t${White}ROCDECODE_VERSION_MAJOR -- ${ROCDECODE_VERSION_MAJOR}${ColourReset}") - message("-- \t${White}ROCDECODE_VERSION_MINOR -- ${ROCDECODE_VERSION_MINOR}${ColourReset}") - message("-- \t${White}ROCDECODE_VERSION_PATCH -- ${ROCDECODE_VERSION_PATCH}${ColourReset}") +# find rocdecode +if(BUILD_FROM_SOURCE) + message("-- ${White}${PROJECT_NAME}: CTests requires rocdecode installed before running CTests") else() - message("-- ${Yellow}${PROJECT_NAME} requires rocDecode. Install rocDecode before running CTests") -endif(ROCDECODE_FOUND) + find_package(rocdecode QUIET) + if(rocdecode_FOUND) + message("-- ${White}${PROJECT_NAME}: rocdecode found with find_package(rocdecode QUIET)${ColourReset}") + message("-- \t${White}rocdecode_INCLUDE_DIR -- ${rocdecode_INCLUDE_DIR}${ColourReset}") + message("-- \t${White}rocdecode_LIB_DIR -- ${rocdecode_LIB_DIR}${ColourReset}") + message("-- \t${White}rocdecode_LIBRARY -- ${rocdecode_LIBRARY}${ColourReset}") + message("-- \t${White}rocdecode_FOUND -- ${rocdecode_FOUND}${ColourReset}") + message("-- \t${White}rocdecode_VERSION -- ${rocdecode_VERSION}${ColourReset}") + message("-- \t${White}rocdecode_VERSION_MAJOR -- ${rocdecode_VERSION_MAJOR}${ColourReset}") + message("-- \t${White}rocdecode_VERSION_MINOR -- ${rocdecode_VERSION_MINOR}${ColourReset}") + message("-- \t${White}rocdecode_VERSION_PATCH -- ${rocdecode_VERSION_PATCH}${ColourReset}") + else() + message("-- ${Yellow}${PROJECT_NAME} requires rocdecode. Install rocdecode before running CTests") + endif(rocdecode_FOUND) +endif(BUILD_FROM_SOURCE) # 1 - videoDecode HEVC add_test( diff --git a/test/rocDecodeNegativeApiTests/CMakeLists.txt b/test/rocDecodeNegativeApiTests/CMakeLists.txt index c0b00625..8f05d99b 100644 --- a/test/rocDecodeNegativeApiTests/CMakeLists.txt +++ b/test/rocDecodeNegativeApiTests/CMakeLists.txt @@ -44,10 +44,10 @@ project(rocdecodenegativetest) list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake) list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/lib/cmake) -# rocDecode sample build type +# rocdecode sample build type set(DEFAULT_BUILD_TYPE "Release") if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}" CACHE STRING "rocDecode Default Build Type" FORCE) + set(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}" CACHE STRING "rocdecode Default Build Type" FORCE) set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release") endif() if(CMAKE_BUILD_TYPE MATCHES Debug) @@ -68,9 +68,9 @@ find_package(rocprofiler-register QUIET) if(HIP_FOUND AND rocdecode_FOUND AND rocprofiler-register_FOUND) # HIP set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} hip::host) - # rocDecode and utils + # rocdecode and utils include_directories (${rocdecode_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) - set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${rocdecode_LIBRARY}) + set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} rocdecode::rocdecode) # rocprofiler-register set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} rocprofiler-register::rocprofiler-register) # sample app exe @@ -84,8 +84,8 @@ else() if (NOT HIP_FOUND) message(FATAL_ERROR "-- ERROR!: HIP Not Found! - please install ROCm and HIP!") endif() - if (NOT ROCDECODE_FOUND) - message(FATAL_ERROR "-- ERROR!: rocDecode Not Found! - please install rocDecode!") + if (NOT rocdecode_FOUND) + message(FATAL_ERROR "-- ERROR!: rocdecode Not Found! - please install rocdecode!") endif() if (NOT rocprofiler-register_FOUND) message(FATAL_ERROR "-- ERROR!: rocprofiler-register Not Found! - please install rocprofiler-register!")