Commit ccf6ae2f authored by vaclav's avatar vaclav
Browse files

Merge branch '97-mismatch-between-push_wmops-and-pop_wmops' into 'main' 

Solves mismatch between push_wmops() and pop_wmops()

See merge request !114
parents 30b12f8d 6c37577c

lib_com/cnst.h

+3 −0
Original line number Diff line number Diff line
@@ -798,6 +798,9 @@ typedef enum 
#define BWD_COUNT_MAX                       100                     /* maximum value of BWD counter              */

#define BWD_N_BINS_MAX                      13                      /* maximum number of BWD bins */

#define BWS_TRAN_PERIOD                     5                       /* BWS - number of frames for transition period */

#ifdef FIX_I2_BWD

#define BWD_HIGH_BRATE_THR                  IVAS_256k               /* BWD - threshold from which the bitrate sets bws_high_rate_flag = 1 */

#endif



#define PREEMPH_FAC                         0.68f                   /* preemphasis factor at 12.8kHz                */

#define PREEMPH_FAC_16k                     0.72f

lib_com/ivas_prot.h

+3 −2
Original line number Diff line number Diff line
@@ -3721,8 +3721,9 @@ void ivas_sba_upmixer_renderer( 
);



void ivas_sba_mix_matrix_determiner(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder struct                     */

    float in_out[][L_FRAME48k],                                 /* i/o: transport/output audio channels         */

    SPAR_DEC_HANDLE hSpar,                                      /* i/o: SPAR decoder handle                     */

    float output[][L_FRAME48k],                                 /* i/o: transport/output audio channels         */

    const int16_t bfi,                                          /* i  : BFI flag                                */

    const int16_t nchan_remapped,                               /* i  : num channels after remapping of TCs     */

    const int16_t output_frame                                  /* i  : output frame length                     */

);

lib_com/options.h

+4 −3
Original line number Diff line number Diff line
@@ -147,7 +147,8 @@ 
/*#define FIX_I1_113*/                                  /* under review : MCT bit distribution optimization for SBA high bitrates*/



#define FIX_ADAP_STEFI_SHIFT                            /* Issue 89: fix bug in parameter shift of adaptive stereo filling */

#define SPAR_SCALING_HARMONIZATION                      /* issue 80: Changes to harmonize scaling in spar */

#define SPAR_SCALING_HARMONIZATION                      /* Issue 80: Changes to harmonize scaling in spar */

#define FIX_I2_BWD                                      /* Issue 2: BWD fix to more quickly react to WB -> SWB/FB change */ 





/* ################## End DEVELOPMENT switches ######################### */

lib_dec/ivas_crend.c

+2 −0
Original line number Diff line number Diff line
@@ -1115,5 +1115,7 @@ ivas_error ivas_crend_process( 
        mvr2r( pcm_tmp[i], output[i], output_frame );

    }



    wmops_sub_end();



    return IVAS_ERR_OK;

}

lib_dec/ivas_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ ivas_error ivas_dec( 


            if ( st_ivas->sba_mode == SBA_MODE_SPAR && ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) )

            {

                ivas_sba_mix_matrix_determiner( st_ivas, output, nchan_remapped, output_frame );

                ivas_sba_mix_matrix_determiner( st_ivas->hSpar, output, st_ivas->bfi, nchan_remapped, output_frame );

            }

        }