Pavel Tcherniaev
b68b9ba8ea
* implemented ROI for NATIVE, YUV_PLANAR, Y, RGB and RGB_PLANAR * added the changes requested by Aryan in the PR * prelim check in of ROI * finished RGB and RGB_PLANAR ROI implementation and testing in rocjpeg_decoder.cpp, updated the versions to 0.6.0, updated jpegdecode.cpp and jpegdecodedbatched.cpp. Still need to modify jpegmultithreads.cpp. Need to run tests on JPEG 444 and 440. And need to add test to ctests and make test. Will update this PR when I've added everything mentioned here. * changed new_offset and new_uv_offset to roi_offset and roi_uv_offset in rocjpeg_decoder.cpp. Added ROI handling in jpegdecodemultithreads sample. Still need to run tests on jpegdecodemultithreads and jpegdecodebatched. * addressed all changes Aryan mentioned for PR 48 on August 12 * added tests to ctests and make tests and fixed conflict in jpegdecodemultithreads.cpp * addressed latest change requests * removed spaces after case VA_FOURCC_444P * updated ctests and make tests * fixed copy/paste error for ctests * fixed typo with extra $ * added print statement for cropped image dimensions * addressed latest change requests from Aryan. Ran make tests and ctests, all passed * added workaround for YUV440 to RGB conversion
179 строки
6.3 KiB
CMake
179 строки
6.3 KiB
CMake
# ##############################################################################
|
|
# Copyright (c) 2023 - 2024 Advanced Micro Devices, Inc.
|
|
#
|
|
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
# of this software and associated documentation files (the "Software"), to deal
|
|
# in the Software without restriction, including without limitation the rights
|
|
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
# copies of the Software, and to permit persons to whom the Software is
|
|
# furnished to do so, subject to the following conditions:
|
|
#
|
|
# The above copyright notice and this permission notice shall be included in all
|
|
# copies or substantial portions of the Software.
|
|
#
|
|
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
# SOFTWARE.
|
|
#
|
|
# ##############################################################################
|
|
cmake_minimum_required(VERSION 3.5)
|
|
|
|
add_test(
|
|
NAME
|
|
jpeg-decode-fmt-native
|
|
COMMAND
|
|
"${CMAKE_CTEST_COMMAND}"
|
|
--build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/jpegDecode"
|
|
"${CMAKE_CURRENT_BINARY_DIR}/jpegDecode"
|
|
--build-generator "${CMAKE_GENERATOR}"
|
|
--test-command "jpegdecode"
|
|
-i ${CMAKE_SOURCE_DIR}/data/images/
|
|
)
|
|
|
|
add_test(
|
|
NAME
|
|
jpeg-decode-fmt-yuv-planar
|
|
COMMAND
|
|
"${CMAKE_CTEST_COMMAND}"
|
|
--build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/jpegDecode"
|
|
"${CMAKE_CURRENT_BINARY_DIR}/jpegDecode"
|
|
--build-generator "${CMAKE_GENERATOR}"
|
|
--test-command "jpegdecode"
|
|
-i ${CMAKE_SOURCE_DIR}/data/images/ -fmt yuv
|
|
)
|
|
|
|
add_test(
|
|
NAME
|
|
jpeg-decode-fmt-y
|
|
COMMAND
|
|
"${CMAKE_CTEST_COMMAND}"
|
|
--build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/jpegDecode"
|
|
"${CMAKE_CURRENT_BINARY_DIR}/jpegDecode"
|
|
--build-generator "${CMAKE_GENERATOR}"
|
|
--test-command "jpegdecode"
|
|
-i ${CMAKE_SOURCE_DIR}/data/images/ -fmt y
|
|
)
|
|
|
|
add_test(
|
|
NAME
|
|
jpeg-decode-fmt-rgb
|
|
COMMAND
|
|
"${CMAKE_CTEST_COMMAND}"
|
|
--build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/jpegDecode"
|
|
"${CMAKE_CURRENT_BINARY_DIR}/jpegDecode"
|
|
--build-generator "${CMAKE_GENERATOR}"
|
|
--test-command "jpegdecode"
|
|
-i ${CMAKE_SOURCE_DIR}/data/images/ -fmt rgb
|
|
)
|
|
|
|
add_test(
|
|
NAME
|
|
jpeg-decode-fmt-rgb-planar
|
|
COMMAND
|
|
"${CMAKE_CTEST_COMMAND}"
|
|
--build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/jpegDecode"
|
|
"${CMAKE_CURRENT_BINARY_DIR}/jpegDecode"
|
|
--build-generator "${CMAKE_GENERATOR}"
|
|
--test-command "jpegdecode"
|
|
-i ${CMAKE_SOURCE_DIR}/data/images/ -fmt rgb_planar
|
|
)
|
|
|
|
add_test(
|
|
NAME
|
|
jpeg-decode-threads-fmt-native
|
|
COMMAND
|
|
"${CMAKE_CTEST_COMMAND}"
|
|
--build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/jpegDecodeMultiThreads"
|
|
"${CMAKE_CURRENT_BINARY_DIR}/jpegDecodeMultiThreads"
|
|
--build-generator "${CMAKE_GENERATOR}"
|
|
--test-command "jpegdecodemultithreads"
|
|
-i ${CMAKE_SOURCE_DIR}/data/images/ -t 2
|
|
)
|
|
|
|
add_test(
|
|
NAME
|
|
jpeg-decode-batch-fmt-native
|
|
COMMAND
|
|
"${CMAKE_CTEST_COMMAND}"
|
|
--build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/jpegDecodeBatched"
|
|
"${CMAKE_CURRENT_BINARY_DIR}/jpegDecodeBatched"
|
|
--build-generator "${CMAKE_GENERATOR}"
|
|
--test-command "jpegdecodebatched"
|
|
-i ${CMAKE_SOURCE_DIR}/data/images/
|
|
)
|
|
|
|
add_test(
|
|
NAME
|
|
jpeg-decode-crop-fmt-native
|
|
COMMAND
|
|
"${CMAKE_CTEST_COMMAND}"
|
|
--build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/jpegDecode"
|
|
"${CMAKE_CURRENT_BINARY_DIR}/jpegDecode"
|
|
--build-generator "${CMAKE_GENERATOR}"
|
|
--test-command "jpegdecode"
|
|
-i ${CMAKE_SOURCE_DIR}/data/images/ -crop 960,540,2880,1620
|
|
)
|
|
|
|
add_test(
|
|
NAME
|
|
jpeg-decode-crop-fmt-yuv-planar
|
|
COMMAND
|
|
"${CMAKE_CTEST_COMMAND}"
|
|
--build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/jpegDecode"
|
|
"${CMAKE_CURRENT_BINARY_DIR}/jpegDecode"
|
|
--build-generator "${CMAKE_GENERATOR}"
|
|
--test-command "jpegdecode"
|
|
-i ${CMAKE_SOURCE_DIR}/data/images/ -fmt yuv -crop 960,540,2880,1620
|
|
)
|
|
|
|
add_test(
|
|
NAME
|
|
jpeg-decode-crop-fmt-y
|
|
COMMAND
|
|
"${CMAKE_CTEST_COMMAND}"
|
|
--build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/jpegDecode"
|
|
"${CMAKE_CURRENT_BINARY_DIR}/jpegDecode"
|
|
--build-generator "${CMAKE_GENERATOR}"
|
|
--test-command "jpegdecode"
|
|
-i ${CMAKE_SOURCE_DIR}/data/images/ -fmt y -crop 960,540,2880,1620
|
|
)
|
|
|
|
add_test(
|
|
NAME
|
|
jpeg-decode-crop-fmt-rgb
|
|
COMMAND
|
|
"${CMAKE_CTEST_COMMAND}"
|
|
--build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/jpegDecode"
|
|
"${CMAKE_CURRENT_BINARY_DIR}/jpegDecode"
|
|
--build-generator "${CMAKE_GENERATOR}"
|
|
--test-command "jpegdecode"
|
|
-i ${CMAKE_SOURCE_DIR}/data/images/ -fmt rgb -crop 960,540,2880,1620
|
|
)
|
|
|
|
add_test(
|
|
NAME
|
|
jpeg-decode-crop-fmt-rgb-planar
|
|
COMMAND
|
|
"${CMAKE_CTEST_COMMAND}"
|
|
--build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/jpegDecode"
|
|
"${CMAKE_CURRENT_BINARY_DIR}/jpegDecode"
|
|
--build-generator "${CMAKE_GENERATOR}"
|
|
--test-command "jpegdecode"
|
|
-i ${CMAKE_SOURCE_DIR}/data/images/ -fmt rgb_planar -crop 960,540,2880,1620
|
|
)
|
|
|
|
add_test(
|
|
NAME
|
|
jpeg-decode-crop-batch-fmt-native
|
|
COMMAND
|
|
"${CMAKE_CTEST_COMMAND}"
|
|
--build-and-test "${CMAKE_CURRENT_SOURCE_DIR}/jpegDecodeBatched"
|
|
"${CMAKE_CURRENT_BINARY_DIR}/jpegDecodeBatched"
|
|
--build-generator "${CMAKE_GENERATOR}"
|
|
--test-command "jpegdecodebatched"
|
|
-i ${CMAKE_SOURCE_DIR}/data/images/ -crop 960,540,2880,1620
|
|
) |