[rbp] fixed broken omxplayer audio stream switching

diff --git a/xbmc/cores/omxplayer/OMXAudio.cpp b/xbmc/cores/omxplayer/OMXAudio.cpp
index a98ab09..2b4373e 100644 (file)
--- a/xbmc/cores/omxplayer/OMXAudio.cpp
+++ b/xbmc/cores/omxplayer/OMXAudio.cpp
@@ -103,6 +103,7 @@ COMXAudio::COMXAudio() :
   m_eEncoding       (OMX_AUDIO_CodingPCM),
   m_extradata       (NULL   ),
   m_extrasize       (0      ),
+  m_omx_render      (NULL   ),
   m_last_pts        (DVD_NOPTS_VALUE)
 {
   m_vizBufferSize   = m_vizRemapBufferSize = VIS_PACKET_SIZE * sizeof(float);
@@ -341,14 +342,21 @@ bool COMXAudio::Initialize(AEAudioFormat format, std::string& device)
   std::string componentName = "";
 
   componentName = "OMX.broadcom.audio_render";
-  if(!m_omx_render.Initialize((const std::string)componentName, OMX_IndexParamAudioInit))
+  m_omx_render = new COMXCoreComponent();
+  if(!m_omx_render)
+  {
+    CLog::Log(LOGERROR, "COMXAudio::Initialize error allocate OMX.broadcom.audio_render\n");
+    return false;
+  }
+
+  if(!m_omx_render->Initialize((const std::string)componentName, OMX_IndexParamAudioInit))
     return false;
 
   OMX_CONFIG_BRCMAUDIODESTINATIONTYPE audioDest;
   OMX_INIT_STRUCTURE(audioDest);
   strncpy((char *)audioDest.sName, device.c_str(), strlen(device.c_str()));
 
-  omx_err = m_omx_render.SetConfig(OMX_IndexConfigBrcmAudioDestination, &audioDest);
+  omx_err = m_omx_render->SetConfig(OMX_IndexConfigBrcmAudioDestination, &audioDest);
   if (omx_err != OMX_ErrorNone)
     return false;
 
@@ -356,7 +364,7 @@ bool COMXAudio::Initialize(AEAudioFormat format, std::string& device)
   OMX_INIT_STRUCTURE(configBool);
   configBool.bEnabled = OMX_FALSE;
 
-  omx_err = m_omx_render.SetConfig(OMX_IndexConfigBrcmClockReferenceSource, &configBool);
+  omx_err = m_omx_render->SetConfig(OMX_IndexConfigBrcmClockReferenceSource, &configBool);
   if (omx_err != OMX_ErrorNone)
     return false;
 
@@ -371,17 +379,17 @@ bool COMXAudio::Initialize(AEAudioFormat format, std::string& device)
       return false;
   }
 
+  OMX_CONFIG_BOOLEANTYPE boolType;
+  OMX_INIT_STRUCTURE(boolType);
   if(m_Passthrough)
-  {
-    OMX_CONFIG_BOOLEANTYPE boolType;
-    OMX_INIT_STRUCTURE(boolType);
     boolType.bEnabled = OMX_TRUE;
-    omx_err = m_omx_decoder.SetParameter(OMX_IndexParamBrcmDecoderPassThrough, &boolType);
-    if(omx_err != OMX_ErrorNone)
-    {
-      CLog::Log(LOGERROR, "COMXAudio::Initialize - Error OMX_IndexParamBrcmDecoderPassThrough 0x%08x", omx_err);
-      return false;
-    }
+  else
+    boolType.bEnabled = OMX_FALSE;
+  omx_err = m_omx_decoder.SetParameter(OMX_IndexParamBrcmDecoderPassThrough, &boolType);
+  if(omx_err != OMX_ErrorNone)
+  {
+    CLog::Log(LOGERROR, "COMXAudio::Initialize - Error OMX_IndexParamBrcmDecoderPassThrough 0x%08x", omx_err);
+    return false;
   }
 
   // set up the number/size of buffers
@@ -408,7 +416,7 @@ bool COMXAudio::Initialize(AEAudioFormat format, std::string& device)
     return false;
   }
 
-  if(m_HWDecode)
+  //if(m_HWDecode)
   {
     OMX_AUDIO_PARAM_PORTFORMATTYPE formatType;
     OMX_INIT_STRUCTURE(formatType);
@@ -424,7 +432,7 @@ bool COMXAudio::Initialize(AEAudioFormat format, std::string& device)
     }
   }
 
