Commit bf499a5b authored by vaclav's avatar vaclav
Browse files

fixes

parent 6b7b131d

lib_dec/ivas_ism_param_dec.c

+39 −40
Original line number Diff line number Diff line
@@ -838,7 +838,7 @@ void ivas_param_ism_dec_digest_tc( 
        }

    }

#else

    {



    int16_t ch, nchan_transport;

    int16_t slot_idx;

    int16_t output_frame;
@@ -881,7 +881,6 @@ void ivas_param_ism_dec_digest_tc( 
        }

    }





    pop_wmops();

#endif

lib_dec/ivas_jbm_dec.c

+6 −6
Original line number Diff line number Diff line
@@ -2145,8 +2145,8 @@ static void ivas_jbm_dec_copy_tc( 
    hTcBuffer->n_samples_buffered = n_samples_still_available + nSamplesForRendering + hTcBuffer->n_samples_discard;

    hTcBuffer->n_samples_available = hTcBuffer->n_samples_granularity * ( hTcBuffer->n_samples_buffered / hTcBuffer->n_samples_granularity );

    *nSamplesResidual = hTcBuffer->n_samples_buffered - hTcBuffer->n_samples_available;

    n_ch_full_copy = min( hTcBuffer->nchan_transport_jbm, hTcBuffer->nchan_buffer_full );

    n_ch_res_copy = hTcBuffer->nchan_transport_jbm - hTcBuffer->nchan_buffer_full;

    n_ch_full_copy = min( hTcBuffer->nchan_transport_rend, hTcBuffer->nchan_buffer_full );

    n_ch_res_copy = hTcBuffer->nchan_transport_rend - hTcBuffer->nchan_buffer_full;



    for ( ch = 0; ch < n_ch_full_copy; ch++ )

    {
@@ -2154,18 +2154,18 @@ static void ivas_jbm_dec_copy_tc( 
        mvr2r( hTcBuffer->tc[ch] + hTcBuffer->n_samples_rendered, hTcBuffer->tc[ch] + hTcBuffer->n_samples_discard, n_samples_still_available );

        for ( m = 0; m < nSamplesForRendering; m++ )

        {

            hTcBuffer->tc[ch][n_samples_still_available + hTcBuffer->n_samples_discard + m] = data[m * st_ivas->hTcBuffer->nchan_transport_jbm + ch];

            hTcBuffer->tc[ch][n_samples_still_available + hTcBuffer->n_samples_discard + m] = data[m * st_ivas->hTcBuffer->nchan_transport_rend + ch];

        }

    }



    if ( n_ch_res_copy > 0 )

    {

        for ( ; ch < hTcBuffer->nchan_transport_jbm; ch++ )

        for ( ; ch < hTcBuffer->nchan_transport_rend; ch++ )

        {

            mvr2r( hTcBuffer->tc[ch], tc_digest_f[ch], n_samples_still_available );

            for ( m = 0; m < nSamplesForRendering; m++ )

            {

                tc_digest_f[ch][n_samples_still_available + m] = data[m * st_ivas->hTcBuffer->nchan_transport_jbm + ch];

                tc_digest_f[ch][n_samples_still_available + m] = data[m * st_ivas->hTcBuffer->nchan_transport_rend + ch];

            }

            mvr2r( tc_digest_f[ch] + hTcBuffer->n_samples_available, hTcBuffer->tc[ch], *nSamplesResidual );

        }
@@ -2704,7 +2704,7 @@ void ivas_jbm_dec_copy_tc_no_tsm( 
    hTcBuffer = st_ivas->hTcBuffer;

    hTcBuffer->n_samples_buffered = output_frame;

    hTcBuffer->n_samples_available = hTcBuffer->n_samples_buffered;

    n_ch_cldfb = hTcBuffer->nchan_transport_jbm - hTcBuffer->nchan_buffer_full;

    n_ch_cldfb = hTcBuffer->nchan_transport_rend - hTcBuffer->nchan_buffer_full;



#ifdef DEBUGGING

    assert( st_ivas->hDecoderConfig->Opt_tsm == 0 );

lib_dec/lib_dec.c

+1 −4
Original line number Diff line number Diff line
@@ -4336,15 +4336,12 @@ static ivas_error evs_dec_main( 




#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS

    if ( !st_ivas->hDecoderConfig->Opt_tsm )

    {

    }

    if ( st_ivas->hDecoderConfig->Opt_tsm )

    {

        /* BE workaround */

        int16_t pcm_buf_local[L_FRAME48k * MAX_OUTPUT_CHANNELS_IN_DIEGETIC_PAN];



        if ( floatBuf != NULL )

        if ( floatBuf == NULL )

        {

            return ( IVAS_ERROR( IVAS_ERR_UNEXPECTED_NULL_POINTER, "APA buffer is missing in JBM processing\n" ) );

        }