Commit c664f705 authored by vaclav's avatar vaclav
Browse files

updates within DEBUG_MODE_INFO to correctly output core-decoder synthesis in... 

updates within DEBUG_MODE_INFO to correctly output core-decoder synthesis in case of SCE/CPE/MCT switching
parent 6de27e94

lib_dec/ivas_cpe_dec.c

+5 −2
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ ivas_error ivas_cpe_dec( 


#ifdef DEBUG_MODE_INFO

    {

        float tmpF = ivas_total_brate / 1000.0f;

        float tmpF = hCPE->element_brate / 1000.0f;



        n = 1;

        if ( st_ivas->ini_frame == 0 && frame > 0 )
@@ -536,12 +536,15 @@ ivas_error ivas_cpe_dec( 
        for ( i = 0; i < n; i++ )

        {

            dbgwrite( &tmpF, sizeof( float ), 1, output_frame, fname( debug_dir, "element_brate", 0, cpe_id, DEC ) );

            dbgwrite( &hCPE->element_mode, 2, 1, output_frame, fname( debug_dir, "element_mode", 0, cpe_id, DEC ) );

            dbgwrite( &hCPE->element_mode, sizeof( int16_t ), 1, output_frame, fname( debug_dir, "element_mode", 0, cpe_id, DEC ) );



            for ( int16_t j = 0; j < CPE_CHANNELS; j++ )

            {

                dbgwrite( output[j], sizeof( float ), output_frame, 1, fname( debug_dir, "output.cpe", j, cpe_id, DEC ) );

            }

            tmpF = 0;

            dbgwrite( &tmpF, sizeof( float ), 1, output_frame, fname( debug_dir, "output.sce", 0, cpe_id, DEC ) );

            dbgwrite( &tmpF, sizeof( float ), 1, output_frame, fname( debug_dir, "output.mct", 0, cpe_id, DEC ) );

        }

    }

#endif

lib_dec/ivas_mct_dec.c

+13 −0
Original line number Diff line number Diff line
@@ -250,6 +250,19 @@ ivas_error ivas_mct_dec( 
#endif

    }



#ifdef DEBUG_MODE_INFO

    for ( cpe_id = 0; cpe_id < nCPE; cpe_id++ )

    {

        float tmpF = st_ivas->hCPE[cpe_id]->element_brate / 1000.0f;

        dbgwrite( &tmpF, sizeof( float ), 1, output_frame, fname( debug_dir, "element_brate", 0, cpe_id, DEC ) );



        dbgwrite( output[0], sizeof( float ), output_frame, 1, fname( debug_dir, "output.mct", 0, cpe_id, DEC ) );

        tmpF = 0;

        dbgwrite( &tmpF, sizeof( float ), 1, output_frame, fname( debug_dir, "output.sce", 0, cpe_id, DEC ) );

        dbgwrite( &tmpF, sizeof( float ), 1, output_frame, fname( debug_dir, "output.cpe", 0, cpe_id, DEC ) );

    }

#endif



    wmops_sub_end();

    return error;

}

lib_dec/ivas_sce_dec.c

+5 −1
Original line number Diff line number Diff line
@@ -286,13 +286,17 @@ ivas_error ivas_sce_dec( 
        for ( i = 0; i < n; i++ )

        {

            dbgwrite( &tmpF, sizeof( float ), 1, output_frame, fname( debug_dir, "element_brate", 0, sce_id, DEC ) );

            dbgwrite( &st->element_mode, 2, 1, output_frame, fname( debug_dir, "element_mode", 0, sce_id, DEC ) );

            dbgwrite( &st->element_mode, sizeof( int16_t ), 1, output_frame, fname( debug_dir, "element_mode", 0, sce_id, DEC ) );



            dbgwrite( output, sizeof( float ), output_frame, 1, fname( debug_dir, "output.sce", 0, sce_id, DEC ) );

            tmpF = 0;

            dbgwrite( &tmpF, sizeof( float ), 1, output_frame, fname( debug_dir, "output.cpe", 0, sce_id, DEC ) );

            dbgwrite( &tmpF, sizeof( float ), 1, output_frame, fname( debug_dir, "output.mct", 0, sce_id, DEC ) );

        }

    }

#endif





    wmops_sub_end();

    return error;

}

lib_enc/ivas_cpe_enc.c

+5 −3
Original line number Diff line number Diff line
@@ -425,9 +425,11 @@ ivas_error ivas_cpe_enc( 
    }



#ifdef DEBUG_MODE_INFO

    dbgwrite( sts[0]->input - NS2SA( sts[0]->input_Fs, ACELP_LOOK_NS ), 4, input_frame, 1, "res/input_DMX" );

    dbgwrite( sts[1]->input - NS2SA( sts[1]->input_Fs, ACELP_LOOK_NS ), 4, input_frame, 1, "res/input_DMX.ch2" );

    dbgwrite( &hCPE->element_mode, 2, 1, input_frame, "res/element_mode" );

    for ( n = 0; n < n_CoreChannels; n++ )

    {

        dbgwrite( sts[0]->input - NS2SA( sts[0]->input_Fs, ACELP_LOOK_NS ), sizeof( float ), input_frame, 1, fname( debug_dir, "input_DMX", n, sts[n]->id_element, ENC ) );

    }

    dbgwrite( &hCPE->element_mode, sizeof( int16_t ), 1, input_frame, fname( debug_dir, "element_mode", 0, sts[0]->id_element, ENC ) );

#endif



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

lib_enc/ivas_sce_enc.c

+11 −1
Original line number Diff line number Diff line
@@ -177,8 +177,10 @@ ivas_error ivas_sce_enc( 
#endif



#ifdef DEBUG_MODE_INFO

    dbgwrite( st->input - NS2SA( st->input_Fs, ACELP_LOOK_NS ), 4, input_frame, 1, "res/input_DMX" );

    dbgwrite( st->input - NS2SA( st->input_Fs, ACELP_LOOK_NS ), sizeof( float ), input_frame, 1, "res/input_DMX" );

    dbgwrite( &st->element_mode, sizeof( int16_t ), 1, input_frame, fname( debug_dir, "element_mode", 0, st->id_element, ENC ) );

#endif



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

     * Front Pre-processing

     *----------------------------------------------------------------*/
@@ -216,6 +218,7 @@ ivas_error ivas_sce_enc( 
    /*----------------------------------------------------------------*

     * Write IVAS format signaling in SID frames

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



#ifdef ALIGN_SID_SIZE

    if ( st->core_brate == SID_2k40 )

#else
@@ -267,6 +270,13 @@ ivas_error ivas_sce_enc( 
    hSCE->last_element_brate = hSCE->element_brate;

#endif



#ifdef DEBUG_MODE_INFO

    {

        float tmpF = hSCE->element_brate / 1000.0f;

        dbgwrite( &tmpF, sizeof( float ), 1, input_frame, fname( debug_dir, "element_brate", 0, sce_id, ENC ) );

    }

#endif



    wmops_sub_end();



    return error;