Permalink
Browse files

[rbp/omxplayer] Cosmetic: Remove unused portSettingsChanged parameter…

… from tunnel establish
  • Loading branch information...
1 parent 4efa4c5 commit ac74d8b993260e755422fa06a9e30dec6082e0bc @popcornmix popcornmix committed Nov 23, 2013
@@ -215,7 +215,7 @@ bool COMXAudio::PortSettingsChanged()
m_omx_tunnel_clock_analog.Initialize(m_omx_clock, m_omx_clock->GetInputPort(),
&m_omx_render_analog, m_omx_render_analog.GetInputPort()+1);
- omx_err = m_omx_tunnel_clock_analog.Establish(false);
+ omx_err = m_omx_tunnel_clock_analog.Establish();
if(omx_err != OMX_ErrorNone)
{
CLog::Log(LOGERROR, "%s::%s - m_omx_tunnel_clock_analog.Establish omx_err(0x%08x)", CLASSNAME, __func__, omx_err);
@@ -228,7 +228,7 @@ bool COMXAudio::PortSettingsChanged()
m_omx_tunnel_clock_hdmi.Initialize(m_omx_clock, m_omx_clock->GetInputPort() + (m_omx_render_analog.IsInitialized() ? 2 : 0),
&m_omx_render_hdmi, m_omx_render_hdmi.GetInputPort()+1);
- omx_err = m_omx_tunnel_clock_hdmi.Establish(false);
+ omx_err = m_omx_tunnel_clock_hdmi.Establish();
if(omx_err != OMX_ErrorNone)
{
CLog::Log(LOGERROR, "%s::%s - m_omx_tunnel_clock_hdmi.Establish omx_err(0x%08x)", CLASSNAME, __func__, omx_err);
@@ -292,15 +292,15 @@ bool COMXAudio::PortSettingsChanged()
if( m_omx_splitter.IsInitialized() )
{
m_omx_tunnel_splitter_analog.Initialize(&m_omx_splitter, m_omx_splitter.GetOutputPort(), &m_omx_render_analog, m_omx_render_analog.GetInputPort());
- omx_err = m_omx_tunnel_splitter_analog.Establish(false);
+ omx_err = m_omx_tunnel_splitter_analog.Establish();
if(omx_err != OMX_ErrorNone)
{
CLog::Log(LOGERROR, "COMXAudio::Initialize - Error m_omx_tunnel_splitter_analog.Establish 0x%08x", omx_err);
return false;
}
m_omx_tunnel_splitter_hdmi.Initialize(&m_omx_splitter, m_omx_splitter.GetOutputPort() + 1, &m_omx_render_hdmi, m_omx_render_hdmi.GetInputPort());
- omx_err = m_omx_tunnel_splitter_hdmi.Establish(false);
+ omx_err = m_omx_tunnel_splitter_hdmi.Establish();
if(omx_err != OMX_ErrorNone)
{
CLog::Log(LOGERROR, "COMXAudio::Initialize - Error m_omx_tunnel_splitter_hdmi.Establish 0x%08x", omx_err);
@@ -342,7 +342,7 @@ bool COMXAudio::PortSettingsChanged()
0, 0, 0, 0);
}
- omx_err = m_omx_tunnel_decoder.Establish(false);
+ omx_err = m_omx_tunnel_decoder.Establish();
if(omx_err != OMX_ErrorNone)
{
CLog::Log(LOGERROR, "%s::%s - m_omx_tunnel_decoder.Establish omx_err(0x%08x)", CLASSNAME, __func__, omx_err);
@@ -360,7 +360,7 @@ bool COMXAudio::PortSettingsChanged()
if( m_omx_mixer.IsInitialized() )
{
- omx_err = m_omx_tunnel_mixer.Establish(false);
+ omx_err = m_omx_tunnel_mixer.Establish();
if(omx_err != OMX_ErrorNone)
{
CLog::Log(LOGERROR, "%s::%s - m_omx_tunnel_decoder.Establish omx_err(0x%08x)", CLASSNAME, __func__, omx_err);
@@ -941,7 +941,7 @@ bool COMXImageDec::HandlePortSettingChange(unsigned int resize_width, unsigned i
m_omx_tunnel_decode.Initialize(&m_omx_decoder, m_omx_decoder.GetOutputPort(), &m_omx_resize, m_omx_resize.GetInputPort());
- omx_err = m_omx_tunnel_decode.Establish(false);
+ omx_err = m_omx_tunnel_decode.Establish();
if(omx_err != OMX_ErrorNone)
{
CLog::Log(LOGERROR, "%s::%s m_omx_tunnel_decode.Establish\n", CLASSNAME, __func__);
@@ -1576,7 +1576,7 @@ bool COMXImageReEnc::HandlePortSettingChange(unsigned int resize_width, unsigned
m_omx_tunnel_decode.Initialize(&m_omx_decoder, m_omx_decoder.GetOutputPort(), &m_omx_resize, m_omx_resize.GetInputPort());
- omx_err = m_omx_tunnel_decode.Establish(false);
+ omx_err = m_omx_tunnel_decode.Establish();
if(omx_err != OMX_ErrorNone)
{
CLog::Log(LOGERROR, "%s::%s m_omx_tunnel_decode.Establish\n", CLASSNAME, __func__);
@@ -1585,7 +1585,7 @@ bool COMXImageReEnc::HandlePortSettingChange(unsigned int resize_width, unsigned
m_omx_tunnel_resize.Initialize(&m_omx_resize, m_omx_resize.GetOutputPort(), &m_omx_encoder, m_omx_encoder.GetInputPort());
- omx_err = m_omx_tunnel_resize.Establish(false);
+ omx_err = m_omx_tunnel_resize.Establish();
if(omx_err != OMX_ErrorNone)
{
CLog::Log(LOGERROR, "%s::%s m_omx_tunnel_resize.Establish\n", CLASSNAME, __func__);
@@ -1928,7 +1928,7 @@ bool COMXTexture::HandlePortSettingChange(unsigned int resize_width, unsigned in
m_omx_tunnel_decode.Initialize(&m_omx_decoder, m_omx_decoder.GetOutputPort(), &m_omx_resize, m_omx_resize.GetInputPort());
- omx_err = m_omx_tunnel_decode.Establish(false);
+ omx_err = m_omx_tunnel_decode.Establish();
if (omx_err != OMX_ErrorNone)
{
CLog::Log(LOGERROR, "%s::%s m_omx_tunnel_decode.Establish (%x)", CLASSNAME, __func__, omx_err);
@@ -1937,7 +1937,7 @@ bool COMXTexture::HandlePortSettingChange(unsigned int resize_width, unsigned in
m_omx_tunnel_egl.Initialize(&m_omx_resize, m_omx_resize.GetOutputPort(), &m_omx_egl_render, m_omx_egl_render.GetInputPort());
- omx_err = m_omx_tunnel_egl.Establish(false);
+ omx_err = m_omx_tunnel_egl.Establish();
if (omx_err != OMX_ErrorNone)
{
CLog::Log(LOGERROR, "%s::%s m_omx_tunnel_egl.Establish (%x)", CLASSNAME, __func__, omx_err);
@@ -282,14 +282,14 @@ bool COMXVideo::PortSettingsChanged()
m_omx_tunnel_clock.Initialize(m_omx_clock, m_omx_clock->GetInputPort() + 1, &m_omx_sched, m_omx_sched.GetOutputPort() + 1);
- omx_err = m_omx_tunnel_clock.Establish(false);
+ omx_err = m_omx_tunnel_clock.Establish();
if(omx_err != OMX_ErrorNone)
{
CLog::Log(LOGERROR, "%s::%s - m_omx_tunnel_clock.Establish omx_err(0x%08x)", CLASSNAME, __func__, omx_err);
return false;
}
- omx_err = m_omx_tunnel_decoder.Establish(false);
+ omx_err = m_omx_tunnel_decoder.Establish();
if(omx_err != OMX_ErrorNone)
{
CLog::Log(LOGERROR, "%s::%s - m_omx_tunnel_decoder.Establish omx_err(0x%08x)", CLASSNAME, __func__, omx_err);
@@ -298,7 +298,7 @@ bool COMXVideo::PortSettingsChanged()
if(m_deinterlace)
{
- omx_err = m_omx_tunnel_image_fx.Establish(false);
+ omx_err = m_omx_tunnel_image_fx.Establish();
if(omx_err != OMX_ErrorNone)
{
CLog::Log(LOGERROR, "%s::%s - m_omx_tunnel_image_fx.Establish omx_err(0x%08x)", CLASSNAME, __func__, omx_err);
@@ -313,7 +313,7 @@ bool COMXVideo::PortSettingsChanged()
}
}
- omx_err = m_omx_tunnel_sched.Establish(false);
+ omx_err = m_omx_tunnel_sched.Establish();
if(omx_err != OMX_ErrorNone)
{
CLog::Log(LOGERROR, "%s::%s - m_omx_tunnel_sched.Establish omx_err(0x%08x)", CLASSNAME, __func__, omx_err);
View
@@ -63,7 +63,6 @@ COMXCoreTunel::COMXCoreTunel()
m_dst_component = NULL;
m_src_port = 0;
m_dst_port = 0;
- m_portSettingsChanged = false;
m_tunnel_set = false;
m_DllOMX = g_RBP.GetDllOMX();
}
@@ -92,9 +91,6 @@ OMX_ERRORTYPE COMXCoreTunel::Deestablish(bool noWait)
OMX_ERRORTYPE omx_err = OMX_ErrorNone;
- if(m_src_component->GetComponent() && m_portSettingsChanged && !noWait)
- omx_err = m_src_component->WaitForEvent(OMX_EventPortSettingsChanged);
-
if(m_src_component->GetComponent())
{
omx_err = m_src_component->DisablePort(m_src_port, false);
@@ -162,7 +158,7 @@ OMX_ERRORTYPE COMXCoreTunel::Deestablish(bool noWait)
return OMX_ErrorNone;
}
-OMX_ERRORTYPE COMXCoreTunel::Establish(bool portSettingsChanged, bool enable_ports /* = true */, bool disable_ports /* = false */)
+OMX_ERRORTYPE COMXCoreTunel::Establish(bool enable_ports /* = true */, bool disable_ports /* = false */)
{
OMX_ERRORTYPE omx_err = OMX_ErrorNone;
OMX_PARAM_U32TYPE param;
@@ -184,15 +180,6 @@ OMX_ERRORTYPE COMXCoreTunel::Establish(bool portSettingsChanged, bool enable_por
}
}
- if(portSettingsChanged)
- {
- omx_err = m_src_component->WaitForEvent(OMX_EventPortSettingsChanged);
- if(omx_err != OMX_ErrorNone)
- {
- return omx_err;
- }
- }
-
if(m_src_component->GetComponent() && disable_ports)
{
omx_err = m_src_component->DisablePort(m_src_port, false);
@@ -304,8 +291,6 @@ OMX_ERRORTYPE COMXCoreTunel::Establish(bool portSettingsChanged, bool enable_por
}
}
- m_portSettingsChanged = portSettingsChanged;
-
return OMX_ErrorNone;
}
View
@@ -72,9 +72,8 @@ class COMXCoreTunel
void Initialize(COMXCoreComponent *src_component, unsigned int src_port, COMXCoreComponent *dst_component, unsigned int dst_port);
bool IsInitialized();
OMX_ERRORTYPE Deestablish(bool noWait = false);
- OMX_ERRORTYPE Establish(bool portSettingsChanged, bool enable_ports = true, bool disable_ports = false);
+ OMX_ERRORTYPE Establish(bool enable_ports = true, bool disable_ports = false);
private:
- bool m_portSettingsChanged;
COMXCoreComponent *m_src_component;
COMXCoreComponent *m_dst_component;
unsigned int m_src_port;

0 comments on commit ac74d8b

Please sign in to comment.