Commit 7098a0f8 authored by sagnowski's avatar sagnowski
Browse files

Merge branch 'basop-2396-constant-stride-in-tc-buffer' into 'main' 

[non-BE] Keep TC channel pointers in one constant place during decoding and rendering

See merge request !2779
parents 389edb38 1c09f8b6

lib_com/ivas_prot_fx.h

+18 −0
Original line number Diff line number Diff line
@@ -2063,19 +2063,37 @@ UWord32 ivas_syn_output_fx( 
    Word16 *synth_out                                           /* o  : integer 16 bits synthesis signal            */

);



#ifdef FIX_2396_CONSTANT_STRIDE_IN_TC_BUFFER

void ivas_buffer_interleaved_to_deinterleaved_fx(

    Word32 *audio_in,                                           /* i  : interleaved audio buffer                                */

    Word32 *audio_out[],                                        /* o  : pointers to each channel of deinterleaved audio buffer  */

    const Word16 n_channels,                                    /* i  : number of channels                                      */

    const Word16 frame_length                                   /* i  : frame length (one channel)                              */

);

#else

void ivas_buffer_interleaved_to_deinterleaved_fx(

    Word32 *audio,                                              /* i/o: audio buffer                                */

    const Word16 n_channels,                                    /* i  : number of channels                          */

    const Word16 frame_length,                                  /* i  : frame length (one channel)                  */

    const Word16 n_samp_full                                    /* i  : full frame length (one channel)             */

);

#endif



#ifdef FIX_2396_CONSTANT_STRIDE_IN_TC_BUFFER

void ivas_buffer_deinterleaved_to_interleaved_fx(

    Word32 *audio_in[],                                         /* i  : pointers to each channel of deinterleaved audio buffer  */

    Word32 *audio_out,                                          /* o  : interleaved audio buffer                                */

    const Word16 n_channels,                                    /* i  : number of channels                                      */

    const Word16 frame_length                                   /* i  : frame length (one channel)                              */

);

#else

void ivas_buffer_deinterleaved_to_interleaved_fx(

    Word32 *audio[],                                            /* i  : deinterleaved audio buffer                  */

    const Word16 n_channels,                                    /* i  : number of channels                          */

    const Word16 frame_length,                                  /* i  : frame length (one channel)                  */

    Word32 *audio_out                                           /* o  : interleaved audio buffer                    */

);

#endif



