Commit 86d48894 authored by vaclav's avatar vaclav
Browse files

fix

parent 926beeda

lib_rend/ivas_rotation_fx.c

+1 −2
Original line number Diff line number Diff line
@@ -1434,8 +1434,7 @@ ivas_error ivas_combined_orientation_open_fx( 
    move32();

    move16();



    ( *hCombinedOrientationData )

        ->Quaternion_prev_extOrientation = identity;

    ( *hCombinedOrientationData )->Quaternion_prev_extOrientation = identity;

    ( *hCombinedOrientationData )->Quaternion_frozen_ext = identity;

    ( *hCombinedOrientationData )->Quaternion_frozen_head = identity;

    set_zero_fx( ( *hCombinedOrientationData )->chEneIIR_fx[0], MASA_FREQUENCY_BANDS );

lib_rend/lib_rend_fx.c

+28 −6
Original line number Diff line number Diff line
@@ -5011,14 +5011,19 @@ ivas_error IVAS_REND_FeedInputAudio_fx( 
        return IVAS_ERR_UNEXPECTED_NULL_POINTER;

    }



    test();

    cldfb2tdShift = ( inputAudio.config.is_cldfb ) ? 1 : 0;

    cldfb2tdShift = 0;

    move16();

    if ( inputAudio.config.is_cldfb )

    {

        cldfb2tdShift = 1;

        move16();

    }



    test();

    test();

    test();

    test();

    IF( inputAudio.config.numSamplesPerChannel <= 0 || ( L_FRAME_MAX < inputAudio.config.numSamplesPerChannel && inputAudio.config.is_cldfb == 0 ) ||

    IF( inputAudio.config.numSamplesPerChannel <= 0 || ( LT_16( L_FRAME_MAX, inputAudio.config.numSamplesPerChannel ) && inputAudio.config.is_cldfb == 0 ) ||

        ( ( shl( L_FRAME_MAX, cldfb2tdShift ) ) < inputAudio.config.numSamplesPerChannel && inputAudio.config.is_cldfb == 1 ) )

    {

        return IVAS_ERROR( IVAS_ERR_INVALID_BUFFER_SIZE, "Buffer size outside of supported range" );
@@ -5030,6 +5035,8 @@ ivas_error IVAS_REND_FeedInputAudio_fx( 
        return IVAS_ERR_WRONG_NUM_CHANNELS;

    }



    test();

    test();

    test();

    move32(); // move added for typecasting

    IF( EQ_32( getAudioConfigType( hIvasRend->outputConfig ), IVAS_REND_AUDIO_CONFIG_TYPE_BINAURAL ) &&
@@ -8563,7 +8570,14 @@ static ivas_error renderInputSba( 
    move32();

    inAudio = sbaInput->base.inputBuffer;



    cldfb2tdShift = outAudio.config.is_cldfb ? 1 : 0;

    cldfb2tdShift = 0;

    move16();

    if ( outAudio.config.is_cldfb )

    {

        cldfb2tdShift = 1;

        move16();

    }

    test();

    IF( NE_32( L_shl( sbaInput->base.numNewSamplesPerChannel, cldfb2tdShift ), outAudio.config.numSamplesPerChannel ) &&

        NE_32( outConfig, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) && NE_32( outConfig, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )

    {
@@ -8934,7 +8948,15 @@ static ivas_error renderInputMasa( 


    inAudio = masaInput->base.inputBuffer;



    cldfb2tdShift = outAudio.config.is_cldfb ? 1 : 0;

    cldfb2tdShift = 0;

    move16();

    if ( outAudio.config.is_cldfb )

    {

        cldfb2tdShift = 1;

        move16();

    }

    test();

    test();

    IF( ( NE_32( L_shl( masaInput->base.numNewSamplesPerChannel, cldfb2tdShift ), outAudio.config.numSamplesPerChannel ) ) &&

        NE_32( outConfig, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) && NE_32( outConfig, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )

    {
@@ -8972,7 +8994,7 @@ static ivas_error renderInputMasa( 


        /* num_subframes = (int16_t) ( masaInput->base.inputBuffer.config.numSamplesPerChannel / ( *masaInput->base.ctx.pOutSampleRate / ( IVAS_NUM_FRAMES_PER_SEC * MAX_PARAM_SPATIAL_SUBFRAMES ) ) ); */

        num_subframes = (Word16) Mpy_32_16_1( *masaInput->base.ctx.pOutSampleRate, ONE_BY_SUBFR_PER_SEC_Q15 );

        num_subframes = BASOP_Util_Divide1616_Scale( num_subframes, masaInput->base.inputBuffer.config.numSamplesPerChannel, &exp );

        num_subframes = BASOP_Util_Divide1616_Scale( masaInput->base.inputBuffer.config.numSamplesPerChannel, num_subframes, &exp );

        num_subframes = shr( num_subframes, sub( 15, exp ) ); /* Q0 */



        IF( EQ_32( outConfig, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) || EQ_32( outConfig, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) )