Commit ede6397b authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge remote-tracking branch... 

Merge remote-tracking branch 'origin/basop-2326-clang18-msan-use-of-uninitialized-value-in-lib_com-tools_fx-c-1487-16' into kiene/test-ubuntu-24_04-runner
parents 916e0cfc 80b1e7bd

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ 
#define HARM_PREPROC                                    /* VA: basop issue 2339: Remove duplicated code in the core-coder DTX  */

#define FIX_BASOP_2323_DIRAC_ENC_WRONG_INIT             /* Nokia/FhG: basop issue 2323: Use correct init size */

#define FIX_BASOP_2324_MISSING_SET_TO_ZERO              /* Nokia: basop issue 2324: Fix issue by setting the exponent to zero where it should be */

#define FIX_BASOP_2326_WRONG_SIG_LENGTH                 /* Nokia: basop issue 2326: Fix issue by using correct signal length in multiple places */



/* #################### End BE switches ################################## */

lib_rend/lib_rend_fx.c

+21 −0
Original line number Diff line number Diff line
@@ -9112,8 +9112,15 @@ static ivas_error renderInputMasa( 
            }



            copyMasaMetadataToDiracRenderer_fx( &masaInput->masaMetadata, masaInput->hMasaExtRend->hSpatParamRendCom, maxBin );

#ifdef FIX_BASOP_2326_WRONG_SIG_LENGTH

            FOR( ch = 0; ch < inAudio.config.numChannels; ch++ )

            {

                Scale_sig32( tmpBuffer_buff_fx[ch], inAudio.config.numSamplesPerChannel, sub( Q11, *outAudio.pq_fact ) ); /* Q11 */

            }

#else

            Scale_sig32( tmpBuffer_buff_fx[0], L_FRAME48k, sub( Q11, *outAudio.pq_fact ) ); /* Q11 */

            Scale_sig32( tmpBuffer_buff_fx[1], L_FRAME48k, sub( Q11, *outAudio.pq_fact ) ); /* Q11 */

#endif

            // scale_sig32( outAudio.data_fx, i_mult( outAudio.config.numChannels, outAudio.config.numSamplesPerChannel ), sub( Q11, *outAudio.pq_fact ) );



            ivas_masa_ext_rend_parambin_render_fx( masaInput->hMasaExtRend, *masaInput->base.ctx.pCombinedOrientationData, tmpBuffer_fx, num_subframes, masaInput->base.ctx.pSplitRendWrapper, Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural );
@@ -9137,10 +9144,17 @@ static ivas_error renderInputMasa( 
                        masaInput->hMasaExtRend->cldfbAnaRend[0]->Q_cldfb_state = Q11;

                        move16();

                    }

#ifdef FIX_BASOP_2326_WRONG_SIG_LENGTH

                    FOR( ch = 0; ch < inAudio.config.numChannels; ch++ )

                    {

                        Scale_sig32( tmpBuffer_buff_fx[ch], inAudio.config.numSamplesPerChannel, sub( Q11, *outAudio.pq_fact ) ); /* Q11 */

                    }

#else

                    FOR( ch = 0; ch < MAX_OUTPUT_CHANNELS; ch++ )

                    {

                        Scale_sig32( tmpBuffer_buff_fx[ch], L_FRAME48k, sub( Q11, *outAudio.pq_fact ) ); /* Q11 */

                    }

#endif



                    scale_sig32( outAudio.data_fx, i_mult( outAudio.config.numChannels, outAudio.config.numSamplesPerChannel ), sub( Q11, *outAudio.pq_fact ) ); /* Q11 */
@@ -9164,8 +9178,15 @@ static ivas_error renderInputMasa( 


                    copyMasaMetadataToDiracRenderer_fx( &masaInput->masaMetadata, masaInput->hMasaExtRend->hSpatParamRendCom, maxBin );



#ifdef FIX_BASOP_2326_WRONG_SIG_LENGTH

                    FOR( ch = 0; ch < inAudio.config.numChannels; ch++ )

                    {

                        Scale_sig32( tmpBuffer_buff_fx[ch], inAudio.config.numSamplesPerChannel, sub( Q11, *outAudio.pq_fact ) ); /* Q11 */

                    }

#else

                    Scale_sig32( tmpBuffer_buff_fx[0], L_FRAME48k, sub( Q11, *outAudio.pq_fact ) ); /* Q11 */

                    Scale_sig32( tmpBuffer_buff_fx[1], L_FRAME48k, sub( Q11, *outAudio.pq_fact ) ); /* Q11 */

#endif



                    scale_sig32( outAudio.data_fx, i_mult( outAudio.config.numChannels, outAudio.config.numSamplesPerChannel ), sub( Q11, *outAudio.pq_fact ) );