Commit 41f8cb05 authored by vaclav's avatar vaclav
Browse files

accept NONBE_FIX_850_MASA_HBR_META_RATIO_DECODING

parent e4276c5a

lib_com/options.h

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


#define NONBE_FIX_856_TCX_LTP_SYNTH_FILTER                    /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/

#define NONBE_UNIFIED_DECODING_PATHS                          /* FhG: unify decoding paths   */

#define NONBE_FIX_850_MASA_HBR_META_RATIO_DECODING            /* Nokia: issue #850: Fixes rare non-valid diffuseness and energy ratio values in 2dir MASA. */

#define NONBE_FIX_MDCT_STEREO_DTX_MONO_OUT                    /* FhG: fix clicks in DTX -> active transition frames in MDCT-Stereo with mono output */

#define NONBE_FIX_836_PARAMUPMIX_HEADROT                      /* Dlb: issue #836: Resolve "ParamUpmix MC to SBA conversion done on the already binaurlized output" */

lib_dec/ivas_dirac_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -1260,14 +1260,12 @@ void ivas_qmetadata_to_dirac( 
                        hSpatParamRendCom->energy_ratio2[meta_write_index][b] = q_direction->band_data[band].energy_ratio[block];

                        hSpatParamRendCom->diffuseness_vector[meta_write_index][b] -= q_direction->band_data[band].energy_ratio[block];



#ifdef NONBE_FIX_850_MASA_HBR_META_RATIO_DECODING

                        /* Sanitize diffuseness for rare cases where floating point inaccuracy could result in negative diffuseness. */

                        if ( hSpatParamRendCom->diffuseness_vector[meta_write_index][b] < 0.0f )

                        {

                            hSpatParamRendCom->diffuseness_vector[meta_write_index][b] = 0.0f;

                        }



#endif

                        if ( q_direction->coherence_band_data != NULL )

                        {

                            hSpatParamRendCom->spreadCoherence2[meta_write_index][b] = q_direction->coherence_band_data[band].spread_coherence[block] / 255.0f;

lib_dec/ivas_qmetadata_dec.c

+0 −3
Original line number Diff line number Diff line
@@ -1104,7 +1104,6 @@ int16_t ivas_qmetadata_dec_decode_hr_384_512( 
            }

        }



#ifdef NONBE_FIX_850_MASA_HBR_META_RATIO_DECODING

        /* Scale energy ratios that sum to over one */

        for ( b = 0; b < hQMetaData->q_direction[0].cfg.nbands; b++ )

        {
@@ -1123,10 +1122,8 @@ int16_t ivas_qmetadata_dec_decode_hr_384_512( 
                }

            }

        }

#endif

    }





#ifdef DEBUG_MODE_QMETADATA

    for ( d = 0; d < hQMetaData->no_directions; d++ )

    {