mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2669 from llyzs/h264

Browse Source 
h264: add encoder constant QP rate control.
This commit is contained in:
MartinHaimberger 2015-06-02 12:38:21 +02:00
commit 02bf7ec0bf
2 changed files with 72 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/freerdp/codec/h264.h
View File

@ -42,6 +42,13 @@ struct _H264_CONTEXT_SUBSYSTEM
}; };
typedef struct _H264_CONTEXT_SUBSYSTEM H264_CONTEXT_SUBSYSTEM; typedef struct _H264_CONTEXT_SUBSYSTEM H264_CONTEXT_SUBSYSTEM;
enum _H264_RATECONTROL_MODE
{
H264_RATECONTROL_VBR = 0,
H264_RATECONTROL_CQP
};
typedef enum _H264_RATECONTROL_MODE H264_RATECONTROL_MODE;
struct _H264_CONTEXT struct _H264_CONTEXT
{ {
BOOL Compressor; BOOL Compressor;
@ -49,8 +56,10 @@ struct _H264_CONTEXT
UINT32 width; UINT32 width;
UINT32 height; UINT32 height;
H264_RATECONTROL_MODE RateControlMode;
UINT32 BitRate; UINT32 BitRate;
FLOAT FrameRate; FLOAT FrameRate;
UINT32 QP;
UINT32 NumberOfThreads; UINT32 NumberOfThreads;
int iStride[3]; int iStride[3];

88
libfreerdp/codec/h264.c
View File

@ -179,8 +179,6 @@ static int openh264_compress(H264_CONTEXT* h264, BYTE** ppDstData, UINT32* pDstS
sys->EncParamExt.iUsageType = SCREEN_CONTENT_REAL_TIME; sys->EncParamExt.iUsageType = SCREEN_CONTENT_REAL_TIME;
sys->EncParamExt.iPicWidth = h264->width; sys->EncParamExt.iPicWidth = h264->width;
sys->EncParamExt.iPicHeight = h264->height; sys->EncParamExt.iPicHeight = h264->height;
sys->EncParamExt.iTargetBitrate = h264->BitRate;
sys->EncParamExt.iRCMode = RC_BITRATE_MODE;
sys->EncParamExt.fMaxFrameRate = h264->FrameRate; sys->EncParamExt.fMaxFrameRate = h264->FrameRate;
sys->EncParamExt.iMaxBitrate = UNSPECIFIED_BIT_RATE; sys->EncParamExt.iMaxBitrate = UNSPECIFIED_BIT_RATE;
sys->EncParamExt.bEnableDenoise = 0; sys->EncParamExt.bEnableDenoise = 0;
@ -191,8 +189,19 @@ static int openh264_compress(H264_CONTEXT* h264, BYTE** ppDstData, UINT32* pDstS
sys->EncParamExt.sSpatialLayers[0].fFrameRate = h264->FrameRate; sys->EncParamExt.sSpatialLayers[0].fFrameRate = h264->FrameRate;
sys->EncParamExt.sSpatialLayers[0].iVideoWidth = sys->EncParamExt.iPicWidth; sys->EncParamExt.sSpatialLayers[0].iVideoWidth = sys->EncParamExt.iPicWidth;
sys->EncParamExt.sSpatialLayers[0].iVideoHeight = sys->EncParamExt.iPicHeight; sys->EncParamExt.sSpatialLayers[0].iVideoHeight = sys->EncParamExt.iPicHeight;
sys->EncParamExt.sSpatialLayers[0].iSpatialBitrate = sys->EncParamExt.iTargetBitrate;
sys->EncParamExt.sSpatialLayers[0].iMaxSpatialBitrate = sys->EncParamExt.iMaxBitrate; sys->EncParamExt.sSpatialLayers[0].iMaxSpatialBitrate = sys->EncParamExt.iMaxBitrate;
switch (h264->RateControlMode)
{
case H264_RATECONTROL_VBR:
sys->EncParamExt.iRCMode = RC_BITRATE_MODE;
sys->EncParamExt.iTargetBitrate = h264->BitRate;
sys->EncParamExt.sSpatialLayers[0].iSpatialBitrate = sys->EncParamExt.iTargetBitrate;
break;
case H264_RATECONTROL_CQP:
sys->EncParamExt.iRCMode = RC_OFF_MODE;
sys->EncParamExt.sSpatialLayers[0].iDLayerQp = h264->QP;
break;
}
if (sys->EncParamExt.iMultipleThreadIdc > 1) if (sys->EncParamExt.iMultipleThreadIdc > 1)
{ {
@ -206,36 +215,65 @@ static int openh264_compress(H264_CONTEXT* h264, BYTE** ppDstData, UINT32* pDstS
WLog_ERR(TAG, "Failed to initialize OpenH264 encoder (status=%ld)", status); WLog_ERR(TAG, "Failed to initialize OpenH264 encoder (status=%ld)", status);
return status; return status;
} }
status = (*sys->pEncoder)->GetOption(sys->pEncoder, ENCODER_OPTION_SVC_ENCODE_PARAM_EXT,
&sys->EncParamExt);
if (status < 0)
{
WLog_ERR(TAG, "Failed to get initial OpenH264 encoder parameters (status=%ld)", status);
return status;
}
} }
else else
{ {
if (sys->EncParamExt.iTargetBitrate != h264->BitRate) switch (h264->RateControlMode)
{ {
sys->EncParamExt.iTargetBitrate = h264->BitRate; case H264_RATECONTROL_VBR:
bitrate.iLayer = SPATIAL_LAYER_ALL; if (sys->EncParamExt.iTargetBitrate != h264->BitRate)
bitrate.iBitrate = h264->BitRate; {
sys->EncParamExt.iTargetBitrate = h264->BitRate;
bitrate.iLayer = SPATIAL_LAYER_ALL;
bitrate.iBitrate = h264->BitRate;
status = (*sys->pEncoder)->SetOption(sys->pEncoder, ENCODER_OPTION_BITRATE, status = (*sys->pEncoder)->SetOption(sys->pEncoder, ENCODER_OPTION_BITRATE,
&bitrate); &bitrate);
if (status < 0) if (status < 0)
{ {
WLog_ERR(TAG, "Failed to set encoder bitrate (status=%ld)", status); WLog_ERR(TAG, "Failed to set encoder bitrate (status=%ld)", status);
return status; return status;
} }
} }
if (sys->EncParamExt.fMaxFrameRate != h264->FrameRate) if (sys->EncParamExt.fMaxFrameRate != h264->FrameRate)
{ {
sys->EncParamExt.fMaxFrameRate = h264->FrameRate; sys->EncParamExt.fMaxFrameRate = h264->FrameRate;
status = (*sys->pEncoder)->SetOption(sys->pEncoder, ENCODER_OPTION_FRAME_RATE, status = (*sys->pEncoder)->SetOption(sys->pEncoder, ENCODER_OPTION_FRAME_RATE,
&sys->EncParamExt.fMaxFrameRate); &sys->EncParamExt.fMaxFrameRate);
if (status < 0) if (status < 0)
{ {
WLog_ERR(TAG, "Failed to set encoder framerate (status=%ld)", status); WLog_ERR(TAG, "Failed to set encoder framerate (status=%ld)", status);
return status; return status;
} }
}
break;
case H264_RATECONTROL_CQP:
if (sys->EncParamExt.sSpatialLayers[0].iDLayerQp != h264->QP)
{
sys->EncParamExt.sSpatialLayers[0].iDLayerQp = h264->QP;
status = (*sys->pEncoder)->SetOption(sys->pEncoder, ENCODER_OPTION_SVC_ENCODE_PARAM_EXT,
&sys->EncParamExt);
if (status < 0)
{
WLog_ERR(TAG, "Failed to set encoder parameters (status=%ld)", status);
return status;
}
}
break;
} }
} }