Commit 48ba5f8b authored by norvell's avatar norvell
Browse files

Merge branch '2042_ref_Port1811_Test_clipping' into 'ivas-float-update'

2042 ref port1811 test clipping

See merge request !2270
parents 6cf0e3e8 09fdd5e5
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -211,6 +211,8 @@ int main(
#ifdef DEBUG_SBA
    int16_t numTransportChannels = 1;
#endif
    int32_t noClipping;
    float maxOverload, minOverload;
#endif

#ifdef DEBUGGING
@@ -820,6 +822,12 @@ int main(
    }

#ifdef DEBUGGING
    if ( ( noClipping = IVAS_ENC_GetNoCLipping( hIvasEnc, &maxOverload, &minOverload ) ) > 0 )
    {
        fprintf( stdout, "Core input overload detected: %d samples!!!\n", noClipping );
        fprintf( stdout, "Max overload value: %f \n", maxOverload );
        fprintf( stdout, "Min overload value: %f \n\n", minOverload );
    }
    print_snr();
#endif
    /*------------------------------------------------------------------------------------------*
+11 −0
Original line number Diff line number Diff line
@@ -215,6 +215,17 @@ void mvr2r(
    const int16_t n  /* i  : vector size                                     */
);

#ifdef DEBUGGING
/*! r: number of overload samples */
uint32_t check_clipping(
    const float x[],    /* i  : input vector                                   */
    const int16_t n,    /* i  : vector size                                    */
    float *maxOverload, /* i/o: max overload value                             */
    float *minOverload  /* i/o: max overload value                             */
);

#endif
/*! r: number of clipped samples */
void mvs2s(
    const int16_t x[], /* i  : input vector                                    */
    int16_t y[],       /* o  : output vector                                   */
+40 −0
Original line number Diff line number Diff line
@@ -373,6 +373,46 @@ void mvs2s(
    return;
}

#ifdef DEBUGGING
/*! r: number of overload samples */
uint32_t check_clipping(
    const float x[],    /* i  : input vector  */
    const int16_t n,    /* i  : vector size   */
    float *maxOverload, /* i/o: max overload value */
    float *minOverload  /* i/o: max overload value */
)
{
    int16_t i;
    float temp;
    uint32_t noClipping = 0;

    for ( i = 0; i < n; i++ )
    {
        temp = x[i];

        if ( temp >= ( MAX16B_FLT + 0.5f ) )
        {
            noClipping++;
            if ( temp > *maxOverload )
            {
                *maxOverload = temp;
            }
        }
        else if ( temp <= ( MIN16B_FLT - 0.5f ) )
        {
            noClipping++;
            if ( temp < *minOverload )
            {
                *minOverload = temp;
            }
        }
    }

    return noClipping;
}

#endif
/*! r: number of clipped samples */
uint32_t mvr2s(
    const float x[], /* i  : input vector  */
    int16_t y[],     /* o  : output vector */
+4 −0
Original line number Diff line number Diff line
@@ -501,6 +501,10 @@ ivas_error ivas_cpe_enc(

    for ( n = 0; n < n_CoreChannels; n++ )
    {
#ifdef DEBUGGING
        st_ivas->noClipping += check_clipping( hCPE->hCoreCoder[n]->input, input_frame, &st_ivas->maxOverload, &st_ivas->minOverload );

#endif
        error = pre_proc_front_ivas( NULL, hCPE, hCPE->element_brate, nb_bits_metadata, input_frame, n, old_inp_12k8[n], old_inp_16k[n],
                                     &ener[n], &relE[n], A[n], Aw[n], epsP[n], lsp_new[n], lsp_mid[n], &vad_hover_flag[n], &attack_flag[n],
                                     realBuffer[n], imagBuffer[n], old_wsp[n], pitch_fr[n], voicing_fr[n], &loc_harm[n], &cor_map_sum[n], &vad_flag_dtx[n], enerBuffer[n],
+5 −0
Original line number Diff line number Diff line
@@ -413,6 +413,11 @@ ivas_error ivas_init_encoder(

    st_ivas->nchan_transport = -1;

#ifdef DEBUGGING
    st_ivas->noClipping = 0;
    st_ivas->maxOverload = 0;
    st_ivas->minOverload = 0;
#endif
    /*-----------------------------------------------------------------*
     * Allocate floating-point input audio buffers
     *-----------------------------------------------------------------*/
Loading