Commit a047dfd1 authored by vaclav's avatar vaclav
Browse files

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

- formatting
- error exits
parents 60b765fe 006a21f5

.gitignore

+3 −3
Original line number Diff line number Diff line
@@ -52,9 +52,9 @@ scripts/testv/stvOMASA_*.csv 
scripts/testv/stvOMASA_2ISM_1MASA1TC48c.wav

scripts/testv/stvOMASA_3ISM_1MASA1TC48c.wav

# default reference binary name

IVAS_cod_ref

IVAS_dec_ref

IVAS_rend_ref

IVAS_cod_ref*

IVAS_dec_ref*

IVAS_rend_ref*



# Python files that pop up when running scripts

__pycache__/

.gitlab-ci.yml

+154 −124

File changed.

Preview size limit exceeded, changes collapsed.

apps/decoder.c

+721 −866

File changed.

Preview size limit exceeded, changes collapsed.

apps/encoder.c

+6 −7
Original line number Diff line number Diff line
@@ -406,8 +406,7 @@ int main( 
            }

            break;

        case IVAS_ENC_INPUT_SBA:

            if ( ( error =

                       IVAS_ENC_ConfigureForAmbisonics( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, arg.inputFormatConfig.sba.order, arg.inputFormatConfig.sba.isPlanar,

            if ( ( error = IVAS_ENC_ConfigureForAmbisonics( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, arg.inputFormatConfig.sba.order, arg.inputFormatConfig.sba.isPlanar,

#ifdef DEBUG_AGC_ENCODER_CMD_OPTION

                                                            arg.agc,

#endif

apps/renderer.c

+128 −78

File changed.

Preview size limit exceeded, changes collapsed.