History

Merge pull request #1471 from mstorsjo/fix-warnings

Remove unused variables and an impossible condition

sijchen committed 12 years ago

Commit 3a1f0a32 parents 41ed734 2907cb21 file · +0 −6Browse files

Showing the changes to test/api/encode_decode_api_test.cpp (1 of 1 file). Show all

Unified · Split

test/api/encode_decode_api_test.cpp+0−6
@@ -282,9 +282,6 @@ void EncodeDecodeTestAPI::ValidateParamExtCombination() { · 281 unmodified lines
282 //IntraPeriod282 //IntraPeriod
283 uiGOPSize = 1 << (param_.iTemporalLayerNum - 1);283 uiGOPSize = 1 << (param_.iTemporalLayerNum - 1);
284 param_.uiIntraPeriod -= param_.uiIntraPeriod % uiGOPSize;284 param_.uiIntraPeriod -= param_.uiIntraPeriod % uiGOPSize;
285 if (param_.uiIntraPeriod < 0) {
286 param_.uiIntraPeriod = 0;
287 }
288 285
289//RefNum286//RefNum
290 int32_t iRefUpperBound = (param_.iUsageType == CAMERA_VIDEO_REAL_TIME) ?287 int32_t iRefUpperBound = (param_.iUsageType == CAMERA_VIDEO_REAL_TIME) ?
@@ -412,11 +409,8 @@ void EncodeDecodeTestAPI::SliceParamValidationForMode2 (int iSpatialIdx) { · 121 unmodified lines
412}409}
413void EncodeDecodeTestAPI::SliceParamValidationForMode3 (int iSpatialIdx) {410void EncodeDecodeTestAPI::SliceParamValidationForMode3 (int iSpatialIdx) {
414 411
415 unsigned int uiMbWidth = 0;
416 unsigned int uiMbHeight = 0;412 unsigned int uiMbHeight = 0;
417 unsigned int uiMbNumInFrame = 0;
418 413
419 uiMbWidth = (param_.iPicWidth + 15) >> 4;
420 uiMbHeight = (param_.iPicHeight + 15) >> 4;414 uiMbHeight = (param_.iPicHeight + 15) >> 4;
421 415
422 //change slice mode to SM_SINGLE_SLICE416 //change slice mode to SM_SINGLE_SLICE

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