Commit a845df43 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept NONBE_1362_FIX_OMASA_TO_MASA1_RENDERING

parent 452b61ba

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -181,7 +181,6 @@ 
#define FIX_1413_IGF_INIT_PRINTOUT                      /* FhG: use correct variable for IGF initiliazation */

#define FIX_1330_JBM_MEMORY                             /* VA: issue 1330: memory savings in the JBM decoder */

#define FIX_1330_JBM_MEMORY_FIX                         /* VA: basop issue: 2179 fix non-BE difference in FIX_1330_JBM_MEMORY */

#define NONBE_1362_FIX_OMASA_TO_MASA1_RENDERING         /* Nokia: Fix OMASA to MASA1 rendering in IVAS_rend */

#define FIX_1383_HEAD_TRACK_SANITIZER                   /* Nok: issue 1383: Fix head tracking struc values reading in renderer */

#define FIX_1411_IGF_CRASH_BW_SWITCHING                 /* FhG: Fix for issue 1411: fixes crash that can happen for IGF with BW switching and DTX*/

#define FIX_1419_MONO_STEREO_UMX                        /* FhG: fix for issue 1419 : support upmix to all output formats for mono and stereo */

lib_rend/ivas_omasa_ana.c

+0 −22
Original line number Diff line number Diff line
@@ -498,7 +498,6 @@ static void ivas_omasa_dmx( 


    for ( i = 0; i < nchan_ism; i++ )

    {

#ifdef NONBE_1362_FIX_OMASA_TO_MASA1_RENDERING

        if ( nchan_transport == 1 )

        {

            v_add( data_out_f[0], data_in_f[i], data_out_f[0], input_frame );
@@ -525,27 +524,6 @@ static void ivas_omasa_dmx( 
                prev_gains[i][j] = gains[j];

            }

        }

#else

        azimuth = ism_azimuth[i];

        elevation = ism_elevation[i];



        ivas_ism_get_stereo_gains( azimuth, elevation, &gains[0], &gains[1] );



        /* Downmix using the panning gains */

        for ( j = 0; j < nchan_transport; j++ )

        {

            if ( fabsf( gains[j] ) > 0.0 || fabsf( prev_gains[i][j] ) > 0.0f )

            {

                for ( k = 0; k < input_frame; k++ )

                {

                    g1 = interpolator[k];

                    g2 = 1.0f - g1;

                    data_out_f[j][k] += ( g1 * gains[j] + g2 * prev_gains[i][j] ) * data_in_f[i][k];

                }

            }

            prev_gains[i][j] = gains[j];

        }

#endif

    }



    for ( i = 0; i < nchan_transport; i++ )