Commit d235e032 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

fix merge error in diffuseness setting for SBA mono input

parent d53630f6

lib_enc/ivas_dirac_enc.c

+13 −12
Original line number Diff line number Diff line
@@ -377,18 +377,6 @@ void ivas_dirac_enc( 
            /* encode SID parameters */

            ivas_qmetadata_enc_sid_encode( hMetaData, hQMetaData, -1, SBA_FORMAT );

        }

#ifdef FIX_527_SBA_MONO_INPUT

        if ( hQMetaData->dirac_mono_flag )

        {

            for ( b = hQMetaData->q_direction->cfg.start_band; b < hQMetaData->q_direction->cfg.nbands; b++ )

            {

                for ( i_ts = 0; i_ts < ( ( dtx_vad == 1 ) ? hQMetaData->q_direction[0].cfg.nblocks : 1 ); i_ts++ )

                {

                    hQMetaData->q_direction[0].band_data[b].energy_ratio[i_ts] = 1.0f;

                }

            }

        }

#endif



        for ( b = hQMetaData->q_direction->cfg.start_band; b < hQMetaData->q_direction->cfg.nbands; b++ )

        {
@@ -421,6 +409,19 @@ void ivas_dirac_enc( 


            hQMetaData->q_direction->cfg.nbands = orig_dirac_bands;

        }



#ifdef FIX_527_SBA_MONO_INPUT

        if ( hQMetaData->dirac_mono_flag )

        {

            for ( b = hQMetaData->q_direction->cfg.start_band; b < hQMetaData->q_direction->cfg.nbands; b++ )

            {

                for ( i_ts = 0; i_ts < ( ( dtx_vad == 1 ) ? hQMetaData->q_direction[0].cfg.nblocks : 1 ); i_ts++ )

                {

                    hQMetaData->q_direction[0].band_data[b].energy_ratio[i_ts] = 0.0f;

                }

            }

        }

#endif

    }

    pop_wmops();