History

Remove stub interfaces for hw decoding

There is no implementation available for actually doing decoding in HW.

Martin Storsjö committed 12 years ago

Commit 55d74911 parent 136931c10 files · +6 −215Browse files

Showing the changes to codec/decoder/plus/src/welsDecoderExt.cpp (1 of 10 files). Show all

Unified · Split

codec/decoder/plus/src/welsDecoderExt.cpp+0−43
@@ -259,32 +259,6 @@ long CWelsDecoder::SetOption (DECODER_OPTION eOptID, void* pOption) { · 258 unmodified lines
259259 m_pDecContext->bEndOfStreamFlag = iVal ? true : false;
260260
261261 return cmResultSuccess;
262− } else if (eOptID == DECODER_OPTION_MODE) {
263− if (pOption == NULL)
264− return cmInitParaError;
265−
266− iVal = * ((int*)pOption);
267−
268− m_pDecContext->iSetMode = iVal;
269− if (iVal == SW_MODE) {
270− m_pDecContext->iDecoderOutputProperty = BUFFER_HOST;
271− } else {
272−#if !defined(__APPLE__)
273− m_pDecContext->iDecoderOutputProperty = BUFFER_DEVICE;
274−#else
275− m_pDecContext->iDecoderOutputProperty = BUFFER_HOST;//BUFFER_HOST;//BUFFER_DEVICE;
276−#endif
277−
278− }
279−
280− return cmResultSuccess;
281− } else if (eOptID == DECODER_OPTION_OUTPUT_PROPERTY) {
282− if (pOption == NULL)
283− return cmInitParaError;
284−
285− iVal = * ((int*)pOption);
286− if (m_pDecContext->iSetMode != SW_MODE)
287− m_pDecContext->iDecoderOutputProperty = iVal;
288262 }
289263
290264
@@ -339,19 +313,6 @@ long CWelsDecoder::GetOption (DECODER_OPTION eOptID, void* pOption) { · 48 unmodified lines
339313 iVal = m_pDecContext->iFeedbackTidInAu;
340314 * ((int*)pOption) = iVal;
341315 return cmResultSuccess;
342− } else if (DECODER_OPTION_MODE == eOptID) {
343− if (pOption == NULL)
344− return cmInitParaError;
345−
346− iVal = m_pDecContext->iSetMode;
347−
348− * ((int*)pOption) = iVal;
349− return cmResultSuccess;
350− } else if (DECODER_OPTION_DEVICE_INFO == eOptID) {
351− if (pOption == NULL)
352− return cmInitParaError;
353−
354− return cmResultSuccess;
355316 }
356317
357318 return cmInitParaError;
@@ -390,7 +351,6 @@ DECODING_STATE CWelsDecoder::DecodeFrame2 (const unsigned char* kpSrc, · 32 unmodified lines
390351 m_pDecContext->iErrorCode = dsErrorFree; //initialize at the starting of AU decoding.
391352 m_pDecContext->iFeedbackVclNalInAu = FEEDBACK_UNKNOWN_NAL; //initialize
392353 memset (pDstInfo, 0, sizeof (SBufferInfo));
393− pDstInfo->eBufferProperty = (EBufferProperty)m_pDecContext->iDecoderOutputProperty;
394354
395355 #ifdef LONG_TERM_REF
396356 m_pDecContext->bReferenceLostAtT0Flag = false; //initialize for LTR
@@ -406,8 +366,6 @@ DECODING_STATE CWelsDecoder::DecodeFrame2 (const unsigned char* kpSrc, · 9 unmodified lines
406366 pDstInfo); //iErrorCode has been modified in this function
407367 XMMREG_PROTECT_LOAD(CWelsH264Decoder);
408368
409− pDstInfo->eWorkMode = (EDecodeMode)m_pDecContext->iDecoderMode;
410−
411369 if (m_pDecContext->iErrorCode) {
412370 ENalUnitType eNalType =
413371 NAL_UNIT_UNSPEC_0; //for NBR, IDR frames are expected to decode as followed if error decoding an IDR currently
@@ -447,7 +405,6 @@ DECODING_STATE CWelsDecoder::DecodeFrame (const unsigned char* kpSrc, · 33 unmodified lines
447405 DstInfo.UsrData.sSystemBuffer.iStride[1] = pStride[1];
448406 DstInfo.UsrData.sSystemBuffer.iWidth = iWidth;
449407 DstInfo.UsrData.sSystemBuffer.iHeight = iHeight;
450− DstInfo.eBufferProperty = BUFFER_HOST;
451408
452409 eDecState = DecodeFrame2 (kpSrc, kiSrcLen, (void**)ppDst, &DstInfo);
453410 if (eDecState == dsErrorFree) {

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