Skip to content

Match function prototype with the variables used in the call (McMASA)

Jouni Paulusrequested to merge
888-mismatch-of-expected-and-provided-function-argument-size-in-mcmasa-enc into main

Reason why this change is needed

McMASA encoding calls the functions computeIntensityVector_enc (in ivas_mcmasa_enc.c) and computeReferencePower_enc (in ivas_dirac_enc.c) with buffers of size [FOA_CHANNELS][DIRAC_NO_FB_BANDS_MAX] while the functions interface defines buffers of size [DIRAC_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX].

The actual use in the functions does not over-index as

  • computeIntensityVector_enc accesses only 4 = FOA_CHANNELS elements, and
  • computeReferencePower_enc receives an extra argument defining the number of channels in the data.

Description of the change

Change the function definitions:

  • computeIntensityVector_enc to use input arrays of size [FOA_CHANNELS][DIRAC_NO_FB_BANDS_MAX]
  • computeReferencePower_enc to use unknown first dimension size [][DIRAC_NO_FB_BANDS_MAX]

Affected operating points

  • Changed functions are called by McMASA encoding and DirAC encoding
  • Everything is BE
Edited by Jouni Paulus

Merge request reports