Commit 0711b950 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_425_MASA_BRSW_RENDERER

parent 13f84214

lib_com/options.h

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






#define FIX_425_MASA_BRSW_RENDERER                      /* Nokia: Issue 425: renderer not reconfigure in MASA bitrate switching */



#define EUALER2QUAT_FIX                                 /* Dlb :fix for issue 430 issue in euler2quat, sign of quat y is inverted */

#define HR_METADATA                                     /* Nok: Contribution #45: encode directional MASA metadata with more bits at 384k and 512k */

lib_dec/ivas_masa_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -1157,7 +1157,6 @@ ivas_error ivas_masa_dec_reconfigure( 


    ivas_init_dec_get_num_cldfb_instances( st_ivas, &numCldfbAnalyses_old, &numCldfbSyntheses_old );



#ifdef FIX_425_MASA_BRSW_RENDERER

    /* renderer might have changed, reselect */

    ivas_renderer_select( st_ivas );
@@ -1175,7 +1174,6 @@ ivas_error ivas_masa_dec_reconfigure( 
        ivas_dirac_dec_close( &( st_ivas->hDirAC ) );

    }

    /* possible reconfigure is done later */

#endif



    /*-----------------------------------------------------------------*

     * Allocate and initialize SCE/CPE and other handles
@@ -1233,13 +1231,11 @@ ivas_error ivas_masa_dec_reconfigure( 
            }

        }

    }

#ifdef FIX_425_MASA_BRSW_RENDERER

    if ( st_ivas->hDiracDecBin != NULL )

    {

        /* regularization factor is bitrate-dependent */

        st_ivas->hDiracDecBin->reqularizationFactor = configure_reqularization_factor( st_ivas->ivas_format, st_ivas->hDecoderConfig->ivas_total_brate );

    }

#endif

    /*-----------------------------------------------------------------*

     * TD Decorrelator

     *-----------------------------------------------------------------*/