History

update bGapsInFrameNumValueAllowedFlag according to parameters setting

ruil2 committed 11 years ago

Commit cce966f1 parent b6670317 files · +58 −46Browse files

Showing the changes to test/api/encoder_test.cpp (1 of 7 files). Show all

Unified · Split

test/api/encoder_test.cpp+14−14
@@ -56,7 +56,7 @@ void EncFileParamToParamExt (EncodeFileParam* pEncFileParam, SEncParamExt* pEnxP · 55 unmodified lines
56 pEnxParamExt->iEntropyCodingModeFlag = pEncFileParam->bCabac ? 1 : 0;56 pEnxParamExt->iEntropyCodingModeFlag = pEncFileParam->bCabac ? 1 : 0;
57 57
58 for (int i = 0; i < pEnxParamExt->iSpatialLayerNum; i++) {58 for (int i = 0; i < pEnxParamExt->iSpatialLayerNum; i++) {
59 pEnxParamExt->sSpatialLayers[i].sSliceCfg.uiSliceMode = pEncFileParam->eSliceMode;59 pEnxParamExt->sSpatialLayers[i].sSliceCfg.uiSliceMode = pEncFileParam->eSliceMode;
60 }60 }
61 61
62}62}
@@ -90,7 +90,7 @@ TEST_P (EncoderOutputTest, CompareOutput) { · 27 unmodified lines
90 std::string filename = std::string ("/sdcard/") + p.pkcFileName;90 std::string filename = std::string ("/sdcard/") + p.pkcFileName;
91 EncodeFile (p.pkcFileName, &EnxParamExt, this);91 EncodeFile (p.pkcFileName, &EnxParamExt, this);
92#else92#else
93 EncodeFile (p.pkcFileName, &EnxParamExt, this);93 EncodeFile (p.pkcFileName, &EnxParamExt, this);
94#endif94#endif
95 //will remove this after screen content algorithms are ready,95 //will remove this after screen content algorithms are ready,
96 //because the bitstream output will vary when the different algorithms are added.96 //because the bitstream output will vary when the different algorithms are added.
@@ -103,23 +103,23 @@ TEST_P (EncoderOutputTest, CompareOutput) { · 6 unmodified lines
103static const EncodeFileParam kFileParamArray[] = {103static const EncodeFileParam kFileParamArray[] = {
104 {104 {
105 "res/CiscoVT2people_320x192_12fps.yuv",105 "res/CiscoVT2people_320x192_12fps.yuv",
106 "996a3bab4d2f6142f408c24b151e03135bd58681", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false106 "e36b6169dcb5bbb90e64291250ec65995d62c846", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false
107 },107 },
108 {108 {
109 "res/CiscoVT2people_160x96_6fps.yuv",109 "res/CiscoVT2people_160x96_6fps.yuv",
110 "4df94f5187c5aded3f940e29e5821297262e4862", CAMERA_VIDEO_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false110 "04c73f202a29befd57ee49d242688f3e6ddfecbc", CAMERA_VIDEO_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false
111 },111 },
112 {112 {
113 "res/Static_152_100.yuv",113 "res/Static_152_100.yuv",
114 "e0c620d732e5b0af53fbbe9c6b83bd79681af89a", CAMERA_VIDEO_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false114 "c959ae52c5469bfc37bb31870c6a7259a1bb1917", CAMERA_VIDEO_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false
115 },115 },
116 {116 {
117 "res/CiscoVT2people_320x192_12fps.yuv",117 "res/CiscoVT2people_320x192_12fps.yuv",
118 "ab8fded9d2a5513cd635118a5ea93cacf24ab82f", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_ROWMB_SLICE, false, 1, false, false, false // One slice per MB row118 "f03ca6a679cd12c90542e351eabfce0d902ffad2", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_ROWMB_SLICE, false, 1, false, false, false // One slice per MB row
119 },119 },
120 {120 {
121 "res/CiscoVT2people_320x192_12fps.yuv",121 "res/CiscoVT2people_320x192_12fps.yuv",
122 "c0372e3a02da479eba5552230f56ff6730870d17", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, true, 1, false, false, false122 "c7f37486e00c1f18715c7aaf10444f03111418cf", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, true, 1, false, false, false
123 },123 },
124 {124 {
125 "res/CiscoVT2people_320x192_12fps.yuv",125 "res/CiscoVT2people_320x192_12fps.yuv",
@@ -127,7 +127,7 @@ static const EncodeFileParam kFileParamArray[] = { · 1 unmodified line
127 },127 },
128 {128 {
129 "res/Cisco_Absolute_Power_1280x720_30fps.yuv",129 "res/Cisco_Absolute_Power_1280x720_30fps.yuv",
130 "ace9511444c022b860abe09ea3ec5884079351aa", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, false, false, false130 "6cc7d08b2a80fc2836396808f919f9b5d4ee1d97", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, false, false, false
131 },131 },
132 {132 {
133 "res/Cisco_Absolute_Power_1280x720_30fps.yuv",133 "res/Cisco_Absolute_Power_1280x720_30fps.yuv",
@@ -136,19 +136,19 @@ static const EncodeFileParam kFileParamArray[] = { · 2 unmodified lines
136 // the following values may be adjusted for times since we start tuning the strategy136 // the following values may be adjusted for times since we start tuning the strategy
137 {137 {
138 "res/CiscoVT2people_320x192_12fps.yuv",138 "res/CiscoVT2people_320x192_12fps.yuv",
139 "f1639ba3e71f45b975e39322d61ff2efe3c50c0d", SCREEN_CONTENT_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false139 "9b8ba682313ed9cd0512563859e050942a3e776e", SCREEN_CONTENT_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, false
140 },140 },
141 {141 {
142 "res/CiscoVT2people_160x96_6fps.yuv",142 "res/CiscoVT2people_160x96_6fps.yuv",
143 "fad7e2a9fc012ab356748092650dc40ed2253251", SCREEN_CONTENT_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false143 "2706c61e9459196b4161f4bbb9444a08308ae8c5", SCREEN_CONTENT_REAL_TIME, 160, 96, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false
144 },144 },
145 {145 {
146 "res/Static_152_100.yuv",146 "res/Static_152_100.yuv",
147 "4869652f5ed64b840295d03d7be352e8c0504afc", SCREEN_CONTENT_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false147 "d8457a47946e91b01310d8de9afa21ac00df8edb", SCREEN_CONTENT_REAL_TIME, 152, 100, 6.0f, SM_SINGLE_SLICE, false, 1, false, false, false
148 },148 },
149 {149 {
150 "res/Cisco_Absolute_Power_1280x720_30fps.yuv",150 "res/Cisco_Absolute_Power_1280x720_30fps.yuv",
151 "9303a2e142475c8f8637129ebfed0089a8c8f4a2", SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, false, false, false151 "116663b5a00f000ab40e95b6202563e3cb4ce488", SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, false, false, false
152 },152 },
153 //for different strategy153 //for different strategy
154 {154 {
@@ -157,11 +157,11 @@ static const EncodeFileParam kFileParamArray[] = { · 2 unmodified lines
157 },157 },
158 {158 {
159 "res/CiscoVT2people_320x192_12fps.yuv",159 "res/CiscoVT2people_320x192_12fps.yuv",
160 "dd281aa3857dc69246d5ac4942ccd7baa8cd80e9", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, true //turn on cabac160 "7aaab6ef2dc5f95c3a2869979eba59553936e36f", CAMERA_VIDEO_REAL_TIME, 320, 192, 12.0f, SM_SINGLE_SLICE, false, 1, false, false, true //turn on cabac
161 },161 },
162 {162 {
163 "res/Cisco_Absolute_Power_1280x720_30fps.yuv",163 "res/Cisco_Absolute_Power_1280x720_30fps.yuv",
164 "15850f7047a65d15a682e3c7ffc88c4bdaea6d15", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, false, false, true164 "bb8ee13f829fa593b77760afdeb1215d0a577ee1", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_DYN_SLICE, false, 1, false, false, true
165 },165 },
166};166};
167 167

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