Commit ae4cbdcc authored by vaclav's avatar vaclav
Browse files

Merge branch '1360_ref_PortFlpMR1319' into 'float-pc' 

Port float MR1319 to BASOP FLP ref

See merge request !1250
parents 442cc5d9 2f65ebb7

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ 
#define FIX_957_REMOVE_PANNING_DEAD_CODE                /* VA: Remove obsolete non-diegetic panning related code. */

#define NONBE_FIX_935_EARLY_REFLECTIONS_WRONG_ORDER           /* Qualcomm: issue 953: fix order or ER channels in LC mode*/

#define FIX_956_DECODER_COMMAND_LINE_FIX                /* VA: Output correct error message when the decoder command-line has too many mandatory arguments. */

#define FIX_955_FASTCONV_REND_IN_ISM                    /* VA: put FastConv rendering call under DEBUGGING */



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_jbm_dec.c

+13 −0
Original line number Diff line number Diff line
@@ -1062,11 +1062,24 @@ ivas_error ivas_jbm_dec_render( 
            {

                ivas_apply_non_diegetic_panning( p_output, st_ivas->hDecoderConfig->non_diegetic_pan_gain, *nSamplesRendered );

            }



#ifdef FIX_955_FASTCONV_REND_IN_ISM

#ifdef DEBUGGING

            else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV )

#else

            else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC )

#endif

            {

                /* Convert to Ambisonics */

                ivas_ism2sba_sf( st_ivas->hTcBuffer->tc, p_output, st_ivas->hIsmRendererData, st_ivas->nchan_transport, *nSamplesRendered, st_ivas->hTcBuffer->n_samples_rendered, st_ivas->hIntSetup.ambisonics_order );

            }

#else

            else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV )

            {

                /* Convert to Ambisonics; used also for ISM->HOA3->binaural rendering */

                ivas_ism2sba_sf( st_ivas->hTcBuffer->tc, p_output, st_ivas->hIsmRendererData, st_ivas->nchan_transport, *nSamplesRendered, st_ivas->hTcBuffer->n_samples_rendered, st_ivas->hIntSetup.ambisonics_order );

            }

#endif



            /* Binaural rendering */

            if ( st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD )