Commit d9b02f27 authored by malenov's avatar malenov
Browse files

make read/write operations exclusive

parent 88847fb7

lib_enc/ivas_core_pre_proc_front.c

+19 −11
Original line number Diff line number Diff line
@@ -825,12 +825,14 @@ ivas_error pre_proc_front_ivas_fx( 
    move16();



#ifdef DEBUG_FORCE_DIR

    dbgwrite( &st->vad_flag, sizeof( int16_t ), 1, 1, "res/force_vad_flag.enf" );



    if ( st->force_dir[0] != '\0' )

    {

        dbgread( &st->vad_flag, sizeof( int16_t ), 1, fname( st->force_dir, "force_vad_flag.enf", -1, -1, -1 ) );

    }

    else

    {

        dbgwrite( &st->vad_flag, sizeof( int16_t ), 1, 1, "res/force_vad_flag.enf" );

    }

#endif



    test();
@@ -911,12 +913,14 @@ ivas_error pre_proc_front_ivas_fx( 
    }



#ifdef DEBUG_FORCE_DIR

    dbgwrite( &st->bwidth, sizeof( int16_t ), 1, 1, "res/force_bwidth.enf" );



    if ( st->force_dir[0] != '\0' )

    {

        dbgread( &st->bwidth, sizeof( int16_t ), 1, fname( st->force_dir, "force_bwidth.enf", -1, -1, -1 ) );

    }

    else

    {

        dbgwrite( &st->bwidth, sizeof( int16_t ), 1, 1, "res/force_bwidth.enf" );

    }

#endif
@@ -1511,12 +1515,14 @@ ivas_error pre_proc_front_ivas_fx( 
    smc_dec = ivas_smc_gmm_fx( st, hStereoClassif, localVAD_HE_SAD, Etot_fx, lsp_new_fx, *cor_map_sum_fx /*Q8*/, epsP_fx, PS_fx, non_staX_fx, *relE_fx, &high_lpn_flag, flag_spitch, Qfact_PS, *epsP_fx_q, hSpMusClas->past_PS_Q ); /* Q0 */



#ifdef DEBUG_FORCE_DIR

    dbgwrite( &smc_dec, sizeof( int16_t ), 1, 1, "res/force_smc_dec_loc1.enf" );



    if ( st->force_dir[0] != '\0' )

    {

        dbgread( &smc_dec, sizeof( int16_t ), 1, fname( st->force_dir, "force_smc_dec_loc1.enf", -1, -1, -1 ) );

    }

    else

    {

        dbgwrite( &smc_dec, sizeof( int16_t ), 1, 1, "res/force_smc_dec_loc1.enf" );

    }

#endif



#ifdef DEBUGGING
@@ -1726,11 +1732,6 @@ ivas_error pre_proc_front_ivas_fx( 
    }



#ifdef DEBUG_FORCE_DIR

    dbgwrite( &smc_dec, sizeof( int16_t ), 1, 1, "res/force_smc_dec_loc2.enf" );

    dbgwrite( &st->sp_aud_decision0, sizeof( int16_t ), 1, 1, "res/force_sp_aud_decision0.enf" );

    dbgwrite( &st->sp_aud_decision1, sizeof( int16_t ), 1, 1, "res/force_sp_aud_decision1.enf" );

    dbgwrite( &st->sp_aud_decision2, sizeof( int16_t ), 1, 1, "res/force_sp_aud_decision2.enf" );



    if ( st->force_dir[0] != '\0' )

    {

        dbgread( &smc_dec, sizeof( int16_t ), 1, fname( st->force_dir, "force_smc_dec_loc2.enf", -1, -1, -1 ) );
@@ -1738,6 +1739,13 @@ ivas_error pre_proc_front_ivas_fx( 
        dbgread( &st->sp_aud_decision1, sizeof( int16_t ), 1, fname( st->force_dir, "force_sp_aud_decision1.enf", -1, -1, -1 ) );

        dbgread( &st->sp_aud_decision2, sizeof( int16_t ), 1, fname( st->force_dir, "force_sp_aud_decision2.enf", -1, -1, -1 ) );

    }

    else

    {

        dbgwrite( &smc_dec, sizeof( int16_t ), 1, 1, "res/force_smc_dec_loc2.enf" );

        dbgwrite( &st->sp_aud_decision0, sizeof( int16_t ), 1, 1, "res/force_sp_aud_decision0.enf" );

        dbgwrite( &st->sp_aud_decision1, sizeof( int16_t ), 1, 1, "res/force_sp_aud_decision1.enf" );

        dbgwrite( &st->sp_aud_decision2, sizeof( int16_t ), 1, 1, "res/force_sp_aud_decision2.enf" );    

    }

#endif



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

lib_enc/ivas_decision_matrix_enc.c

+4 −2
Original line number Diff line number Diff line
@@ -256,12 +256,14 @@ void ivas_decision_matrix_enc_fx( 
#endif



#ifdef DEBUG_FORCE_DIR

    dbgwrite( &st->core, sizeof( int16_t ), 1, 1, "res/force_core.enf" );



    if ( st->force_dir[0] != '\0' )

    {

        dbgread( &st->core, sizeof( int16_t ), 1, fname( st->force_dir, "force_core.enf", -1, -1, -1 ) );

    }

    else

    {

        dbgwrite( &st->core, sizeof( int16_t ), 1, 1, "res/force_core.enf" );

    }

#endif



    /* TCX not available at low bitrates -> replace it by GSC */

lib_enc/ivas_stereo_classifier.c

+4 −2
Original line number Diff line number Diff line
@@ -218,12 +218,14 @@ Word16 select_stereo_mode( 
    }



#ifdef DEBUG_FORCE_DIR

    dbgwrite( &element_mode, sizeof( int16_t ), 1, 1, "res/force_element_mode.enf" );



    if ( hCPE->hCoreCoder[0]->force_dir[0] != '\0' )

    {

        dbgread( &element_mode, sizeof( int16_t ), 1, fname( hCPE->hCoreCoder[0]->force_dir, "force_element_mode.enf", -1, -1, -1 ) );

    }

    else

    {

        dbgwrite( &element_mode, sizeof( int16_t ), 1, 1, "res/force_element_mode.enf" );

    }

#endif



    /* switch from LRTD to DFT when xtalk_decision goes from 0->1 (note: this special case is not handled in the xtalk classifier) */