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

Unify struct definitions (#7633)

Browse Source 
* Unified enum/struct definitions, fixed include issues

* Fixed mac compilation issues

* Added missing include

* Fixed windows server build warnings

* Fixed VS2010 build issue

* Removed unnecessary library linking

* Fixed ThreadPool WinXP compatibility

* Fixed pr review remarks
This commit is contained in:
akallabeth
2022-02-14 13:59:22 +00:00
committed by GitHub
parent e27a7e834e
commit 8cc6582044
334 changed files with 1980 additions and 2635 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
channels/video/client/video_main.c
View File

@@ -47,27 +47,25 @@
#include "video_main.h"
struct _VIDEO_CHANNEL_CALLBACK
typedef struct
{
IWTSVirtualChannelCallback iface;
IWTSPlugin* plugin;
IWTSVirtualChannelManager* channel_mgr;
IWTSVirtualChannel* channel;
};
typedef struct _VIDEO_CHANNEL_CALLBACK VIDEO_CHANNEL_CALLBACK;
} VIDEO_CHANNEL_CALLBACK;
struct _VIDEO_LISTENER_CALLBACK
typedef struct
{
IWTSListenerCallback iface;
IWTSPlugin* plugin;
IWTSVirtualChannelManager* channel_mgr;
VIDEO_CHANNEL_CALLBACK* channel_callback;
};
typedef struct _VIDEO_LISTENER_CALLBACK VIDEO_LISTENER_CALLBACK;
} VIDEO_LISTENER_CALLBACK;
struct _VIDEO_PLUGIN
typedef struct
{
IWTSPlugin wtsPlugin;
@@ -78,46 +76,15 @@ struct _VIDEO_PLUGIN
VideoClientContext* context;
BOOL initialized;
};
typedef struct _VIDEO_PLUGIN VIDEO_PLUGIN;
} VIDEO_PLUGIN;
#define XF_VIDEO_UNLIMITED_RATE 31
static const BYTE MFVideoFormat_H264[] = { 'H', '2', '6', '4', 0x00, 0x00, 0x10, 0x00,
0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71 };
typedef struct _PresentationContext PresentationContext;
typedef struct _VideoFrame VideoFrame;
/** @brief private data for the channel */
struct _VideoClientContextPriv
{
VideoClientContext* video;
GeometryClientContext* geometry;
wQueue* frames;
CRITICAL_SECTION framesLock;
wBufferPool* surfacePool;
UINT32 publishedFrames;
UINT32 droppedFrames;
UINT32 lastSentRate;
UINT64 nextFeedbackTime;
PresentationContext* currentPresentation;
};
/** @brief */
struct _VideoFrame
{
UINT64 publishTime;
UINT64 hnsDuration;
MAPPED_GEOMETRY* geometry;
UINT32 w, h;
UINT32 scanline;
BYTE* surfaceData;
PresentationContext* presentation;
};
/** @brief */
struct _PresentationContext
typedef struct
{
VideoClientContext* video;
BYTE PresentationId;
@@ -131,6 +98,33 @@ struct _PresentationContext
UINT64 lastPublishTime, nextPublishTime;
volatile LONG refCounter;
VideoSurface* surface;
} PresentationContext;
/** @brief */
typedef struct
{
UINT64 publishTime;
UINT64 hnsDuration;
MAPPED_GEOMETRY* geometry;
UINT32 w, h;
UINT32 scanline;
BYTE* surfaceData;
PresentationContext* presentation;
} VideoFrame;
/** @brief private data for the channel */
struct s_VideoClientContextPriv
{
VideoClientContext* video;
GeometryClientContext* geometry;
wQueue* frames;
CRITICAL_SECTION framesLock;
wBufferPool* surfacePool;
UINT32 publishedFrames;
UINT32 droppedFrames;
UINT32 lastSentRate;
UINT64 nextFeedbackTime;
PresentationContext* currentPresentation;
};
static void PresentationContext_unref(PresentationContext* presentation);