History

fix conflict with master

sijchen committed 10 years ago

Commit 1ac02f32 parents 0074754 7188e5017 files · +1297 −546Browse files

Showing the changes to codec/encoder/core/src/encoder.cpp (1 of 17 files). Show all

Unified · Split

codec/encoder/core/src/encoder.cpp+5−0
@@ -46,6 +46,7 @@ · 45 unmodified lines
4646 #include "deblocking.h"
4747 #include "ref_list_mgr_svc.h"
4848 #include "mc.h"
49+#include "paraset_strategy.h"
4950 #include "sample.h"
5051
5152 #include "svc_enc_golomb.h"
@@ -221,6 +222,10 @@ int32_t InitFunctionPointers (sWelsEncCtx* pEncCtx, SWelsSvcCodingParam* pParam, · 169 unmodified lines
221222
222223 InitFillNeighborCacheInterFunc (pFuncList, pParam->bEnableBackgroundDetection);
223224
225+ pFuncList->pParametersetStrategy = IWelsParametersetStrategy::CreateParametersetStrategy (pParam->eSpsPpsIdStrategy,
226+ pParam->bSimulcastAVC, pParam->iSpatialLayerNum);
227+ WELS_VERIFY_RETURN_IF (ENC_RETURN_MEMALLOCERR, (NULL == pFuncList->pParametersetStrategy))
228+
224229 return iReturn;
225230 }
226231

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