Commit d779e40e authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

ivas_jbm_dec file changes, to test for MLD scores.

parent b8035fc8

lib_dec/ivas_jbm_dec.c

+2 −54
Original line number Diff line number Diff line
@@ -322,24 +322,7 @@ ivas_error ivas_jbm_dec_tc( 
                    st_ivas->hMasa->hMasaLfeSynth->lfeToTotalEnergyRatio_fx[j] = float_to_fix16( st_ivas->hMasa->hMasaLfeSynth->lfeToTotalEnergyRatio[j], Q14 );

                }

            }

            IF( st_ivas->hSpatParamRendCom != NULL )

            {

                FOR( i = 0; i < st_ivas->hSpatParamRendCom->dirac_md_buffer_length; i++ )

                {

                    FOR( j = 0; j < st_ivas->hSpatParamRendCom->num_freq_bands; j++ )

                    {

                        st_ivas->hSpatParamRendCom->diffuseness_vector_fx[i][j] = float_to_fix( st_ivas->hSpatParamRendCom->diffuseness_vector[i][j], 30 );

                        st_ivas->hSpatParamRendCom->energy_ratio1_fx[i][j] = float_to_fix( st_ivas->hSpatParamRendCom->energy_ratio1[i][j], 30 );

                        IF( EQ_16( st_ivas->hQMetaData->no_directions, 2 ) )

                        {

                            st_ivas->hSpatParamRendCom->energy_ratio2_fx[i][j] = float_to_fix( st_ivas->hSpatParamRendCom->energy_ratio2[i][j], 30 );

                            st_ivas->hSpatParamRendCom->spreadCoherence2_fx[i][j] = float_to_fix16( st_ivas->hSpatParamRendCom->spreadCoherence2[i][j], 15 );

                        }

                        st_ivas->hSpatParamRendCom->surroundingCoherence_fx[i][j] = float_to_fix16( st_ivas->hSpatParamRendCom->surroundingCoherence[i][j], 15 );

                        st_ivas->hSpatParamRendCom->spreadCoherence_fx[i][j] = float_to_fix16( st_ivas->hSpatParamRendCom->spreadCoherence[i][j], 15 );

                    }

                }

            }



            // Float to fix conversion ends here.



            IF( ( error = ivas_masa_decode_fx( st_ivas, st, &nb_bits_metadata[0] ) ) != IVAS_ERR_OK )
@@ -1130,24 +1113,7 @@ ivas_error ivas_jbm_dec_tc( 
                st_ivas->hMasa->hMasaLfeSynth->lfeToTotalEnergyRatio_fx[j] = float_to_fix16( st_ivas->hMasa->hMasaLfeSynth->lfeToTotalEnergyRatio[j], Q14 );

            }

        }

        IF( st_ivas->hSpatParamRendCom != NULL )

        {

            FOR( i = 0; i < st_ivas->hSpatParamRendCom->dirac_md_buffer_length; i++ )

            {

                FOR( j = 0; j < st_ivas->hSpatParamRendCom->num_freq_bands; j++ )

                {

                    st_ivas->hSpatParamRendCom->diffuseness_vector_fx[i][j] = float_to_fix( st_ivas->hSpatParamRendCom->diffuseness_vector[i][j], 30 );

                    st_ivas->hSpatParamRendCom->energy_ratio1_fx[i][j] = float_to_fix( st_ivas->hSpatParamRendCom->energy_ratio1[i][j], 30 );

                    IF( EQ_16( st_ivas->hQMetaData->no_directions, 2 ) )

                    {

                        st_ivas->hSpatParamRendCom->energy_ratio2_fx[i][j] = float_to_fix( st_ivas->hSpatParamRendCom->energy_ratio2[i][j], 30 );

                        st_ivas->hSpatParamRendCom->spreadCoherence2_fx[i][j] = float_to_fix16( st_ivas->hSpatParamRendCom->spreadCoherence2[i][j], 15 );

                    }

                    st_ivas->hSpatParamRendCom->surroundingCoherence_fx[i][j] = float_to_fix16( st_ivas->hSpatParamRendCom->surroundingCoherence[i][j], 15 );

                    st_ivas->hSpatParamRendCom->spreadCoherence_fx[i][j] = float_to_fix16( st_ivas->hSpatParamRendCom->spreadCoherence[i][j], 15 );

                }

            }

        }



        FOR( n = 0; n < tmp_nchan_ism; n++ )

        {

            set32_fx( p_output_fx[n], 0, L_FRAME48k );
@@ -2654,24 +2620,6 @@ ivas_error ivas_jbm_dec_tc( 
                    st_ivas->hMasa->hMasaLfeSynth->lfeToTotalEnergyRatio_fx[j] = float_to_fix16( st_ivas->hMasa->hMasaLfeSynth->lfeToTotalEnergyRatio[j], Q14 );

                }

            }

            IF( st_ivas->hSpatParamRendCom != NULL )

            {

                FOR( i = 0; i < st_ivas->hSpatParamRendCom->dirac_md_buffer_length; i++ )

                {

                    FOR( j = 0; j < st_ivas->hSpatParamRendCom->num_freq_bands; j++ )

                    {

                        st_ivas->hSpatParamRendCom->diffuseness_vector_fx[i][j] = float_to_fix( st_ivas->hSpatParamRendCom->diffuseness_vector[i][j], 30 );

                        st_ivas->hSpatParamRendCom->energy_ratio1_fx[i][j] = float_to_fix( st_ivas->hSpatParamRendCom->energy_ratio1[i][j], 30 );

                        IF( EQ_16( st_ivas->hQMetaData->no_directions, 2 ) )

                        {

                            st_ivas->hSpatParamRendCom->energy_ratio2_fx[i][j] = float_to_fix( st_ivas->hSpatParamRendCom->energy_ratio2[i][j], 30 );

                            st_ivas->hSpatParamRendCom->spreadCoherence2_fx[i][j] = float_to_fix16( st_ivas->hSpatParamRendCom->spreadCoherence2[i][j], 15 );

                        }

                        st_ivas->hSpatParamRendCom->surroundingCoherence_fx[i][j] = float_to_fix16( st_ivas->hSpatParamRendCom->surroundingCoherence[i][j], 15 );

                        st_ivas->hSpatParamRendCom->spreadCoherence_fx[i][j] = float_to_fix16( st_ivas->hSpatParamRendCom->spreadCoherence[i][j], 15 );

                    }

                }

            }

            // Float to fix conversion ends here.



            IF( ( error = ivas_masa_decode_fx( st_ivas, st, &nb_bits_metadata[0] ) ) != IVAS_ERR_OK )