History

fix the missing loadbalancing part

sijchen committed 11 years ago

Commit e508c861 parent beacba78 files · +159 −20Browse files

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

Unified · Split

codec/encoder/core/src/wels_task_encoder.cpp+2−10
@@ -192,14 +192,6 @@ WelsErrorType CWelsSliceEncodingTask::ExecuteTask() { · 191 unmodified lines
192192
193193
194194 // CWelsLoadBalancingSlicingEncodingTask
195−CWelsLoadBalancingSlicingEncodingTask::CWelsLoadBalancingSlicingEncodingTask (sWelsEncCtx* pCtx,
196− const int32_t iSliceIdx) :
197− CWelsSliceEncodingTask (pCtx, iSliceIdx) {
198−}
199−
200−CWelsLoadBalancingSlicingEncodingTask::~CWelsLoadBalancingSlicingEncodingTask() {
201−}
202−
203195 WelsErrorType CWelsLoadBalancingSlicingEncodingTask::InitTask() {
204196 WelsErrorType iReturn = CWelsSliceEncodingTask::InitTask();
205197 if (ENC_RETURN_SUCCESS != iReturn) {
@@ -217,12 +209,12 @@ WelsErrorType CWelsLoadBalancingSlicingEncodingTask::InitTask() { · 11 unmodified lines
217209 void CWelsLoadBalancingSlicingEncodingTask::FinishTask() {
218210 CWelsSliceEncodingTask::FinishTask();
219211
220− m_pCtx->pSliceThreading->pSliceConsumeTime[m_uiDependencyId][m_iSliceIdx] = (uint32_t) (WelsTime() - m_iSliceStart);
212+ m_pCtx->pCurDqLayer->pSliceEncCtx->pSliceConsumeTime[m_iSliceIdx] = (uint32_t) (WelsTime() - m_iSliceStart);
221213 WelsLog (&m_pCtx->sLogCtx, WELS_LOG_DEBUG,
222214 "[MT] CWelsLoadBalancingSlicingEncodingTask()FinishTask, coding_idx %d, um_iSliceIdx %d, pSliceConsumeTime %d, iSliceSize %d, pFirstMbInSlice %d, count_num_mb_in_slice %d",
223215 m_pCtx->iCodingIndex,
224216 m_iSliceIdx,
225− m_pCtx->pSliceThreading->pSliceConsumeTime[m_uiDependencyId][m_iSliceIdx],
217+ m_pCtx->pCurDqLayer->pSliceEncCtx->pSliceConsumeTime[m_iSliceIdx],
226218 m_iSliceSize,
227219 m_pCtx->pCurDqLayer->pSliceEncCtx->pFirstMbInSlice[m_iSliceIdx],
228220 m_pCtx->pCurDqLayer->pSliceEncCtx->pCountMbNumInSlice[m_iSliceIdx]);

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