Commit ba524608 authored by bayers's avatar bayers
Browse files

fix JBM problems

parent b4c76218

lib_dec/ivas_jbm_dec.c

+15 −0
Original line number Diff line number Diff line
@@ -702,6 +702,7 @@ ivas_error ivas_jbm_dec_render( 
    *nSamplesRendered = 0;

    while ( *nSamplesRendered < nSamplesAsked && st_ivas->hTcBuffer->n_samples_available > 0 )

    {

        uint16_t subframes_rendered = st_ivas->hTcBuffer->subframes_rendered;

        nSamplesAskedLocal = st_ivas->hTcBuffer->subframe_nbslots[st_ivas->hTcBuffer->subframes_rendered] * st_ivas->hTcBuffer->n_samples_granularity;

#endif
@@ -749,6 +750,7 @@ ivas_error ivas_jbm_dec_render( 
#ifdef API_5MS

                nSamplesRenderedLocal = min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal );

                ivas_ls_setup_conversion( st_ivas, st_ivas->nchan_transport, nSamplesRenderedLocal, p_tc, p_output );

                st_ivas->hTcBuffer->subframes_rendered++;

#else

            *nSamplesRendered = min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal );

            ivas_ls_setup_conversion( st_ivas, st_ivas->nchan_transport, *nSamplesRendered, p_tc, p_output );
@@ -802,6 +804,9 @@ ivas_error ivas_jbm_dec_render( 
#endif

                    }

                }

#ifdef API_5MS

                st_ivas->hTcBuffer->subframes_rendered++;

#endif

            }

            else /* ISM_MODE_DISC */

            {
@@ -883,6 +888,11 @@ ivas_error ivas_jbm_dec_render( 
                    ivas_binaural_cldfb_sf( st_ivas, *nSamplesRendered, p_output );

#endif

                }

#endif

#ifdef API_5MS

                {

                    st_ivas->hTcBuffer->subframes_rendered++;

                }

#endif

            }

        }
@@ -943,6 +953,9 @@ ivas_error ivas_jbm_dec_render( 
            ivas_sba_dec_render( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output );

#endif

            }

#ifdef API_5MS

            st_ivas->hTcBuffer->subframes_rendered++;

#endif

        }

        else if ( st_ivas->ivas_format == MC_FORMAT )

        {
@@ -1158,6 +1171,8 @@ ivas_error ivas_jbm_dec_render( 
#endif

            ivas_syn_output( p_output, nSamplesRenderedLocal, nchan_out, data + *nSamplesRendered * nchan_out );

        *nSamplesRendered += nSamplesRenderedLocal;



        st_ivas->hTcBuffer->subframes_rendered = subframes_rendered+1;

    }

#else

#ifdef DEBUGGING