-  m_omx_tunnel_clock.Initialize(m_omx_clock, m_omx_clock->GetInputPort(), &m_omx_render, m_omx_render.GetInputPort()+1);
+  m_omx_tunnel_clock.Initialize(m_omx_clock, m_omx_clock->GetInputPort(), m_omx_render, m_omx_render->GetInputPort()+1);
 
   omx_err = m_omx_tunnel_clock.Establish(false);
   if(omx_err != OMX_ErrorNone)
@@ -466,7 +474,7 @@ bool COMXAudio::Initialize(AEAudioFormat format, std::string& device)
       return false;
     }
 
-    m_omx_tunnel_mixer.Initialize(&m_omx_mixer, m_omx_mixer.GetOutputPort(), &m_omx_render, m_omx_render.GetInputPort());
+    m_omx_tunnel_mixer.Initialize(&m_omx_mixer, m_omx_mixer.GetOutputPort(), m_omx_render, m_omx_render->GetInputPort());
     omx_err = m_omx_tunnel_mixer.Establish(false);
     if(omx_err != OMX_ErrorNone)
     {
@@ -482,7 +490,7 @@ bool COMXAudio::Initialize(AEAudioFormat format, std::string& device)
   }
   else
   {
-    m_omx_tunnel_decoder.Initialize(&m_omx_decoder, m_omx_decoder.GetOutputPort(), &m_omx_render, m_omx_render.GetInputPort());
+    m_omx_tunnel_decoder.Initialize(&m_omx_decoder, m_omx_decoder.GetOutputPort(), m_omx_render, m_omx_render->GetInputPort());
     omx_err = m_omx_tunnel_decoder.Establish(false);
     if(omx_err != OMX_ErrorNone)
     {
@@ -497,13 +505,15 @@ bool COMXAudio::Initialize(AEAudioFormat format, std::string& device)
     }
   }
 
-  omx_err = m_omx_render.SetStateForComponent(OMX_StateExecuting);
+  omx_err = m_omx_render->SetStateForComponent(OMX_StateExecuting);
   if(omx_err != OMX_ErrorNone) 
   {
     CLog::Log(LOGERROR, "COMXAudio::Initialize - Error setting OMX_StateExecuting 0x%08x", omx_err);
     return false;
   }
 
