Commit 80f1cbf4 authored by vaclav's avatar vaclav
Browse files

address reviewer comments

parent c41b1d23

lib_com/common_api_types.h

+0 −3
Original line number Diff line number Diff line
@@ -64,9 +64,6 @@ 
/* JBM constants for adaptive-playout */

#define IVAS_TIME_SCALE_MIN 50  /* min. time-scaling [%] */

#define IVAS_TIME_SCALE_MAX 150 /* max. time-scaling [%] */

#ifdef JBM_MEMORY_OPT

#define IVAS_TIME_SCALE_MAX_FRAME_SIZE ( 2 * IVAS_MAX_FRAME_SIZE ) /* max. time-scaled frame buffer length (per channel) in samples */

#endif





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

lib_com/ivas_cnst.h

+2 −2
Original line number Diff line number Diff line
@@ -173,8 +173,8 @@ typedef enum 
#define MAX_JBM_CLDFB_TIMESLOTS                 32

#define DEFAULT_JBM_CLDFB_TIMESLOTS             16

#ifdef JBM_MEMORY_OPT

#define MAX_JBM_L_FRAME48k                      IVAS_TIME_SCALE_MAX_FRAME_SIZE  /* 1920:  max. time-scaled frame buffer length (per channel) in samples */

#define MAX_JBM_L_FRAME_NS                      40000000L                   /* 40 ms: time-scaled frame size in ns, proportional to IVAS_TIME_SCALE_MAX_FRAME_SIZE  */

#define MAX_JBM_L_FRAME48k                      ( IVAS_MAX_FRAME_SIZE * 2 ) /* 1920:  max. time-scaled frame buffer length (per channel) in samples */

#define MAX_JBM_L_FRAME_NS                      40000000L                   /* 40 ms: time-scaled frame size in ns, proportional to MAX_JBM_L_FRAME48k  */

#else

#define MAX_JBM_L_FRAME48k                      1920

#define MAX_JBM_L_FRAME_NS                      40000000L

lib_dec/ivas_jbm_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -804,7 +804,7 @@ void ivas_jbm_dec_feed_tc_to_renderer( 
        {

            for ( ; ch < hTcBuffer->nchan_transport_jbm; ch++ )

            {

                p_data_f[ch - n_ch_full_copy] = hTcBuffer->tc[ch];

                p_data_f[ch] = hTcBuffer->tc[ch];

                mvr2r( hTcBuffer->tc[ch], tmp_buf, nSamplesForRendering );

                mvr2r( hTcBuffer->tc_buffer_old[ch], p_data_f[ch], n_samples_still_available );

                mvr2r( tmp_buf, p_data_f[ch] + n_samples_still_available, nSamplesForRendering - *nSamplesResidual );

lib_dec/jbm_pcmdsp_apa.h

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 


/* size of IO buffers (a_in[], a_out[]) for apa_exec() */

#ifdef JBM_MEMORY_OPT

#define APA_BUF_PER_CHANNEL  IVAS_TIME_SCALE_MAX_FRAME_SIZE

#define APA_BUF_PER_CHANNEL  ( IVAS_MAX_FRAME_SIZE * 2 ) /* == twice the max. frame length */

#define APA_MAX_NUM_CHANNELS ( 12 )                      /* == MAX_TRANSPORT_CHANNELS   */

#else

#define APA_BUF_PER_CHANNEL  ( IVAS_MAX_FRAME_SIZE * 3 )