Commit e588a2be authored by lintervo's avatar lintervo
Browse files

Resolve MR comments

parent 87a21269

lib_dec/ivas_jbm_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -2907,9 +2907,9 @@ void ivas_dec_prepare_renderer( 
                    /* Gain MASA part, if edited */

                    if ( st_ivas->hMasaIsmData->masa_gain_is_edited )

                    {

                        for ( int16_t ch = 0; ch < 2; ch++ )

                        for ( n = 0; n < CPE_CHANNELS; n++ )

                        {

                            v_multc( st_ivas->hTcBuffer->tc[ch], st_ivas->hMasaIsmData->gain_masa_edited, st_ivas->hTcBuffer->tc[ch], st_ivas->hTcBuffer->n_samples_available );

                            v_multc( st_ivas->hTcBuffer->tc[n], st_ivas->hMasaIsmData->gain_masa_edited, st_ivas->hTcBuffer->tc[n], st_ivas->hTcBuffer->n_samples_available );

                        }

                    }

                }

lib_dec/ivas_omasa_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -716,9 +716,9 @@ void ivas_omasa_dirac_rend_jbm( 
        /* Gain MASA part, if edited in G192. MASA gaining with VOIP is done in ivas_dec_prepare_renderer() */

        if ( !st_ivas->hDecoderConfig->Opt_tsm && st_ivas->hMasaIsmData->masa_gain_is_edited )

        {

            for ( int16_t ch = 0; ch < 2; ch++ )

            for ( n = 0; n < CPE_CHANNELS; n++ )

            {

                v_multc( output_f[ch], st_ivas->hMasaIsmData->gain_masa_edited, output_f[ch], *nSamplesRendered );

                v_multc( output_f[n], st_ivas->hMasaIsmData->gain_masa_edited, output_f[n], *nSamplesRendered );

            }

        }

    }

lib_rend/ivas_dirac_dec_binaural_functions.c