+  m_omx_decoder.EnablePort(m_omx_decoder.GetInputPort(), true);
+
   if(m_eEncoding == OMX_AUDIO_CodingPCM)
   {
     OMX_BUFFERHEADERTYPE *omx_buffer = m_omx_decoder.GetInputBuffer();
@@ -589,10 +599,7 @@ bool COMXAudio::Deinitialize()
   if(!m_Initialized)
     return true;
 
-  /*
-  if(m_av_clock && !m_external_clock)
-    m_av_clock->OMXStop();
-  */
+  CSingleLock lock (m_critSection);
 
   if(m_av_clock && !m_external_clock)
   {
@@ -612,12 +619,11 @@ bool COMXAudio::Deinitialize()
 
   m_omx_decoder.FlushInput();
 
-  m_omx_render.Deinitialize();
+  m_omx_render->Deinitialize();
   if(!m_Passthrough)
     m_omx_mixer.Deinitialize();
   m_omx_decoder.Deinitialize();
 
-  m_Initialized = false;
   m_BytesPerSec = 0;
   m_BufferLen   = 0;
 
@@ -625,12 +631,7 @@ bool COMXAudio::Deinitialize()
   {
     m_av_clock->OMXReset(false);
     m_av_clock->UnLock();
-  }
-
-  if(!m_external_clock && m_av_clock != NULL)
-  {
     delete m_av_clock;
-    m_av_clock  = NULL;
     m_external_clock = false;
   }
 
@@ -651,6 +652,9 @@ bool COMXAudio::Deinitialize()
   m_first_frame   = true;
   m_last_pts      = DVD_NOPTS_VALUE;
 
+  delete m_omx_render;
+  m_omx_render = NULL;
+
   return true;
 }
 
@@ -731,6 +735,8 @@ void COMXAudio::Mute(bool bMute)
 //***********************************************************************************************
 bool COMXAudio::SetCurrentVolume(float fVolume)
 {
+  CSingleLock lock (m_critSection);
+
   if(!m_Initialized || m_Passthrough)
     return -1;
 
@@ -738,13 +744,13 @@ bool COMXAudio::SetCurrentVolume(float fVolume)
 
   OMX_AUDIO_CONFIG_VOLUMETYPE volume;
   OMX_INIT_STRUCTURE(volume);
-  volume.nPortIndex = m_omx_render.GetInputPort();
+  volume.nPortIndex = m_omx_render->GetInputPort();
 
   volume.bLinear    = OMX_TRUE;
   float hardwareVolume = std::max(VOLUME_MINIMUM, std::min(VOLUME_MAXIMUM, fVolume)) * 100.0f;
   volume.sVolume.nValue = (int)hardwareVolume;
 
-  m_omx_render.SetConfig(OMX_IndexConfigAudioVolume, &volume);
+  m_omx_render->SetConfig(OMX_IndexConfigAudioVolume, &volume);
 
   return true;
 }
@@ -759,6 +765,8 @@ unsigned int COMXAudio::AddPackets(const void* data, unsigned int len)
 //***********************************************************************************************
 unsigned int COMXAudio::AddPackets(const void* data, unsigned int len, double dts, double pts)
 {
+  CSingleLock lock (m_critSection);
+
   if(!m_Initialized) 
   {
     CLog::Log(LOGERROR,"COMXAudio::AddPackets - sanity failed. no valid play handle!");
@@ -900,7 +908,7 @@ unsigned int COMXAudio::AddPackets(const void* data, unsigned int len, double dt
       m_first_frame = false;
       //m_omx_render.WaitForEvent(OMX_EventPortSettingsChanged);
 
-      m_omx_render.DisablePort(m_omx_render.GetInputPort(), false);
+      m_omx_render->DisablePort(m_omx_render->GetInputPort(), false);
       if(!m_Passthrough)
       {
         m_omx_mixer.DisablePort(m_omx_mixer.GetOutputPort(), false);
@@ -964,13 +972,13 @@ unsigned int COMXAudio::AddPackets(const void* data, unsigned int len, double dt
 
         m_pcm_output.nSamplingRate = m_format.m_sampleRate;
 
-        m_pcm_output.nPortIndex      = m_omx_render.GetInputPort();
-        omx_err = m_omx_render.SetParameter(OMX_IndexParamAudioPcm, &m_pcm_output);
+        m_pcm_output.nPortIndex      = m_omx_render->GetInputPort();
+        omx_err = m_omx_render->SetParameter(OMX_IndexParamAudioPcm, &m_pcm_output);
         if(omx_err != OMX_ErrorNone)
         {
           CLog::Log(LOGERROR, "COMXAudio::AddPackets error SetParameter 1 render omx_err(0x%08x)\n", omx_err);
         }
-        omx_err = m_omx_render.GetParameter(OMX_IndexParamAudioPcm, &m_pcm_output);
+        omx_err = m_omx_render->GetParameter(OMX_IndexParamAudioPcm, &m_pcm_output);
         if(omx_err != OMX_ErrorNone)
         {
           CLog::Log(LOGERROR, "COMXAudio::AddPackets error GetParameter 2 render omx_err(0x%08x)\n", omx_err);
@@ -981,15 +989,11 @@ unsigned int COMXAudio::AddPackets(const void* data, unsigned int len, double dt
       }
       else
       {
-        m_pcm_output.nPortIndex      = m_omx_decoder.GetOutputPort();
-        m_omx_decoder.GetParameter(OMX_IndexParamAudioPcm, &m_pcm_output);
-        PrintPCM(&m_pcm_output, std::string("output"));
-
         OMX_AUDIO_PARAM_PORTFORMATTYPE formatType;
         OMX_INIT_STRUCTURE(formatType);
-        formatType.nPortIndex = m_omx_render.GetInputPort();
+        formatType.nPortIndex = m_omx_render->GetInputPort();
 
-        omx_err = m_omx_render.GetParameter(OMX_IndexParamAudioPortFormat, &formatType);
+        omx_err = m_omx_render->GetParameter(OMX_IndexParamAudioPortFormat, &formatType);
         if(omx_err != OMX_ErrorNone)
         {
           CLog::Log(LOGERROR, "COMXAudio::AddPackets error OMX_IndexParamAudioPortFormat omx_err(0x%08x)\n", omx_err);
@@ -998,7 +1002,7 @@ unsigned int COMXAudio::AddPackets(const void* data, unsigned int len, double dt
 
         formatType.eEncoding = m_eEncoding;
 
-        omx_err = m_omx_render.SetParameter(OMX_IndexParamAudioPortFormat, &formatType);
+        omx_err = m_omx_render->SetParameter(OMX_IndexParamAudioPortFormat, &formatType);
         if(omx_err != OMX_ErrorNone)
         {
           CLog::Log(LOGERROR, "COMXAudio::AddPackets error OMX_IndexParamAudioPortFormat omx_err(0x%08x)\n", omx_err);
@@ -1010,7 +1014,7 @@ unsigned int COMXAudio::AddPackets(const void* data, unsigned int len, double dt
           OMX_AUDIO_PARAM_DDPTYPE m_ddParam;
           OMX_INIT_STRUCTURE(m_ddParam);
 
-          m_ddParam.nPortIndex      = m_omx_render.GetInputPort();
+          m_ddParam.nPortIndex      = m_omx_render->GetInputPort();
 
           m_ddParam.nChannels       = m_format.m_channelLayout.Count(); //(m_InputChannels == 6) ? 8 : m_InputChannels;
           m_ddParam.nSampleRate     = m_SampleRate;
@@ -1025,13 +1029,13 @@ unsigned int COMXAudio::AddPackets(const void* data, unsigned int len, double dt
             m_ddParam.eChannelMapping[i] = OMXChannels[i];
           }
   
-          m_omx_render.SetParameter(OMX_IndexParamAudioDdp, &m_ddParam);
-          m_omx_render.GetParameter(OMX_IndexParamAudioDdp, &m_ddParam);
+          m_omx_render->SetParameter(OMX_IndexParamAudioDdp, &m_ddParam);
+          m_omx_render->GetParameter(OMX_IndexParamAudioDdp, &m_ddParam);
           PrintDDP(&m_ddParam);
         }
         else if(m_eEncoding == OMX_AUDIO_CodingDTS)
         {
-          m_dtsParam.nPortIndex      = m_omx_render.GetInputPort();
+          m_dtsParam.nPortIndex      = m_omx_render->GetInputPort();
 
           m_dtsParam.nChannels       = m_format.m_channelLayout.Count(); //(m_InputChannels == 6) ? 8 : m_InputChannels;
           m_dtsParam.nBitRate        = 0;
@@ -1044,13 +1048,13 @@ unsigned int COMXAudio::AddPackets(const void* data, unsigned int len, double dt
             m_dtsParam.eChannelMapping[i] = OMXChannels[i];
           }
   
-          m_omx_render.SetParameter(OMX_IndexParamAudioDts, &m_dtsParam);
-          m_omx_render.GetParameter(OMX_IndexParamAudioDts, &m_dtsParam);
+          m_omx_render->SetParameter(OMX_IndexParamAudioDts, &m_dtsParam);
+          m_omx_render->GetParameter(OMX_IndexParamAudioDts, &m_dtsParam);
           PrintDTS(&m_dtsParam);
         }
       }
 
-      m_omx_render.EnablePort(m_omx_render.GetInputPort(), false);
+      m_omx_render->EnablePort(m_omx_render->GetInputPort(), false);
       if(!m_Passthrough)
       {
         m_omx_mixer.EnablePort(m_omx_mixer.GetOutputPort(), false);
@@ -1123,12 +1127,15 @@ void COMXAudio::UnRegisterAudioCallback()
 
 unsigned int COMXAudio::GetAudioRenderingLatency()
 {
+  if(!m_Initialized)
+    return 0;
+
   OMX_PARAM_U32TYPE param;
   OMX_INIT_STRUCTURE(param);
-  param.nPortIndex = m_omx_render.GetInputPort();
+  param.nPortIndex = m_omx_render->GetInputPort();
 
   OMX_ERRORTYPE omx_err =
-    m_omx_render.GetConfig(OMX_IndexConfigAudioRenderingLatency, &param);
+    m_omx_render->GetConfig(OMX_IndexConfigAudioRenderingLatency, &param);
 
   if(omx_err != OMX_ErrorNone)
   {
@@ -1142,6 +1149,8 @@ unsigned int COMXAudio::GetAudioRenderingLatency()
 
 void COMXAudio::WaitCompletion()
 {
+  CSingleLock lock (m_critSection);
+
   if(!m_Initialized || m_Pause)
     return;
 
@@ -1170,7 +1179,7 @@ void COMXAudio::WaitCompletion()
   unsigned int nTimeOut = AUDIO_BUFFER_SECONDS * 1000;
   while(nTimeOut)
   {
-    if(m_omx_render.IsEOS())
+    if(m_omx_render->IsEOS())
       break;
 
     if(nTimeOut == 0)

diff --git a/xbmc/cores/omxplayer/OMXAudio.h b/xbmc/cores/omxplayer/OMXAudio.h
index ebc9271..66c6f92 100644 (file)
--- a/xbmc/cores/omxplayer/OMXAudio.h
+++ b/xbmc/cores/omxplayer/OMXAudio.h
@@ -39,6 +39,8 @@
 #include "DllAvCodec.h"
 #include "DllAvUtil.h"
 
+#include "threads/CriticalSection.h"
+
 #define AUDIO_BUFFER_SECONDS 2
 #define VIS_PACKET_SIZE 512
 
@@ -75,7 +77,6 @@ public:
   bool SetCurrentVolume(float fVolume);
   void SetDynamicRangeCompression(long drc) { m_drc = drc; }
   int SetPlaySpeed(int iSpeed);
-  unsigned int GetAudioRenderingLatency();
   void WaitCompletion();
   void SwitchChannels(int iAudioStream, bool bAudioOnAllSpeakers);
 
@@ -132,7 +133,7 @@ private:
   WAVEFORMATEXTENSIBLE        m_wave_header;
   AEAudioFormat m_format;
 protected:
-  COMXCoreComponent m_omx_render;
+  COMXCoreComponent *m_omx_render;
   COMXCoreComponent m_omx_mixer;
   COMXCoreComponent m_omx_decoder;
   COMXCoreTunel     m_omx_tunnel_clock;
@@ -148,6 +149,8 @@ protected:
   CAEChannelInfo    GetChannelLayout(AEAudioFormat format);
 
   void CheckOutputBufferSize(void **buffer, int *oldSize, int newSize);
+  unsigned int GetAudioRenderingLatency();
+  CCriticalSection m_critSection;
 };
 #endif
 

diff --git a/xbmc/cores/omxplayer/OMXImage.cpp b/xbmc/cores/omxplayer/OMXImage.cpp
index 22842ac..a268b97 100644 (file)
--- a/xbmc/cores/omxplayer/OMXImage.cpp
+++ b/xbmc/cores/omxplayer/OMXImage.cpp
@@ -99,9 +99,9 @@ void COMXImage::Close()
   if(m_decoder_open)
   {
     m_omx_decoder.FlushInput();
-    m_omx_decoder.FreeInputBuffers(true);
+    m_omx_decoder.FreeInputBuffers();
     m_omx_resize.FlushOutput();
-    m_omx_resize.FreeOutputBuffers(true);
+    m_omx_resize.FreeOutputBuffers();
 
     m_omx_tunnel_decode.Flush();
     m_omx_tunnel_decode.Flush();

diff --git a/xbmc/cores/omxplayer/OMXPlayerAudio.cpp b/xbmc/cores/omxplayer/OMXPlayerAudio.cpp
index 785539b..94debbb 100644 (file)
--- a/xbmc/cores/omxplayer/OMXPlayerAudio.cpp
+++ b/xbmc/cores/omxplayer/OMXPlayerAudio.cpp
@@ -707,8 +707,6 @@ AEDataFormat OMXPlayerAudio::GetDataFormat(CDVDStreamInfo hints)
 
 bool OMXPlayerAudio::OpenDecoder()
 {
-  bool bAudioRenderOpen = false;
-
   m_nChannels   = m_hints.channels;
   m_passthrough = false;
   m_hw_decode   = false;
@@ -717,7 +715,6 @@ bool OMXPlayerAudio::OpenDecoder()
 
   m_av_clock->Lock();
   m_av_clock->OMXStop(false);
-  m_av_clock->HasAudio(false);
 
   /* setup audi format for audio render */
   m_format.m_sampleRate    = m_hints.samplerate;
@@ -732,17 +729,14 @@ bool OMXPlayerAudio::OpenDecoder()
   else
     device = "local";
 
-  bAudioRenderOpen = m_omxAudio.Initialize(m_format, device, m_av_clock, m_hints, m_passthrough, m_hw_decode);
+  bool bAudioRenderOpen = m_omxAudio.Initialize(m_format, device, m_av_clock, m_hints, m_passthrough, m_hw_decode);
 
   m_codec_name = "";
   
   if(!bAudioRenderOpen)
   {
     CLog::Log(LOGERROR, "OMXPlayerAudio : Error open audio output");
-    m_av_clock->HasAudio(false);
-    m_av_clock->OMXReset(false);
-    m_av_clock->UnLock();
-    return false;
+    m_omxAudio.Deinitialize();
   }
   else
   {
@@ -750,19 +744,19 @@ bool OMXPlayerAudio::OpenDecoder()
       m_codec_name.c_str(), m_nChannels, m_hints.samplerate, m_hints.bitspersample);
   }
 
-  m_av_clock->HasAudio(true);
+  m_av_clock->HasAudio(bAudioRenderOpen);
   m_av_clock->OMXReset(false);
   m_av_clock->UnLock();
 
-  return true;
+  return bAudioRenderOpen;
 }
 
 void OMXPlayerAudio::CloseDecoder()
 {
   m_av_clock->Lock();
   m_av_clock->OMXStop(false);
-  m_omxAudio.Deinitialize();
   m_av_clock->HasAudio(false);
+  m_omxAudio.Deinitialize();
   m_av_clock->OMXReset(false);
   m_av_clock->UnLock();
 

diff --git a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp
index 9888b72..053d18f 100644 (file)
--- a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp
+++ b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp
@@ -193,8 +193,8 @@ bool OMXPlayerVideo::CloseStream(bool bWaitForBuffers)
 
   m_av_clock->Lock();
   m_av_clock->OMXStop(false);
-  m_omxVideo.Close();
   m_av_clock->HasVideo(false);
+  m_omxVideo.Close();
   m_av_clock->OMXReset(false);
   m_av_clock->UnLock();
 
@@ -701,35 +701,37 @@ bool OMXPlayerVideo::OpenDecoder()
 
   m_av_clock->Lock();
   m_av_clock->OMXStop(false);
-  if(!m_omxVideo.Open(m_hints, m_av_clock, m_Deinterlace, m_hdmi_clock_sync))
+
+  bool bVideoDecoderOpen = m_omxVideo.Open(m_hints, m_av_clock, m_Deinterlace, m_hdmi_clock_sync);
+
+  if(!bVideoDecoderOpen)
   {
     CLog::Log(LOGERROR, "OMXPlayerAudio : Error open video output");
-    m_av_clock->HasVideo(false);
-    m_av_clock->OMXReset(false);
-    m_av_clock->UnLock();
-    return false;
+    m_omxVideo.Close();
   }
   else
+  {
     CLog::Log(LOGINFO, "OMXPlayerVideo::OpenDecoder : Video codec %s width %d height %d profile %d fps %f\n",
         m_omxVideo.GetDecoderName().c_str() , m_hints.width, m_hints.height, m_hints.profile, m_fFrameRate);
 
-  m_codecname = m_omxVideo.GetDecoderName();
+    m_codecname = m_omxVideo.GetDecoderName();
 
-  // if we are closer to ntsc version of framerate, let gpu know
-  int   iFrameRate  = (int)(m_fFrameRate + 0.5f);
-  bool  bNtscFreq  = fabs(m_fFrameRate * 1001.0f / 1000.0f - iFrameRate) < fabs(m_fFrameRate - iFrameRate);
-  char  response[80], command[80];
-  sprintf(command, "hdmi_ntsc_freqs %d", bNtscFreq);
-  CLog::Log(LOGINFO, "OMXPlayerVideo::OpenDecoder fps: %f %s\n", m_fFrameRate, command);
-  m_DllBcmHost.vc_gencmd(response, sizeof response, command);
+    // if we are closer to ntsc version of framerate, let gpu know
+    int   iFrameRate  = (int)(m_fFrameRate + 0.5f);
+    bool  bNtscFreq  = fabs(m_fFrameRate * 1001.0f / 1000.0f - iFrameRate) < fabs(m_fFrameRate - iFrameRate);
+    char  response[80], command[80];
+    sprintf(command, "hdmi_ntsc_freqs %d", bNtscFreq);
+    CLog::Log(LOGINFO, "OMXPlayerVideo::OpenDecoder fps: %f %s\n", m_fFrameRate, command);
+    m_DllBcmHost.vc_gencmd(response, sizeof response, command);
 
-  if(m_av_clock)
-    m_av_clock->SetRefreshRate(m_fFrameRate);
+    if(m_av_clock)
+      m_av_clock->SetRefreshRate(m_fFrameRate);
+  }
 
-  m_av_clock->HasVideo(true);
+  m_av_clock->HasVideo(bVideoDecoderOpen);
   m_av_clock->OMXReset(false);
   m_av_clock->UnLock();
-  return true;
+  return bVideoDecoderOpen;
 }
 
 int  OMXPlayerVideo::GetDecoderBufferSize()