ef1fd12b15
1) Added missing checks for CreateEvent which also required the following related changes: - changed freerdp_context_new API to BOOL - changed freerdp_peer_context_new API to BOOL - changed pRdpClientNew callback to BOOL - changed pContextNew callback to BOOL - changed psPeerAccepted callback to BOOL - changed psPeerContextNew callback to BOOL 2) Fixed lots of missing alloc and error checks in the changed code's neighbourhood. 3) Check freerdp_client_codecs_prepare result to avoid segfaults caused by using non-initialized codecs. 4) Fixed deadlocks in x11 caused by missing xf_unlock_x11() calls in some error handlers 5) Some fixes in thread pool: - DEFAULT_POOL assignment did not match TP_POOL definition - don't free the pool pointer if it points to the static DEFAULT_POOL - added error handling and cleanup in InitializeThreadpool
233 lines
4.2 KiB
C
233 lines
4.2 KiB
C
/**
|
|
* FreeRDP: A Remote Desktop Protocol Implementation
|
|
* RDP Codecs
|
|
*
|
|
* Copyright 2014 Marc-Andre Moreau <marcandre.moreau@gmail.com>
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include "rdp.h"
|
|
|
|
#include <freerdp/codecs.h>
|
|
|
|
#define TAG FREERDP_TAG("core.codecs")
|
|
|
|
BOOL freerdp_client_codecs_prepare(rdpCodecs* codecs, UINT32 flags)
|
|
{
|
|
if (flags & FREERDP_CODEC_INTERLEAVED && !codecs->interleaved)
|
|
{
|
|
if (!(codecs->interleaved = bitmap_interleaved_context_new(FALSE)))
|
|
{
|
|
WLog_ERR(TAG, "Failed to create interleaved codec context");
|
|
return FALSE;
|
|
}
|
|
}
|
|
|
|
if (flags & FREERDP_CODEC_PLANAR && !codecs->planar)
|
|
{
|
|
if (!(codecs->planar = freerdp_bitmap_planar_context_new(FALSE, 64, 64)))
|
|
{
|
|
WLog_ERR(TAG, "Failed to create planar bitmap codec context");
|
|
return FALSE;
|
|
}
|
|
}
|
|
|
|
if (flags & FREERDP_CODEC_NSCODEC && !codecs->nsc)
|
|
{
|
|
if (!(codecs->nsc = nsc_context_new()))
|
|
{
|
|
WLog_ERR(TAG, "Failed to create nsc codec context");
|
|
return FALSE;
|
|
}
|
|
}
|
|
|
|
if (flags & FREERDP_CODEC_REMOTEFX && !codecs->rfx)
|
|
{
|
|
if (!(codecs->rfx = rfx_context_new(FALSE)))
|
|
{
|
|
WLog_ERR(TAG, "Failed to create rfx codec context");
|
|
return FALSE;
|
|
}
|
|
}
|
|
|
|
if (flags & FREERDP_CODEC_CLEARCODEC && !codecs->clear)
|
|
{
|
|
if (!(codecs->clear = clear_context_new(FALSE)))
|
|
{
|
|
WLog_ERR(TAG, "Failed to create clear codec context");
|
|
return FALSE;
|
|
}
|
|
}
|
|
|
|
if (flags & FREERDP_CODEC_ALPHACODEC)
|
|
{
|
|
|
|
}
|
|
|
|
if (flags & FREERDP_CODEC_PROGRESSIVE && !codecs->progressive)
|
|
{
|
|
if (!(codecs->progressive = progressive_context_new(FALSE)))
|
|
{
|
|
WLog_ERR(TAG, "Failed to create progressive codec context");
|
|
return FALSE;
|
|
}
|
|
}
|
|
|
|
if (flags & FREERDP_CODEC_H264 && !codecs->h264)
|
|
{
|
|
if (!(codecs->h264 = h264_context_new(FALSE)))
|
|
{
|
|
WLog_ERR(TAG, "Failed to create h264 codec context");
|
|
return FALSE;
|
|
}
|
|
}
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
BOOL freerdp_client_codecs_reset(rdpCodecs* codecs, UINT32 flags)
|
|
{
|
|
if (flags & FREERDP_CODEC_INTERLEAVED)
|
|
{
|
|
if (codecs->interleaved)
|
|
{
|
|
bitmap_interleaved_context_reset(codecs->interleaved);
|
|
}
|
|
}
|
|
|
|
if (flags & FREERDP_CODEC_PLANAR)
|
|
{
|
|
if (codecs->planar)
|
|
{
|
|
freerdp_bitmap_planar_context_reset(codecs->planar);
|
|
}
|
|
}
|
|
|
|
if (flags & FREERDP_CODEC_NSCODEC)
|
|
{
|
|
if (codecs->nsc)
|
|
{
|
|
nsc_context_reset(codecs->nsc);
|
|
}
|
|
}
|
|
|
|
if (flags & FREERDP_CODEC_REMOTEFX)
|
|
{
|
|
if (codecs->rfx)
|
|
{
|
|
rfx_context_reset(codecs->rfx);
|
|
}
|
|
}
|
|
|
|
if (flags & FREERDP_CODEC_CLEARCODEC)
|
|
{
|
|
if (codecs->clear)
|
|
{
|
|
clear_context_reset(codecs->clear);
|
|
}
|
|
}
|
|
|
|
if (flags & FREERDP_CODEC_ALPHACODEC)
|
|
{
|
|
|
|
}
|
|
|
|
if (flags & FREERDP_CODEC_PROGRESSIVE)
|
|
{
|
|
if (codecs->progressive)
|
|
{
|
|
progressive_context_reset(codecs->progressive);
|
|
}
|
|
}
|
|
|
|
if (flags & FREERDP_CODEC_H264)
|
|
{
|
|
if (codecs->h264)
|
|
{
|
|
h264_context_reset(codecs->h264);
|
|
}
|
|
}
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
rdpCodecs* codecs_new(rdpContext* context)
|
|
{
|
|
rdpCodecs* codecs;
|
|
|
|
codecs = (rdpCodecs*) calloc(1, sizeof(rdpCodecs));
|
|
|
|
if (codecs)
|
|
{
|
|
codecs->context = context;
|
|
}
|
|
|
|
return codecs;
|
|
}
|
|
|
|
void codecs_free(rdpCodecs* codecs)
|
|
{
|
|
if (!codecs)
|
|
return;
|
|
|
|
if (codecs->rfx)
|
|
{
|
|
rfx_context_free(codecs->rfx);
|
|
codecs->rfx = NULL;
|
|
}
|
|
|
|
if (codecs->nsc)
|
|
{
|
|
nsc_context_free(codecs->nsc);
|
|
codecs->nsc = NULL;
|
|
}
|
|
|
|
if (codecs->h264)
|
|
{
|
|
h264_context_free(codecs->h264);
|
|
codecs->h264 = NULL;
|
|
}
|
|
|
|
if (codecs->clear)
|
|
{
|
|
clear_context_free(codecs->clear);
|
|
codecs->clear = NULL;
|
|
}
|
|
|
|
if (codecs->progressive)
|
|
{
|
|
progressive_context_free(codecs->progressive);
|
|
codecs->progressive = NULL;
|
|
}
|
|
|
|
if (codecs->planar)
|
|
{
|
|
freerdp_bitmap_planar_context_free(codecs->planar);
|
|
codecs->planar = NULL;
|
|
}
|
|
|
|
if (codecs->interleaved)
|
|
{
|
|
bitmap_interleaved_context_free(codecs->interleaved);
|
|
codecs->interleaved = NULL;
|
|
}
|
|
|
|
free(codecs);
|
|
}
|
|
|