Commit 361e89e8 authored by laitinenmik's avatar laitinenmik
Browse files

Correct metadata update subframe for omasa jbm td rendering

parent 5ff2c140

lib_dec/ivas_dec.c

+0 −1
Original line number Diff line number Diff line
@@ -560,7 +560,6 @@ ivas_error ivas_dec( 
        }

    }

#ifdef MASA_AND_OBJECTS

    // Todo OMASA JBM: Check here for p_output vs. output and possibly also metadata indices

    else if ( st_ivas->ivas_format == MASA_ISM_FORMAT )

    {

        int16_t nchan_ism, nchan_transport_ism;

lib_dec/ivas_dirac_dec.c

+0 −1
Original line number Diff line number Diff line
@@ -929,7 +929,6 @@ ivas_error ivas_dirac_dec_config( 
            else

            {

                /* This is required to keep BE in rate switching. This probably means that 1TC and 2TC MASA perform differently. */

                /* TODO: refactor merge: does this need to be adapted for OMASA? */

#ifdef SPLIT_REND_WITH_HEAD_ROT_PARAMBIN

                if ( st_ivas->hDiracDecBin[0]->h_freq_domain_decorr_ap_params != NULL && !( st_ivas->ivas_format == MASA_FORMAT && st_ivas->nSCE > 0 ) )

#else

lib_dec/ivas_objectRenderer_internal.c

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ ivas_error ivas_td_binaural_renderer_sf( 
#ifdef MASA_AND_OBJECTS

    if ( st_ivas->ivas_format == MASA_ISM_FORMAT )

    {

        ism_md_subframe_update_jbm = max( 0, st_ivas->hTcBuffer->nb_subframes - 4 ); /* Todo Nokia: Update this value to match the value of nonJBM rendering. */

        ism_md_subframe_update_jbm = max( 0, st_ivas->hTcBuffer->nb_subframes - 2 );

    }

#endif