Commit 8ddd209d authored by Jan Kiene's avatar Jan Kiene
Browse files

Accept FIX_1550_WRONG_RENDER_FRAMESIZE_PRINTOUT

parent 73c9d62c

apps/decoder.c

+0 −94
Original line number Diff line number Diff line
@@ -498,98 +498,6 @@ int main( 
        }

    }



#ifndef FIX_1550_WRONG_RENDER_FRAMESIZE_PRINTOUT

#ifdef DEBUGGING

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

     * Preview bitstream and print config information

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



    if ( arg.voipMode )

    {

        if ( ( error = printBitstreamInfoVoip( arg, hBsReader, hIvasDec ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "Error while previewing VoIP bitstream: %s\n", ivas_error_to_string( error ) );

            goto cleanup;

        }

    }

    else

    {

        uint16_t bit_stream[IVAS_MAX_BITS_PER_FRAME + 4 * 8];

        int16_t num_bits;

        int16_t bfi = 0;

        do

        {

            if ( BS_Reader_ReadFrame_short( hBsReader, bit_stream, &num_bits, &bfi ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "\nError: input bitstream file %s couldn't be read\n\n", arg.inputBitstreamFilename );

                goto cleanup;

            }

        } while ( bfi || num_bits < MIN_NUM_BITS_ACTIVE_FRAME || num_bits == NUM_BITS_SID_IVAS_5K2 );



        BS_Reader_Rewind( hBsReader );



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



#ifdef VARIABLE_SPEED_DECODING

        if ( arg.tsmEnabled )

        {

            if ( arg.tsmScaleFileEnabled )

            {

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

            }

            else

            {

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

            }

        }

#endif

    }



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

     * Open Error pattern file for simulation

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



    if ( arg.FEPatternFileName != NULL )

    {

        if ( ( FEC_pattern = fopen( arg.FEPatternFileName, "rb" ) ) == NULL )

        {

            fprintf( stderr, "Error: Missing or incorrect FEC filename specification\n\n" );

            usage_dec();

            goto cleanup;

        }

    }



#ifdef DEBUG_SBA_AUDIO_DUMP

    ivas_open_sba_decoder_debug_files( arg.output_Fs, 1, 1 );

#endif



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

     * Print information about FEC

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



    if ( !arg.voipMode && ( arg.FEPatternFileName != NULL || arg.FER > 0 ) )

    {

        if ( arg.FEPatternFileName != NULL )

        {

            fprintf( stdout, "FEC:                    %s\n", arg.FEPatternFileName );

        }

        else

        {

            fprintf( stdout, "FEC:                    %.2f %%\n", arg.FER );

        }

    }

#else

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

     * Print config information

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



    if ( ( error = IVAS_DEC_PrintConfig( hIvasDec, 1, arg.voipMode ) ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\nIVAS_DEC_PrintConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

        goto cleanup;

    }

#endif

#endif



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

     * Load renderer configuration from file
@@ -779,7 +687,6 @@ int main( 
        hHrtfBinary.hrtf_set_audio_cfg = IVAS_AUDIO_CONFIG_INVALID;

    }



#ifdef FIX_1550_WRONG_RENDER_FRAMESIZE_PRINTOUT

#ifdef DEBUGGING

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

     * Preview bitstream and print config information
@@ -869,7 +776,6 @@ int main( 
        fprintf( stderr, "\nIVAS_DEC_PrintConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

        goto cleanup;

    }

#endif

#endif



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

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -162,7 +162,6 @@ 
#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define FIX_FLOAT_1539_G192_FORMAT_SWITCH               /* Nokia: reintroduce format switching for g192 bitstreams */

#define FIX_1550_WRONG_RENDER_FRAMESIZE_PRINTOUT        /* Dolby: float issue 1550: Wrong render framesize printout */



/* #################### End BE switches ################################## */