morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fixed sign-compare warnings

Browse Source
This commit is contained in:
Armin Novak
2019-02-07 14:31:17 +01:00
parent 7dfc453858
commit e72d9fd484
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libfreerdp/codec/dsp_ffmpeg.c
View File

@@ -638,17 +638,20 @@ BOOL freerdp_dsp_ffmpeg_encode(FREERDP_DSP_CONTEXT* context, const AUDIO_FORMAT*
{
int inSamples = rest;
if (inSamples + context->bufferedSamples > context->context->frame_size)
inSamples = context->context->frame_size - context->bufferedSamples;
if ((inSamples < 0) || (context->bufferedSamples > (UINT32)(INT_MAX - inSamples)))
return FALSE;
if (inSamples + (int)context->bufferedSamples > context->context->frame_size)
inSamples = context->context->frame_size - (int)context->bufferedSamples;
rc = av_samples_copy(context->buffered->extended_data, context->resampled->extended_data,
context->bufferedSamples, copied, inSamples,
(int)context->bufferedSamples, copied, inSamples,
context->context->channels, context->context->sample_fmt);
rest -= inSamples;
copied += inSamples;
context->bufferedSamples += inSamples;
context->bufferedSamples += (UINT32)inSamples;
if (context->context->frame_size <= context->bufferedSamples)
if (context->context->frame_size <= (int)context->bufferedSamples)
{
/* Encode in desired format. */
if (!ffmpeg_encode_frame(context->context, context->buffered,

7
libfreerdp/codec/h264_ffmpeg.c
View File

@@ -120,13 +120,16 @@ static BOOL libavcodec_create_encoder(H264_CONTEXT* h264)
if (!h264 || !h264->subsystem)
return FALSE;
if ((h264->width > INT_MAX) || (h264->height > INT_MAX))
return FALSE;
sys = (H264_CONTEXT_LIBAVCODEC*)h264->pSystemData;
recreate = !sys->codecEncoder || !sys->codecEncoderContext;
if (sys->codecEncoderContext)
{
if ((sys->codecEncoderContext->width != h264->width) ||
(sys->codecEncoderContext->height != h264->height))
if ((sys->codecEncoderContext->width != (int)h264->width) ||
(sys->codecEncoderContext->height != (int)h264->height))
recreate = TRUE;
}