History

Merge pull request #1169 from sijchen/interfaceUT12

[Encoder UT] Interface: EncoderEncodeParameterSets

ruil2 committed 12 years ago

Commit 010e4232 parents 4a51865 b6698012 files · +64 −3Browse files

Showing the changes to test/encoder/EncUT_EncoderExt.cpp (1 of 2 files). Show all

Unified · Split

test/encoder/EncUT_EncoderExt.cpp+62−3
@@ -8,6 +8,16 @@ class EncoderInterfaceTest : public ::testing::Test { · 7 unmodified lines
88 #define MB_SIZE (16)
99 #define MAX_WIDTH (3840)
1010 #define MAX_HEIGHT (2160)
11+#define VALID_SIZE(iSize) (((iSize)>1)?(iSize):1)
12+
13+#define NAL_HEADER_BYTES (4)
14+#define NAL_TYPE (0x0F)
15+#define SPS_NAL_TYPE (7)
16+#define PPS_NAL_TYPE (8)
17+#define SUBSETSPS_NAL_TYPE (15)
18+#define GET_NAL_TYPE(pNalStart) (*(pNalStart+NAL_HEADER_BYTES) & NAL_TYPE)
19+#define IS_PARASET(iNalType) ((iNalType==SPS_NAL_TYPE) || (iNalType==PPS_NAL_TYPE) || (iNalType==SUBSETSPS_NAL_TYPE))
20+
1121 public:
1222 virtual void SetUp() {
1323 int rv = WelsCreateSVCEncoder (&pPtrEnc);
@@ -172,8 +182,10 @@ TEST_F (EncoderInterfaceTest, TestTemporalLayerSetting) { · 158 unmodified lines
172182
173183 void GetValidEncParamBase (SEncParamBase* pEncParamBase) {
174184 pEncParamBase->iUsageType = CAMERA_VIDEO_REAL_TIME;
175− pEncParamBase->iPicWidth = abs ((rand() * 2) + MB_SIZE) % (MAX_WIDTH + 1);
176− pEncParamBase->iPicHeight = abs ((rand() * 2) + MB_SIZE) % (MAX_HEIGHT + 1);
185+ pEncParamBase->iPicWidth = ((rand() * 2) % (MAX_WIDTH));
186+ pEncParamBase->iPicHeight = ((rand() * 2) % (MAX_HEIGHT));
187+ pEncParamBase->iPicWidth = VALID_SIZE(pEncParamBase->iPicWidth);
188+ pEncParamBase->iPicHeight = VALID_SIZE(pEncParamBase->iPicHeight);
177189 pEncParamBase->iTargetBitrate = rand() + 1; //!=0
178190 pEncParamBase->iRCMode = RC_BITRATE_MODE; //-1, 0, 1, 2
179191 pEncParamBase->fMaxFrameRate = rand() + 0.5f; //!=0
@@ -293,7 +305,6 @@ TEST_F (EncoderInterfaceTest, BasicInitializeTestAutoAdjustment) { · 113 unmodified lines
293305 EXPECT_GE (sEncParamBase.fMaxFrameRate, 1.0);
294306 }
295307
296−
297308 TEST_F (EncoderInterfaceTest, ForceIntraFrame) {
298309 SEncParamBase sEncParamBase;
299310 GetValidEncParamBase (&sEncParamBase);
@@ -359,3 +370,51 @@ TEST_F (EncoderInterfaceTest, ForceIntraFrameWithTemporal) { · 59 unmodified lines
359370 EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));
360371 }
361372
373+TEST_F (EncoderInterfaceTest, EncodeParameterSets) {
374+ SEncParamBase sEncParamBase;
375+ GetValidEncParamBase (&sEncParamBase);
376+
377+ int iResult = pPtrEnc->Initialize (&sEncParamBase);
378+ EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));
379+ if (iResult != cmResultSuccess) {
380+ fprintf (stderr, "Unexpected ParamBase? \
381+ iUsageType=%d, Pic=%dx%d, TargetBitrate=%d, iRCMode=%d, fMaxFrameRate=%.1f\n",
382+ sEncParamBase.iUsageType, sEncParamBase.iPicWidth, sEncParamBase.iPicHeight,
383+ sEncParamBase.iTargetBitrate, sEncParamBase.iRCMode, sEncParamBase.fMaxFrameRate);
384+ }
385+ PrepareOneSrcFrame();
386+ EncodeOneIDRandP (pPtrEnc);
387+
388+ //try EncodeParameterSets
389+ pPtrEnc->EncodeParameterSets (&sFbi);
390+ EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));
391+ EXPECT_EQ (sFbi.eFrameType, static_cast<int> (videoFrameTypeInvalid));
392+
393+ //check the result
394+ int iNalType = 0;
395+ SLayerBSInfo* pLayerBsInfo;
396+ for (int i = 0; i < sFbi.iLayerNum; i++) {
397+ pLayerBsInfo = & (sFbi.sLayerInfo[i]);
398+ EXPECT_EQ (pLayerBsInfo->uiLayerType , static_cast<int> (NON_VIDEO_CODING_LAYER));
399+
400+ iNalType = GET_NAL_TYPE (pLayerBsInfo->pBsBuf);
401+ EXPECT_EQ (true, IS_PARASET (iNalType));
402+ for (int j = 0; j < (pLayerBsInfo->iNalCount - 1); j++) {
403+ iNalType = GET_NAL_TYPE (pLayerBsInfo->pBsBuf + pLayerBsInfo->pNalLengthInByte[j]);
404+ EXPECT_EQ (true, IS_PARASET (iNalType));
405+ }
406+ }
407+
408+ //try another P to make sure no impact on succeeding frames
409+ iResult = pPtrEnc->EncodeFrame (pSrcPic, &sFbi);
410+ EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));
411+ EXPECT_NE (sFbi.eFrameType, static_cast<int> (videoFrameTypeIDR));
412+
413+ pPtrEnc->Uninitialize();
414+ EXPECT_EQ (iResult, static_cast<int> (cmResultSuccess));
415+}
416+
417+TEST_F (EncoderInterfaceTest, BasicReturnTypeTest) {
418+ //TODO
419+}
420+

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t