diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt index 700b761773..bdbb18f0e9 100644 --- a/samples/CMakeLists.txt +++ b/samples/CMakeLists.txt @@ -43,7 +43,7 @@ add_test( "${CMAKE_CURRENT_BINARY_DIR}/jpegDecode" --build-generator "${CMAKE_GENERATOR}" --test-command "jpegdecode" - -i ${CMAKE_SOURCE_DIR}/data/images/ -fmt yuv + -i ${CMAKE_SOURCE_DIR}/data/images/ -fmt yuv_planar ) add_test( @@ -127,7 +127,7 @@ add_test( "${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 + -i ${CMAKE_SOURCE_DIR}/data/images/ -fmt yuv_planar -crop 960,540,2880,1620 ) add_test( diff --git a/samples/jpegDecode/README.md b/samples/jpegDecode/README.md index af27e6c76b..702380675d 100644 --- a/samples/jpegDecode/README.md +++ b/samples/jpegDecode/README.md @@ -20,7 +20,7 @@ make -j ./jpegdecode -i <[input path] - input path to a single JPEG image or a directory containing JPEG images - [required]> -be <[backend] - select rocJPEG backend (0 for hardware-accelerated JPEG decoding using VCN, 1 for hybrid JPEG decoding using CPU and GPU HIP kernels (currently not supported)) [optional - default: 0]> - -fmt <[output format] - select rocJPEG output format for decoding, one of the [native, yuv, y, rgb, rgb_planar] [optional - default: native]> + -fmt <[output format] - select rocJPEG output format for decoding, one of the [native, yuv_planar, y, rgb, rgb_planar] [optional - default: native]> -o <[output path] - path to an output file or a path to a directory - write decoded images to a file or directory based on selected output format [optional]> -crop <[crop rectangle] - crop rectangle for output in a comma-separated format: left,top,right,bottom - [optional]> -d <[device id] - specify the GPU device id for the desired device (use 0 for the first device, 1 for the second device, and so on); [optional - default: 0]> diff --git a/samples/jpegDecodeBatched/README.md b/samples/jpegDecodeBatched/README.md index 9845724dbe..2b97d8f309 100644 --- a/samples/jpegDecodeBatched/README.md +++ b/samples/jpegDecodeBatched/README.md @@ -20,7 +20,7 @@ make -j ./jpegdecodebatched -i <[input path] - input path to a single JPEG image or a directory containing JPEG images - [required]> -be <[backend] - select rocJPEG backend (0 for hardware-accelerated JPEG decoding using VCN, 1 for hybrid JPEG decoding using CPU and GPU HIP kernels (currently not supported)) [optional - default: 0]> - -fmt <[output format] - select rocJPEG output format for decoding, one of the [native, yuv, y, rgb, rgb_planar] [optional - default: native]> + -fmt <[output format] - select rocJPEG output format for decoding, one of the [native, yuv_planar, y, rgb, rgb_planar] [optional - default: native]> -o <[output path] - path to an output file or a path to a directory - write decoded images to a file or directory based on selected output format [optional]> -d <[device id] - specify the GPU device id for the desired device (use 0 for the first device, 1 for the second device, and so on) - [optional - default: 0]> -crop <[crop rectangle] - crop rectangle for output in a comma-separated format: left,top,right,bottom - [optional]> diff --git a/samples/jpegDecodeMultiThreads/README.md b/samples/jpegDecodeMultiThreads/README.md index be082cb187..76a8544cab 100644 --- a/samples/jpegDecodeMultiThreads/README.md +++ b/samples/jpegDecodeMultiThreads/README.md @@ -20,7 +20,7 @@ make -j ./jpegdecodemultithreads -i <[input path] - input path to a single JPEG image or a directory containing JPEG images - [required]> -be <[backend] - select rocJPEG backend (0 for hardware-accelerated JPEG decoding using VCN, 1 for hybrid JPEG decoding using CPU and GPU HIP kernels (currently not supported)) [optional - default: 0]> - -fmt <[output format] - select rocJPEG output format for decoding, one of the [native, yuv, y, rgb, rgb_planar] [optional - default: native]> + -fmt <[output format] - select rocJPEG output format for decoding, one of the [native, yuv_planar, y, rgb, rgb_planar] [optional - default: native]> -o <[output path] - path to an output file or a path to a directory - write decoded images to a file or directory based on selected output format [optional]> -d <[device id] - specify the GPU device id for the desired device (use 0 for the first device, 1 for the second device, and so on) [optional - default: 0]> -crop <[crop rectangle] - crop rectangle for output in a comma-separated format: left,top,right,bottom - [optional]> diff --git a/samples/rocjpeg_samples_utils.h b/samples/rocjpeg_samples_utils.h index b53a2a8080..ec8f939937 100644 --- a/samples/rocjpeg_samples_utils.h +++ b/samples/rocjpeg_samples_utils.h @@ -128,7 +128,7 @@ public: std::string selected_output_format = argv[i]; if (selected_output_format == "native") { decode_params.output_format = ROCJPEG_OUTPUT_NATIVE; - } else if (selected_output_format == "yuv") { + } else if (selected_output_format == "yuv_planar") { decode_params.output_format = ROCJPEG_OUTPUT_YUV_PLANAR; } else if (selected_output_format == "y") { decode_params.output_format = ROCJPEG_OUTPUT_Y; @@ -634,7 +634,7 @@ private: "-i [input path] - input path to a single JPEG image or a directory containing JPEG images - [required]\n" "-be [backend] - select rocJPEG backend (0 for hardware-accelerated JPEG decoding using VCN,\n" " 1 for hybrid JPEG decoding using CPU and GPU HIP kernels (currently not supported)) [optional - default: 0]\n" - "-fmt [output format] - select rocJPEG output format for decoding, one of the [native, yuv, y, rgb, rgb_planar] - [optional - default: native]\n" + "-fmt [output format] - select rocJPEG output format for decoding, one of the [native, yuv_planar, y, rgb, rgb_planar] - [optional - default: native]\n" "-o [output path] - path to an output file or a path to an existing directory - write decoded images to a file or an existing directory based on selected output format - [optional]\n" "-crop [crop rectangle] - crop rectangle for output in a comma-separated format: left,top,right,bottom - [optional]\n" "-d [device id] - specify the GPU device id for the desired device (use 0 for the first device, 1 for the second device, and so on) [optional - default: 0]\n"; diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index cd24077ede..664f8cdd85 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -71,7 +71,7 @@ add_test( "${CMAKE_CURRENT_BINARY_DIR}/jpegDecode" --build-generator "${CMAKE_GENERATOR}" --test-command "jpegdecode" - -i ${ROCM_PATH}/share/rocjpeg/images/ -fmt yuv + -i ${ROCM_PATH}/share/rocjpeg/images/ -fmt yuv_planar ) add_test( @@ -155,7 +155,7 @@ add_test( "${CMAKE_CURRENT_BINARY_DIR}/jpegDecode" --build-generator "${CMAKE_GENERATOR}" --test-command "jpegdecode" - -i ${ROCM_PATH}/share/rocjpeg/images/ -fmt yuv -crop 960,540,2880,1620 + -i ${ROCM_PATH}/share/rocjpeg/images/ -fmt yuv_planar -crop 960,540,2880,1620 ) add_test(