Commit be24f74c authored by Adam Mills's avatar Adam Mills
Browse files

Merge branch '766-split-rendering-missing-in-omasa' into 'isar_selection_branch' 

[split-non-be] Resolve # 766 "Split-rendering missing in OMASA"

See merge request !1449
parents c1e0e842 87f4113b

lib_dec/lib_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -1111,7 +1111,7 @@ ivas_error IVAS_DEC_GetSplitBinauralBitstream( 
    else

    {

#ifdef FIX_766_OMASA_SPLIT_REND

        /* TODO: check correctness: this is needed for OMASA-DISC, because the td-rend granularity is 240 samples at 48kHz, leading to wrong slot count. */

        /* this is needed for OMASA-DISC, because the td-rend granularity is 240 samples at 48kHz, leading to wrong slot count. */

        if ( st_ivas->ivas_format == MASA_ISM_FORMAT && st_ivas->ism_mode == ISM_MASA_MODE_DISC )

        {

            slots_rendered = st_ivas->hTcBuffer->n_samples_rendered / NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS );
@@ -1152,7 +1152,7 @@ ivas_error IVAS_DEC_GetSplitBinauralBitstream( 
    else

    {

#ifdef FIX_766_OMASA_SPLIT_REND

        /* TODO: check correctness: this is needed for OMASA-DISC, because the td-rend granularity is 240 samples at 48kHz, leading to wrong slot count. */

        /* this is needed for OMASA-DISC, because the td-rend granularity is 240 samples at 48kHz, leading to wrong slot count. */

        if ( st_ivas->ivas_format == MASA_ISM_FORMAT && st_ivas->ism_mode == ISM_MASA_MODE_DISC )

        {

            slots_rendered_new = st_ivas->hTcBuffer->n_samples_rendered / NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS );