Commit 99ffa8ac authored by vaclav's avatar vaclav
Browse files

Merge branch '1902-basop-PortFlpMr1832' into 'main' 

Merge MR1832 and MR1856 from float to BASOP

Closes #1902

See merge request !2101
parents c2412485 bbaa9f44

lib_com/ivas_cnst.h

+4 −0
Original line number Diff line number Diff line
@@ -272,7 +272,11 @@ typedef enum 
#define SID_MDCT_STEREO                         0x1                         /*      1|      0|     0 */

#define SID_ISM                                 0x2                         /*      0|      1|     0 */

#define SID_MASA_1TC                            0x3                         /*      1|      1|     0 */

#ifdef FIX_1209_SID_SIGNALING

/*reserved*/                                  /*0x4*/                       /*      0|      0|     1 */

#else

#define SID_MULTICHANNEL                        0x4                         /*      0|      0|     1 */

#endif

#define SID_SBA_1TC                             0x5                         /*      1|      0|     1 */

#define SID_SBA_2TC                             0x6                         /*      0|      1|     1 */

#define SID_MASA_2TC                            0x7                         /*      1|      1|     1 */

lib_com/ivas_prot_fx.h

+2 −5
Original line number Diff line number Diff line
@@ -4038,7 +4038,6 @@ void ivas_syn_output_f_fx( 
    Word32 *synth_out          /* o  : integer 16 bits synthesis signal    */

);





ivas_error ivas_init_encoder_fx(

    Encoder_Struct *st_ivas /* i/o: IVAS encoder structure                  */

);
@@ -4049,10 +4048,8 @@ ivas_error ivas_output_buff_dec_fx( 
    const Word16 nchan_out_buff      /* i  : number of output channels                  */

);



/*! r: flag to indicate if split rendering is enabled */

Word16 is_split_rendering_enabled(

    const DECODER_CONFIG_HANDLE hDecoderConfig,   /* i  : configuration structure         */

    const IVAS_RENDER_CONFIG_HANDLE hRenderConfig /* i  : Render config data structure    */

ivas_error ivas_dec_get_format_fx(

    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                  */

);



ivas_error ivas_dec_setup(

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ 
#define NONBE_1360_LFE_DELAY                            /* Dlb: LFE delay alignment when rendering in CLDFB domain*/

#define NONBE_1229_FIX_ISM1_DPID                        /* Eri: issue 1229: fix bug causing ISM 1 to use default -dpid instead of the specified one */

#define NONBE_SVD_OPTIMIZATION 

#define FIX_1209_SID_SIGNALING                          /* VA: issue 1209: remove dead code in IVAS SID signaling */

#define NONBE_FIX_1176_OSBA_REVERB_JBM_ASAN_ERROR       /* Ericsson: Issue 1176, fix in TDREND_firfilt for subframes shorter than the filter length */

#define NONBE_1131_ACELP_OOB                            /* VA: issue 1131: fix division-by-zero in acelp gain decoding caused by wrong length of buffer update when switching from HQ core to ACELP core */

#define NONBE_1240_FIX_CORE_SELECTION_ISM_SW            /* VA: issue 1240: Remove the forcing of the TCX core in ISM when switching from a high bitarte to a low one */

lib_dec/ivas_init_dec_fx.c

+449 −12

File changed.

Preview size limit exceeded, changes collapsed.

lib_dec/ivas_jbm_dec_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -2659,7 +2659,7 @@ ivas_error ivas_jbm_dec_render_fx( 
    nchan_out_syn_output = nchan_out;

    move16();



    if ( is_split_rendering_enabled( st_ivas->hDecoderConfig, st_ivas->hRenderConfig ) == 0 )

    IF( is_split_rendering_enabled( st_ivas->hDecoderConfig, st_ivas->hRenderConfig ) == 0 )

    {

        IF( NE_32( st_ivas->ivas_format, MONO_FORMAT ) )

        {
@@ -2971,7 +2971,7 @@ ivas_error ivas_jbm_dec_flush_renderer_fx( 
    move16();



    /* Only write out the valid data*/

    if ( is_split_rendering_enabled( st_ivas->hDecoderConfig, st_ivas->hRenderConfig ) == 0 )

    IF( is_split_rendering_enabled( st_ivas->hDecoderConfig, st_ivas->hRenderConfig ) == 0 )

    {

        IF( NE_16( st_ivas->ivas_format, MONO_FORMAT ) )

        {