Commit 12a07ec0 authored by lintervo's avatar lintervo
Browse files

Address comments

parent ef30baab

lib_dec/lib_dec_fx.c

+2 −5
Original line number Diff line number Diff line
@@ -4146,9 +4146,6 @@ ivas_error IVAS_DEC_SetEditableParameters( 
    IVAS_DEC_HANDLE hIvasDec,

    IVAS_EDITABLE_PARAMETERS hIvasEditableParameters )

{

#if 0

    ivas_error error;

#endif

#ifdef OMASA_OBJECT_EDITING

    Word16 dirac_read_idx;

#endif
@@ -4270,13 +4267,13 @@ ivas_error IVAS_DEC_SetEditableParameters( 
                /* first, need to convert float values to ints used internally */

                Word16 new_azi, new_ele;

                new_azi = extract_l( L_shr( L_add( L_abs( hIvasEditableParameters.ism_metadata[obj].azimuth_fx ), 2097152 ), Q22 ) ); // Q22->Q0

                if ( hIvasEditableParameters.ism_metadata[obj].azimuth_fx < 0 )

                IF( LT_32( hIvasEditableParameters.ism_metadata[obj].azimuth_fx, 0 ) )

                {

                    new_azi = negate( new_azi );

                }



                new_ele = extract_l( L_shr( L_add( L_abs( hIvasEditableParameters.ism_metadata[obj].elevation_fx ), 2097152 ), Q22 ) ); // Q22->Q0

                if ( hIvasEditableParameters.ism_metadata[obj].elevation_fx < 0 )

                IF( LT_32( hIvasEditableParameters.ism_metadata[obj].elevation_fx, 0 ) )

                {

                    new_ele = negate( new_ele );

                }

lib_rend/ivas_dirac_dec_binaural_functions_fx.c

+9 −9
Original line number Diff line number Diff line
@@ -5578,7 +5578,7 @@ void ivas_omasa_preProcessStereoTransportsForEditedObjects_fx( 
        max_band = 0;

        move16();

        test();

        WHILE( sub( MAX_PARAM_ISM_NBANDS, max_band ) > 0 && sub( nBins, hParamIsmDec->hParamIsm->band_grouping[max_band] ) > 0 )

        WHILE( GT_16( sub( MAX_PARAM_ISM_NBANDS, max_band ), 0 ) && GT_16( sub( nBins, hParamIsmDec->hParamIsm->band_grouping[max_band] ), 0 ) )

        {

            max_band++;

        }
@@ -5838,7 +5838,7 @@ void ivas_omasa_preProcessStereoTransportsForEditedObjects_fx( 
        {

#endif

            test();

            WHILE( ( sub( MASA_FREQUENCY_BANDS, max_band ) > 0 ) && ( sub( nBins, MASA_band_grouping_24[max_band] ) > 0 ) )

            WHILE( GT_16( sub( MASA_FREQUENCY_BANDS, max_band ), 0 ) && GT_16( sub( nBins, MASA_band_grouping_24[max_band] ), 0 ) )

            {

                max_band++;

            }
@@ -5847,7 +5847,7 @@ void ivas_omasa_preProcessStereoTransportsForEditedObjects_fx( 
        ELSE

        {

            test();

            WHILE( ( sub( MAX_PARAM_ISM_NBANDS, max_band ) > 0 ) && ( sub( nBins, hParamIsmDec->hParamIsm->band_grouping[max_band] ) > 0 ) )

            WHILE( GT_16( sub( MAX_PARAM_ISM_NBANDS, max_band ), 0 ) && GT_16( sub( nBins, hParamIsmDec->hParamIsm->band_grouping[max_band] ), 0 ) )

            {

                max_band++;

            }
@@ -6268,7 +6268,7 @@ void ivas_omasa_preProcessStereoTransportsForEditedObjects_fx( 
            /* Determine new energetic values after gaining */

            totalTargetEne = L_add( totalTargetEneCh[0], totalTargetEneCh[1] ); // SubQ



            IF( totalTargetEne > 0 )

            IF( GT_32( totalTargetEne, 0 ) )

            {

                tempDivisor = BASOP_Util_Divide3232_Scale_newton( ONE_IN_Q28, max( EPSILON_FX, totalTargetEne ), &temp_q );
@@ -6411,7 +6411,7 @@ void ivas_omasa_preProcessStereoTransportsForEditedObjects_fx( 
                move32();

                move32();



                IF( hMasaIsmData->enePreserveIIR_fx[ch][band_idx] > 0 )

                IF( GT_32( hMasaIsmData->enePreserveIIR_fx[ch][band_idx], 0 ) )

                {

                    temp = BASOP_Util_Divide3232_Scale_newton( hMasaIsmData->enePreserveIIR_fx[ch][band_idx], L_max( 1, hMasaIsmData->eneOrigIIR_fx[band_idx] ), &temp_q );

                    temp_q = sub( Q31, sub( sub( Q31, temp_q ), sub( hMasaIsmData->enePreserveIIR_e[ch][band_idx], hMasaIsmData->eneOrigIIR_e[band_idx] ) ) );
@@ -6444,7 +6444,7 @@ void ivas_omasa_preProcessStereoTransportsForEditedObjects_fx( 
                move32();

                move16();



                IF( hMasaIsmData->eneMoveIIR_fx[ch][band_idx] > 0 )

                IF( GT_32( hMasaIsmData->eneMoveIIR_fx[ch][band_idx], 0 ) )

                {

                    temp = BASOP_Util_Divide3232_Scale_newton( hMasaIsmData->eneMoveIIR_fx[ch][band_idx], L_max( 1, hMasaIsmData->eneOrigIIR_fx[band_idx] ), &temp_q );

                    temp_q = sub( Q31, sub( sub( Q31, temp_q ), sub( hMasaIsmData->eneMoveIIR_e[ch][band_idx], hMasaIsmData->eneOrigIIR_e[band_idx] ) ) );
@@ -6644,7 +6644,7 @@ void ivas_omasa_preProcessStereoTransportsForMovedObjects_fx( 
    }



    /* Bypass processing until first object is moved */

    IF( hMasaIsmData->objectsMoved == 0 )

    IF( EQ_16( hMasaIsmData->objectsMoved, 0 ) )

    {

        FOR( ismDirIndex = 0; ismDirIndex < hSpatParamRendCom->numIsmDirections; ismDirIndex++ )

        {
@@ -6654,7 +6654,7 @@ void ivas_omasa_preProcessStereoTransportsForMovedObjects_fx( 
                move16();

            }

        }

        IF( hMasaIsmData->objectsMoved == 0 )

        IF( EQ_16( hMasaIsmData->objectsMoved, 0 ) )

        {

            /* No objects have moved so far */

            return;
@@ -6711,7 +6711,7 @@ void ivas_omasa_preProcessStereoTransportsForMovedObjects_fx( 


            subframeEne_fx = L_add( Enes_fx[0], Enes_fx[1] ); // Q = *cldfb_buf_q + *cldfb_buf_q - 31 = Q-19



            IF( subframeEne_fx != 0 )

            IF( NE_32( subframeEne_fx, 0 ) )

            {

                normEnes_fx[0] = BASOP_Util_Divide3232_Scale( Enes_fx[0], subframeEne_fx, &temp_q );

                move32();