Commit f40fa467 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge branch... 

Merge branch '1712-compilation-errors-with-instrumentation-in-ivas-float-update' into 'ivas-float-update'

Resolve "Compilation errors with instrumentation in ivas-float-update"

See merge request !1648
parents 90dade9e 4b37cfd3

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -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

lib_com/bitstream.c

+6 −3
Original line number Diff line number Diff line
@@ -2865,9 +2865,11 @@ ivas_error push_indice( 
 * Push a new indice into the buffer at the next position

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



ivas_error push_next_indice_(

#ifdef DBG_BITSTREAM_ANALYSIS

ivas_error push_next_indice_(

    const char *caller,

#else

ivas_error push_next_indice(

#endif

    BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle                    */

    uint16_t value,        /* i  : value of the quantized indice               */
@@ -2930,10 +2932,11 @@ ivas_error push_next_indice_( 
 * Push a bit buffer into the buffer at the next position

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





ivas_error push_next_bits_(

#ifdef DBG_BITSTREAM_ANALYSIS

ivas_error push_next_bits_(

    const char *caller,

#else

ivas_error push_next_bits(

#endif

    BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle                     */

    const uint16_t bits[], /* i  : bit buffer to pack, sequence of single bits  */

lib_com/prot.h

+6 −5
Original line number Diff line number Diff line
@@ -476,23 +476,24 @@ ivas_error push_indice( 
#ifdef DBG_BITSTREAM_ANALYSIS

#define push_next_indice( ... ) push_next_indice_( __func__, __VA_ARGS__ )

#define push_next_bits( ... )   push_next_bits_( __func__, __VA_ARGS__ );

#else

#define push_next_indice( ... ) push_next_indice_( __VA_ARGS__ )

#define push_next_bits( ... )   push_next_bits_( __VA_ARGS__ );

#endif



ivas_error push_next_indice_(

#ifdef DBG_BITSTREAM_ANALYSIS

ivas_error push_next_indice_(

    const char *caller,

#else

ivas_error push_next_indice(

#endif

    BSTR_ENC_HANDLE hBstr,

    uint16_t value, /* i  : value of the quantized indice          */

    int16_t nb_bits /* i  : number of bits used to quantize the indice */

);



ivas_error push_next_bits_(

#ifdef DBG_BITSTREAM_ANALYSIS

ivas_error push_next_bits_(

    const char *caller,

#else

ivas_error push_next_bits(

#endif

    BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle               */

    const uint16_t bits[], /* i  : bit buffer to pack, sequence of single bits */