Commit c6534870 authored by vaclav's avatar vaclav
Browse files

Fix build when VARIABLE_SPEED_DECODING is under DEBUGGING and deactivated.

parent a24d3b7e

apps/decoder.c

+4 −6
Original line number Diff line number Diff line
@@ -440,14 +440,17 @@ int main( 


    if ( arg.voipMode )

    {

#ifdef VARIABLE_SPEED_DECODING

        if ( ( error = IVAS_DEC_EnableVoIP( hIvasDec, IVAS_DEC_VOIP_MODE_VOIP, 100, 60, arg.inputFormat ) ) != IVAS_ERR_OK )

#else

        if ( ( error = IVAS_DEC_EnableVoIP( hIvasDec, 60, arg.inputFormat ) ) != IVAS_ERR_OK )

#endif

        {

            fprintf( stderr, "\nCould not enable VOIP: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

            goto cleanup;

        }

    }

#ifdef VARIABLE_SPEED_DECODING

#ifdef DEBUGGING

    else if ( arg.variableSpeedMode )

    {

        if ( ( error = IVAS_DEC_EnableVoIP( hIvasDec, IVAS_DEC_VOIP_MODE_VARIABLE_SPEED, arg.tsmScale, 60, arg.inputFormat ) ) != IVAS_ERR_OK )
@@ -457,7 +460,6 @@ int main( 
        }

    }

#endif

#endif



#ifdef DEBUGGING

    /*-----------------------------------------------------------------*
@@ -491,7 +493,6 @@ int main( 
        IVAS_DEC_PrintConfigWithBitstream( hIvasDec, arg.quietModeEnabled, bit_stream, num_bits );



#ifdef VARIABLE_SPEED_DECODING

#ifdef DEBUGGING

        if ( arg.variableSpeedMode )

        {

            if ( arg.tsmScaleFileEnabled )
@@ -503,7 +504,6 @@ int main( 
                fprintf( stdout, "Variable speed factor:  %i\n", arg.tsmScale );

            }

        }

#endif

#endif

    }
@@ -688,7 +688,6 @@ int main( 
        error = decodeVoIP( arg, hBsReader, hIvasDec );

    }

#ifdef VARIABLE_SPEED_DECODING

#ifdef DEBUGGING

    else if ( arg.variableSpeedMode )

    {

        error = decodeVariableSpeed( arg, hBsReader, headRotReader,
@@ -697,7 +696,6 @@ int main( 
#endif

                                     refRotReader, referenceVectorReader, hIvasDec );

    }

#endif

#endif

    else

    {

lib_com/options.h

+3 −1
Original line number Diff line number Diff line
@@ -128,6 +128,9 @@ 
//#define DEBUG_AGC_ENCODER_CMD_OPTION            /* Ability to force enable or disable AGC behaviour in DIRAC/SPAR via command line option */

#define DEBUG_JBM_CMD_OPTION                    /* ability for telling the decoder the frontend fetch size and to not delay compensate for bad frames at the beginning */

#endif



#define VARIABLE_SPEED_DECODING                 /* variable speed decoding employing the JBM functioniality; move to DEBUGGING after build for disabled is fixed */



/* #################### End DEBUGGING switches ############################ */



/* ################# Start DEVELOPMENT switches ######################## */
@@ -145,7 +148,6 @@ 
#define USE_HRIR_128_METH5_IRC_53_Q10_SYML_ITRP1_48000  /* Dolby (Orange, FhG) : Contribution 36 - SBA HRIR update */

#define UPDATE_SBA_FILTER                               /* Dolby (Orange, FhG) : Contribution 36 - SBA HRIR update */



#define VARIABLE_SPEED_DECODING                         /* variable speed decoding employing the JBM functioniality; move to DEBUGGING after build for disabled is fixed */

/*#define FIX_XXX_JBM_FIFO_BUFFER  */                   /* FhG: prevent wraparound of a length identifier in cause of large frames and many channels*/



#define FIX_393_459_460_SBA_MD                          /* FhG: fix issues 393, 459, 460, 494 all related to MD buffers and the read index for accessing them */