aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Kerling <pkerling@casix.org>2019-03-28 17:51:36 +0100
committerPhilipp Kerling <pkerling@casix.org>2019-03-28 18:22:02 +0100
commit3e38d747173d76e828ce0808b9b0b037a45201b4 (patch)
tree2aea5edc3fc73e65ecb52feac6232a5354c3477c
parent05a4ef54cdb7c02982a4e5f524de7b939247a43c (diff)
[vaapi] Remove unused code
-rw-r--r--xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp29
-rw-r--r--xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.h2
2 files changed, 2 insertions, 29 deletions
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
index 1ca4c8142a..4d874fdf72 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
@@ -1547,16 +1547,8 @@ void COutput::StateMachine(int signal, Protocol *port, Message *msg)
// set initial number of
EnsureBufferPool();
- if (!m_vaError)
- {
- m_state = O_TOP_CONFIGURED_IDLE;
- msg->Reply(COutputControlProtocol::ACC);
- }
- else
- {
- m_state = O_TOP_ERROR;
- msg->Reply(COutputControlProtocol::ERROR);
- }
+ m_state = O_TOP_CONFIGURED_IDLE;
+ msg->Reply(COutputControlProtocol::ACC);
return;
default:
break;
@@ -1747,11 +1739,6 @@ void COutput::StateMachine(int signal, Protocol *port, Message *msg)
m_dataPort.SendInMessage(COutputDataProtocol::PICTURE, &outPic, sizeof(outPic));
}
m_config.stats->DecProcessed();
- if (m_vaError)
- {
- m_state = O_TOP_ERROR;
- return;
- }
}
m_state = O_TOP_CONFIGURED_IDLE;
m_extTimeout = 0;
@@ -1861,7 +1848,6 @@ bool COutput::Init()
m_config.processInfo->UpdateDeinterlacingMethods(deintMethods);
m_config.processInfo->SetDeinterlacingMethodDefault(EINTERLACEMETHOD::VS_INTERLACEMETHOD_VAAPI_BOB);
- m_vaError = false;
m_seenInterlaced = false;
return true;
@@ -2219,17 +2205,6 @@ void COutput::ReadyForDisposal(CPostproc *pp)
}
}
-bool COutput::CheckSuccess(VAStatus status, const std::string& function)
-{
- if (status != VA_STATUS_SUCCESS)
- {
- CLog::Log(LOGERROR, "VAAPI/output {} error: {} ({})", function, vaErrorStr(status), status);
- m_vaError = true;
- return false;
- }
- return true;
-}
-
//-----------------------------------------------------------------------------
// Postprocessing
//-----------------------------------------------------------------------------
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.h
index 7deb65496d..4ad6efda0d 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.h
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.h
@@ -264,7 +264,6 @@ protected:
void Flush();
void EnsureBufferPool();
void ReleaseBufferPool(bool precleanup = false);
- bool CheckSuccess(VAStatus status, const std::string& function);
void ReadyForDisposal(CPostproc *pp);
CEvent m_outMsgEvent;
CEvent *m_inMsgEvent;
@@ -274,7 +273,6 @@ protected:
// extended state variables for state machine
int m_extTimeout;
- bool m_vaError;
/// \brief Whether at least one interlaced frame was encountered in the video stream (indicating that more interlaced frames could potentially follow)
bool m_seenInterlaced;
CVaapiConfig m_config;