From 35accd3d1d098b32dcf96f5fcd68fe036a4fba96 Mon Sep 17 00:00:00 2001 From: Aryan Salmanpour Date: Mon, 12 May 2025 16:15:33 -0400 Subject: [PATCH] Code cleanup (#149) [ROCm/rocjpeg commit: 0415c78cbf893a45f751257a964fe9a853a6d607] --- projects/rocjpeg/CHANGELOG.md | 2 +- projects/rocjpeg/src/rocjpeg_vaapi_decoder.cpp | 18 +----------------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/projects/rocjpeg/CHANGELOG.md b/projects/rocjpeg/CHANGELOG.md index e074e8369f..dc640ea49b 100644 --- a/projects/rocjpeg/CHANGELOG.md +++ b/projects/rocjpeg/CHANGELOG.md @@ -3,7 +3,7 @@ Documentation for rocJPEG is available at [https://rocm.docs.amd.com/projects/rocJPEG/en/latest/](https://rocm.docs.amd.com/projects/rocJPEG/en/latest/) -## rocJPEG 0.11.1 for ROCm 6.5 +## rocJPEG 0.12.0 for ROCm 6.5 ## Added * cmake config files diff --git a/projects/rocjpeg/src/rocjpeg_vaapi_decoder.cpp b/projects/rocjpeg/src/rocjpeg_vaapi_decoder.cpp index ed18ad5046..c2999eb8c1 100644 --- a/projects/rocjpeg/src/rocjpeg_vaapi_decoder.cpp +++ b/projects/rocjpeg/src/rocjpeg_vaapi_decoder.cpp @@ -849,26 +849,10 @@ RocJpegStatus RocJpegVappiDecoder::SubmitDecodeBatched(JpegStreamParameters *jpe * @return The status of the synchronization operation. */ RocJpegStatus RocJpegVappiDecoder::SyncSurface(VASurfaceID surface_id) { - VASurfaceStatus surface_status; if (!vaapi_mem_pool_->FindSurfaceId(surface_id)) { return ROCJPEG_STATUS_INVALID_PARAMETER; } - - CHECK_VAAPI(vaQuerySurfaceStatus(va_display_, surface_id, &surface_status)); - while (surface_status != VASurfaceReady) { - VAStatus va_status = vaSyncSurface(va_display_, surface_id); - if (va_status != VA_STATUS_SUCCESS) { - if (va_status == 0x26 /*VA_STATUS_ERROR_TIMEDOUT*/) { - CHECK_VAAPI(vaQuerySurfaceStatus(va_display_, surface_id, &surface_status)); - } else { - std::cout << "vaSyncSurface() failed with error code: 0x" << std::hex << va_status << - std::dec << "', status: " << vaErrorStr(va_status) << "' at " << __FILE__ << ":" << __LINE__ << std::endl; - return ROCJPEG_STATUS_RUNTIME_ERROR; - } - } else { - break; - } - } + CHECK_VAAPI(vaSyncSurface(va_display_, surface_id)); return ROCJPEG_STATUS_SUCCESS; }