Commit 4eea9cef authored by sagnowski's avatar sagnowski
Browse files

Apply review suggestions - batch 1

parent 42b0cc5a

lib_dec/ivas_jbm_dec_fx.c

+3 −2
Original line number Diff line number Diff line
@@ -2463,7 +2463,7 @@ ivas_error ivas_jbm_dec_render_fx( 
#ifdef FIX_1119_SPLIT_RENDERING_VOIP

        const Word32 *p_output_fx_const[MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS];



        nchan_out_syn_output = BINAURAL_CHANNELS * st_ivas->hSplitBinRend->splitrend.multiBinPoseData.num_poses;

        nchan_out_syn_output = i_mult( BINAURAL_CHANNELS, st_ivas->hSplitBinRend->splitrend.multiBinPoseData.num_poses );



        /* Save TD signals for pose correction if they are to be used */

        IF( st_ivas->hSplitBinRend->hMultiBinTdData != NULL )
@@ -2476,9 +2476,10 @@ ivas_error ivas_jbm_dec_render_fx( 
        }



#ifdef TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR

        IF( st_ivas->flushing )

        if( st_ivas->flushing )

        {

            nchan_out_syn_output = BINAURAL_CHANNELS;

            move16();

        }

#endif

#else

lib_dec/ivas_omasa_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -1250,7 +1250,7 @@ ivas_error ivas_omasa_dirac_td_binaural_jbm_fx( 
                Scale_sig32( Cldfb_ImagBuffer, num_cldfb_bands, sub( Q6, q_cldfb ) );



#ifdef FIX_1119_SPLIT_RENDERING_VOIP

                ivas_CLDFB_RINGBUF_GetByIdx( st_ivas->hSplitBinRend->hMultiBinCldfbData[n], &re, &im, slot_idx - cldfb_slots );

                ivas_CLDFB_RINGBUF_GetByIdx( st_ivas->hSplitBinRend->hMultiBinCldfbData[n], &re, &im, sub( slot_idx, cldfb_slots ) );

                v_add_fx( re, Cldfb_RealBuffer, re, num_cldfb_bands );

                v_add_fx( im, Cldfb_ImagBuffer, im, num_cldfb_bands );

#else

lib_dec/ivas_osba_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ ivas_error ivas_osba_dirac_td_binaural_jbm_fx( 
                Scale_sig32( Cldfb_ImagBuffer, num_cldfb_bands, sub( Q6, q_cldfb ) );



#ifdef FIX_1119_SPLIT_RENDERING_VOIP

                ivas_CLDFB_RINGBUF_GetByIdx( st_ivas->hSplitBinRend->hMultiBinCldfbData[n], &re, &im, slot_idx - cldfb_slots );

                ivas_CLDFB_RINGBUF_GetByIdx( st_ivas->hSplitBinRend->hMultiBinCldfbData[n], &re, &im, sub( slot_idx, cldfb_slots ) );

                v_add_fx( re, Cldfb_RealBuffer, re, num_cldfb_bands );

                v_add_fx( im, Cldfb_ImagBuffer, im, num_cldfb_bands );

#else

lib_dec/ivas_output_config_fx.c

+5 −0
Original line number Diff line number Diff line
@@ -626,7 +626,12 @@ RENDERER_TYPE ivas_renderer_secondary_select_fx( 


    test();

    test();

    test();

    test();

    test();

#ifdef FIX_1119_SPLIT_RENDERING_VOIP

    test();

    test();

    test();

    test();

    IF( EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) && EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) &&

lib_dec/ivas_stat_dec.h

+1 −1
Original line number Diff line number Diff line
@@ -1209,7 +1209,7 @@ typedef struct Decoder_Struct 
    Word16 ism_extmeta_cnt;                                   /* Change frame counter for extended metadata */



#ifdef TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR

    int16_t flushing;

    Word16 flushing;

#endif



} Decoder_Struct;