Commit 6281f85a authored by vaclav's avatar vaclav
Browse files

fix merging

parent dbb8c03b

apps/isar_post_rend.c

+0 −2
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ 
*******************************************************************************************************/



#include "lib_isar_post_rend.h"





#include <assert.h>

#include <math.h>

#include <string.h>

lib_dec/lib_dec.c

+19 −21
Original line number Diff line number Diff line
@@ -613,7 +613,7 @@ static int16_t get_render_frame_size_ms( 
/*---------------------------------------------------------------------*

 * IVAS_DEC_SetRenderNumSubfr( )

 *

 * Set render framesize

 * Set number of rendering subrames

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



ivas_error IVAS_DEC_SetRenderNumSubfr(
@@ -2164,13 +2164,12 @@ ivas_error IVAS_DEC_GetSplitBinauralBitstream( 
    /* convert to int16 with limiting for BINAURAL_SPLIT_PCM */

    if ( pcm_out_flag )

    {

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

#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_framesize == IVAS_RENDER_FRAMESIZE_5MS )

        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 );
@@ -4115,13 +4114,12 @@ 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 )

        {

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

#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 );

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

#endif

#else

                if ( st_ivas->hDecoderConfig->render_framesize == IVAS_RENDER_FRAMESIZE_5MS )

            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 );