Merge branch 'main' into 1097-out-of-bound-writing-in-sba-dtx-bitrate-switching (101826c8) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/bitstream.c

+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];

scripts/prepare_delivery.sh

+0 −4

Original line number	Diff line number	Diff line
		@@ -116,10 +116,6 @@ sed -i.bak -e "/lib_util\\\tsm_scale_file_reader.[ch]/d" ${OUTDIR}/Workspace_msv
		cp ${ROOT}/readme.txt ${OUTDIR}
		recode lat1..ibmpc ${OUTDIR}/readme.txt # unix2dos ...

		# readme_split_rendering
		cp ${ROOT}/readme_split_rendering.txt ${OUTDIR}
		recode lat1..ibmpc ${OUTDIR}/readme_split_rendering.txt # unix2dos ...

		# LICENSE.md
		cp ${ROOT}/LICENSE.md ${OUTDIR}
		recode lat1..ibmpc ${OUTDIR}/LICENSE.md # unix2dos ...