Commit 2a99a2b6 authored by vaclav's avatar vaclav
Browse files

fix 5/10/20 ms renderer differences for object editing file

parent d6d107d7
Loading
Loading
Loading
Loading
+11 −4
Original line number Diff line number Diff line
@@ -3290,11 +3290,18 @@ static ivas_error decodeVoIP(
#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
        if ( arg.objEditEnabled && ( arg.objEditFileName != NULL ) )
        {
#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM
            if ( frame * num_subframes % IVAS_MAX_PARAM_SPATIAL_SUBFRAMES == 0 )
            {
#endif
                if ( ( error = ObjectEditFileReader_readNextFrame( objectEditFileReader ) ) != IVAS_ERR_OK )
                {
                    fprintf( stderr, "\nError: could not read object editing instructions from file: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
                    return error;
                }
#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM
            }
#endif
        }
#endif

@@ -3810,7 +3817,7 @@ static void do_object_editing(
        for ( obj_idx = 0; obj_idx < editableParameters->num_obj; obj_idx++ )
        {
#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM
            editableParameters->ism_metadata[obj_idx].gain = 0.5f + (float) ( ( ( frame * num_subframes / 4 ) + obj_idx * 50 ) % 250 ) / 250.0f;
            editableParameters->ism_metadata[obj_idx].gain = 0.5f + (float) ( ( ( frame * num_subframes / IVAS_MAX_PARAM_SPATIAL_SUBFRAMES ) + obj_idx * 50 ) % 250 ) / 250.0f;

#else
        editableParameters->ism_metadata[obj_idx].gain = 0.5f + (float) ( ( frame + obj_idx * 50 ) % 250 ) / 250.0f;