+30 −30
Original line number Diff line number Diff line
@@ -2766,7 +2766,7 @@ void ivas_omasa_preProcessStereoTransportsForEditedObjects( 
        }



        /* MASA gaining */

        for ( ch = 0; ch < 2; ch++ )

        for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ )

        {

            if ( masaGainEdited )

            {
@@ -2794,7 +2794,7 @@ void ivas_omasa_preProcessStereoTransportsForEditedObjects( 
        nSlotDiv = 1.0f / ( (float) nSlots );



        /* Use diagonal mixing matrix as the instant mixing matrix, to slowly fade away the editing during dtx */

        for ( ch = 0; ch < 2; ch++ )

        for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ )

        {

            ismPreprocMtxNew[ch][ch] = 1.0f;

            ismPreprocMtxNew[1 - ch][ch] = 0.0f;
@@ -2808,12 +2808,12 @@ void ivas_omasa_preProcessStereoTransportsForEditedObjects( 
        }



        /* Init out array */

        for ( int k = 0; k < nSlots; k++ )

        for ( slot = 0; slot < nSlots; slot++ )

        {

            for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ )

            {

                set_zero( outSlotRe[ch][k], CLDFB_NO_CHANNELS_MAX );

                set_zero( outSlotIm[ch][k], CLDFB_NO_CHANNELS_MAX );

                set_zero( outSlotRe[ch][slot], CLDFB_NO_CHANNELS_MAX );

                set_zero( outSlotIm[ch][slot], CLDFB_NO_CHANNELS_MAX );

            }

        }
@@ -2827,7 +2827,7 @@ void ivas_omasa_preProcessStereoTransportsForEditedObjects( 
            totalTargetEne = 0.0f;

            for ( slot = 0; slot < nSlots; slot++ )

            {

                for ( ch = 0; ch < 2; ch++ )

                for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ )

                {

                    for ( bin = bin_lo; bin < bin_hi; bin++ )

                    {
@@ -2838,9 +2838,9 @@ void ivas_omasa_preProcessStereoTransportsForEditedObjects( 
            }



            /* Get increment value for temporal interpolation */

            for ( inCh = 0; inCh < 2; inCh++ )

            for ( inCh = 0; inCh < BINAURAL_CHANNELS; inCh++ )

            {

                for ( outCh = 0; outCh < 2; outCh++ )

                for ( outCh = 0; outCh < BINAURAL_CHANNELS; outCh++ )

                {

                    ismPreprocMtxIncrement[outCh][inCh] = ( ismPreprocMtxNew[outCh][inCh] - hMasaIsmData->ismPreprocMatrix[outCh][inCh][band_idx] ) * nSlotDiv;

                }
@@ -2851,11 +2851,11 @@ void ivas_omasa_preProcessStereoTransportsForEditedObjects( 
            hMasaIsmData->preprocEneRealized[band_idx] *= STEREO_PREPROCESS_IIR_FACTOR;

            hMasaIsmData->preprocEneTarget[band_idx] += totalTargetEne;



            for ( outCh = 0; outCh < 2; outCh++ )

            for ( outCh = 0; outCh < BINAURAL_CHANNELS; outCh++ )

            {

                for ( slot = 0; slot < nSlots; slot++ )

                {

                    for ( inCh = 0; inCh < 2; inCh++ )

                    for ( inCh = 0; inCh < BINAURAL_CHANNELS; inCh++ )

                    {

                        hMasaIsmData->ismPreprocMatrix[outCh][inCh][band_idx] += ismPreprocMtxIncrement[outCh][inCh];

                        for ( bin = bin_lo; bin < bin_hi; bin++ )
@@ -2874,7 +2874,7 @@ void ivas_omasa_preProcessStereoTransportsForEditedObjects( 


            eqVal = fminf( 4.0f, sqrtf( hMasaIsmData->preprocEneTarget[band_idx] / fmaxf( 1e-12f, hMasaIsmData->preprocEneRealized[band_idx] ) ) );



            for ( ch = 0; ch < 2; ch++ )

            for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ )

            {

                for ( slot = 0; slot < nSlots; slot++ )

                {
@@ -2950,14 +2950,14 @@ void ivas_omasa_preProcessStereoTransportsForEditedObjects( 
            else

            {

                /* When not edited, input and output pan gains are the same */

                for ( ch = 0; ch < 2; ch++ )

                for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ )

                {

                    panGainsOut[ismDirIndex][ch] = panGainsIn[ismDirIndex][ch];

                }

            }



            /* Determine pan enes */

            for ( ch = 0; ch < 2; ch++ )

            for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ )

            {

                panEnesOut[ismDirIndex][ch] = panGainsOut[ismDirIndex][ch] * panGainsOut[ismDirIndex][ch];

                panEnesIn[ismDirIndex][ch] = panGainsIn[ismDirIndex][ch] * panGainsIn[ismDirIndex][ch];
@@ -2982,12 +2982,12 @@ void ivas_omasa_preProcessStereoTransportsForEditedObjects( 
        }



        /* Init out array */

        for ( int k = 0; k < nSlots; k++ )

        for ( slot = 0; slot < nSlots; slot++ )

        {

            for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ )

            {

                set_zero( outSlotRe[ch][k], CLDFB_NO_CHANNELS_MAX );

                set_zero( outSlotIm[ch][k], CLDFB_NO_CHANNELS_MAX );

                set_zero( outSlotRe[ch][slot], CLDFB_NO_CHANNELS_MAX );

                set_zero( outSlotIm[ch][slot], CLDFB_NO_CHANNELS_MAX );

            }

        }
@@ -3017,7 +3017,7 @@ void ivas_omasa_preProcessStereoTransportsForEditedObjects( 
            /* Determine transport normalized energies and subframe energy */

            for ( slot = 0; slot < nSlots; slot++ )

            {

                for ( ch = 0; ch < 2; ch++ )

                for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ )

                {

                    for ( bin = bin_lo; bin < bin_hi; bin++ )

                    {
@@ -3040,7 +3040,7 @@ void ivas_omasa_preProcessStereoTransportsForEditedObjects( 
                ratioAccOrig += ratio;



                /* Calculate MASA energy as a residual of original channel energies subtracted with ISM energies */

                for ( ch = 0; ch < 2; ch++ )

                for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ )

                {

                    masaEneThisCh[ch] -= panEnesIn[ismDirIndex][ch] * ratio * subframeEne;

                }
@@ -3058,7 +3058,7 @@ void ivas_omasa_preProcessStereoTransportsForEditedObjects( 
                    ratio *= gainIsmThis * gainIsmThis;



                    /* Determine panning energies and channel target energies */

                    for ( ch = 0; ch < 2; ch++ )

                    for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ )

                    {

                        ismTargetEneThisCh[ch] = panEnesIn[ismDirIndex][ch] * ismTargetEneThis; /* Ism target energy per channel */

                        totalTargetEneCh[ch] -= panEnesIn[ismDirIndex][ch] * ismEneThis;        /* Reduce original ism energy */
@@ -3099,7 +3099,7 @@ void ivas_omasa_preProcessStereoTransportsForEditedObjects( 
                    ratio *= gainMasaPow2;



                    /* Calculate MASA target energies and add to total target energy estimation */

                    for ( ch = 0; ch < 2; ch++ )

                    for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ )

                    {

                        masaEneThisCh[ch] = fmaxf( masaEneThisCh[ch], 0.0f );       /* MASA original energy per channel */

                        masaTargetEneThisCh[ch] = gainMasaPow2 * masaEneThisCh[ch]; /* MASA target energy per channel */
@@ -3113,7 +3113,7 @@ void ivas_omasa_preProcessStereoTransportsForEditedObjects( 


            /* Limit target energies to non-negative values */

#ifdef NONBE_1399_1400_FIX_OBJ_EDIT_ISSUES

            for ( ch = 0; ch < 2; ch++ )

            for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ )

            {

                totalTargetEneCh[ch] = max( totalTargetEneCh[ch], 0.0f );

            }
@@ -3183,14 +3183,14 @@ void ivas_omasa_preProcessStereoTransportsForEditedObjects( 
                if ( enableCentering )

                {

                    centeringFactor = fmaxf( 0.0f, 2.0f * fabsf( panEnesIn[ismDirIndex][0] - panEnesOut[ismDirIndex][0] ) - 1.0f );

                    for ( ch = 0; ch < 2; ch++ )

                    for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ )

                    {

                        panEnesOut[ismDirIndex][ch] *= ( 1.0f - centeringFactor );

                        panEnesOut[ismDirIndex][ch] += 0.5f * centeringFactor;

                    }

                }



                for ( ch = 0; ch < 2; ch++ )

                for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ )

                {

                    eneMoveThis = fmaxf( 0.0f, panEnesIn[ismDirIndex][ch] - panEnesOut[ismDirIndex][ch] );

                    enePreserveThis = panEnesIn[ismDirIndex][ch] - eneMoveThis;
@@ -3207,7 +3207,7 @@ void ivas_omasa_preProcessStereoTransportsForEditedObjects( 
            remainderNormEne = fmaxf( 0.0f, ( 1.0f - ismRatioAcc ) - normEnes[0] - normEnes[1] );



            /* Normalize */

            for ( ch = 0; ch < 2; ch++ )

            for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ )

            {

                enePreserve[ch] += fmaxf( 0.0f, normEnes[ch] + remainderNormEne / 2.0f );

                normVal = 1.0f / fmaxf( EPSILON, eneMove[ch] + enePreserve[ch] );
@@ -3222,7 +3222,7 @@ void ivas_omasa_preProcessStereoTransportsForEditedObjects( 


            /* Temporally average energy moving and preserving, and generate the transport signal preprocessing matrix for

             * gaining objects and moving objects between left and right */

            for ( ch = 0; ch < 2; ch++ )

            for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ )

            {

                hMasaIsmData->eneMoveIIR[ch][band_idx] *= STEREO_PREPROCESS_IIR_FACTOR;

                hMasaIsmData->eneMoveIIR[ch][band_idx] += eneMove[ch] * totalTargetEne;
@@ -3234,9 +3234,9 @@ void ivas_omasa_preProcessStereoTransportsForEditedObjects( 
            }



            /* Get increment value for temporal interpolation */

            for ( inCh = 0; inCh < 2; inCh++ )

            for ( inCh = 0; inCh < BINAURAL_CHANNELS; inCh++ )

            {

                for ( outCh = 0; outCh < 2; outCh++ )

                for ( outCh = 0; outCh < BINAURAL_CHANNELS; outCh++ )

                {

                    ismPreprocMtxIncrement[outCh][inCh] = ( ismPreprocMtxNew[outCh][inCh] - hMasaIsmData->ismPreprocMatrix[outCh][inCh][band_idx] ) * nSlotDiv;

                }
@@ -3247,11 +3247,11 @@ void ivas_omasa_preProcessStereoTransportsForEditedObjects( 
            hMasaIsmData->preprocEneRealized[band_idx] *= STEREO_PREPROCESS_IIR_FACTOR;

            hMasaIsmData->preprocEneTarget[band_idx] += totalTargetEne;



            for ( outCh = 0; outCh < 2; outCh++ )

            for ( outCh = 0; outCh < BINAURAL_CHANNELS; outCh++ )

            {

                for ( slot = 0; slot < nSlots; slot++ )

                {

                    for ( inCh = 0; inCh < 2; inCh++ )

                    for ( inCh = 0; inCh < BINAURAL_CHANNELS; inCh++ )

                    {

                        hMasaIsmData->ismPreprocMatrix[outCh][inCh][band_idx] += ismPreprocMtxIncrement[outCh][inCh];

                        for ( bin = bin_lo; bin < bin_hi; bin++ )
@@ -3270,7 +3270,7 @@ void ivas_omasa_preProcessStereoTransportsForEditedObjects( 


            eqVal = fminf( 4.0f, sqrtf( hMasaIsmData->preprocEneTarget[band_idx] / fmaxf( 1e-12f, hMasaIsmData->preprocEneRealized[band_idx] ) ) );



            for ( ch = 0; ch < 2; ch++ )

            for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ )

            {

                for ( slot = 0; slot < nSlots; slot++ )

                {