Commit 8dd65e04 authored by fotopoulou's avatar fotopoulou
Browse files

Merge branch '2092-fix-assert-in-ivas_omasa_render_objects_from_mix_fx' into 'main' 

Resolve "Assert in ivas_omasa_render_objects_from_mix_fx for BASOP decoder"

Closes #2092

See merge request !2386
parents d8c81544 fdcdd300

lib_dec/ivas_omasa_dec_fx.c

+7 −0
Original line number Diff line number Diff line
@@ -2111,12 +2111,19 @@ void ivas_omasa_render_objects_from_mix_fx( 
            outSlotImPr = &( outIm[n][slot][0] );

            move32();

            move32();

#ifdef FIX_2092_ASSERT_IN_OMASA_RENDER

            mantissa_exp_to_qvalue( &outRe_exp[n][slot][0], &outRe[n][slot][0], Q20 + Q2, nBins ); // + Q2: add two bits headroom to prevent overflow in cldfbSynthesis_ivas_fx().

            mantissa_exp_to_qvalue( &outIm_exp[n][slot][0], &outIm[n][slot][0], Q20 + Q2, nBins );



            cldfbSynthesis_ivas_fx( &outSlotRePr, &outSlotImPr, &rendered_objects[n][index],

                                    nBins, 0, 1 + Q2, st_ivas->cldfbSynDec[index2] );

#else

            mantissa_exp_to_qvalue( &outRe_exp[n][slot][0], &outRe[n][slot][0], Q20, nBins );

            mantissa_exp_to_qvalue( &outIm_exp[n][slot][0], &outIm[n][slot][0], Q20, nBins );



            cldfbSynthesis_ivas_fx( &outSlotRePr, &outSlotImPr, &rendered_objects[n][index],

                                    nBins, 0, 1, st_ivas->cldfbSynDec[index2] );

#endif

        }

    }