Commit 8bb10624 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1449_RENDERER_FRAME_SIZE_UNCLEAR_IN_ISAR

parent 2907566d

apps/decoder.c

+0 −2
Original line number Diff line number Diff line
@@ -481,12 +481,10 @@ int main( 
            goto cleanup;

        }



#ifdef FIX_1449_RENDERER_FRAME_SIZE_UNCLEAR_IN_ISAR

        if ( !arg.renderConfigEnabled && ( arg.render_num_subframes != asked_num_subframes ) )

        {

            fprintf( stderr, "\nChanged render framesize, only 20ms are allowed for non-0dof split rendering!\n" );

        }

#endif

    }



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

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -162,7 +162,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#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_1449_RENDERER_FRAME_SIZE_UNCLEAR_IN_ISAR    /* Dolby: Fix for issue 1449: renderer frame size unclear in ISAR */

#define FIX_1827_REMOVE_UNUSED_PSNOISEGEN_ISAR          /* Dolby: remove unused noise generator from ISAR */

#define FIX_1495_INCORRECT_FREAD_CALL                   /* Eri: Switched size and number of elements in fread call. */

#define FIX_1494_SET_SPLITBFI_UNUSED                    /* Dolby: Fix issue 1494, remove unused function setting BFI flag in ISAR renderer */

lib_dec/lib_dec.c

+0 −26
Original line number Diff line number Diff line
@@ -2150,22 +2150,9 @@ ivas_error IVAS_DEC_GetSplitBinauralBitstream( 
    /* convert to int16 with limiting for BINAURAL_SPLIT_PCM */

    if ( pcm_out_flag )

    {

#ifdef FIX_1449_RENDERER_FRAME_SIZE_UNCLEAR_IN_ISAR

#ifndef DISABLE_LIMITER

        ivas_limiter_dec( st_ivas->hLimiter, p_head_pose_buf, st_ivas->hDecoderConfig->nchan_out, numSamplesPerChannelToOutput, st_ivas->BER_detect );

#endif

#else

        if ( st_ivas->hDecoderConfig->render_num_subframes == IVAS_RENDER_NUM_SUBFR_5MS )

        {

#ifndef DISABLE_LIMITER

            ivas_limiter_dec( st_ivas->hLimiter, p_head_pose_buf, st_ivas->hDecoderConfig->nchan_out, numSamplesPerChannelToOutput, st_ivas->BER_detect );

#endif

        }

        else

        {

            ivas_limiter_dec( st_ivas->hLimiter, p_head_pose_buf, st_ivas->hDecoderConfig->nchan_out, numSamplesPerChannelToOutput, st_ivas->BER_detect );

        }

#endif



#ifdef DEBUGGING

        st_ivas->noClipping +=
@@ -4077,22 +4064,9 @@ static ivas_error ivas_dec_voip_get_samples_common( 
        /* Synthesise PCM output if split PCM */

        if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

        {

#ifdef FIX_1449_RENDERER_FRAME_SIZE_UNCLEAR_IN_ISAR

#ifndef DISABLE_LIMITER

            ivas_limiter_dec( st_ivas->hLimiter, p_head_pose_buf, st_ivas->hDecoderConfig->nchan_out, *nSamplesRendered, st_ivas->BER_detect );

#endif

#else

            if ( st_ivas->hDecoderConfig->render_num_subframes == IVAS_RENDER_NUM_SUBFR_5MS )

            {

#ifndef DISABLE_LIMITER

                ivas_limiter_dec( st_ivas->hLimiter, p_head_pose_buf, st_ivas->hDecoderConfig->nchan_out, *nSamplesRendered, st_ivas->BER_detect );

#endif

            }

            else

            {

                ivas_limiter_dec( st_ivas->hLimiter, p_head_pose_buf, st_ivas->hDecoderConfig->nchan_out, *nSamplesRendered, st_ivas->BER_detect );

            }

#endif



#ifdef DEBUGGING

            st_ivas->noClipping +=