generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix bug RC_QUALITY_MODE not works as expected

Browse Source
This commit is contained in:
lyao2
2014-09-15 15:31:20 +08:00
parent 631ca210a8
commit 72862118f9
5 changed files with 8453 additions and 8453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
codec/encoder/core/src/wels_preprocess.cpp
View File

@@ -794,9 +794,9 @@ void CWelsPreProcess::AnalyzePictureComplexity (sWelsEncCtx* pCtx, SPicture* pCu
if (pSvcParam->iRCMode == RC_QUALITY_MODE && pCtx->eSliceType == P_SLICE) { if (pSvcParam->iRCMode == RC_QUALITY_MODE && pCtx->eSliceType == P_SLICE) {
iComplexityAnalysisMode = FRAME_SAD; iComplexityAnalysisMode = FRAME_SAD;
} else if (pSvcParam->iRCMode >= RC_BITRATE_MODE && pCtx->eSliceType == P_SLICE) { } else if (pSvcParam->iRCMode == RC_BITRATE_MODE && pCtx->eSliceType == P_SLICE) {
iComplexityAnalysisMode = GOM_SAD; iComplexityAnalysisMode = GOM_SAD;
} else if (pSvcParam->iRCMode >= RC_BITRATE_MODE && pCtx->eSliceType == I_SLICE) { } else if (pSvcParam->iRCMode == RC_BITRATE_MODE && pCtx->eSliceType == I_SLICE) {
iComplexityAnalysisMode = GOM_VAR; iComplexityAnalysisMode = GOM_VAR;
} else { } else {
return; return;

6
test/api/encoder_test.cpp
View File

@@ -94,7 +94,7 @@ static const EncodeFileParam kFileParamArray[] = {
}, },
{ {
"res/CiscoVT2people_320x192_12fps.yuv", "res/CiscoVT2people_320x192_12fps.yuv",
"086c9592dd505e43ab6e673ad4f7acc663f04a60", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 2 "684e6d141ada776892bdb01ee93efe475983ed36", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 2
}, },
{ {
"res/Cisco_Absolute_Power_1280x720_30fps.yuv", "res/Cisco_Absolute_Power_1280x720_30fps.yuv",
@@ -106,7 +106,7 @@ static const EncodeFileParam kFileParamArray[] = {
}, },
{ {
"res/CiscoVT2people_320x192_12fps.yuv", "res/CiscoVT2people_320x192_12fps.yuv",
"2489cc737dd7924a263ff2b31eded887aecd4d31", SCREEN_CONTENT_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1 "030d0e2d742ac039c2ab6333fe7cb18623c0d283", SCREEN_CONTENT_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1
}, },
{ {
"res/CiscoVT2people_160x96_6fps.yuv", "res/CiscoVT2people_160x96_6fps.yuv",
@@ -114,7 +114,7 @@ static const EncodeFileParam kFileParamArray[] = {
}, },
{ {
"res/Static_152_100.yuv", "res/Static_152_100.yuv",
"352da745e605ffc0260a428628b4b2fb3c724b84", SCREEN_CONTENT_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1 "494068b59aa9ed9118a9f33174b732024effc870", SCREEN_CONTENT_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1
}, },
{ {
"res/Cisco_Absolute_Power_1280x720_30fps.yuv", "res/Cisco_Absolute_Power_1280x720_30fps.yuv",

5632
test/encoder_binary_comparison/SHA1Table/BA_MW_D.264_AllCase_SHA1_Table.csv
View File

File diff suppressed because it is too large Load Diff

5632
test/encoder_binary_comparison/SHA1Table/CVPCMNL1_SVA_C.264_AllCase_SHA1_Table.csv
View File

File diff suppressed because it is too large Load Diff

5632
test/encoder_binary_comparison/SHA1Table/LS_SVA_D.264_AllCase_SHA1_Table.csv
View File

File diff suppressed because it is too large Load Diff