Commit 0fbfb763 authored by malenov's avatar malenov
Browse files

fix element_mode read/write location

parent 8926070a

lib_enc/ivas_stereo_classifier.c

+53 −12
Original line number Diff line number Diff line
@@ -217,17 +217,6 @@ Word16 select_stereo_mode( 
        }

    }



#ifdef DEBUG_FORCE_DIR

    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) */

    test();

    test();
@@ -252,6 +241,17 @@ Word16 select_stereo_mode( 
        }

    }



#ifdef DEBUG_FORCE_DIR

    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



    IF( NE_16( hCPE->last_element_mode, element_mode ) )

    {

        test();
@@ -914,6 +914,16 @@ void unclr_classifier_td_fx( 
        move16();

    }



#ifdef DEBUG_FORCE_DIR

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

    {

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

    }

    else

    {

        dbgwrite( &hStereoClassif->unclr_decision, sizeof( int16_t ), 1, 1, "res/force_unclr_decision.enf" );

    }

#endif



    return;

}
@@ -1021,6 +1031,16 @@ void unclr_classifier_dft_fx( 
        move16();

    }



#ifdef DEBUG_FORCE_DIR

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

    {

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

    }

    else

    {

        dbgwrite( &hStereoClassif->unclr_decision, sizeof( int16_t ), 1, 1, "res/force_unclr_decision.enf" );

    }

#endif



    return;

}
@@ -1169,6 +1189,17 @@ void xtalk_classifier_td_fx( 
        move16();

    }



#ifdef DEBUG_FORCE_DIR

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

    {

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

    }

    else

    {

        dbgwrite( &hStereoClassif->xtalk_decision, sizeof( int16_t ), 1, 1, "res/force_xtalk_decision.enf" );

    }

#endif



    return;

}
@@ -1389,7 +1420,6 @@ void xtalk_classifier_dft_fx( 
        move16();

    }





    /* updates */

    hItd->prev_m1_fx = m1;

    move32();
@@ -1400,6 +1430,17 @@ void xtalk_classifier_dft_fx( 
    hItd->prev_itd2 = itd2;

    move16();



#ifdef DEBUG_FORCE_DIR

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

    {

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

    }

    else

    {

        dbgwrite( &hStereoClassif->xtalk_decision, sizeof( int16_t ), 1, 1, "res/force_xtalk_decision.enf" );

    }

#endif



    return;

}