Change the dims[0] and dims[1] positioning for Spectrogram and AudioF…

…illDescPointers
ROCm · Mar 25, 2024 · 886d6af · 886d6af
1 parent 854aa50
commit 886d6af
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/amd_openvx_extensions/amd_rpp/source/kernel_rpp.cpp b/amd_openvx_extensions/amd_rpp/source/kernel_rpp.cpp
@@ -2655,8 +2655,8 @@ void fillDescriptionPtrfromDims(RpptDescPtr &descPtr, vxTensorLayout layout, siz
 
 void fillAudioDescriptionPtrFromDims(RpptDescPtr &descPtr, size_t *tensorDims) {
     descPtr->n = tensorDims[0];
-    descPtr->h = tensorDims[2];
-    descPtr->w = tensorDims[1];
+    descPtr->h = tensorDims[1];
+    descPtr->w = tensorDims[2];
     descPtr->c = 1;
     descPtr->strides.nStride = descPtr->c * descPtr->w * descPtr->h;
     descPtr->strides.hStride = descPtr->c * descPtr->w;

diff --git a/amd_openvx_extensions/amd_rpp/source/tensor/Spectrogram.cpp b/amd_openvx_extensions/amd_rpp/source/tensor/Spectrogram.cpp
@@ -46,7 +46,7 @@ struct SpectrogramLocalData {
 void copy_src_dims_and_update_dst_roi(SpectrogramLocalData *data, RpptROI *src_roi, RpptROI *dst_roi) {
     const Rpp32s num_frames = ((data->nfft / 2) + 1);
     for (unsigned i = 0; i < data->inputTensorDims[0]; i++) {
-        data->pSrcLength[i] = static_cast<int>(src_roi[i].xywhROI.roiWidth);
+        data->pSrcLength[i] = static_cast<int>(src_roi[i].xywhROI.roiHeight); // bins, frames
         if (data->spectrogramLayout == RpptSpectrogramLayout::FT) {
             dst_roi[i].xywhROI.roiWidth = ((data->pSrcLength[i] - data->windowOffset) / data->windowStep) + 1;
             dst_roi[i].xywhROI.roiHeight = num_frames;
@@ -104,13 +104,13 @@ static vx_status VX_CALLBACK validateSpectrogram(vx_node node, const vx_referenc
         return ERRMSG(VX_ERROR_INVALID_TYPE, "validate: Parameter: #12 type=%d (must be size)\n", scalar_type);
 
     // Check for input parameters
-    size_t num_tensor_dims;
+    size_t num_tensor_dims, tensor_dims[RPP_MAX_TENSOR_DIMS];
     STATUS_ERROR_CHECK(vxQueryTensor((vx_tensor)parameters[0], VX_TENSOR_NUMBER_OF_DIMS, &num_tensor_dims, sizeof(num_tensor_dims)));
-    if (num_tensor_dims < 3) return ERRMSG(VX_ERROR_INVALID_DIMENSION, "validate: Spectrogram: tensor: #0 dimensions=%lu (must be greater than or equal to 3)\n", num_tensor_dims);
-
+    if (num_tensor_dims < 3) return ERRMSG(VX_ERROR_INVALID_DIMENSION, "validate: Spectrogram: tensor: #0 dimensions=%lu (must be equal to 3)\n", num_tensor_dims);
+    STATUS_ERROR_CHECK(vxQueryTensor((vx_tensor)parameters[0], VX_TENSOR_DIMS, &tensor_dims, sizeof(tensor_dims)));
+    if (tensor_dims[2]!=1) return ERRMSG(VX_ERROR_INVALID_VALUE, "validate: Spectrogram: tensor dimensions[2] = %lu (must be equal to 1). Input data is expected to be single channel \n", num_tensor_dims);
     // Check for output parameters
     vx_uint8 tensor_fixed_point_position;
-    size_t tensor_dims[RPP_MAX_TENSOR_DIMS];
     vx_enum tensor_datatype;
     STATUS_ERROR_CHECK(vxQueryTensor((vx_tensor)parameters[2], VX_TENSOR_NUMBER_OF_DIMS, &num_tensor_dims, sizeof(num_tensor_dims)));
     if (num_tensor_dims < 3) return ERRMSG(VX_ERROR_INVALID_DIMENSION, "validate: Spectrogram: tensor: #2 dimensions=%lu (must be greater than or equal to 3)\n", num_tensor_dims);