Commit 80e6290c authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch '3gpp_issue_784_fix' into 'main' 

Fix for issue 784: BASOP decoder without JBM not BE to BASOP decoder with zero-delay profile

See merge request !390
parents f7e4301a a1240ac9

lib_dec/ivas_jbm_dec.c

+8 −0
Original line number Diff line number Diff line
@@ -3029,6 +3029,10 @@ ivas_error ivas_jbm_dec_render_fx( 
                FOR( i = 0; i < nchan_in; i++ )

                {

                    scale_sig32( p_output_fx[i], *nSamplesRendered, negate( sub( Q11, *st_ivas->hCrendWrapper->p_io_qfactor ) ) );

                    IF( st_ivas->hDecoderConfig->Opt_tsm )

                    {

                        scale_sig32( p_tc_fx[i], *nSamplesRendered, negate( sub( Q11, *st_ivas->hCrendWrapper->p_io_qfactor ) ) );

                    }

                }

                IF( ( error = ivas_rend_crendProcessSubframe( st_ivas->hCrendWrapper, st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hDecoderConfig, st_ivas->hCombinedOrientationData,

                                                              &st_ivas->hIntSetup, st_ivas->hEFAPdata, st_ivas->hTcBuffer, crendInPlaceRotation ? p_output_fx : p_tc_fx, p_output_fx, *nSamplesRendered, output_Fs ) ) != IVAS_ERR_OK )
@@ -3040,6 +3044,10 @@ ivas_error ivas_jbm_dec_render_fx( 
                FOR( i = 0; i < nchan_in; i++ )

                {

                    scale_sig32( p_output_fx[i], *nSamplesRendered, sub( Q11, *st_ivas->hCrendWrapper->p_io_qfactor ) );

                    IF( st_ivas->hDecoderConfig->Opt_tsm )

                    {

                        scale_sig32( p_tc_fx[i], *nSamplesRendered, sub( Q11, *st_ivas->hCrendWrapper->p_io_qfactor ) );

                    }

                }

            }

            ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_MC ) )