Commit 9f43bf8e authored by Sandesh Venkatesh's avatar Sandesh Venkatesh Committed by Manuel Jander
Browse files

Fix for 3GPP issue 1361: Assert in BASOP decoder function... 

Fix for 3GPP issue 1361: Assert in BASOP decoder function ivas_dirac_dec_render_sf_fx for LTV MASA bitstream

Link #1361
parent a79e6da8

lib_dec/ivas_cpe_dec_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -352,10 +352,6 @@ ivas_error ivas_cpe_dec_fx( 
            {

                sts[0]->total_brate = hCPE->element_brate; /* Only mono downmix was transmitted in this case */

                move32();

#ifdef MSAN_FIX

                hCPE->hStereoDft->frame_sid_nodata = 0;

                move16();

#endif

            }

            ELSE

            {

lib_dec/ivas_dirac_dec_fx.c

+23 −14
Original line number Diff line number Diff line
@@ -2204,13 +2204,15 @@ void ivas_dirac_dec_render_sf_fx( 
    Word32 Cldfb_RealBuffer_Temp_fx[2][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX];

    Word32 Cldfb_ImagBuffer_Temp_fx[2][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX];

    Word16 cldfb_buf_q;

    Word16 offset, buff_len;

    Word16 offset = 0, buff_len = 0;

    move16();

    move16();

    Word16 q_cldfb, q_temp_cldfb = 0;

    move16();

    Word16 proto_length = 0;

    move16();

    Word16 q_proto_direct_buffer[CLDFB_SLOTS_PER_SUBFRAME];

    Word16 q_proto_diffuse_buffer[CLDFB_SLOTS_PER_SUBFRAME];

    Word16 q_proto_direct_buffer[CLDFB_SLOTS_PER_SUBFRAME + 1];

    Word16 q_proto_diffuse_buffer[CLDFB_SLOTS_PER_SUBFRAME + 1];

    Word16 size, size_ho;



    DIRAC_DEC_STACK_MEM DirAC_mem;
@@ -2263,8 +2265,8 @@ void ivas_dirac_dec_render_sf_fx( 
    }

    q_cldfb = Q11;

    move16();

    set16_fx( q_proto_direct_buffer, hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q, CLDFB_SLOTS_PER_SUBFRAME );

    set16_fx( q_proto_diffuse_buffer, hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_q, CLDFB_SLOTS_PER_SUBFRAME );

    set16_fx( q_proto_direct_buffer, hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q, CLDFB_SLOTS_PER_SUBFRAME + 1 );

    set16_fx( q_proto_diffuse_buffer, hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_q, CLDFB_SLOTS_PER_SUBFRAME + 1 );

    set_zero_fx( surCohRatio_fx, CLDFB_NO_CHANNELS_MAX );



    IF( EQ_16( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_MONO ) )
@@ -3477,22 +3479,21 @@ void ivas_dirac_dec_render_sf_fx( 
        }

    }



    minimum_s( q_proto_direct_buffer, hSpatParamRendCom->subframe_nbslots[subframe_idx], &hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q );

    minimum_s( q_proto_direct_buffer, add( hSpatParamRendCom->subframe_nbslots[subframe_idx], 1 ), &hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q );

    IF( EQ_16( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_GAIN_SHD ) )

    {

        minimum_s( q_proto_diffuse_buffer, hSpatParamRendCom->subframe_nbslots[subframe_idx], &hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_q );

        minimum_s( q_proto_diffuse_buffer, add( hSpatParamRendCom->subframe_nbslots[subframe_idx], 1 ), &hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_q );

    }

    FOR( slot_idx = 0; slot_idx < hSpatParamRendCom->subframe_nbslots[subframe_idx]; slot_idx++ )

    {

        IF( EQ_16( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_GAIN_SHD ) )

        {

            offset = i_mult( i_mult( slot_idx, 2 ), i_mult( hSpatParamRendCom->num_freq_bands, nchan_transport ) );

            buff_len = i_mult( 2, i_mult( nchan_transport, hSpatParamRendCom->num_freq_bands ) );

            scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_fx + offset, buff_len, sub( hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q, q_proto_direct_buffer[slot_idx] ) ); // proto_direct_buffer_f_q



            offset = i_mult( i_mult( slot_idx, 2 ), i_mult( hSpatParamRendCom->num_freq_bands, hDirACRend->num_outputs_diff ) );

            buff_len = i_mult( 2, i_mult( hDirACRend->num_outputs_diff, hSpatParamRendCom->num_freq_bands ) );

            scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_fx + offset, buff_len, sub( hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_q, q_proto_diffuse_buffer[slot_idx] ) ); // proto_diffuse_buffer_f_q

            offset = i_mult( i_mult( slot_idx, 2 ), i_mult( hSpatParamRendCom->num_freq_bands, nchan_transport ) );

            buff_len = i_mult( 2, i_mult( nchan_transport, hSpatParamRendCom->num_freq_bands ) );

            scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_fx + offset, buff_len, sub( hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q, q_proto_direct_buffer[slot_idx] ) ); // proto_direct_buffer_f_q

        }

        ELSE IF( EQ_16( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_MONO ) )

        {
@@ -3532,10 +3533,18 @@ void ivas_dirac_dec_render_sf_fx( 
                    BREAK;

            }

        }

        q_proto_direct_buffer[slot_idx] = hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q;

        move16();

    }



    test();

    IF( EQ_16( slot_idx, hSpatParamRendCom->subframe_nbslots[subframe_idx] ) && sub( hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_len, add( offset, buff_len ) ) > 0 )

    {

        scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_fx + add( offset, buff_len ), sub( hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_len, add( offset, buff_len ) ), sub( hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q, q_proto_direct_buffer[slot_idx] ) ); // proto_direct_buffer_f_q

        offset = i_mult( i_mult( sub( slot_idx, 1 ), 2 ), i_mult( hSpatParamRendCom->num_freq_bands, hDirACRend->num_outputs_diff ) );

        buff_len = i_mult( 2, i_mult( hDirACRend->num_outputs_diff, hSpatParamRendCom->num_freq_bands ) );

        IF( EQ_16( hDirACRend->synthesisConf, DIRAC_SYNTHESIS_GAIN_SHD ) && sub( hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_len, add( offset, buff_len ) ) > 0 )

        {

            scale_sig32( hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_fx + add( offset, buff_len ), sub( hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_len, add( offset, buff_len ) ), sub( hDirACRend->h_output_synthesis_psd_state.proto_diffuse_buffer_f_q, q_proto_diffuse_buffer[slot_idx] ) ); // proto_direct_buffer_f_q

        }

    }

    ivas_dirac_dec_output_synthesis_get_interpolator_fx( &hDirACRend->h_output_synthesis_psd_params, hSpatParamRendCom->subframe_nbslots[subframe_idx] );



    size = i_mult( hDirACRend->num_outputs_dir, hSpatParamRendCom->num_freq_bands );

lib_dec/ivas_stereo_dft_dec_fx.c

+2 −1
Original line number Diff line number Diff line
@@ -258,7 +258,8 @@ void stereo_dft_dec_reset_fx( 
    move16();

    hStereoDft->ipd_xfade_prev_fx = 0;

    move32();



    hStereoDft->frame_sid_nodata = 0;

    move16();

#ifdef MSAN_FIX

    FOR( b = 0; b < 2 * IVAS_MAX_NUM_BANDS; b++ )

    {

lib_rend/ivas_dirac_rend_fx.c

+2 −0
Original line number Diff line number Diff line
@@ -882,6 +882,8 @@ ivas_error ivas_dirac_alloc_mem_fx( 
        }

        hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_len = imult1616( imult1616( 2 * MAX_PARAM_SPATIAL_SUBFRAMES, num_protos_dir ), num_freq_bands );

        move16();

        hDirACRend->h_output_synthesis_psd_state.proto_direct_buffer_f_q = Q31;

        move16();



        IF( hDirACRend->proto_signal_decorr_on )

        {