Commit 5112e7fe authored Aug 08, 2023 by Dominik Weckbecker

remove extraneous argument from ivas_osba_ism_metadata_dec

parent 8aa2f2a1

lib_com/ivas_prot.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -5696,7 +5696,6 @@ ivas_error ivas_osba_ism_metadata_dec(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const int32_t ism_total_brate, /* i : ISM total bitrate */
		int16_t nchan_ism, / o : number of ISM separated channels */
		int16_t nchan_transport_ism, / o : number of ISM TCs */
		int16_t nb_bits_metadata[] /* o : number of ISM metadata bits */
		);

lib_dec/ivas_dec.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -681,14 +681,13 @@ ivas_error ivas_dec(
		#ifdef OSBA_DISC_OBJ_MCT
		else if ( st_ivas->ivas_format == SBA_ISM_FORMAT )
		{
		int16_t nchan_ism, nchan_transport_ism;
		int16_t nchan_ism;

		set_s( nb_bits_metadata, 0, MAX_SCE + 1 );
		nchan_transport_ism = 1;

		#ifdef ENABLE_ISM_MD_CODING
		/* set ISM parameters and decode ISM metadata in OSBA format */
		if ( ( error = ivas_osba_ism_metadata_dec( st_ivas, ivas_total_brate, &nchan_ism, &nchan_transport_ism, &nb_bits_metadata[1] ) ) != IVAS_ERR_OK )
		if ( ( error = ivas_osba_ism_metadata_dec( st_ivas, ivas_total_brate, &nchan_ism, &nb_bits_metadata[1] ) ) != IVAS_ERR_OK )
		{
		return error;
		}

lib_dec/ivas_osba_dec.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -225,15 +225,15 @@ ivas_error ivas_osba_ism_metadata_dec(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const int32_t ism_total_brate, /* i : ISM total bitrate */
		int16_t nchan_ism, / o : number of ISM separated channels */
		int16_t nchan_transport_ism, / o : number of ISM TCs */
		int16_t nb_bits_metadata[] /* o : number of ISM metadata bits */
		)
		{
		ivas_error error;
		int16_t *nchan_transport_ism = 0;

		/* set ISM parameters */
		*nchan_ism = st_ivas->nchan_ism;
		*nchan_transport_ism = st_ivas->nchan_ism;
		*nchan_ism = st_ivas->nchan_ism;


		/* decode ISM metadata */