Commit 0b9264e1 authored by PLAINSI's avatar PLAINSI
Browse files

Merge branch... 

Merge branch '836-paramupmix-mc-to-sba-conversion-done-on-the-already-binaurlized-output' into 'main'

[Non-BE][split-non-BE][rend-non-BE] Resolve "ParamUpmix MC to SBA conversion done on the already binaurlized output"

See merge request !1151
parents 4473003c 1c9dea54

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ 
#define BE_FIX_867_PARAMC_RECONFIG                            /* FhG: issue #867: fix ParamMC CLDFB buffer dealloc when reconfiguring */

#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" */



/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_dec.c

+10 −0
Original line number Diff line number Diff line
@@ -868,13 +868,23 @@ ivas_error ivas_dec( 


            ivas_mc_paramupmix_dec( st_ivas, p_output );



#ifdef NONBE_FIX_836_PARAMUPMIX_HEADROT

            if ( st_ivas->transport_config != st_ivas->intern_config &&

                 ( st_ivas->intern_config == IVAS_AUDIO_CONFIG_FOA || st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA2 || st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA3 ) &&

                 ( output_config == IVAS_AUDIO_CONFIG_FOA || output_config == IVAS_AUDIO_CONFIG_HOA2 || output_config == IVAS_AUDIO_CONFIG_HOA3 ) )

#else

            if ( st_ivas->transport_config != st_ivas->intern_config && ( st_ivas->intern_config == IVAS_AUDIO_CONFIG_FOA || st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA2 || st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA3 ) )

#endif

            {

                ivas_mc2sba( st_ivas->hTransSetup, p_output, p_output, output_frame, st_ivas->hIntSetup.ambisonics_order, GAIN_LFE );

            }



            /* Rendering */

#ifdef NONBE_FIX_836_PARAMUPMIX_HEADROT

            if ( ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) && !st_ivas->hDecoderConfig->Opt_Headrotation )

#else

            if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )

#endif

            {

#ifdef SPLIT_REND_WITH_HEAD_ROT

                if ( output_config != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED && output_config != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

lib_dec/ivas_jbm_dec.c

+6 −1
Original line number Diff line number Diff line
@@ -1352,14 +1352,19 @@ ivas_error ivas_jbm_dec_render( 
        {

            ivas_mc_paramupmix_dec_render( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_tc, p_output );





#ifndef NONBE_FIX_836_PARAMUPMIX_HEADROT

            if ( st_ivas->transport_config != st_ivas->intern_config && ( st_ivas->intern_config == IVAS_AUDIO_CONFIG_FOA || st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA2 || st_ivas->intern_config == IVAS_AUDIO_CONFIG_HOA3 ) )

            {

                ivas_mc2sba( st_ivas->hTransSetup, p_output, p_output, *nSamplesRendered, st_ivas->hIntSetup.ambisonics_order, GAIN_LFE );

            }

#endif



            /* Rendering */

#ifdef NONBE_FIX_836_PARAMUPMIX_HEADROT

            if ( ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) && !st_ivas->hDecoderConfig->Opt_Headrotation )

#else

            if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )

#endif

            {

#ifdef SPLIT_REND_WITH_HEAD_ROT

                /*handled in CLDFB domain already*/