[AE] paplayer: drop ReadSamples/HasFloatData from codecs

Red-F · May 9, 2012 · 461207b · 461207b
1 parent 08b78c8
commit 461207b
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 39 deletions.
diff --git a/xbmc/cores/paplayer/ICodec.h b/xbmc/cores/paplayer/ICodec.h
@@ -74,14 +74,6 @@ class ICodec
   // the data has been exhausted, and READ_ERROR on error.
   virtual int ReadPCM(BYTE *pBuffer, int size, int *actualsize)=0;
 
-  // ReadSamples()
-  // Decodes audio into floats (normalized to 1) into pBuffer up to numsamples samples.
-  // The actual amount of returned samples is given in actualsamples.  Samples are
-  // total samples (ie distributed over channels).
-  // Returns READ_SUCCESS on success.  Returns READ_EOF when the data has been exhausted,
-  // and READ_ERROR on error.
-  virtual int ReadSamples(float *pBuffer, int numsamples, int *actualsamples) { return READ_ERROR; };
-
   // CanInit()
   // Should return true if the codec can be initialized
   // eg. check if a dll needed for the codec exists
@@ -97,8 +89,6 @@ class ICodec
   virtual bool IsCaching()    const    {return false;}
   virtual int GetCacheLevel() const    {return -1;}
 
-  // true if we can retrieve normalized float data immediately
-  virtual bool HasFloatData() const { return false; }
 
   int64_t m_TotalTime;  // time in ms
   int m_SampleRate;

diff --git a/xbmc/cores/paplayer/MP3codec.cpp b/xbmc/cores/paplayer/MP3codec.cpp
@@ -206,13 +206,6 @@ int64_t MP3Codec::Seek(int64_t iSeekTime)
   return iSeekTime;
 }
 
-int MP3Codec::ReadSamples(float *pBuffer, int numsamples, int *actualsamples)
-{
-  int result = ReadPCM((BYTE *)pBuffer, numsamples * sizeof(float), actualsamples);
-  *actualsamples /= sizeof(float);
-  return result;
-}
-
 int MP3Codec::Read(int size, bool init)
 {
   int inputBufferToRead = (int)(m_InputBufferSize - m_InputBufferPos);

diff --git a/xbmc/cores/paplayer/MP3codec.h b/xbmc/cores/paplayer/MP3codec.h
@@ -61,10 +61,8 @@ class MP3Codec : public CachingCodec
   virtual bool CanSeek();
   virtual int64_t Seek(int64_t iSeekTime);
   virtual int ReadPCM(BYTE *pBuffer, int size, int *actualsize);
-  virtual int ReadSamples(float *pBuffer, int numsamples, int *actualsamples);
   virtual bool CanInit();
   virtual bool SkipNext();
-  virtual bool HasFloatData() const { return m_BitsPerSampleInternal == 32; };
 private:
 
   /* TODO decoder functions */

diff --git a/xbmc/cores/paplayer/WAVcodec.cpp b/xbmc/cores/paplayer/WAVcodec.cpp
@@ -48,7 +48,6 @@ WAVCodec::WAVCodec()
   m_SampleRate = 0;
   m_Channels = 0;
   m_BitsPerSample = 0;
-  m_bHasFloat = false;
   m_iDataStart=0;
   m_iDataLen=0;
   m_Bitrate = 0;
@@ -115,7 +114,6 @@ bool WAVCodec::Init(const CStdString &strFile, unsigned int filecache)
         case WAVE_FORMAT_PCM:
           CLog::Log(LOGINFO, "WAVCodec::Init - WAVE_FORMAT_PCM detected");
           m_ChannelMask = 0;
-          m_bHasFloat = false;
         break;
 
         case WAVE_FORMAT_IEEE_FLOAT:
@@ -127,7 +125,6 @@ bool WAVCodec::Init(const CStdString &strFile, unsigned int filecache)
           }
 
           m_ChannelMask = 0;
-          m_bHasFloat = true;
         break;
 
         case WAVE_FORMAT_EXTENSIBLE:
@@ -145,7 +142,6 @@ bool WAVCodec::Init(const CStdString &strFile, unsigned int filecache)
           if (memcmp(&wfx.SubFormat, &KSDATAFORMAT_SUBTYPE_PCM, sizeof(GUID)) == 0)
           {
             CLog::Log(LOGINFO, "WAVCodec::Init - SubFormat KSDATAFORMAT_SUBTYPE_PCM Detected");
-            m_bHasFloat = false;
           }
           else if (memcmp(&wfx.SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, sizeof(GUID)) == 0)
           {
@@ -155,7 +151,6 @@ bool WAVCodec::Init(const CStdString &strFile, unsigned int filecache)
               CLog::Log(LOGERROR, "WAVCodec::Init - Only 32bit Float is supported");
               return false;
             }
-            m_bHasFloat = true;
           }
           else
           {
@@ -263,18 +258,6 @@ int WAVCodec::ReadPCM(BYTE *pBuffer, int size, int *actualsize)
   return READ_ERROR;
 }
 
-int WAVCodec::ReadSamples(float *pBuffer, int numsamples, int *actualsamples)
-{
-  int ret = READ_ERROR;
-  *actualsamples = 0;
-  if (m_bHasFloat)
-  {
-    ret = ReadPCM((BYTE*)pBuffer, numsamples * (m_BitsPerSample >> 3), actualsamples);
-    *actualsamples /= (m_BitsPerSample >> 3);
-  }
-  return ret;
-}
-
 bool WAVCodec::CanInit()
 {
   return true;

diff --git a/xbmc/cores/paplayer/WAVcodec.h b/xbmc/cores/paplayer/WAVcodec.h
@@ -34,12 +34,9 @@ class WAVCodec : public CachingCodec
   virtual void DeInit();
   virtual int64_t Seek(int64_t iSeekTime);
   virtual int ReadPCM(BYTE *pBuffer, int size, int *actualsize);
-  virtual int ReadSamples(float *pBuffer, int numsamples, int *actualsamples);
   virtual bool CanInit();
-  virtual bool HasFloatData() const { return m_bHasFloat; }
 
 private:
-  bool m_bHasFloat;
   uint32_t m_iDataStart;
   uint32_t m_iDataLen;
   DWORD m_ChannelMask;