remove cast (67b9ab88) · Commits · SA4 / Audio / IVAS BASOP

lib_enc/ivas_qmetadata_enc_fx.c

+16 −16

Original line number	Diff line number	Diff line
		@@ -4672,14 +4672,14 @@ static Word16 encode_coherence_indexesDCT0_fx(
		{
		k = sub( k, 16 );
		#ifdef FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC
		hMetaData->ind_list[indice_coherence + i].value = u_extract_l( (UWord32) W_extract_l( W_shr( (Word64) idx, k ) ) ); /* ( ( idx >> k ) & 65535 ); 16 bits */
		hMetaData->ind_list[indice_coherence + i].value = u_extract_l( (UWord32) W_extract_l( W_shr( idx, k ) ) ); /* ( ( idx >> k ) & 65535 ); 16 bits */
		#else
		hMetaData->ind_list[indice_coherence + i].value = ( ( idx >> k ) & 65535 ); /* 16 bits */
		move16();
		#endif
		}
		#ifdef FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC
		hMetaData->ind_list[indice_coherence + i].value = u_extract_l( (UWord32) L_and( W_extract_l( (Word64) idx ), L_sub( L_shl( 1, k ), 1 ) ) ); /* ( idx & ( ( 1 << k ) - 1 ) ); */
		hMetaData->ind_list[indice_coherence + i].value = u_extract_l( (UWord32) L_and( W_extract_l( idx ), L_sub( L_shl( 1, k ), 1 ) ) ); /* ( idx & ( ( 1 << k ) - 1 ) ); */
		#else
		hMetaData->ind_list[indice_coherence + i].value = ( idx & ( ( 1 << k ) - 1 ) );
		move16();
		@@ -4706,14 +4706,14 @@ static Word16 encode_coherence_indexesDCT0_fx(
		{
		k = sub( k, 16 );
		#ifdef FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC
		hMetaData->ind_list[indice_coherence + j].value = u_extract_l( (UWord32) W_extract_l( W_shr( (Word64) idx1, k ) ) ); /* ( ( idx1 >> k ) & 65535 ); 16 bits */
		hMetaData->ind_list[indice_coherence + j].value = u_extract_l( (UWord32) W_extract_l( W_shr( idx1, k ) ) ); /* ( ( idx1 >> k ) & 65535 ); 16 bits */
		#else
		hMetaData->ind_list[indice_coherence + j].value = ( ( idx1 >> k ) & 65535 ); /* 16 bits */
		move16();
		#endif
		}
		#ifdef FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC
		hMetaData->ind_list[indice_coherence + j].value = u_extract_l( (UWord32) L_and( W_extract_l( (Word64) idx1 ), L_sub( L_shl( 1, k ), 1 ) ) ); /* ( idx1 & ( ( 1 << k ) - 1 ) ); */
		hMetaData->ind_list[indice_coherence + j].value = u_extract_l( (UWord32) L_and( W_extract_l( idx1 ), L_sub( L_shl( 1, k ), 1 ) ) ); /* ( idx1 & ( ( 1 << k ) - 1 ) ); */
		#else
		hMetaData->ind_list[indice_coherence + j].value = ( idx1 & ( ( 1 << k ) - 1 ) );
		move16();
		@@ -4999,13 +4999,13 @@ static Word16 encode_spread_coherence_1sf_fx(
		{
		k = sub( k, 16 );
		#ifdef FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC
		push_next_indice( hMasaMetaData, u_extract_l( (UWord32) W_extract_l( W_shr( (Word64) idx, k ) ) ), 16 ); /* ( ( idx >> k ) & 65535 ); 16 bits */
		push_next_indice( hMasaMetaData, u_extract_l( (UWord32) W_extract_l( W_shr( idx, k ) ) ), 16 ); /* ( ( idx >> k ) & 65535 ); 16 bits */
		#else
		push_next_indice( hMasaMetaData, ( ( idx >> k ) & 65535 ), 16 ); /* 16 bits */
		#endif
		}
		#ifdef FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC
		push_next_indice( hMasaMetaData, u_extract_l( (UWord32) L_and( W_extract_l( (Word64) idx ), L_sub( L_shl( 1, k ), 1 ) ) ), k ); /* ( idx & ( ( 1 << k ) - 1 ) ); */
		push_next_indice( hMasaMetaData, u_extract_l( (UWord32) L_and( W_extract_l( idx ), L_sub( L_shl( 1, k ), 1 ) ) ), k ); /* ( idx & ( ( 1 << k ) - 1 ) ); */
		#else
		push_next_indice( hMasaMetaData, ( idx & ( ( 1 << k ) - 1 ) ), k );
		#endif
		@@ -5031,13 +5031,13 @@ static Word16 encode_spread_coherence_1sf_fx(
		{
		k = sub( k, 16 );
		#ifdef FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC
		push_next_indice( hMasaMetaData, u_extract_l( (UWord32) W_extract_l( W_shr( (Word64) idx1, k ) ) ), 16 ); /* ( ( idx1 >> k ) & 65535 ); 16 bits */
		push_next_indice( hMasaMetaData, u_extract_l( (UWord32) W_extract_l( W_shr( idx1, k ) ) ), 16 ); /* ( ( idx1 >> k ) & 65535 ); 16 bits */
		#else
		push_next_indice( hMasaMetaData, ( ( idx1 >> k ) & 65535 ), 16 ); /* 16 bits */
		#endif
		}
		#ifdef FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC
		push_next_indice( hMasaMetaData, u_extract_l( (UWord32) L_and( W_extract_l( (Word64) idx1 ), L_sub( L_shl( 1, k ), 1 ) ) ), k ); /* ( idx1 & ( ( 1 << k ) - 1 ) ); */
		push_next_indice( hMasaMetaData, u_extract_l( (UWord32) L_and( W_extract_l( idx1 ), L_sub( L_shl( 1, k ), 1 ) ) ), k ); /* ( idx1 & ( ( 1 << k ) - 1 ) ); */
		#else
		push_next_indice( hMasaMetaData, ( idx1 & ( ( 1 << k ) - 1 ) ), k );
		#endif
		@@ -5246,13 +5246,13 @@ static Word16 encode_surround_coherence_fx(
		{
		k = sub( k, 16 );
		#ifdef FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC
		push_next_indice( hMetaData, u_extract_l( (UWord32) W_extract_l( W_shr( (Word64) idx, k ) ) ), 16 ); /* ( ( idx >> k ) & 65535 ); 16 bits */
		push_next_indice( hMetaData, u_extract_l( (UWord32) W_extract_l( W_shr( idx, k ) ) ), 16 ); /* ( ( idx >> k ) & 65535 ); 16 bits */
		#else
		push_next_indice( hMetaData, ( ( idx >> k ) & 65535 ), 16 ); /* 16 bits */
		#endif
		}
		#ifdef FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC
		push_next_indice( hMetaData, u_extract_l( (UWord32) L_and( W_extract_l( (Word64) idx ), L_sub( L_shl( 1, k ), 1 ) ) ), k ); /* ( idx & ( ( 1 << k ) - 1 ) ); */
		push_next_indice( hMetaData, u_extract_l( (UWord32) L_and( W_extract_l( idx ), L_sub( L_shl( 1, k ), 1 ) ) ), k ); /* ( idx & ( ( 1 << k ) - 1 ) ); */
		#else
		push_next_indice( hMetaData, ( idx & ( ( 1 << k ) - 1 ) ), k );
		#endif
		@@ -5278,13 +5278,13 @@ static Word16 encode_surround_coherence_fx(
		{
		k = sub( k, 16 );
		#ifdef FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC
		push_next_indice( hMetaData, u_extract_l( (UWord32) W_extract_l( W_shr( (Word64) idx1, k ) ) ), 16 ); /* ( ( idx1 >> k ) & 65535 ); 16 bits */
		push_next_indice( hMetaData, u_extract_l( (UWord32) W_extract_l( W_shr( idx1, k ) ) ), 16 ); /* ( ( idx1 >> k ) & 65535 ); 16 bits */
		#else
		push_next_indice( hMetaData, ( ( idx1 >> k ) & 65535 ), 16 ); /* 16 bits */
		#endif
		}
		#ifdef FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC
		push_next_indice( hMetaData, u_extract_l( (UWord32) L_and( W_extract_l( (Word64) idx1 ), L_sub( L_shl( 1, k ), 1 ) ) ), k ); /* ( idx1 & ( ( 1 << k ) - 1 ) ); */
		push_next_indice( hMetaData, u_extract_l( (UWord32) L_and( W_extract_l( idx1 ), L_sub( L_shl( 1, k ), 1 ) ) ), k ); /* ( idx1 & ( ( 1 << k ) - 1 ) ); */
		#else
		push_next_indice( hMetaData, ( idx1 & ( ( 1 << k ) - 1 ) ), k );
		#endif
		@@ -5495,13 +5495,13 @@ static Word16 encode_surround_coherence_hr_fx(
		{
		k = sub( k, 16 );
		#ifdef FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC
		push_next_indice( hMetaData, u_extract_l( (UWord32) W_extract_l( W_shr( (Word64) idx, k ) ) ), 16 ); /* ( ( idx >> k ) & 65535 ); 16 bits */
		push_next_indice( hMetaData, u_extract_l( (UWord32) W_extract_l( W_shr( idx, k ) ) ), 16 ); /* ( ( idx >> k ) & 65535 ); 16 bits */
		#else
		push_next_indice( hMetaData, ( ( idx >> k ) & 65535 ), 16 ); /* 16 bits */
		#endif
		}
		#ifdef FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC
		push_next_indice( hMetaData, u_extract_l( (UWord32) L_and( W_extract_l( (Word64) idx ), L_sub( L_shl( 1, k ), 1 ) ) ), k ); /* ( idx & ( ( 1 << k ) - 1 ) ); */
		push_next_indice( hMetaData, u_extract_l( (UWord32) L_and( W_extract_l( idx ), L_sub( L_shl( 1, k ), 1 ) ) ), k ); /* ( idx & ( ( 1 << k ) - 1 ) ); */
		#else
		push_next_indice( hMetaData, ( idx & ( ( 1 << k ) - 1 ) ), k );
		#endif
		@@ -5525,13 +5525,13 @@ static Word16 encode_surround_coherence_hr_fx(
		{
		k = sub( k, 16 );
		#ifdef FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC
		push_next_indice( hMetaData, u_extract_l( (UWord32) W_extract_l( W_shr( (Word64) idx1, k ) ) ), 16 ); /* ( ( idx1 >> k ) & 65535 ); 16 bits */
		push_next_indice( hMetaData, u_extract_l( (UWord32) W_extract_l( W_shr( idx1, k ) ) ), 16 ); /* ( ( idx1 >> k ) & 65535 ); 16 bits */
		#else
		push_next_indice( hMetaData, ( ( idx1 >> k ) & 65535 ), 16 ); /* 16 bits */
		#endif
		}
		#ifdef FIX_2433_ARITH_OVERFLOW_IN_QMETA_ENC
		push_next_indice( hMetaData, u_extract_l( (UWord32) L_and( W_extract_l( (Word64) idx1 ), L_sub( L_shl( 1, k ), 1 ) ) ), k ); /* ( idx1 & ( ( 1 << k ) - 1 ) ); */
		push_next_indice( hMetaData, u_extract_l( (UWord32) L_and( W_extract_l( idx1 ), L_sub( L_shl( 1, k ), 1 ) ) ), k ); /* ( idx1 & ( ( 1 << k ) - 1 ) ); */
		#else
		push_next_indice( hMetaData, ( idx1 & ( ( 1 << k ) - 1 ) ), k );
		#endif