Commit 60407004 authored by vaclav's avatar vaclav
Browse files

maintenance around FIX_899_VARIABLE_SPEED_DECODING

parent e1884be0

apps/decoder.c

+2 −0
Original line number Diff line number Diff line
@@ -2387,6 +2387,7 @@ static ivas_error decodeG192( 
                        fprintf( stderr, "\nError: input bitstream file couldn't be read: %s \n\n", arg.inputBitstreamFilename );

                        goto cleanup;

                    }



#ifdef FIX_899_VARIABLE_SPEED_DECODING

                    int16_t maxScaling;

                    /* max scaling as abs diff to the normal frame size in samples */
@@ -2466,6 +2467,7 @@ static ivas_error decodeG192( 
#ifdef SPLIT_REND_WITH_HEAD_ROT

            }

#endif



#ifdef FIX_899_VARIABLE_SPEED_DECODING

            if ( needNewFrame )

            {

lib_com/options.h

+2 −2
Original line number Diff line number Diff line
@@ -151,15 +151,15 @@ 
/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_643_PCA_OPTION                              /* VA: issue 643: rename PCA bypass command-line option */

#define FIX_899_VARIABLE_SPEED_DECODING                 /* FhG: Fix variable speed decoding                                    */





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

#define FIX_899_VARIABLE_SPEED_DECODING                       /* FhG: Fix variable speed decoding                                    */



/* #################### Start NON-BE switches ############################ */

/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */





#define NONBE_FIX_788_SBA_DTX_BR_SWITCHING                    /* VA: issue 787: fix Msan error in SBA BR switching with dtx in FOA encoding */

#define NONBE_FIX_856_TCX_LTP_SYNTH_FILTER                    /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/

#define NONBE_UNIFIED_DECODING_PATHS                          /* FhG: unify decoding paths   */

lib_dec/lib_dec.c

+2 −7
Original line number Diff line number Diff line
@@ -2573,11 +2573,7 @@ ivas_error IVAS_DEC_TSM_SetQuality( 
    const float quality       /* i  : target TSM quality                                                          */

)

{

    ivas_error error;



    error = IVAS_ERR_OK;



    if ( hIvasDec->st_ivas->hDecoderConfig->Opt_tsm == false )

    if ( hIvasDec->st_ivas->hDecoderConfig->Opt_tsm == FALSE )

    {

        return IVAS_ERR_TSM_NOT_ENABLED;

    }
@@ -2586,9 +2582,8 @@ ivas_error IVAS_DEC_TSM_SetQuality( 
        hIvasDec->tsm_quality = quality;

    }



    return error;

    return IVAS_ERR_OK;

}



#endif