void stereo_tcx_core_dec_fx(

    Decoder_State *st,                                          /* i/o: decoder state structure                     */

lib_com/ivas_tools_fx.c

+66 −0
Original line number Diff line number Diff line
@@ -160,6 +160,38 @@ UWord32 ivas_syn_output_fx( 
 * Convert an interleaved buffer of audio channels to deinterleaved one

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



#ifdef FIX_2396_CONSTANT_STRIDE_IN_TC_BUFFER

void ivas_buffer_interleaved_to_deinterleaved_fx(

    Word32 *audio_in,         /* i  : interleaved audio buffer                                */

    Word32 *audio_out[],      /* o  : pointers to each channel of deinterleaved audio buffer  */

    const Word16 n_channels,  /* i  : number of channels                                      */

    const Word16 frame_length /* i  : frame length (one channel)                              */

)

{

    Word16 ch, s;

    Word32 buffer[MAX_TRANSPORT_CHANNELS][MAX_JBM_L_FRAME48k]; /* temp buffer needed when "*audio_in" and "*audio_out[]" point to the same memory */



    FOR( ch = 0; ch < n_channels; ch++ )

    {

        FOR( s = 0; s < frame_length; s++ )

        {

            buffer[ch][s] = audio_in[s * n_channels + ch];

            move32();

        }

    }



    FOR( ch = 0; ch < n_channels; ch++ )

    {

        FOR( s = 0; s < frame_length; s++ )

        {

            audio_out[ch][s] = buffer[ch][s];

            move32();

        }

    }



    return;

}

#else

void ivas_buffer_interleaved_to_deinterleaved_fx(

    Word32 *audio,             /* i/o: audio buffer                    */

    const Word16 n_channels,   /* i  : number of channels              */
@@ -189,6 +221,7 @@ void ivas_buffer_interleaved_to_deinterleaved_fx( 


    return;

}

#endif





/*-------------------------------------------------------------------*
@@ -197,6 +230,38 @@ void ivas_buffer_interleaved_to_deinterleaved_fx( 
 * Convert a deinterleaved buffer of audio channels to interleaved one

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



#ifdef FIX_2396_CONSTANT_STRIDE_IN_TC_BUFFER

void ivas_buffer_deinterleaved_to_interleaved_fx(

    Word32 *audio_in[],       /* i  : pointers to each channel of deinterleaved audio buffer  */

    Word32 *audio_out,        /* o  : interleaved audio buffer                                */

    const Word16 n_channels,  /* i  : number of channels                                      */

    const Word16 frame_length /* i  : frame length (one channel)                              */

)

{

    Word16 ch, s;

    Word32 buffer[MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS][L_FRAME48k]; /* temp buffer needed when "*audio_in[]" and "*audio_out" point to the same memory */



    FOR( ch = 0; ch < n_channels; ch++ )

    {

        FOR( s = 0; s < frame_length; s++ )

        {

            buffer[ch][s] = audio_in[ch][s];

            move32();

        }

    }



    FOR( ch = 0; ch < n_channels; ch++ )

    {

        FOR( s = 0; s < frame_length; s++ )

        {

            audio_out[s * n_channels + ch] = buffer[ch][s];

            move32();

        }

    }



    return;

}

#else

void ivas_buffer_deinterleaved_to_interleaved_fx(

    Word32 *audio[],           /* i/o: deinterleaved audio buffer      */

    const Word16 n_channels,   /* i  : number of channels              */
@@ -224,6 +289,7 @@ void ivas_buffer_deinterleaved_to_interleaved_fx( 


    return;

}

#endif





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

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ 
#define FIX_BASOP_2317_UNINIT_VALUE_IN_STEREO_CNG       /* Eri: Basop issue 2317: Uninitialized value read in case of DTX and BW switching   */

#define FIX_1283_STEREO_DFT_COLLAPSE                    /* FhG: float issue 1283: fix for critical issue with DFT stereo core coder */

#define FIX_2379_REMOVE_previoussynth_fx_32             /* VA: basop issue 2379: remove duplicated buffer st->previoussynth_fx_32[] */

#define FIX_2396_CONSTANT_STRIDE_IN_TC_BUFFER           /* FhG/VA: basop issue 2396: keep TC channel pointers in one constant place during decoding and rendering */



/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_dec_render_fx.c

+6 −0
Original line number Diff line number Diff line
@@ -83,8 +83,12 @@ void ivas_dec_feed_tc_to_renderer_fx( 
{

    Word32 tmp_buf_fx[MAX_JBM_L_FRAME48k];

    Word32 *p_data_fx[FOA_CHANNELS + MAX_NUM_OBJECTS];

#ifdef FIX_2396_CONSTANT_STRIDE_IN_TC_BUFFER

    Word16 n, n_render_timeslots, n_ch_cldfb, ch;

#else

    Word16 n, n_render_timeslots, n_ch_cldfb;

    Word16 ch, offset, len_offset;

#endif

    DECODER_TC_BUFFER_HANDLE hTcBuffer;



    hTcBuffer = st_ivas->hTcBuffer;
@@ -109,6 +113,7 @@ void ivas_dec_feed_tc_to_renderer_fx( 
        n_ch_full_copy = s_min( hTcBuffer->nchan_transport_rend, hTcBuffer->nchan_buffer_full );

        n_ch_res_copy = sub( hTcBuffer->nchan_transport_rend, hTcBuffer->nchan_buffer_full );



#ifndef FIX_2396_CONSTANT_STRIDE_IN_TC_BUFFER

        /* buffers are shared between 'hTcBuffer->tc[]' and 'p_output_f[]':

           in case of 'length(hTcBuffer->tc[]) < length(p_output_f[])', reset of TC buffer

           pointers is needed after ivas_buffer_interleaved_to_deinterleaved() */
@@ -125,6 +130,7 @@ void ivas_dec_feed_tc_to_renderer_fx( 
            }

        }



#endif

        FOR( ch = 0; ch < n_ch_full_copy; ch++ )

        {

            Copy32( hTcBuffer->tc_fx[ch], tmp_buf_fx, nSamplesForRendering );

lib_dec/lib_dec_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -3934,7 +3934,11 @@ ivas_error IVAS_DEC_GetSamplesDecoder( 
            }



            /* convert deinterleaved decoded TC audio channels buffer to an interleaved one */

#ifdef FIX_2396_CONSTANT_STRIDE_IN_TC_BUFFER

            ivas_buffer_deinterleaved_to_interleaved_fx( st_ivas->p_output_fx, st_ivas->hTcBuffer->tc_buffer_fx, nTransportChannels, hIvasDec->nSamplesFrame );

#else

            ivas_buffer_deinterleaved_to_interleaved_fx( st_ivas->p_output_fx, nTransportChannels, hIvasDec->nSamplesFrame, st_ivas->hTcBuffer->tc_buffer_fx );

#endif



            IF( EQ_16( (Word16) hIvasDec->mode, IVAS_DEC_MODE_EVS ) )

            {
@@ -3954,7 +3958,11 @@ ivas_error IVAS_DEC_GetSamplesDecoder( 
            move16();



            /* convert interleaved time-scaled TC audio channels buffer to deinterleaved one */

#ifdef FIX_2396_CONSTANT_STRIDE_IN_TC_BUFFER

            ivas_buffer_interleaved_to_deinterleaved_fx( st_ivas->hTcBuffer->tc_buffer_fx, st_ivas->p_output_fx, nTransportChannels, nSamplesTcsScaled );

#else

            ivas_buffer_interleaved_to_deinterleaved_fx( st_ivas->hTcBuffer->tc_buffer_fx, nTransportChannels, nSamplesTcsScaled, NS2SA( st_ivas->hDecoderConfig->output_Fs, MAX_JBM_L_FRAME_NS ) );

#endif

        }

        else

        {