Commit 364ea7cc authored by fotopoulou's avatar fotopoulou
Browse files

fixes after dirac rendering refactoring

parents 62ef5585 3521fbf8

lib_dec/ivas_dirac_dec.c

+5 −0
Original line number Diff line number Diff line
@@ -375,7 +375,12 @@ static ivas_error ivas_dirac_rend_config( 
    set_s( hDirACRend->proto_index_diff, 0, hDirACRend->num_outputs_diff );



    hDirACRend->sba_map_tc = sba_map_tc;



#ifdef SBA_AND_OBJECTS

    if ( ( st_ivas->ivas_format == SBA_FORMAT ) || ( st_ivas->ivas_format == SBA_ISM_FORMAT ) )

#else

    if ( st_ivas->ivas_format == SBA_FORMAT )

#endif

    {

        if ( st_ivas->sba_order > SBA_FOA_ORDER && ivas_total_brate >= IVAS_512k )

        {

lib_rend/ivas_dirac_rend.c

+11 −5
Original line number Diff line number Diff line
@@ -237,8 +237,11 @@ ivas_error ivas_spat_hSpatParamRendCom_config( 
/*-----------------------------------------------------------------*

 * set input parameters

 *-----------------------------------------------------------------*/



#ifdef OSBA_DISC_OBJ_MCT

    if ( ( ivas_format == SBA_FORMAT || ivas_format == SBA_ISM_FORMAT ) && flag_config == DIRAC_RECONFIGURE )

#else

    if ( ivas_format == SBA_FORMAT && flag_config == DIRAC_RECONFIGURE )

#endif

    {

        if ( hodirac_flag && hSpatParamRendCom->azimuth2 == NULL )

        {
@@ -298,8 +301,11 @@ ivas_error ivas_spat_hSpatParamRendCom_config( 
        {

            return error;

        }



#ifdef OSBA_DISC_OBJ_MCT

        if ( ivas_format == MASA_FORMAT || ( ( ivas_format == SBA_FORMAT || ivas_format == SBA_ISM_FORMAT ) && hodirac_flag ) )

#else

        if ( ivas_format == MASA_FORMAT || ( ivas_format == SBA_FORMAT && hodirac_flag ) )

#endif

        {

            if ( ( error = ivas_dirac_allocate_parameters( hSpatParamRendCom, 2 ) ) != IVAS_ERR_OK )

            {