History

Multi-thread-fixed:RBC#1713:pSlice instead of kiSliceIdx as input parameter in WelsCodeOneSlice

huade committed 9 years ago

Commit 40566f21 parent 6f347d16 files · +28 −19Browse files

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

Unified · Split

codec/encoder/core/src/wels_task_encoder.cpp+6−2
@@ -163,7 +163,9 @@ WelsErrorType CWelsSliceEncodingTask::ExecuteTask() { · 162 unmodified lines
163 }163 }
164 164
165 WelsLoadNalForSlice (m_pSliceBs, m_eNalType, m_eNalRefIdc);165 WelsLoadNalForSlice (m_pSliceBs, m_eNalType, m_eNalRefIdc);
166 int32_t iReturn = WelsCodeOneSlice (m_pCtx, m_iSliceIdx, m_eNalType);166 SSlice* pCurSlice = m_pCtx->pCurDqLayer->ppSliceInLayer[m_iSliceIdx];
167 assert (m_iSliceIdx == (int) pCurSlice->uiSliceIdx);
168 int32_t iReturn = WelsCodeOneSlice (m_pCtx, pCurSlice, m_eNalType);
167 if (ENC_RETURN_SUCCESS != iReturn) {169 if (ENC_RETURN_SUCCESS != iReturn) {
168 return iReturn;170 return iReturn;
169 }171 }
@@ -280,7 +282,9 @@ WelsErrorType CWelsConstrainedSizeSlicingEncodingTask::ExecuteTask() { · 110 unmodified lines
280 }282 }
281 283
282 WelsLoadNalForSlice (m_pSliceBs, m_eNalType, m_eNalRefIdc);284 WelsLoadNalForSlice (m_pSliceBs, m_eNalType, m_eNalRefIdc);
283 int32_t iReturn = WelsCodeOneSlice (m_pCtx, iLocalSliceIdx, m_eNalType);285 SSlice* pCurSlice = m_pCtx->pCurDqLayer->ppSliceInLayer[iLocalSliceIdx];
286 assert (iLocalSliceIdx == (int) pCurSlice->uiSliceIdx);
287 int32_t iReturn = WelsCodeOneSlice (m_pCtx, pCurSlice, m_eNalType);
284 if (ENC_RETURN_SUCCESS != iReturn) {288 if (ENC_RETURN_SUCCESS != iReturn) {
285 return iReturn;289 return iReturn;
286 }290 }

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