Commit 7860e719 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

fix crash in OSBA to CUSTOM_LS decoding

parent f6923e0c

lib_dec/ivas_osba_dec.c

+7 −1
Original line number Diff line number Diff line
@@ -319,7 +319,13 @@ ivas_error ivas_osba_render( 
        sba_ch_idx = 0;

    }



    for ( n = 0; n < nchan_out; n++ )

    for ( n = 0; n < 

#ifdef NONBE_FIX_798_OSBA_MC_DEC_CRASH

        max(nchan_out,nchan_ism);

#else

		nchan_out;

#endif

		n++ )

    {

        p_tmp_ism_out[n] = &tmp_ism_out[n][0];

    }

lib_rend/ivas_output_init.c

+3 −4
Original line number Diff line number Diff line
@@ -377,15 +377,14 @@ int16_t ivas_get_nchan_buffers_dec( 
            {

                nchan_out_buff = max( nchan_out_buff + st_ivas->nchan_ism, audioCfg2channels( output_config ) ); /* needed for iivas_spar_dec_upmixer_sf() which is based on 'nchan_out' */

            }

#ifdef NONBE_FIX_798_OSBA_MC_DEC_CRASH

            nchan_out_buff = max( nchan_out_buff, nchan_internal + st_ivas->nchan_ism );

#endif

        }

        else if ( output_config == IVAS_AUDIO_CONFIG_EXTERNAL )

        {

            nchan_out_buff = st_ivas->hDecoderConfig->nchan_out + st_ivas->nchan_ism; /*take into account sba_ch_idx' in ivas_dec() */

        }



#ifdef NONBE_FIX_798_OSBA_MC_DEC_CRASH

        nchan_out_buff = max( nchan_out_buff, nchan_internal + st_ivas->nchan_ism );

#endif

        nchan_out_buff = min( nchan_out_buff, MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS );

    }

    else if ( st_ivas->ivas_format == MC_FORMAT )