Commit ba929d40 authored by vaclav's avatar vaclav
Browse files

- move IVAS_DEC_EnableVoIP() 

- print-out VoIP and VS info
parent 522379fc

apps/decoder.c

+41 −10
Original line number Diff line number Diff line
@@ -398,6 +398,31 @@ int main( 
        goto cleanup;

    }



#ifdef JBM_TSM_ON_TCS

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

     * Configure VoIP mode

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



    if ( arg.voipMode )

    {

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

        {

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

            goto cleanup;

        }

    }

#ifdef VARIABLE_SPEED_DECODING

    else if ( arg.variableSpeedMode )

    {

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

        {

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

            goto cleanup;

        }

    }

#endif

#endif



#ifdef DEBUGGING

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

     * Preview bitstream and print config information
@@ -428,6 +453,20 @@ int main( 
        BS_Reader_Rewind( hBsReader );



        IVAS_DEC_PrintConfigWithBitstream( hIvasDec, arg.quietModeEnabled, bit_stream, num_bits );



#ifdef VARIABLE_SPEED_DECODING

        if ( arg.variableSpeedMode )

        {

            if ( arg.tsmScaleFileEnabled )

            {

                fprintf( stdout, "Variable speed file:    %s\n", arg.tsmScaleFileName );

            }

            else

            {

                fprintf( stdout, "Variable speed factor:  %i\n", arg.tsmScale );

            }

        }

#endif

    }



    /*------------------------------------------------------------------------------------------*
@@ -592,30 +631,22 @@ int main( 


    if ( arg.voipMode )

    {

#ifdef JBM_TSM_ON_TCS

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

#else

#ifndef JBM_TSM_ON_TCS

#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

#endif

        {

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

            goto cleanup;

        }



#endif

        error = decodeVoIP( arg, hBsReader, hIvasDec );

    }

#ifdef VARIABLE_SPEED_DECODING

    else if ( arg.variableSpeedMode )

    {

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

        {

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

            goto cleanup;

        }

        error = decodeVariableSpeed( arg, hBsReader, headRotReader, refRotReader, referenceVectorReader, hIvasDec );

    }

#endif

lib_dec/lib_dec.c

+12 −1
Original line number Diff line number Diff line
@@ -2671,7 +2671,7 @@ static ivas_error printConfigInfo_dec( 
    }



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

     * Print number of output configuration

     * Print output configuration

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



    if ( st_ivas->ivas_format == MONO_FORMAT )
@@ -2790,6 +2790,17 @@ static ivas_error printConfigInfo_dec( 
        }

    }



#ifdef JBM_TSM_ON_TCS

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

     * Print VoIP mode info

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



    if ( st_ivas->hDecoderConfig->voip_active )

    {

        fprintf( stdout, "VoIP mode:              ON\n" );

    }

#endif



    return IVAS_ERR_OK;

}