e00655c3c2
1. Export fps related API so that subsystem implementation no longer need to know about details in encoder structure. 2. Discard frameList dictionary. The 'value' in this dictionary is never used and not properly free'ed when client is disconnected. The dictionary was used to calculate 'inflight' frame count. Once an ACK is received from client, an item in the dictionary is removed. We then calculate 'inflight' frame by the count of the items in the dictionary. However, some rdp clients (win7 mstsc) skips frame ACK if it is inactive, ACK of some frame would actually never arrive. We actually don't need the dictionary. We only need to record the latest acknowledged frame id, and the difference between last sent frame id is the inflight frame count. 3. Minor fix in default fps calculation. encoder->frameAck is wrongly used as integer while it's actually bool flag.
76 lines
1.7 KiB
C
76 lines
1.7 KiB
C
/**
|
|
* FreeRDP: A Remote Desktop Protocol Implementation
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#ifndef FREERDP_SHADOW_SERVER_ENCODER_H
|
|
#define FREERDP_SHADOW_SERVER_ENCODER_H
|
|
|
|
#include <winpr/crt.h>
|
|
#include <winpr/stream.h>
|
|
|
|
#include <freerdp/freerdp.h>
|
|
#include <freerdp/codecs.h>
|
|
|
|
#include <freerdp/server/shadow.h>
|
|
|
|
struct rdp_shadow_encoder
|
|
{
|
|
rdpShadowClient* client;
|
|
rdpShadowServer* server;
|
|
|
|
int width;
|
|
int height;
|
|
UINT32 codecs;
|
|
|
|
BYTE** grid;
|
|
int gridWidth;
|
|
int gridHeight;
|
|
BYTE* gridBuffer;
|
|
int maxTileWidth;
|
|
int maxTileHeight;
|
|
|
|
wStream* bs;
|
|
|
|
RFX_CONTEXT* rfx;
|
|
NSC_CONTEXT* nsc;
|
|
BITMAP_PLANAR_CONTEXT* planar;
|
|
BITMAP_INTERLEAVED_CONTEXT* interleaved;
|
|
|
|
int fps;
|
|
int maxFps;
|
|
BOOL frameAck;
|
|
UINT32 frameId;
|
|
UINT32 lastAckframeId;
|
|
};
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
int shadow_encoder_reset(rdpShadowEncoder* encoder);
|
|
int shadow_encoder_prepare(rdpShadowEncoder* encoder, UINT32 codecs);
|
|
UINT32 shadow_encoder_create_frame_id(rdpShadowEncoder* encoder);
|
|
|
|
rdpShadowEncoder* shadow_encoder_new(rdpShadowClient* client);
|
|
void shadow_encoder_free(rdpShadowEncoder* encoder);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif /* FREERDP_SHADOW_SERVER_ENCODER_H */
|