Commit 26798cac authored by TYAGIRIS's avatar TYAGIRIS
Browse files

Merge branch 'ivas-float-update' of... 

Merge branch 'ivas-float-update' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into ivas-float-update
parents 88a91514 f40fa467

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ stages: 


.build-job-linux:

  stage: build

  timeout: "2 minutes"

  timeout: "20 minutes"

  needs: []

  tags:

    - ivas-basop-linux
@@ -669,7 +669,7 @@ build-codec-linux-instrumented-make: 
  rules:

    - if: $CI_PIPELINE_SOURCE == 'web'

    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH

    - 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'

    - if: $CI_PIPELINE_SOURCE == 'schedule'

    - if: $CI_PIPELINE_SOURCE == 'push'

      when: never

apps/encoder.c

+6 −1
Original line number Diff line number Diff line
@@ -785,7 +785,12 @@ int main( 
        }



        /* *** Encode one frame *** */

        if ( ( error = IVAS_ENC_EncodeFrameToSerial( hIvasEnc, pcmBuf, pcmBufSize, bitStream, &numBits ) ) != IVAS_ERR_OK )

        if ( ( error = IVAS_ENC_EncodeFrameToSerial( hIvasEnc, pcmBuf, pcmBufSize, bitStream, &numBits

#ifdef DBG_BITSTREAM_ANALYSIS

                                                     ,

                                                     frame

#endif

                                                     ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nencodeFrame failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );

            goto cleanup;

enum-helper.c

0 → 100644
+382 −0

File added.

Preview size limit exceeded, changes collapsed.

lib_com/bitstream.c

+2007 −62

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ 
/*#define MEM_COUNT_DETAILS*/                   /* Output detailed memory analysis for the worst-case frame (writes to the file "mem_analysis.csv") */



#ifdef DEBUGGING

/*#define DBG_BITSTREAM_ANALYSIS*/                  /* Write bitstream with annotations to a text file */



#define DISABLE_DFT_STEREO_ASSERT               /* This assert is hit for -10 dB tests/codec_be_on_mr_nonselection/test_param_file.py::test_param_file_tests[stv-stereo at 32 kbps, 48kHz in, 48kHz out, DTX on, random FER at 5%, bandwidth switching] */



/*#define DEBUG_MODE_INFO*/                         /* output most important parameters to the subdirectory "res/" */
@@ -93,7 +95,6 @@ 


/*DirAC Debug switches*/

/*#define DEBUG_DISABLE_DIRAC_DELAY_COMP */     /* temporarily disable delay compensation on DirAC encoder */

/*#define DEBUG_BS_READ_WRITE*/

/*#define DEBUG_MODE_DIRAC_NOCORE*/

/*#define DEBUG_MODE_QMETADATA*/                /* output q_metadata parameters */