Commit 85168bca authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

fix encapdulation of the changes in lib_dec/ivas_osba_dec.c and lib_enc/ivas_osba_enc.c

parent 10372a21

lib_dec/ivas_osba_dec.c

+13 −6
Original line number Diff line number Diff line
@@ -183,16 +183,21 @@ ivas_error ivas_osba_dirac_td_binaural_jbm( 
                for ( b = 0; b < num_cldfb_bands; b++ )

                {

                    st_ivas->hSplitBinRend->hMultiBinCldfbData->Cldfb_RealBuffer_Binaural[n][slot_idx_start + slot_idx][b] =

                        // ( 0.5f * st_ivas->hSplitBinRend->hMultiBinCldfbData->Cldfb_RealBuffer_Binaural[n][slot_idx_start + slot_idx][b] ) +

                        // ( 0.5f * Cldfb_RealBuffer[b] );

#ifndef NONBE_13552_HARMONIZE_OSBA_LOUDNESS

                        ( 0.5f * st_ivas->hSplitBinRend->hMultiBinCldfbData->Cldfb_RealBuffer_Binaural[n][slot_idx_start + slot_idx][b] ) +

                        ( 0.5f * Cldfb_RealBuffer[b] );

#else

                        st_ivas->hSplitBinRend->hMultiBinCldfbData->Cldfb_RealBuffer_Binaural[n][slot_idx_start + slot_idx][b] +

                        Cldfb_RealBuffer[b];



#endif

                    st_ivas->hSplitBinRend->hMultiBinCldfbData->Cldfb_ImagBuffer_Binaural[n][slot_idx_start + slot_idx][b] =

                        // ( 0.5f * st_ivas->hSplitBinRend->hMultiBinCldfbData->Cldfb_ImagBuffer_Binaural[n][slot_idx_start + slot_idx][b] ) +

                        // ( 0.5f * Cldfb_ImagBuffer[b] );

#ifndef NONBE_13552_HARMONIZE_OSBA_LOUDNESS 

                        ( 0.5f * st_ivas->hSplitBinRend->hMultiBinCldfbData->Cldfb_ImagBuffer_Binaural[n][slot_idx_start + slot_idx][b] ) +

                        ( 0.5f * Cldfb_ImagBuffer[b] );

#else

                        st_ivas->hSplitBinRend->hMultiBinCldfbData->Cldfb_ImagBuffer_Binaural[n][slot_idx_start + slot_idx][b] +

                        Cldfb_ImagBuffer[b];

#endif

                }

            }

        }
@@ -300,7 +305,9 @@ ivas_error ivas_osba_render_sf( 
            v_add( p_output[n], p_output_ism[n], p_output[n], *nSamplesRendered );

        }



        // v_multc( p_output[n], 0.5f, p_output[n], *nSamplesRendered );

#ifndef NONBE_13552_HARMONIZE_OSBA_LOUDNESS

         v_multc( p_output[n], 0.5f, p_output[n], *nSamplesRendered );

#endif

    }



    return IVAS_ERR_OK;

lib_enc/ivas_osba_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static void ivas_merge_sba_transports( 
    {

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

        {

#ifdef NONBE_1339_FIXOSBA_EXT_LOUDNESS

#ifdef NONBE_13552_HARMONIZE_OSBA_LOUDNESS

            data_out_f[i][j] = data_in_f1[i][j] + data_in_f2[i][j];

#else

            data_out_f[i][j] = 0.5f * ( data_in_f1[i][j] + data_in_f2[i][j] );