Commit 044f5ee8 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_663_PARAM_ISM_EXT

parent 4e8c8523

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -172,7 +172,6 @@ 






#define FIX_663_PARAM_ISM_EXT                           /* FhG: Issue 663: ParamISM EXT output improvement */

#define FIX_673_OMASA_OBJ_MD_SYNC                       /* Nokia: Fix issue 673 by updating metadata in the third subframe to account for audio delay. */

#define PARAMUPMIX_BINAURAL_UPDATES                     /* Dlb : issue 652, MC ParamUpmix Binaural Updates */

#define FIX_657_REMOVE_EDITING                          /* Nokia: Remove remaining unused coded related to object editing */

lib_dec/ivas_ism_param_dec.c

+0 −34
Original line number Diff line number Diff line
@@ -843,22 +843,6 @@ void ivas_param_ism_dec( 
            }

        }



#ifndef FIX_663_PARAM_ISM_EXT

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

        {

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

            {

                if ( i == j )

                {

                    hDirAC->hParamIsmRendering->proto_matrix[( i * nchan_out_woLFE ) + j] = 1.0f;

                }

                else

                {

                    hDirAC->hParamIsmRendering->proto_matrix[( i * nchan_out_woLFE ) + j] = 0.0f;

                }

            }

        }

#else

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

        {

            if ( hDirAC->azimuth_values[j] > 0.0f )
@@ -880,7 +864,6 @@ void ivas_param_ism_dec( 
                }

            }

        }

#endif

    }



    /* Energy Compensation */
@@ -1221,22 +1204,6 @@ void ivas_param_ism_dec_digest_tc( 
            }

        }



#ifndef FIX_663_PARAM_ISM_EXT

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

        {

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

            {

                if ( i == j )

                {

                    hDirAC->hParamIsmRendering->proto_matrix[( i * nchan_out_woLFE ) + j] = 1.0f;

                }

                else

                {

                    hDirAC->hParamIsmRendering->proto_matrix[( i * nchan_out_woLFE ) + j] = 0.0f;

                }

            }

        }

#else

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

        {

            if ( hDirAC->azimuth_values[j] > 0.0f )
@@ -1258,7 +1225,6 @@ void ivas_param_ism_dec_digest_tc( 
                }

            }

        }

#endif

    }



    /* Energy Compensation */