Commit 3179a68c authored by Jouni Paulus's avatar Jouni Paulus
Browse files

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

parents a8a903a8 5cee8c6d

.gitlab-ci.yml

+21 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ workflow: 
    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Pushes to main

    - if: $CI_PIPELINE_SOURCE == 'schedule' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Scheduled in main

    - if: $CI_PIPELINE_SOURCE == 'web' # for testing

    - if: $CI_PIPELINE_SOURCE == 'trigger'



stages:

  - .pre
@@ -135,6 +136,8 @@ stages: 
      when: never

    - if: $CI_PIPELINE_SOURCE == 'schedule' # Don't run in any scheduled pipelines by default (use schedule templates below to enable again for certain conditions)

      when: never

    - if: $CI_PIPELINE_SOURCE == 'trigger'  # Don't run triggered pipeline by default

      when: never

    - when: on_success



.rules-merge-request:
@@ -1401,6 +1404,24 @@ complexity-StereoDmxEVS-stereo-in-mono-out: 
# Other jobs

# ---------------------------------------------------------------



upload-selection-BE-log:

  rules:

  - if: $UPLOAD_SELECTION_BE_RESULTS && $CI_PIPELINE_SOURCE == 'trigger'

    when: always

  timeout: 5 minutes

  tags:

    - ericsson-windows-runner

  script:

    - cp -r $SELECTION_BE_RESULT ./selection-BE-result

    - Get-Content -Path selection-BE-result/public_log--sha-*.txt

    - $has_failed = (Select-String -Path selection-BE-result/public_log--sha-*.txt -Pattern '^FAILED tests' -CaseSensitive).Line

    - If($has_failed) {exit -1}

  artifacts:

    paths:

      - selection-BE-result/public_log--sha-*.txt

    when: always

    expire_in: 1 week



# job that sets up gitlab pages website

pages:

  stage: deploy

lib_com/bitstream.c

