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

Merge branch 'main' into fix_todos_in_fd_cng_enc

parents 03b8d839 6098cbcb

.gitlab-ci.yml

+1 −0
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ build-codec-instrumented-linux: 
  extends:

    - .build-job-linux

    - .rules-basis

  timeout: "6 minutes"

  script:

    - *print-common-info

    - bash ci/build_codec_instrumented_linux.sh

apps/encoder.c

+1 −1
Original line number Diff line number Diff line
@@ -1489,7 +1489,7 @@ static bool parseCmdlIVAS_enc( 
            arg->inputFormatConfig.stereoToMonoDownmix = true;

            i++;

        }

        else if ( strcmp( argv_to_upper, "-BYPASS" ) == 0 ) // VE: should be renamed to "-pca"

        else if ( strcmp( argv_to_upper, "-BYPASS" ) == 0 ) // TODO: should be renamed to "-pca"

        {

            i++;

            if ( i < argc - 4 )

apps/renderer.c

+5 −1
Original line number Diff line number Diff line
@@ -242,7 +242,11 @@ static const CmdLnParser_Option cliOptions[] = { 
        .id = CmdLnOptionId_nonDiegeticPan,

        .match = "non_diegetic_pan",

        .matchShort = "ndp",

#ifdef FIX_TODO_NON_DIEGETIC_PAN_NOT_IMPLELENTED_IN_RENDERER

        .description = "Panning mono non diegetic sound to stereo -90<= pan <= 90\nleft or l or 90->left, right or r or -90->right, center or c or 0 ->middle\n",

#else

        .description = "Panning mono non diegetic sound to stereo -90<= pan <= 90\nleft or l or 90->left, right or r or -90->right, center or c or 0 ->middle\n(todo: implementation)",

#endif

    },

    {

        .id = CmdLnOptionId_orientationTracking,
@@ -987,7 +991,7 @@ int main( 
        else

        {

            error = IVAS_REND_SetHeadRotation( hIvasRend, NULL, NULL );

            if ( ( error != IVAS_ERR_OK ) && ( error != IVAS_ERR_INVALID_OUTPUT_FORMAT ) ) // VE: TBC

            if ( error != IVAS_ERR_OK && error != IVAS_ERR_INVALID_OUTPUT_FORMAT )

            {

                fprintf( stderr, "Error setting Head Rotation: %s\n", ivas_error_to_string( error ) );

                exit( -1 );

lib_com/bits_alloc.c

+2 −2
Original line number Diff line number Diff line
@@ -737,7 +737,7 @@ ivas_error config_acelp1( 
                }

                else /* L_frame == L_FRAME16k */

                {

                    acelp_cfg->lsf_bits = 41; /* TBV: currently LSFQ @16kHz is not flexible (only 31/41 bits supported */

                    acelp_cfg->lsf_bits = 41;

                }

            }
@@ -1360,7 +1360,7 @@ ivas_error config_acelp1( 
                    acelp_cfg->ubits = acelp_cfg->lsf_bits - 46;

                    acelp_cfg->lsf_bits = 46;

                }

                else if ( acelp_cfg->lsf_bits > 42 && L_frame == L_FRAME ) /* TBV: verify maximum supported LSF Q bitbudget (for some reason 43 bits LSFQ decreases segSNR by 0.7 dB) */

                else if ( acelp_cfg->lsf_bits > 42 && L_frame == L_FRAME )

                {

                    acelp_cfg->ubits = acelp_cfg->lsf_bits - 42;

                    acelp_cfg->lsf_bits = 42;

lib_com/bitstream.c

+3 −7
Original line number Diff line number Diff line
@@ -2903,9 +2903,6 @@ ivas_error preview_indices( 
                break;

            case SID_ISM:

                st_ivas->ivas_format = ISM_FORMAT;

                /* temporary hack to make mode signaling work with the current 1-object ISM DTX: read padding bits */

                /* Todo: how to apply this here? maybe pt_stream += ... would work? */

                /* st->bit_stream += ( IVAS_SID_4k4 - SID_2k40 ) / FRAMES_PER_SEC - SID_FORMAT_NBITS; */

                break;

            case SID_MULTICHANNEL:

                st_ivas->ivas_format = MC_FORMAT;
@@ -3070,7 +3067,7 @@ ivas_error read_indices( 
    file_read_FECpattern( &st_ivas->bfi );

    st_ivas->bfi |= bfi;



    if ( bfi == FRAMEMODE_MISSING ) /* TODO(mcjbm): This fixes channel-aware mode BE. Still requires review from a bitstream reading expert */

    if ( bfi == FRAMEMODE_MISSING )

    {

        for ( k = 0; k < num_bits; k++ )

        {
@@ -3236,7 +3233,7 @@ ivas_error read_indices( 


    /* handle bad/lost speech frame(and CS bad SID frame) in the decoders CNG synthesis settings pair (total_brate, bfi) */

    if ( (

             bfi != FRAMEMODE_FUTURE &&                                            /* TODO(mcjbm): This fixes channel-aware mode BE. Still requires review from a bitstream reading expert */

             bfi != FRAMEMODE_FUTURE &&

             ( *CNG != 0 ) && ( ( speech_bad != 0 ) || ( speech_lost != 0 ) ) ) || /* SP_BAD or SPEECH_LOST)   --> stay in CNG */

         ( sid_upd_bad != 0 ) )                                                    /* SID_UPD_BAD              --> start CNG */

    {
@@ -3280,8 +3277,7 @@ ivas_error read_indices( 
    }



    /* GOOD frame */

    if ( st_ivas->bfi == 0 || st_ivas->bfi == FRAMEMODE_FUTURE /* TODO(mcjbm): This fixes channel-aware mode BE. Still requires review from a bitstream reading expert */

    )

    if ( st_ivas->bfi == 0 || st_ivas->bfi == FRAMEMODE_FUTURE )

    {

        /* GOOD frame - convert ITU-T G.192 words to short values */

        st_ivas->hDecoderConfig->ivas_total_brate = total_brate;