Skip to content

Resolve "Mismatch of declaration and definition of computeIntensityVector_ana and computeReferencePower_ana"

Jouni Paulusrequested to merge
853-mismatch-of-declaration-and-definition-of-computeintensityvector_ana-and into main

Reason why this change is needed

The input array size in the declarations of functions computeIntensityVector_ana() and computeReferencePower_ana() in lib_rend/ivas_prot_rend.h differ from the one in the definitions in lib_rend/ivas_omasa_ana.c.

Declaration:

float Cldfb_RealBuffer[DIRAC_MAX_ANA_CHANS][CLDFB_NO_CHANNELS_MAX], /* i  : Real part of input signal       */
float Cldfb_ImagBuffer[DIRAC_MAX_ANA_CHANS][CLDFB_NO_CHANNELS_MAX], /* i  : Imag part of input signal       */

Definition:

float Cldfb_RealBuffer[FOA_CHANNELS][CLDFB_NO_CHANNELS_MAX], /* i  : Real part of input signal       */
float Cldfb_ImagBuffer[FOA_CHANNELS][CLDFB_NO_CHANNELS_MAX], /* i  : Imag part of input signal       */

The version from the definition is the correct one and the prototype should be aligned with this.

Description of the change

Change the array size declaration in lib_rend/ivas_prot_rend.h to match the definition in lib_rend/ivas_omasa_ana.c.

Affected operating points

  • The functions are used in OMASA rendering → bitstream is BE (level 1).
  • It is expected that the output is BE.

Related to #853 (closed)

Merge request reports