Commit 4169b608 authored by vaclav's avatar vaclav
Browse files

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

- Merge remote-tracking branch 'remotes/origin/main' into 2015-low-frequency-artifacts-in-3-ism-fx-enc-at-32kbps-2
parents ee4318e4 3dd980c3

apps/decoder.c

+1 −4
Original line number Diff line number Diff line
@@ -133,7 +133,6 @@ typedef struct 
    bool applyPiData;

    char *piOutputFilename;

    bool rtpOutSR;

    bool evsMode;

    IVAS_ROOM_SIZE_T roomSize;



} DecArguments;
@@ -884,7 +883,6 @@ static bool parseCmdlIVAS_dec( 
    arg->output_Fs = IVAS_MAX_SAMPLING_RATE;

    arg->outputConfig = IVAS_AUDIO_CONFIG_MONO;

    arg->decMode = IVAS_DEC_MODE_IVAS;

    arg->evsMode = false;

    arg->quietModeEnabled = false;

    arg->delayCompensationEnabled = true;

    arg->voipMode = false;
@@ -1378,7 +1376,6 @@ static bool parseCmdlIVAS_dec( 
        }

        else if ( strcmp( argv_to_upper, "-EVS" ) == 0 )

        {

            arg->evsMode = true;

            arg->decMode = IVAS_DEC_MODE_EVS;

            i++;

        }
@@ -1469,7 +1466,7 @@ static bool parseCmdlIVAS_dec( 
            usage_dec();

            return false;

        }

        else if ( arg->non_diegetic_pan_enabled && arg->outputConfig == IVAS_AUDIO_CONFIG_STEREO && arg->evsMode )

        else if ( arg->non_diegetic_pan_enabled && arg->outputConfig == IVAS_AUDIO_CONFIG_STEREO && arg->decMode == IVAS_DEC_MODE_EVS )

        {

            fprintf( stderr, "Error: Both non-diegetic panning and stereo output specified!\n\n" );

            usage_dec();

apps/renderer.c

+1 −1
Original line number Diff line number Diff line
@@ -1640,7 +1640,7 @@ int main( 


    ObjectPositionBuffer mtdBuffer;

    outBuffer.pq_fact = &outBuffer.q_factor;

    Word16 subframe_len = (Word16) ( args.sampleRate / ( 200 ) ); // sample rate /FRAMES_PER_SEC * MAX_PARAM_SPATIAL_SUBFRAMES

    Word16 subframe_len = (Word16) ( args.sampleRate / ( FRAMES_PER_SEC * MAX_PARAM_SPATIAL_SUBFRAMES ) );

    Word16 gd_bits = find_guard_bits( subframe_len );

    Word16 prev_q_fact = Q11;

    while ( 1 )

lib_com/cnst.h

+0 −3
Original line number Diff line number Diff line
@@ -593,12 +593,9 @@ enum 
 *----------------------------------------------------------------------------------*/



#define FRAMES_PER_SEC                      50

#define MAX_PARAM_SPATIAL_SUB_FRAMES_PER_SEC              200 //(FRAMES_PER_SEC * MAX_PARAM_SPATIAL_SUBFRAMES)

#define ONE_BY_SUBFRAME_LEN_MS_Q31                (429496730)

#define ONE_BY_FRAMES_PER_SEC_Q31           ( 42949673 )

#define FRAMES_PER_SEC_BY_2                 (FRAMES_PER_SEC >> 1)

#define INV_FRAME_PER_SEC_Q15               656

#define INV_FR_P_S_MX_PRM_SPL_SBFR_Q15      164

#define FRAME_SIZE_NS                       20000000L



#define ACELP_LOOK_NS                       8750000L

lib_com/ivas_cnst.h

+3 −0
Original line number Diff line number Diff line
@@ -208,6 +208,9 @@ typedef enum 
    TC_BUFFER_MODE_BUFFER

} TC_BUFFER_MODE;



#define ONE_BY_SUBFRAME_LEN_MS_Q31              429496730

#define ONE_BY_SUBFR_PER_SEC_Q15                164





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

 * IVAS Bitrates

lib_com/ivas_prot_fx.h

+9 −3
Original line number Diff line number Diff line
@@ -1126,8 +1126,8 @@ void ivas_mono_stereo_downmix_mcmasa_fx( 
);



void ivas_apply_non_diegetic_panning_fx(

    Word32 *input_f_fx,                                         /* i  : non-diegetic object                              */

    Word32 *output_fx[],                                        /* i/o: core-coder transport mono channel/stereo output  */

    Word32 *input_f_fx,                                         /* i  : non-diegetic object (mono channel)               */

    Word32 *output_fx[],                                        /* o  : stereo output channels                           */

    const Word16 non_diegetic_pan_gain_fx,                      /* i  : non-diegetic panning gain                        */

    const Word16 output_frame                                   /* i  : output frame length per channel                  */

);
@@ -3733,6 +3733,12 @@ void ivas_mc2sba_fx( 
    const Word16 gain_lfe                                       /* i  : gain for LFE, 0 = ignore LFE                     */

);



void ivas_stereo2sba_fx(

    Word32 *input_fx[],                                         /* i  : core-coder transport stereo channels            */

    Word32 *output_fx[],                                        /* o  : SBA output channels                             */

    const Word16 output_frame                                   /* i  : output frame length per channel                 */

);



void ivas_param_mc_mc2sba_cldfb_fx(

    IVAS_OUTPUT_SETUP hTransSetup,                                                 /* i  : transported MC Format                                       */

    Word32 *hoa_encoder,                                                           /* i  : HOA3 encoder for the transported MC format                  */
@@ -3885,6 +3891,7 @@ void ivas_set_ism_importance_interformat_fx( 
    const Word16 lp_noise_CPE_fx,                               /* i  : LP filtered total noise estimation          */

    Word16 ism_imp[]                                            /* o  : ISM importance flags                        */

);



void ivas_omasa_preProcessStereoTransportsForEditedObjects_fx(

    Decoder_Struct *st_ivas,

    Word32 inRe_fx[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX], /*cldfb_buf_q*/
@@ -3894,7 +3901,6 @@ void ivas_omasa_preProcessStereoTransportsForEditedObjects_fx( 
    const Word16 subframe

);





void ivas_omasa_decode_masa_to_total_fx(

    UWord16 *bit_stream,

    Word16 *index,