Commit 2eae948a authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

fix crash with OMASA to EXT conditions

parent 810fd5e5

lib_dec/ivas_init_dec.c

+6 −1
Original line number Diff line number Diff line
@@ -1891,7 +1891,12 @@ ivas_error ivas_init_decoder( 
            }

        }



        if ( st_ivas->renderer_type == RENDERER_DIRAC && ( st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_DISC ) )

        if ( ( st_ivas->renderer_type == RENDERER_DIRAC

#ifdef OBJ_EDITING_PARAMISM

               || st_ivas->renderer_type == RENDERER_DISABLE

#endif

               ) &&

             ( st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_DISC ) )

        {

            /* Allocate 'hIsmRendererData' handle and memory for delay buffer within 'hMasaIsmData' */

            if ( ( error = ivas_omasa_separate_object_renderer_open( st_ivas ) ) != IVAS_ERR_OK )

lib_dec/lib_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -2121,7 +2121,7 @@ ivas_error IVAS_DEC_GetObjectMetadata( 
            metadata->non_diegetic_flag = hIsmMeta->non_diegetic_flag;

        }

#endif

        else if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC )

        else if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC || st_ivas->ism_mode == ISM_MASA_MODE_DISC )

        {

            if ( st_ivas->hIsmRendererData->has_been_edited )

            {