Commit e473565e authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into 1935-duplicate-define-nonbe_svd_optimization-in-options-h
parents c14158ec 99ffa8ac

apps/renderer.c

+12 −1
Original line number Diff line number Diff line
@@ -1167,7 +1167,18 @@ int main( 
            fprintf( stderr, "\nFailed to read renderer configuration from file %s\n", args.renderConfigFilePath );

            goto cleanup;

        }



#ifdef NONBE_FIX_1337_MISSING_DIRECTIVITY_DISTATT_EXTREND

        if ( ( error = RenderConfigReader_getDirectivity( renderConfigReader, args.directivityPatternId, renderConfig.directivity_fx ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "Failed to get directivity patterns for one or more of IDs: %d %d %d %d\n\n", args.directivityPatternId[0], args.directivityPatternId[1], args.directivityPatternId[2], args.directivityPatternId[3] );

            goto cleanup;

        }

        if ( ( error = RenderConfigReader_getDistanceAttenuation( renderConfigReader, renderConfig.distAtt_fx ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "Failed to get Distance Attenuation \n\n" );

            goto cleanup;

        }

#endif

        if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

        {

#ifdef FIX_1053_REVERB_RECONFIGURATION

lib_com/cnst.h

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
#define NUM_SAMPLES_320 (320)

#define NUM_SAMPLES_160 (160)

#define L_SUBFRAME_48k         (240)

#define L_SUBFRAME_32k         (180)

#define L_SUBFRAME_32k         (160)

#define L_SUBFRAME_16k         (80)

#define L_SUBFRAME_8k           (40)

#define Q31_BY_NUM_SAMPLES_960 ( 2239294 ) /* 1/959 in Q31 */

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/ivas_spar_com_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -802,7 +802,11 @@ static void ivas_get_pred_coeffs_enc_fx( 
                tmp64 = W_mult0_32_32( w_norm_fac, dm_w ); // Q=q_tmp

                IF( LT_16( q_tmp, q_cov_real[0][0][b] ) )

                {

#ifdef FIX_ISSUE_1811_EXCEEDING_W_SHIFTS

                    tmp64 = W_shr( tmp64, s_min( 63, sub( q_cov_real[0][0][b], q_tmp ) ) ); // Q=q_tmp

#else

                    tmp64 = W_shr( tmp64, sub( q_cov_real[0][0][b], q_tmp ) ); // Q=q_tmp

#endif

                }

                ELSE

                {