History

remove max slice number constraint

ganyang committed 12 years ago

Commit 2e6f1801 parent 3b782906 files · +3745 −12Browse files

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

Unified · Split

test/api/BaseEncoderTest.cpp+5−1
@@ -32,7 +32,7 @@ static int InitWithParam(ISVCEncoder* encoder, EUsageType usageType,int width, · 31 unmodified lines
3232 param.bEnableDenoise = denoise;
3333 param.iSpatialLayerNum = layers;
3434
35− if (sliceMode != SM_SINGLE_SLICE)
35+ if (sliceMode != SM_SINGLE_SLICE && sliceMode != SM_DYN_SLICE) //SM_DYN_SLICE don't support multi-thread now
3636 param.iMultipleThreadIdc = 2;
3737
3838 for (int i = 0; i < param.iSpatialLayerNum; i++) {
@@ -42,6 +42,10 @@ static int InitWithParam(ISVCEncoder* encoder, EUsageType usageType,int width, · 3 unmodified lines
4242 param.sSpatialLayers[i].iSpatialBitrate = param.iTargetBitrate;
4343
4444 param.sSpatialLayers[i].sSliceCfg.uiSliceMode = sliceMode;
45+ if (sliceMode == SM_DYN_SLICE) {
46+ param.sSpatialLayers[i].sSliceCfg.sSliceArgument.uiSliceSizeConstraint = 600;
47+ param.uiMaxNalSize = 1500;
48+ }
4549 }
4650
4751 return encoder->InitializeExt(&param);

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