b7b46b8123
Progressive codec was not honoring the threading flags in settings like does remoteFX, so even when no multiple threads decoding was asked, progressive was using multiple threads anyway. This patch fixes it.
264 lines
5.1 KiB
C
264 lines
5.1 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.
|
|
*/
|
|
|
|
#include <freerdp/config.h>
|
|
|
|
#include <winpr/assert.h>
|
|
|
|
#include "rdp.h"
|
|
|
|
#include <freerdp/codecs.h>
|
|
|
|
#define TAG FREERDP_TAG("core.codecs")
|
|
|
|
static void codecs_free_int(rdpCodecs* codecs, UINT32 flags)
|
|
{
|
|
WINPR_ASSERT(codecs);
|
|
|
|
if (flags & FREERDP_CODEC_REMOTEFX)
|
|
{
|
|
if (codecs->rfx)
|
|
{
|
|
rfx_context_free(codecs->rfx);
|
|
codecs->rfx = NULL;
|
|
}
|
|
}
|
|
|
|
if (flags & FREERDP_CODEC_NSCODEC)
|
|
{
|
|
if (codecs->nsc)
|
|
{
|
|
nsc_context_free(codecs->nsc);
|
|
codecs->nsc = NULL;
|
|
}
|
|
}
|
|
|
|
#ifdef WITH_GFX_H264
|
|
if (flags & (FREERDP_CODEC_AVC420 | FREERDP_CODEC_AVC444))
|
|
{
|
|
if (codecs->h264)
|
|
{
|
|
h264_context_free(codecs->h264);
|
|
codecs->h264 = NULL;
|
|
}
|
|
}
|
|
#endif
|
|
|
|
if (flags & FREERDP_CODEC_CLEARCODEC)
|
|
{
|
|
if (codecs->clear)
|
|
{
|
|
clear_context_free(codecs->clear);
|
|
codecs->clear = NULL;
|
|
}
|
|
}
|
|
|
|
if (flags & FREERDP_CODEC_PROGRESSIVE)
|
|
{
|
|
if (codecs->progressive)
|
|
{
|
|
progressive_context_free(codecs->progressive);
|
|
codecs->progressive = NULL;
|
|
}
|
|
}
|
|
|
|
if (flags & FREERDP_CODEC_PLANAR)
|
|
{
|
|
if (codecs->planar)
|
|
{
|
|
freerdp_bitmap_planar_context_free(codecs->planar);
|
|
codecs->planar = NULL;
|
|
}
|
|
}
|
|
|
|
if (flags & FREERDP_CODEC_INTERLEAVED)
|
|
{
|
|
if (codecs->interleaved)
|
|
{
|
|
bitmap_interleaved_context_free(codecs->interleaved);
|
|
codecs->interleaved = NULL;
|
|
}
|
|
}
|
|
}
|
|
BOOL freerdp_client_codecs_prepare(rdpCodecs* codecs, UINT32 flags, UINT32 width, UINT32 height)
|
|
{
|
|
codecs_free_int(codecs, flags);
|
|
if ((flags & FREERDP_CODEC_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))
|
|
{
|
|
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))
|
|
{
|
|
if (!(codecs->nsc = nsc_context_new()))
|
|
{
|
|
WLog_ERR(TAG, "Failed to create nsc codec context");
|
|
return FALSE;
|
|
}
|
|
}
|
|
|
|
UINT32 threadingFlags =
|
|
freerdp_settings_get_uint32(codecs->context->settings, FreeRDP_ThreadingFlags);
|
|
if ((flags & FREERDP_CODEC_REMOTEFX))
|
|
{
|
|
if (!(codecs->rfx = rfx_context_new_ex(FALSE, threadingFlags)))
|
|
{
|
|
WLog_ERR(TAG, "Failed to create rfx codec context");
|
|
return FALSE;
|
|
}
|
|
}
|
|
|
|
if ((flags & FREERDP_CODEC_CLEARCODEC))
|
|
{
|
|
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))
|
|
{
|
|
if (!(codecs->progressive = progressive_context_new_ex(FALSE, threadingFlags)))
|
|
{
|
|
WLog_ERR(TAG, "Failed to create progressive codec context");
|
|
return FALSE;
|
|
}
|
|
}
|
|
|
|
#ifdef WITH_GFX_H264
|
|
if ((flags & (FREERDP_CODEC_AVC420 | FREERDP_CODEC_AVC444)))
|
|
{
|
|
if (!(codecs->h264 = h264_context_new(FALSE)))
|
|
{
|
|
WLog_WARN(TAG, "Failed to create h264 codec context");
|
|
}
|
|
}
|
|
#endif
|
|
|
|
return freerdp_client_codecs_reset(codecs, flags, width, height);
|
|
}
|
|
|
|
BOOL freerdp_client_codecs_reset(rdpCodecs* codecs, UINT32 flags, UINT32 width, UINT32 height)
|
|
{
|
|
BOOL rc = TRUE;
|
|
|
|
if (flags & FREERDP_CODEC_INTERLEAVED)
|
|
{
|
|
if (codecs->interleaved)
|
|
{
|
|
rc &= bitmap_interleaved_context_reset(codecs->interleaved);
|
|
}
|
|
}
|
|
|
|
if (flags & FREERDP_CODEC_PLANAR)
|
|
{
|
|
if (codecs->planar)
|
|
{
|
|
rc &= freerdp_bitmap_planar_context_reset(codecs->planar, width, height);
|
|
}
|
|
}
|
|
|
|
if (flags & FREERDP_CODEC_NSCODEC)
|
|
{
|
|
if (codecs->nsc)
|
|
{
|
|
rc &= nsc_context_reset(codecs->nsc, width, height);
|
|
}
|
|
}
|
|
|
|
if (flags & FREERDP_CODEC_REMOTEFX)
|
|
{
|
|
if (codecs->rfx)
|
|
{
|
|
rc &= rfx_context_reset(codecs->rfx, width, height);
|
|
}
|
|
}
|
|
|
|
if (flags & FREERDP_CODEC_CLEARCODEC)
|
|
{
|
|
if (codecs->clear)
|
|
{
|
|
rc &= clear_context_reset(codecs->clear);
|
|
}
|
|
}
|
|
|
|
if (flags & FREERDP_CODEC_ALPHACODEC)
|
|
{
|
|
}
|
|
|
|
if (flags & FREERDP_CODEC_PROGRESSIVE)
|
|
{
|
|
if (codecs->progressive)
|
|
{
|
|
rc &= progressive_context_reset(codecs->progressive);
|
|
}
|
|
}
|
|
|
|
#ifdef WITH_GFX_H264
|
|
if (flags & (FREERDP_CODEC_AVC420 | FREERDP_CODEC_AVC444))
|
|
{
|
|
if (codecs->h264)
|
|
{
|
|
rc &= h264_context_reset(codecs->h264, width, height);
|
|
}
|
|
}
|
|
#endif
|
|
|
|
return rc;
|
|
}
|
|
|
|
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;
|
|
|
|
codecs_free_int(codecs, FREERDP_CODEC_ALL);
|
|
|
|
free(codecs);
|
|
}
|