+10 −0
Original line number Diff line number Diff line
@@ -990,7 +990,12 @@ ivas_error check_ind_list_limits( 
    if ( ( &hBstr->ind_list[hBstr->nb_ind_tot] - ivas_ind_list_zero ) >= *( hBstr->ivas_max_num_indices ) )

    {

#ifdef DEBUGGING

#ifdef DEBUG_IND_LIST_MEMORY

        /* TODO: replace with the warning message below before the finalization of the IVAS codec */

        assert( 0 && "The maximum number of indices has been exceeded! Increase the limits in get_ivas_max_num_indices() or get_max_num_indices_metadata()." );

#else

        fprintf( stderr, "Warning: The maximum number of indices %d has been exceeded in frame %d! Increase the limits in get_ivas_max_num_indices() or get_max_num_indices_metadata().\n", *( hBstr->ivas_max_num_indices ), frame );

#endif

#endif



        /* reallocate the buffer of indices with increased limit */
@@ -1022,7 +1027,12 @@ ivas_error check_ind_list_limits( 
            if ( hBstr->ind_list >= ivas_ind_list_last )

            {

#ifdef DEBUGGING

#ifdef DEBUG_IND_LIST_MEMORY

                /* TODO: replace with the warning message below before the finalization of the IVAS codec */

                assert( 0 && "The maximum number of indices has been exceeded! Increase the limits in get_ivas_max_num_indices() or get_max_num_indices_metadata()." );

#else

                fprintf( stderr, "Warning: The maximum number of indices %d has been exceeded in frame %d! Increase the limits in get_ivas_max_num_indices() or get_max_num_indices_metadata().\n", *( hBstr->ivas_max_num_indices ), frame );

#endif

#endif



                /* no available empty slot -> need to re-allocate the buffer */

lib_com/cnst.h

+2 −0
Original line number Diff line number Diff line
@@ -2240,11 +2240,13 @@ enum 
    VOIP_RTPDUMP

};



#ifndef JBM_PARAMUPMIX

typedef enum _COV_SMOOTHING_TYPE

{

    COV_SMOOTH_SPAR,

    COV_SMOOTH_MC

} COV_SMOOTHING_TYPE;

#endif



/* clang-format on */

#endif /* CNST_H */

lib_com/ivas_cnst.h

+28 −0
Original line number Diff line number Diff line
@@ -176,6 +176,9 @@ typedef enum 
#define CPE_CHANNELS                            2                           /* number of CPE (stereo) channels */

#define FOA_CHANNELS                            4                           /* number of FOA channels */

#define HOA2_CHANNELS                           9

#ifdef UPDATE_FASTCONV_SBA_FILTER

#define HOA3_CHANNELS                           16

#endif



#define MAX_NUM_OBJECTS                         4                           /* max. number of audio objects */
@@ -1334,6 +1337,14 @@ typedef enum 
#define MC_PARAMUPMIX_NCH                  2           /* number of channels to combine into 1 */

#define MC_PARAMUPMIX_MIN_CLDFB            8



#ifdef JBM_PARAMUPMIX

typedef enum _COV_SMOOTHING_TYPE

{

    COV_SMOOTH_SPAR,

    COV_SMOOTH_MC

} COV_SMOOTHING_TYPE;

#endif



typedef struct {

    const int32_t *value;

    const uint16_t *length;
@@ -1515,6 +1526,11 @@ typedef enum 
#define BINAURAL_MAXBANDS                       60                          /* Max number of bands */

#define BINAURAL_CONVBANDS                      50                          /* Bands upto which convolution is performed */

#define BINAURAL_NTAPS                           5



#ifdef UPDATE_FASTCONV_SBA_FILTER

#define BINAURAL_NTAPS_SBA                       3

#endif



#define BINAURAL_NTAPS_MAX                      96



#ifdef SPLIT_REND_WITH_HEAD_ROT
@@ -1562,7 +1578,11 @@ typedef enum 
#endif /* SPLIT_REND_WITH_HEAD_ROT */



#define HRTF_SH_ORDER                           3

#ifdef UPDATE_FASTCONV_SBA_FILTER

#define HRTF_SH_CHANNELS                        HOA3_CHANNELS

#else

#define HRTF_SH_CHANNELS                        16

#endif

#define HRTF_LS_CHANNELS                        15

#define HRTF_NUM_BINS                           60

#define REVERB_PREDELAY_MAX                     20                          /* Max input delay for reverb module */
@@ -1620,14 +1640,22 @@ typedef enum 
typedef enum

{

    TDREND_POSTYPE_ABSOLUTE,                                                /* The source position is in absolute coordinates  */

#ifdef FIX_550_FIRST_FRAME_ACCESS_ALT

    TDREND_POSTYPE_NON_DIEGETIC                                             /* The source position is non-diegetic */

#else

    TDREND_POSTYPE_RELATIVE_TO_LISTENER                                     /* The source position is relative to the listener */

#endif

} TDREND_PosType_t;



typedef enum

{

    TDREND_PLAYSTATUS_INITIAL,

#ifndef FIX_550_FIRST_FRAME_ACCESS_ALT

    TDREND_PLAYSTATUS_PLAYING,

    TDREND_PLAYSTATUS_PLAYING_NON_DIEGETIC

#else

    TDREND_PLAYSTATUS_PLAYING

#endif

} TDREND_PlayStatus_t;



typedef enum

lib_com/ivas_prot.h

+41 −2
Original line number Diff line number Diff line
@@ -841,6 +841,10 @@ TC_BUFFER_MODE ivas_jbm_dec_get_tc_buffer_mode( 
/*! r: render granularity */

int16_t ivas_jbm_dec_get_render_granularity(

    const RENDERER_TYPE rendererType,                           /* i  : renderer type                                               */

#ifdef JBM_PARAMUPMIX

    const IVAS_FORMAT ivas_format,                              /* i  : ivas format                                                 */

    const MC_MODE mc_mode,                                      /* i  : MC mode                                                     */

#endif

   const int32_t output_Fs                                     /* i  : sampling rate                                               */

);
@@ -3719,6 +3723,23 @@ void ivas_mc_paramupmix_dec_read_BS( 
    int16_t *nb_bits                                            /* o  : number of bits written                          */

);



#ifdef JBM_PARAMUPMIX

void ivas_mc_paramupmix_dec_digest_tc(

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

    const uint8_t nCldfbSlots,                                      /* i : number of CLFBS slots in the transport channels */

    const int16_t nSamplesForRendering                              /* i  : number of samples provided   */

);



void ivas_mc_paramupmix_dec_render(

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

    const uint16_t nSamplesAsked,                                   /* i  : number of CLDFB slots requested           */

    uint16_t *nSamplesRendered,                                     /* o  : number of CLDFB slots rendered            */

    uint16_t *nSamplesAvailable,                                    /* o  : number of CLDFB slots still to render     */

    float *input_f[],                                               /* i: core-coder transport channels  */

    float *output_f[]                                               /* i/o: synthesized core-coder transport channels */

);

#endif



void ivas_param_mc_metadata_open(

    const MC_LS_SETUP mc_ls_setup,                              /* i  : MC ls setup                                         */

    const int16_t lfe_index,                                    /* i  : channel index of LFE                                */
@@ -4963,6 +4984,10 @@ void ivas_masa_prerender( 
    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                             */

    float output[][L_FRAME48k],                                 /* i/o: synthesized core-coder transport channels       */

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

#ifdef CR_FIX_585_MASA_2TC_DTX_EXT

    ,

    const int16_t nchan_remapped                                /* i  : number of transports used in core               */

#endif

);
@@ -4986,6 +5011,19 @@ void ivas_binRenderer_close( 
    BINAURAL_RENDERER_HANDLE *hBinRenderer                      /* i/o: decoder binaural renderer handle                */

);



#ifdef JBM_PARAMUPMIX

void ivas_binaural_cldfb(

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

    float *output_f[]                                           /* i/o: synthesized core-coder transport channels/DirAC output  */

);



void ivas_binaural_cldfb_sf(

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

    const int16_t n_samples_to_render,                          /* i  : output frame length per channel                         */

    const int16_t slot_size,                                    /* i  : JBM slot size                                           */

    float *output_f[]                                           /* i/o: synthesized core-coder transport channels/DirAC output  */

);

#else

#ifdef DEBUGGING

void ivas_binaural_cldfb(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                                  */
@@ -4998,8 +5036,9 @@ void ivas_binaural_cldfb_sf( 
    float *output_f[]                                           /* i/o: synthesized core-coder transport channels/DirAC output  */



);



#endif

#endif



void ivas_binRenderer(

    BINAURAL_RENDERER_HANDLE hBinRenderer, /* i/o: binaural renderer handle    */

#ifdef SPLIT_REND_WITH_HEAD_ROT