History

Merge pull request #2281 from sijchen/th11

[Encoder] remove duplicated operation after thread pool

HaiboZhu committed 10 years ago

Commit f679da92 parents b749fe7 05c89b77 files · +26 −23Browse files

Unified · Split

7 files
  1. codec/encoder/core/inc/svc_enc_frame.h +1 −0
  2. codec/encoder/core/inc/wels_task_base.h +1 −1
  3. codec/encoder/core/inc/wels_task_encoder.h +1 −1
  4. codec/encoder/core/src/encoder_ext.cpp +1 −0
  5. codec/encoder/core/src/slice_multi_threading.cpp +3 −14
  6. codec/encoder/core/src/wels_task_management.cpp +7 −3
  7. test/api/encode_decode_api_test.cpp +12 −4
codec/encoder/core/inc/svc_enc_frame.h+1−0
@@ -108,6 +108,7 @@ SPicture* pRefOri[MAX_REF_PIC_COUNT]; · 107 unmodified lines
108108 int32_t* pNumSliceCodedOfPartition; // for dynamic slicing mode
109109 int32_t* pLastCodedMbIdxOfPartition; // for dynamic slicing mode
110110 int32_t* pLastMbIdxOfPartition; // for dynamic slicing mode
111+bool bNeedAdjustingSlicing;
111112
112113 SFeatureSearchPreparation* pFeatureSearchPreparation;
113114
codec/encoder/core/inc/wels_task_base.h+1−1
@@ -55,7 +55,7 @@ class CWelsBaseTask : public WelsCommon::IWelsTask { · 54 unmodified lines
5555 WELS_ENC_TASK_ENCODE_FIXED_SLICE = WELS_ENC_TASK_ENCODING,
5656 WELS_ENC_TASK_ENCODE_SLICE_LOADBALANCING = WELS_ENC_TASK_ENCODING,
5757 WELS_ENC_TASK_ENCODE_SLICE_SIZECONSTRAINED = WELS_ENC_TASK_ENCODING,
58− WELS_ENC_TASK_PREENCODING = 1,
58+ WELS_ENC_TASK_UPDATEMBMAP = 1,
5959 WELS_ENC_TASK_PREPROCESS = 2,
6060 WELS_ENC_TASK_ALL = 3,
6161 };
codec/encoder/core/inc/wels_task_encoder.h+1−1
@@ -132,7 +132,7 @@ class CWelsUpdateMbMapTask : public CWelsBaseTask { · 131 unmodified lines
132132 virtual WelsErrorType Execute();
133133
134134 virtual uint32_t GetTaskType() const {
135− return WELS_ENC_TASK_PREENCODING;
135+ return WELS_ENC_TASK_UPDATEMBMAP;
136136 }
137137 protected:
138138 sWelsEncCtx* m_pCtx;
codec/encoder/core/src/encoder_ext.cpp+1−0
@@ -1178,6 +1178,7 @@ static inline int32_t InitDqLayers (sWelsEncCtx** ppCtx, SExistingParasetList* p · 1177 unmodified lines
11781178 NULL == pDqLayer->pLastMbIdxOfPartition),
11791179 FreeMemorySvc (ppCtx))
11801180 }
1181+ pDqLayer->bNeedAdjustingSlicing = false;
11811182
11821183 pDqLayer->iMbWidth = kiMbW;
11831184 pDqLayer->iMbHeight = kiMbH;
codec/encoder/core/src/slice_multi_threading.cpp+3−14
@@ -242,21 +242,10 @@ void DynamicAdjustSlicing (sWelsEncCtx* pCtx, · 241 unmodified lines
242242 }
243243 iRunLen[iSliceIdx] = iMbNumLeft;
244244 MT_TRACE_LOG (pCtx, WELS_LOG_DEBUG,
245− "[MT] DynamicAdjustSlicing(), iSliceIdx= %d, iSliceComplexRatio= %.2f, slice_run_org= %d, slice_run_adj= %d",
246− iSliceIdx, pSliceInLayer[iSliceIdx].iSliceComplexRatio * 1.0f / INT_MULTIPLY,
247− pSliceInLayer[iSliceIdx].iCountMbNumInSlice, iMbNumLeft);
245+ "[MT] DynamicAdjustSlicing(), iSliceIdx= %d, pSliceComplexRatio= %.2f, slice_run_org= %d, slice_run_adj= %d",
246+ iSliceIdx, pSliceComplexRatio[iSliceIdx] * 1.0f / INT_MULTIPLY, pSliceCtx->pCountMbNumInSlice[iSliceIdx], iMbNumLeft);
248247
249− if (DynamicAdjustSlicePEncCtxAll (pCurDqLayer, iRunLen) == 0) {
250− const int32_t kiThreadNum = pCtx->pSvcParam->iCountThreadsNum;
251− int32_t iThreadIdx = 0;
252− do {
253− WelsEventSignal (&pCtx->pSliceThreading->pUpdateMbListEvent[iThreadIdx]);
254− WelsEventSignal (&pCtx->pSliceThreading->pThreadMasterEvent[iThreadIdx]);
255− ++ iThreadIdx;
256− } while (iThreadIdx < kiThreadNum);
257−
258− WelsMultipleEventsWaitAllBlocking (kiThreadNum, &pCtx->pSliceThreading->pFinUpdateMbListEvent[0]);
259− }
248+ pCurDqLayer->bNeedAdjustingSlicing = !DynamicAdjustSlicePEncCtxAll (pCurDqLayer, iRunLen);
260249 }
261250
262251 int32_t SetMultiSliceBuffer (sWelsEncCtx** ppCtx, CMemoryAlign* pMa, SSliceThreading* pSmt,
codec/encoder/core/src/wels_task_management.cpp+7−3
@@ -99,7 +99,7 @@ WelsErrorType CWelsTaskManageBase::Init (sWelsEncCtx* pEncCtx) { · 98 unmodified lines
9999 WELS_VERIFY_RETURN_IF (ENC_RETURN_MEMALLOCERR, NULL == m_pThreadPool)
100100
101101 m_pcAllTaskList[CWelsBaseTask::WELS_ENC_TASK_ENCODING] = m_cEncodingTaskList;
102− m_pcAllTaskList[CWelsBaseTask::WELS_ENC_TASK_PREENCODING] = m_cPreEncodingTaskList;
102+ m_pcAllTaskList[CWelsBaseTask::WELS_ENC_TASK_UPDATEMBMAP] = m_cPreEncodingTaskList;
103103
104104 m_iCurrentTaskNum = pEncCtx->pSvcParam->sSpatialLayers[0].sSliceArgument.uiSliceNum;
105105 //printf ("CWelsTaskManageBase Init m_iThreadNum %d m_iCurrentTaskNum %d pEncCtx->iMaxSliceCount %d\n", m_iThreadNum, m_iCurrentTaskNum, pEncCtx->iMaxSliceCount);
@@ -202,7 +202,9 @@ WelsErrorType CWelsTaskManageBase::ExecuteTaskList (TASKLIST_TYPE* pTargetTaskL · 96 unmodified lines
202202 }
203203
204204 void CWelsTaskManageBase::InitFrame (const int32_t kiCurDid) {
205− ExecuteTaskList (m_pcAllTaskList[CWelsBaseTask::WELS_ENC_TASK_PREENCODING]);
205+ if (m_pEncCtx->pCurDqLayer->bNeedAdjustingSlicing) {
206+ ExecuteTaskList (m_pcAllTaskList[CWelsBaseTask::WELS_ENC_TASK_UPDATEMBMAP]);
207+ }
206208 }
207209
208210 WelsErrorType CWelsTaskManageBase::ExecuteTasks (const CWelsBaseTask::ETaskType iTaskType) {
@@ -229,7 +231,9 @@ void CWelsTaskManageMultiD::InitFrame (const int32_t kiCurDid) { · 20 unmodified lines
229231 //printf("CWelsTaskManageMultiD: InitFrame: m_iCurDid=%d, m_iCurrentTaskNum=%d\n", m_iCurDid, m_iCurrentTaskNum);
230232 m_iCurDid = kiCurDid;
231233 m_iCurrentTaskNum = m_iTaskNumD[kiCurDid];
232− ExecuteTaskList (m_pcAllTaskList[CWelsBaseTask::WELS_ENC_TASK_PREENCODING]);
234+ if (m_pEncCtx->pCurDqLayer->bNeedAdjustingSlicing) {
235+ ExecuteTaskList (m_pcAllTaskList[CWelsBaseTask::WELS_ENC_TASK_UPDATEMBMAP]);
236+ }
233237 }
234238
235239 WelsErrorType CWelsTaskManageMultiD::ExecuteTasks (const CWelsBaseTask::ETaskType iTaskType) {
test/api/encode_decode_api_test.cpp+12−4
@@ -3788,6 +3788,7 @@ TEST_F (EncodeDecodeTestAPI, ThreadNumAndSliceNum) { · 3787 unmodified lines
37883788
37893789
37903790 TEST_F (EncodeDecodeTestAPI, TriggerLoadBalancing) {
3791+//#define DEBUG_FILE_SAVE_TRIGGER
37913792 int iSpatialLayerNum = 1;
37923793 int iWidth = WelsClip3 ((((rand() % MAX_WIDTH) >> 1) + 1) << 1, (64 << 2), MAX_WIDTH);
37933794 int iHeight = WelsClip3 ((((rand() % MAX_HEIGHT) >> 1) + 1) << 1, (64 << 2),
@@ -3799,7 +3800,7 @@ TEST_F (EncodeDecodeTestAPI, TriggerLoadBalancing) { · 5 unmodified lines
37993800 SEncParamExt sParam;
38003801 encoder_->GetDefaultParams (&sParam);
38013802 prepareParamDefault (iSpatialLayerNum, 1, iWidth, iHeight, fFrameRate, &sParam);
3802− sParam.iMultipleThreadIdc = (rand() % 8) + 1;
3803+ sParam.iMultipleThreadIdc = 4;
38033804 sParam.bSimulcastAVC = 1;
38043805 sParam.sSpatialLayers[0].iVideoWidth = iWidth;
38053806 sParam.sSpatialLayers[0].iVideoHeight = iHeight;
@@ -3815,6 +3816,11 @@ TEST_F (EncodeDecodeTestAPI, TriggerLoadBalancing) { · 9 unmodified lines
38153816 int iIdx = 0;
38163817 int aLen[MAX_SPATIAL_LAYER_NUM] = {};
38173818
3819+#ifdef DEBUG_FILE_SAVE_TRIGGER
3820+ FILE* fEnc = fopen ("trigger00.264", "wb");
3821+ printf("Current Threads is %d\n", sParam.iMultipleThreadIdc);
3822+#endif
3823+
38183824 //create decoder
38193825 for (iIdx = 0; iIdx < iSpatialLayerNum; iIdx++) {
38203826 pBsBuf[iIdx] = static_cast<unsigned char*> (malloc (iWidth * iHeight * 3 * sizeof (unsigned char) / 2));
@@ -3881,8 +3887,8 @@ TEST_F (EncodeDecodeTestAPI, TriggerLoadBalancing) { · 60 unmodified lines
38813887 pData[0] = pData[1] = pData[2] = 0;
38823888 memset (&dstBufInfo_, 0, sizeof (SBufferInfo));
38833889
3884−#ifdef DEBUG_FILE_SAVE4
3885− fwrite (pBsBuf[iIdx], aLen[iIdx], 1, fEnc[iIdx]);
3890+#ifdef DEBUG_FILE_SAVE_TRIGGER
3891+ fwrite (pBsBuf[iIdx], aLen[iIdx], 1, fEnc);
38863892 #endif
38873893 iResult = decoder[iIdx]->DecodeFrame2 (pBsBuf[iIdx], aLen[iIdx], pData, &dstBufInfo_);
38883894 EXPECT_TRUE (iResult == cmResultSuccess) << "iResult=" << iResult << ", LayerIdx=" << iIdx;
@@ -3900,7 +3906,9 @@ TEST_F (EncodeDecodeTestAPI, TriggerLoadBalancing) { · 11 unmodified lines
39003906 decoder[iIdx]->Uninitialize();
39013907 WelsDestroyDecoder (decoder[iIdx]);
39023908 }
3903−
39043909 }
3910+#ifdef DEBUG_FILE_SAVE_TRIGGER
3911+ fclose(fEnc);
3912+#endif
39053913 }
39063914

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