Commit c831ffe6 authored by vaclav's avatar vaclav
Browse files

fix implicit data type conversion

parent 1f984fff

apps/decoder.c

+18 −0
Original line number Original line Diff line number Diff line
@@ -2280,7 +2280,11 @@ static ivas_error decodeG192( 
            int8_t enableRotationInterpolation[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];

            int8_t enableRotationInterpolation[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];

            int16_t numFramesToTargetOrientation[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];

            int16_t numFramesToTargetOrientation[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];





#ifdef FIX_945_REMOVE_DUPLICATED_API_FUNC

            for ( i = 0; i < (int16_t) num_subframes; i++ )

#else

            for ( i = 0; i < num_subframes; i++ )

            for ( i = 0; i < num_subframes; i++ )

#endif

            {

            {

                if ( ( error = ExternalOrientationFileReading( externalOrientationFileReader, &Quaternions[i], &enableHeadRotation[i], &enableExternalOrientation[i], &enableRotationInterpolation[i], &numFramesToTargetOrientation[i] ) ) != IVAS_ERR_OK )

                if ( ( error = ExternalOrientationFileReading( externalOrientationFileReader, &Quaternions[i], &enableHeadRotation[i], &enableExternalOrientation[i], &enableRotationInterpolation[i], &numFramesToTargetOrientation[i] ) ) != IVAS_ERR_OK )

                {

                {
@@ -2288,7 +2292,12 @@ static ivas_error decodeG192( 
                    goto cleanup;

                    goto cleanup;

                }

                }

            }

            }



#ifdef FIX_945_REMOVE_DUPLICATED_API_FUNC

            for ( i = 0; i < (int16_t) num_subframes; i++ )

#else

            for ( i = 0; i < num_subframes; i++ )

            for ( i = 0; i < num_subframes; i++ )

#endif

            {

            {

                if ( ( error = IVAS_DEC_FeedExternalOrientationData( hIvasDec, Quaternions[i], enableHeadRotation[i], enableExternalOrientation[i], enableRotationInterpolation[i], numFramesToTargetOrientation[i], i ) ) != IVAS_ERR_OK )

                if ( ( error = IVAS_DEC_FeedExternalOrientationData( hIvasDec, Quaternions[i], enableHeadRotation[i], enableExternalOrientation[i], enableRotationInterpolation[i], numFramesToTargetOrientation[i], i ) ) != IVAS_ERR_OK )

                {

                {
@@ -3232,7 +3241,11 @@ static ivas_error decodeVoIP( 
            int8_t enableRotationInterpolation[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];

            int8_t enableRotationInterpolation[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];

            int16_t numFramesToTargetOrientation[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];

            int16_t numFramesToTargetOrientation[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];





#ifdef FIX_945_REMOVE_DUPLICATED_API_FUNC

            for ( i = 0; i < (int16_t) num_subframes; i++ )

#else

            for ( i = 0; i < num_subframes; i++ )

            for ( i = 0; i < num_subframes; i++ )

#endif

            {

            {





                if ( ( error = ExternalOrientationFileReading( externalOrientationFileReader, &Quaternions[i], &enableHeadRotation[i], &enableExternalOrientation[i], &enableRotationInterpolation[i], &numFramesToTargetOrientation[i] ) ) != IVAS_ERR_OK )

                if ( ( error = ExternalOrientationFileReading( externalOrientationFileReader, &Quaternions[i], &enableHeadRotation[i], &enableExternalOrientation[i], &enableRotationInterpolation[i], &numFramesToTargetOrientation[i] ) ) != IVAS_ERR_OK )
@@ -3242,7 +3255,12 @@ static ivas_error decodeVoIP( 
                    goto cleanup;

                    goto cleanup;

                }

                }

            }

            }



#ifdef FIX_945_REMOVE_DUPLICATED_API_FUNC

            for ( i = 0; i < (int16_t) num_subframes; i++ )

#else

            for ( i = 0; i < num_subframes; i++ )

            for ( i = 0; i < num_subframes; i++ )

#endif

            {

            {

                if ( ( error = IVAS_DEC_FeedExternalOrientationData( hIvasDec, Quaternions[i], enableHeadRotation[i], enableExternalOrientation[i], enableRotationInterpolation[i], numFramesToTargetOrientation[i], i ) ) != IVAS_ERR_OK )

                if ( ( error = IVAS_DEC_FeedExternalOrientationData( hIvasDec, Quaternions[i], enableHeadRotation[i], enableExternalOrientation[i], enableRotationInterpolation[i], numFramesToTargetOrientation[i], i ) ) != IVAS_ERR_OK )

                {

                {