diff --git a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c index 63e95311b..15398fb83 100644 --- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c +++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c @@ -108,11 +108,13 @@ static BOOL tsmf_ffmpeg_init_context(ITSMFDecoder* decoder) static BOOL tsmf_ffmpeg_init_video_stream(ITSMFDecoder* decoder, const TS_AM_MEDIA_TYPE* media_type) { TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*)decoder; - mdecoder->codec_context->width = media_type->Width; - mdecoder->codec_context->height = media_type->Height; - mdecoder->codec_context->bit_rate = media_type->BitRate; - mdecoder->codec_context->time_base.den = media_type->SamplesPerSecond.Numerator; - mdecoder->codec_context->time_base.num = media_type->SamplesPerSecond.Denominator; + mdecoder->codec_context->width = WINPR_ASSERTING_INT_CAST(int, media_type->Width); + mdecoder->codec_context->height = WINPR_ASSERTING_INT_CAST(int, media_type->Height); + mdecoder->codec_context->bit_rate = WINPR_ASSERTING_INT_CAST(int, media_type->BitRate); + mdecoder->codec_context->time_base.den = + WINPR_ASSERTING_INT_CAST(int, media_type->SamplesPerSecond.Numerator); + mdecoder->codec_context->time_base.num = + WINPR_ASSERTING_INT_CAST(int, media_type->SamplesPerSecond.Denominator); #if LIBAVCODEC_VERSION_MAJOR < 55 mdecoder->frame = avcodec_alloc_frame(); #else @@ -124,14 +126,16 @@ static BOOL tsmf_ffmpeg_init_video_stream(ITSMFDecoder* decoder, const TS_AM_MED static BOOL tsmf_ffmpeg_init_audio_stream(ITSMFDecoder* decoder, const TS_AM_MEDIA_TYPE* media_type) { TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*)decoder; - mdecoder->codec_context->sample_rate = media_type->SamplesPerSecond.Numerator; - mdecoder->codec_context->bit_rate = media_type->BitRate; + mdecoder->codec_context->sample_rate = + WINPR_ASSERTING_INT_CAST(int, media_type->SamplesPerSecond.Numerator); + mdecoder->codec_context->bit_rate = WINPR_ASSERTING_INT_CAST(int, media_type->BitRate); #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(57, 28, 100) - mdecoder->codec_context->ch_layout.nb_channels = media_type->Channels; + mdecoder->codec_context->ch_layout.nb_channels = + WINPR_ASSERTING_INT_CAST(int, media_type->Channels); #else - mdecoder->codec_context->channels = media_type->Channels; + mdecoder->codec_context->channels = WINPR_ASSERTING_INT_CAST(int, media_type->Channels); #endif - mdecoder->codec_context->block_align = media_type->BlockAlign; + mdecoder->codec_context->block_align = WINPR_ASSERTING_INT_CAST(int, media_type->BlockAlign); #if LIBAVCODEC_VERSION_MAJOR < 55 #ifdef AV_CPU_FLAG_SSE2 mdecoder->codec_context->dsp_mask = AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2; @@ -199,7 +203,8 @@ static BOOL tsmf_ffmpeg_init_stream(ITSMFDecoder* decoder, const TS_AM_MEDIA_TYP if (media_type->ExtraData) { /* Add a padding to avoid invalid memory read in some codec */ - mdecoder->codec_context->extradata_size = media_type->ExtraDataSize + 8; + mdecoder->codec_context->extradata_size = + WINPR_ASSERTING_INT_CAST(int, media_type->ExtraDataSize + 8); mdecoder->codec_context->extradata = calloc(1, mdecoder->codec_context->extradata_size); if (!mdecoder->codec_context->extradata) @@ -387,7 +392,7 @@ static BOOL tsmf_ffmpeg_decode_video(ITSMFDecoder* decoder, const BYTE* data, UI av_init_packet(&pkt); #endif pkt.data = WINPR_CAST_CONST_PTR_AWAY(data, BYTE*); - pkt.size = data_size; + pkt.size = WINPR_ASSERTING_INT_CAST(int, data_size); if (extensions & TSMM_SAMPLE_EXT_CLEANPOINT) pkt.flags |= AV_PKT_FLAG_KEY; @@ -501,9 +506,9 @@ static BOOL tsmf_ffmpeg_decode_audio(ITSMFDecoder* decoder, const BYTE* data, UI dst += mdecoder->decoded_size; } - frame_size = mdecoder->decoded_size_max - mdecoder->decoded_size; #if LIBAVCODEC_VERSION_MAJOR < 52 || \ (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR <= 20) + frame_size = mdecoder->decoded_size_max - mdecoder->decoded_size; len = avcodec_decode_audio2(mdecoder->codec_context, (int16_t*)dst, &frame_size, src, src_size); #else @@ -520,7 +525,7 @@ static BOOL tsmf_ffmpeg_decode_audio(ITSMFDecoder* decoder, const BYTE* data, UI #endif pkt.data = WINPR_CAST_CONST_PTR_AWAY(src, BYTE*); - pkt.size = src_size; + pkt.size = WINPR_ASSERTING_INT_CAST(int, src_size); #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57, 48, 101) len = avcodec_decode_audio4(mdecoder->codec_context, decoded_frame, &got_frame, &pkt); #else diff --git a/channels/tsmf/client/oss/tsmf_oss.c b/channels/tsmf/client/oss/tsmf_oss.c index ad8033604..9cc2119d8 100644 --- a/channels/tsmf/client/oss/tsmf_oss.c +++ b/channels/tsmf/client/oss/tsmf_oss.c @@ -31,7 +31,6 @@ #include #include #include -#include #if defined(__OpenBSD__) #include #else @@ -131,17 +130,17 @@ static BOOL tsmf_oss_set_format(ITSMFAudioDevice* audio, UINT32 sample_rate, UIN if (ioctl(oss->pcm_handle, SNDCTL_DSP_SETFMT, &tmp) == -1) OSS_LOG_ERR("SNDCTL_DSP_SETFMT failed", errno); - tmp = channels; + tmp = WINPR_ASSERTING_INT_CAST(int, channels); if (ioctl(oss->pcm_handle, SNDCTL_DSP_CHANNELS, &tmp) == -1) OSS_LOG_ERR("SNDCTL_DSP_CHANNELS failed", errno); - tmp = sample_rate; + tmp = WINPR_ASSERTING_INT_CAST(int, sample_rate); if (ioctl(oss->pcm_handle, SNDCTL_DSP_SPEED, &tmp) == -1) OSS_LOG_ERR("SNDCTL_DSP_SPEED failed", errno); - tmp = ((bits_per_sample / 8) * channels * sample_rate); + tmp = WINPR_ASSERTING_INT_CAST(int, ((bits_per_sample / 8) * channels * sample_rate)); if (ioctl(oss->pcm_handle, SNDCTL_DSP_SETFRAGMENT, &tmp) == -1) OSS_LOG_ERR("SNDCTL_DSP_SETFRAGMENT failed", errno); diff --git a/channels/tsmf/client/tsmf_ifman.c b/channels/tsmf/client/tsmf_ifman.c index dc97c56b1..6fcb82b72 100644 --- a/channels/tsmf/client/tsmf_ifman.c +++ b/channels/tsmf/client/tsmf_ifman.c @@ -351,12 +351,14 @@ UINT tsmf_ifman_set_source_video_rect(TSMF_IFMAN* ifman) } else { +#ifdef WITH_DEBUG_TSMF Left = tsmf_stream_read_float(ifman->input); /* Left (4 bytes) */ Top = tsmf_stream_read_float(ifman->input); /* Top (4 bytes) */ Right = tsmf_stream_read_float(ifman->input); /* Right (4 bytes) */ Bottom = tsmf_stream_read_float(ifman->input); /* Bottom (4 bytes) */ DEBUG_TSMF("SetSourceVideoRect: Left: %f Top: %f Right: %f Bottom: %f", Left, Top, Right, Bottom); +#endif } ifman->output_pending = TRUE; diff --git a/client/X11/xf_tsmf.c b/client/X11/xf_tsmf.c index 7d79c04b8..ff42dcfcc 100644 --- a/client/X11/xf_tsmf.c +++ b/client/X11/xf_tsmf.c @@ -127,8 +127,8 @@ static int xf_tsmf_xv_video_frame_event(TsmfClientContext* tsmf, TSMF_VIDEO_FRAM width = event->visibleRects[i].right - event->visibleRects[i].left; height = event->visibleRects[i].bottom - event->visibleRects[i].top; - xrects[i].x = x; - xrects[i].y = y; + xrects[i].x = WINPR_ASSERTING_INT_CAST(short, x); + xrects[i].y = WINPR_ASSERTING_INT_CAST(short, y); xrects[i].width = width; xrects[i].height = height; } @@ -188,8 +188,8 @@ static int xf_tsmf_xv_video_frame_event(TsmfClientContext* tsmf, TSMF_VIDEO_FRAM return -1003; } - image = XvShmCreateImage(xfc->display, xv->xv_port, xvpixfmt, 0, event->frameWidth, - event->frameHeight, &shminfo); + image = XvShmCreateImage(xfc->display, xv->xv_port, WINPR_ASSERTING_INT_CAST(int, xvpixfmt), 0, + event->frameWidth, event->frameHeight, &shminfo); if (xv->xv_image_size != image->data_size) { diff --git a/libfreerdp/codec/dsp_fdk_aac.c b/libfreerdp/codec/dsp_fdk_aac.c index 2165863ce..94fd23fd1 100644 --- a/libfreerdp/codec/dsp_fdk_aac.c +++ b/libfreerdp/codec/dsp_fdk_aac.c @@ -34,7 +34,7 @@ static void write_log(unsigned log_level, const char* fmt, ...) va_list ap = { 0 }; va_start(ap, fmt); - vsnprintf(buffer, sizeof(buffer), fmt, ap); + (void)vsnprintf(buffer, sizeof(buffer), fmt, ap); va_end(ap); WLog_PrintMessage(log, WLOG_MESSAGE_TEXT, log_level, __LINE__, __FILE__, __func__, "%s", diff --git a/libfreerdp/codec/dsp_fdk_impl.c b/libfreerdp/codec/dsp_fdk_impl.c index 7a7579034..d2f3442f7 100644 --- a/libfreerdp/codec/dsp_fdk_impl.c +++ b/libfreerdp/codec/dsp_fdk_impl.c @@ -480,7 +480,7 @@ int fdk_aac_dsp_impl_config(void* handle, size_t* pbuffersize, int encoder, unsi if (err != AACENC_OK) log(WLOG_WARN, "aacEncClose failed with %s", enc_err_str(err)); - *pbuffersize = info.frameLength * info.inputChannels * sizeof(INT_PCM); + *pbuffersize = sizeof(INT_PCM) * info.frameLength * info.inputChannels; HANDLE_AACDECODER aacdec = (HANDLE_AACDECODER)handle; @@ -555,14 +555,15 @@ ssize_t fdk_aac_dsp_impl_stream_info(void* handle, int encoder, fdk_log_fkt_t lo return -1; } - return sizeof(INT_PCM) * info->numChannels * info->frameSize; + const size_t rsize = sizeof(INT_PCM) * info->numChannels * info->frameSize; + return (ssize_t)rsize; } } ssize_t fdk_aac_dsp_impl_encode(void* handle, const void* data, size_t size, void* dst, size_t dstSize, fdk_log_fkt_t log) { - INT inSizes[] = { size }; + INT inSizes[] = { (INT)size }; INT inElSizes[] = { sizeof(INT_PCM) }; INT inIdentifiers[] = { IN_AUDIO_DATA }; union @@ -581,7 +582,7 @@ ssize_t fdk_aac_dsp_impl_encode(void* handle, const void* data, size_t size, voi .bufElSizes = inElSizes /* TODO: 8/16 bit input? */ }; - INT outSizes[] = { dstSize }; + INT outSizes[] = { (INT)dstSize }; INT outElSizes[] = { 1 }; INT outIdentifiers[] = { OUT_BITSTREAM_DATA }; void* outBuffers[] = { dst }; @@ -592,7 +593,7 @@ ssize_t fdk_aac_dsp_impl_encode(void* handle, const void* data, size_t size, voi .bufElSizes = outElSizes }; const AACENC_InArgs inArgs = { .numInSamples = - size / sizeof(INT_PCM), /* TODO: 8/16 bit input? */ + (INT)(size / sizeof(INT_PCM)), /* TODO: 8/16 bit input? */ .numAncBytes = 0 }; AACENC_OutArgs outArgs = { 0 }; diff --git a/winpr/libwinpr/clipboard/clipboard.c b/winpr/libwinpr/clipboard/clipboard.c index 965be4df0..ea6c0e05b 100644 --- a/winpr/libwinpr/clipboard/clipboard.c +++ b/winpr/libwinpr/clipboard/clipboard.c @@ -32,7 +32,7 @@ #include "../log.h" #define TAG WINPR_TAG("clipboard") -const char* mime_text_plain = "text/plain"; +const char* const mime_text_plain = "text/plain"; /** * Clipboard (Windows): diff --git a/winpr/libwinpr/clipboard/clipboard.h b/winpr/libwinpr/clipboard/clipboard.h index b3dc4d07e..14071d04a 100644 --- a/winpr/libwinpr/clipboard/clipboard.h +++ b/winpr/libwinpr/clipboard/clipboard.h @@ -72,6 +72,6 @@ WINPR_LOCAL BOOL ClipboardInitSynthesizers(wClipboard* clipboard); WINPR_LOCAL char* parse_uri_to_local_file(const char* uri, size_t uri_len); -extern const char* mime_text_plain; +extern const char* const mime_text_plain; #endif /* WINPR_CLIPBOARD_PRIVATE_H */ diff --git a/winpr/libwinpr/sspi/Kerberos/krb5glue_heimdal.c b/winpr/libwinpr/sspi/Kerberos/krb5glue_heimdal.c index 60b2c4572..fbd87016b 100644 --- a/winpr/libwinpr/sspi/Kerberos/krb5glue_heimdal.c +++ b/winpr/libwinpr/sspi/Kerberos/krb5glue_heimdal.c @@ -50,7 +50,8 @@ krb5_error_code krb5glue_update_keyset(krb5_context ctx, krb5_auth_context auth_ krb5glue_keys_free(ctx, keyset); - if (!(rv = krb5_auth_con_getkey(ctx, auth_ctx, &keyblock))) + rv = krb5_auth_con_getkey(ctx, auth_ctx, &keyblock); + if (!rv) { krb5_crypto_init(ctx, keyblock, ENCTYPE_NULL, &keyset->session_key); krb5_free_keyblock(ctx, keyblock);