fix array size declaration for data_separated_object[] (aefdf2d7) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_prot.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -997,7 +997,11 @@ ivas_error ivas_ism_metadata_dec_create(

		ivas_error ivas_ism_enc(
		Encoder_Struct st_ivas, / i/o: IVAS encoder structure */
		#ifdef BE_FIX_887_GCC_WARNING_ARRAY_SIZE
		float data[], / i : input signal [channels][samples] */
		#else
		float data[MAX_NUM_OBJECTS], / i : input signal */
		#endif
		const int16_t input_frame, /* i : input frame length per channel */
		int16_t nb_bits_metadata, / i : number of metadata bits */
		const int16_t flag_omasa_ener_brate /* i : less bitrate for objects in OMASA flag */

lib_enc/ivas_enc.c

+2 −20

Original line number	Diff line number	Diff line
		@@ -274,11 +274,8 @@ ivas_error ivas_enc(
		}
		else if ( ivas_format == MASA_ISM_FORMAT )
		{
		#ifdef BE_FIX_887_GCC_WARNING_ARRAY_SIZE
		float *data_separated_object[1];
		#else
		float *data_separated_object;
		#endif

		int16_t idx_separated_object;
		int16_t flag_omasa_ener_brate;

		@@ -301,43 +298,28 @@ ivas_error ivas_enc(

		set_s( nb_bits_metadata, 0, MAX_SCE + 1 );
		idx_separated_object = 0;
		#ifdef BE_FIX_887_GCC_WARNING_ARRAY_SIZE
		data_separated_object[0] = data_f[hEncoderConfig->nchan_ism + CPE_CHANNELS];
		#else

		data_separated_object = data_f[hEncoderConfig->nchan_ism + CPE_CHANNELS];
		#endif

		/* put audio object data in SCE's */
		if ( st_ivas->ism_mode != ISM_MASA_MODE_DISC )
		{
		/* Estimate MASA parameters for the objects */
		#ifdef BE_FIX_887_GCC_WARNING_ARRAY_SIZE
		ivas_omasa_enc( st_ivas->hOMasa, st_ivas->hMasa, st_ivas->hIsmMetaData, data_f, input_frame, st_ivas->nchan_transport, hEncoderConfig->nchan_ism, st_ivas->ism_mode, data_separated_object[0], &idx_separated_object );
		#else
		ivas_omasa_enc( st_ivas->hOMasa, st_ivas->hMasa, st_ivas->hIsmMetaData, data_f, input_frame, st_ivas->nchan_transport, hEncoderConfig->nchan_ism, st_ivas->ism_mode, data_separated_object, &idx_separated_object );
		#endif
		}

		/* Encode ISMs transport channels */
		n = 0;
		if ( st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ )
		{
		#ifdef BE_FIX_887_GCC_WARNING_ARRAY_SIZE
		if ( ( error = ivas_sce_enc( st_ivas, 0, data_separated_object[0], input_frame, nb_bits_metadata[1] ) ) != IVAS_ERR_OK ) /* there are no metadata bits in SCE in this mode */
		#else
		if ( ( error = ivas_sce_enc( st_ivas, 0, data_separated_object, input_frame, nb_bits_metadata[1] ) ) != IVAS_ERR_OK ) /* there are no metadata bits in SCE in this mode */
		#endif
		{
		return error;
		}
		}
		else if ( st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ )
		{
		#ifdef BE_FIX_887_GCC_WARNING_ARRAY_SIZE
		if ( ( error = ivas_ism_enc( st_ivas, data_separated_object, input_frame, &nb_bits_metadata[1], 0 ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ivas_ism_enc( st_ivas, &data_separated_object, input_frame, &nb_bits_metadata[1], 0 ) ) != IVAS_ERR_OK )
		#endif
		{
		return error;
		}

lib_enc/ivas_ism_enc.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -50,7 +50,11 @@

		ivas_error ivas_ism_enc(
		Encoder_Struct st_ivas, / i/o: IVAS encoder structure */
		#ifdef BE_FIX_887_GCC_WARNING_ARRAY_SIZE
		float data[], / i : input signal [channels][samples] */
		#else
		float data[MAX_NUM_OBJECTS], / i : input signal */
		#endif
		const int16_t input_frame, /* i : input frame length per channel */
		int16_t nb_bits_metadata, / i : number of metadata bits */
		const int16_t flag_omasa_ener_brate /* i : less bitrate for objects in OMASA flag */

Admin message