Commit a2b27edb authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into 1359-ivas_rend-omasa-binaural-output-level-not-matching-internal-rendering
parents 20e30949 9d63df44

lib_com/tools.c

+3 −1
Original line number Diff line number Diff line
@@ -1743,9 +1743,11 @@ int16_t is_numeric_float( 
    float x )

{

#ifdef CODE_IMPROVEMENTS

    int16_t retval;

#define WMC_TOOL_SKIP

    return (int16_t) ( !isnan( x ) && !isinf( x ) );

    retval = (int16_t) ( !isnan( x ) && !isinf( x ) );

#undef WMC_TOOL_SKIP

    return retval;

#else

#ifndef BASOP_NOGLOB

    union float_int

lib_rend/lib_rend.c

+7 −3
Original line number Diff line number Diff line
@@ -3308,11 +3308,15 @@ static void *getInputByIndex( 
        case IVAS_REND_AUDIO_CONFIG_TYPE_MASA:

            return (input_masa *) inputsArray + index;

        default:

            break;

    }



    /* this should be unreachable */

    assert( 0 );



    /* include a final return to make the linter happy and avoid problems with wmc_tool (see #1355) */

    return NULL;

}

}

#endif



static ivas_error findFreeInputSlot(