Commit e15ad001 authored by PLAINSI's avatar PLAINSI
Browse files

Add to JBM path, account for ambisonics

parent b78d4ebf

lib_dec/ivas_dec.c

+6 −2
Original line number Diff line number Diff line
@@ -868,12 +868,16 @@ ivas_error ivas_dec( 


            ivas_mc_paramupmix_dec( st_ivas, p_output );



#ifndef NONBE_FIX_836_PARAMUPMIX_HEADROT

#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 );

            }

#endif



            /* Rendering */

#ifdef NONBE_FIX_836_PARAMUPMIX_HEADROT

lib_dec/ivas_jbm_dec.c

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

            ivas_mc_paramupmix_dec_render( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_tc, 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, *nSamplesRendered, 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

                /*handled in CLDFB domain already*/