Commit 3dc9f82f authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_469_BRSWITCH_PUPMIX

parent 2ae25034

lib_com/options.h

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






#define FIX_469_BRSWITCH_PUPMIX                         /* Dlb: Fix issue 469 for Param Upmix bitrate switching */



#define HODIRAC                                         /* FhG: Contribution 32: Sector-based HO-DirAC method for SBA at high bitrates */

#define DIRAC_ALLOC_HARM                                /* VA: harmonize DirAC parameters allocation/deallocation */

lib_dec/ivas_mct_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -808,15 +808,11 @@ static ivas_error ivas_mc_dec_reconfig( 
                ivas_ls_setup_conversion_close( &st_ivas->hLsSetUpConversion );

            }



#ifdef FIX_469_BRSWITCH_PUPMIX

            if ( last_mc_mode == MC_MODE_PARAMUPMIX )

            {

                ivas_mc_paramupmix_dec_close( &( st_ivas->hMCParamUpmix ) );

                ivas_ls_setup_conversion_close( &( st_ivas->hLsSetUpConversion ) );

            }

#else

            ivas_mc_paramupmix_dec_close( &( st_ivas->hMCParamUpmix ) );

#endif

            /* De-allocate McMasa-related handles */

            ivas_masa_dec_close( &( st_ivas->hMasa ) );

            ivas_qmetadata_close( &st_ivas->hQMetaData );