Merge pull request #4672 from anssih/fix/dvdplayer-samplerate

dvdplayer sample rate fixes
xbmc · May 10, 2014 · d8d745b · d8d745b
2 parents 15822c4 + d74bd78
commit d8d745b
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 10 deletions.
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodec.h b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodec.h
@@ -140,7 +140,7 @@ class CDVDAudioCodec
   /*
    * returns the samplerate for the encoded audio stream
    */
-  virtual int GetEncodedSampleRate() { return 0; } 
+  virtual int GetEncodedSampleRate() { return GetSampleRate(); }
 
   /*
    * returns the data format for the decoded audio stream (eg AE_FMT_S16LE)

diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp
@@ -285,13 +285,6 @@ int CDVDAudioCodecFFmpeg::GetSampleRate()
   return 0;
 }
 
-int CDVDAudioCodecFFmpeg::GetEncodedSampleRate()
-{
-  if (m_pCodecContext)
-    return m_pCodecContext->sample_rate;
-  return 0;
-}
-
 enum AEDataFormat CDVDAudioCodecFFmpeg::GetDataFormat()
 {
   switch(m_pCodecContext->sample_fmt)

diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.h b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.h
@@ -42,7 +42,6 @@ class CDVDAudioCodecFFmpeg : public CDVDAudioCodec
   virtual int GetChannels();
   virtual CAEChannelInfo GetChannelMap();
   virtual int GetSampleRate();
-  virtual int GetEncodedSampleRate();
   virtual enum AEDataFormat GetDataFormat();
   virtual const char* GetName() { return "FFmpeg"; }
   virtual int GetBufferSize() { return m_iBuffered; }

diff --git a/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp b/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
@@ -286,7 +286,7 @@ int CDVDPlayerAudio::DecodeFrame(DVDAudioFrame &audioframe)
       if (audioframe.pts == DVD_NOPTS_VALUE)
         audioframe.pts = m_audioClock;
 
-      if (m_streaminfo.samplerate != audioframe.encoded_sample_rate)
+      if (audioframe.encoded_sample_rate && m_streaminfo.samplerate != audioframe.encoded_sample_rate)
       {
         // The sample rate has changed or we just got it for the first time
         // for this stream. See if we should enable/disable passthrough due