Commit 3fd1d684 authored by Jouni Paulus's avatar Jouni Paulus
Browse files

adhoc change to p_output for getting same output in different rendering frame lengths

parent eed9d1e6

lib_dec/ivas_jbm_dec.c

+9 −4
Original line number Diff line number Diff line
@@ -950,6 +950,9 @@ ivas_error ivas_jbm_dec_render( 
#ifdef SPLIT_REND_WITH_HEAD_ROT

    int16_t nchan_out_syn_output;

#endif

#ifdef NONBE_FIX_951_MCMASA_5MS_RENDERING

    float tmp_output[MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS][L_FRAME48k];

#endif



    push_wmops( "ivas_dec_render" );

    /*----------------------------------------------------------------*
@@ -987,7 +990,12 @@ ivas_error ivas_jbm_dec_render( 
            p_tc[n] = &st_ivas->hTcBuffer->tc[n][st_ivas->hTcBuffer->n_samples_rendered];

        }

    }



#ifdef NONBE_FIX_951_MCMASA_5MS_RENDERING

    for ( n = 0; n < MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS; n++ )

    {

        p_output[n] = tmp_output[n];

    }

#endif

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

     * Update combined orientation access index

     *----------------------------------------------------------------*/
@@ -1381,9 +1389,6 @@ ivas_error ivas_jbm_dec_render( 
            nchan_remapped = st_ivas->nchan_transport;

            if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC )

            {

#ifdef NONBE_FIX_951_MCMASA_5MS_RENDERING

                nchan_remapped = st_ivas->hTcBuffer->nchan_buffer_full;

#endif

                ivas_dirac_dec_binaural_render( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, nchan_remapped, p_output );

            }

            else if ( st_ivas->renderer_type == RENDERER_DIRAC || st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC ) /* rendering to CICPxx and Ambisonics */

lib_rend/lib_rend.c

+2 −1
Original line number Diff line number Diff line
@@ -517,6 +517,7 @@ static void accumulate2dArrayToBuffer( 
 * In-place saturation control for multichannel buffers with adaptive release time

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



#ifndef DISABLE_LIMITER

/*! r: number of clipped output samples */

static int32_t limitRendererOutput(

    IVAS_LIMITER_HANDLE hLimiter, /* i/o: limiter struct handle                                           */
@@ -561,7 +562,7 @@ static int32_t limitRendererOutput( 


    return numClipping;

}



#endif



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

 * validateOutputAudioConfig()