Commit 69852fa4 authored by malenovsky's avatar malenovsky
Browse files

Merge branch '1093-ivas_error-calls-in-bitstream-c-use-global-variable-frame' into 'main'

Resolve "IVAS_ERROR() calls in bitstream.c use global variable frame"

See merge request !1567
parents 36b63cd5 c43e0f11
Loading
Loading
Loading
Loading
Loading
+16 −0
Original line number Diff line number Diff line
@@ -884,7 +884,11 @@ ivas_error check_ind_list_limits(
        }
        else
        {
#ifdef DEBUGGING
            return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Buffer of indices corrupted in frame %d! Attempt to overwrite indice ID = %d (value: %d, bits: %d)!\n", frame, hBstr->ind_list[hBstr->nb_ind_tot].id, hBstr->ind_list[hBstr->nb_ind_tot].value, hBstr->ind_list[hBstr->nb_ind_tot].nb_bits );
#else
            return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Buffer of indices corrupted! Attempt to overwrite indice ID = %d (value: %d, bits: %d)!\n", hBstr->ind_list[hBstr->nb_ind_tot].id, hBstr->ind_list[hBstr->nb_ind_tot].value, hBstr->ind_list[hBstr->nb_ind_tot].nb_bits );
#endif
        }
    }

@@ -939,7 +943,11 @@ ivas_error push_indice(
    /* check the limits of the list of indices */
    if ( ( error = check_ind_list_limits( hBstr ) ) != IVAS_ERR_OK )
    {
#ifdef DEBUGGING
        return IVAS_ERROR( error, "Error occured in push_indice() while re-allocating the list of indices (frame %d) !\n", frame );
#else
        return IVAS_ERROR( error, "Error occured in push_indice() while re-allocating the list of indices!\n" );
#endif
    }

    /* find the location in the list of indices based on ID */
@@ -1095,7 +1103,11 @@ ivas_error push_next_bits(
        /* check the limits of the list of indices */
        if ( ( error = check_ind_list_limits( hBstr ) ) != IVAS_ERR_OK )
        {
#ifdef DEBUGGING
            return IVAS_ERROR( error, "Error occured in push_next_bits() while re-allocating the list of indices (frame %d) !\n", frame );
#else
            return IVAS_ERROR( error, "Error occured in push_next_bits() while re-allocating the list of indices!\n" );
#endif
        }
        ptr = &hBstr->ind_list[hBstr->nb_ind_tot];

@@ -1114,7 +1126,11 @@ ivas_error push_next_bits(
        /* check the limits of the list of indices */
        if ( ( error = check_ind_list_limits( hBstr ) ) != IVAS_ERR_OK )
        {
#ifdef DEBUGGING
            return IVAS_ERROR( error, "Error occured in push_next_bits() while re-allocating the list of indices (frame %d) !\n", frame );
#else
            return IVAS_ERROR( error, "Error occured in push_next_bits() while re-allocating the list of indices!\n" );
#endif
        }
        ptr = &hBstr->ind_list[hBstr->nb_ind_tot];