Commit 5a383072 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'ci/clang-format-check-for-merges-to-ivas-float-update' into 'ivas-float-update' 

[CI] run clang-format check for merges to ivas-float-update

See merge request !1178
parents 463f0f18 36161458

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -596,7 +596,7 @@ clang-format-check: 
  extends:

    - .test-job-linux

  rules:

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" # only have MR pipelines for MRs to main

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "ivas-float-update")

    - if: $CI_PIPELINE_SOURCE == 'push'

      when: never

    - if: $CI_PIPELINE_SOURCE == 'schedule'

apps/decoder.c

+58 −61
Original line number Diff line number Diff line
@@ -278,8 +278,7 @@ int main( 
    if ( arg.enableHeadRotation )

    {

        /* sanity check */

        if ( arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB

        )

        if ( arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

        {

            fprintf( stderr, "\nError: Head-rotation file file cannot be used in this output configuration.\n\n" );

            goto cleanup;
@@ -379,8 +378,7 @@ int main( 
    if ( arg.renderConfigEnabled )

    {

        /* sanity check */

        if ( arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB

        )

        if ( arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

        {

            fprintf( stderr, "\nError: Renderer configuration file cannot be used in this output configuration.\n\n" );

            goto cleanup;
@@ -2697,8 +2695,7 @@ static ivas_error decodeVoIP( 


            for ( i = 0; i < num_subframes; i++ )

            {

                if ( ( error = IVAS_DEC_FeedHeadTrackData( hIvasDec, Quaternions[i], Pos[i], i

                                                           ) ) != IVAS_ERR_OK )

                if ( ( error = IVAS_DEC_FeedHeadTrackData( hIvasDec, Quaternions[i], Pos[i], i ) ) != IVAS_ERR_OK )

                {

                    fprintf( stderr, "\nIVAS_DEC_FeedHeadTrackData failed: %s\n", IVAS_DEC_GetErrorMessage( error ) );

                    goto cleanup;

lib_com/common_api_types.h

+0 −1
Original line number Diff line number Diff line
@@ -195,7 +195,6 @@ typedef struct _IVAS_JBM_TRACE_DATA 
} IVAS_JBM_TRACE_DATA;







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

 * Renderer API structures and enums

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

lib_com/gs_bitallocation.c

+17 −18
Original line number Diff line number Diff line
@@ -1229,8 +1229,7 @@ static Word16 Find_bit_alloc_IVAS_int( /* o : Number of band to encode */ 
/* Find normalized 1 / ToDivide */

static Word16 Find_norm_inv(

    const Word32 ToDivide,

    Word16 *e_div 

) 

    Word16 *e_div )

{

    Word16 d_tmp, e_tmp;

lib_com/ivas_dirac_com.c

+7 −14
Original line number Diff line number Diff line
@@ -162,10 +162,8 @@ ivas_error ivas_dirac_config( 
    hConfig->dec_param_estim = FALSE;

    if ( ivas_format == SBA_FORMAT || ivas_format == SBA_ISM_FORMAT ) /* skip for MASA decoder */

    {

        if ( ( error = ivas_dirac_sba_config( hQMetaData, element_mode, ivas_total_brate, sba_order, hConfig->nbands - spar_dirac_split_band

                                              ,

                                              ivas_format

                                              ) ) != IVAS_ERR_OK )

        if ( ( error = ivas_dirac_sba_config( hQMetaData, element_mode, ivas_total_brate, sba_order, hConfig->nbands - spar_dirac_split_band,

                                              ivas_format ) ) != IVAS_ERR_OK )

        {

            return error;

        }
@@ -322,10 +320,8 @@ void ivas_get_dirac_sba_max_md_bits( 
    int16_t *bits_frame_nominal,

    int16_t *metadata_max_bits,

    int16_t *qmetadata_max_bit_req,

    const int16_t nbands

    ,

    IVAS_FORMAT ivas_format

)

    const int16_t nbands,

    IVAS_FORMAT ivas_format )

{

    if ( sba_total_brate <= IVAS_13k2 )

    {
@@ -402,8 +398,7 @@ ivas_error ivas_dirac_sba_config( 
    const int16_t sba_order,          /* i  : Ambisonic (SBA) order                                */

    const int16_t nbands              /* i  : number of frequency bands                            */

    ,

    IVAS_FORMAT ivas_format

)

    IVAS_FORMAT ivas_format )

{

    int16_t nbands_coded;

    int16_t hodirac_flag;
@@ -465,10 +460,8 @@ ivas_error ivas_dirac_sba_config( 
        }

    }



    ivas_get_dirac_sba_max_md_bits( sba_total_brate, &hQMetaData->bits_frame_nominal, &hQMetaData->metadata_max_bits, &hQMetaData->qmetadata_max_bit_req, hQMetaData->q_direction[0].cfg.nbands

                                    ,

                                    ivas_format

    );

    ivas_get_dirac_sba_max_md_bits( sba_total_brate, &hQMetaData->bits_frame_nominal, &hQMetaData->metadata_max_bits, &hQMetaData->qmetadata_max_bit_req, hQMetaData->q_direction[0].cfg.nbands,

                                    ivas_format );



    return error;

}