diff options
| -rw-r--r-- | src/qmmp/audioparameters.cpp | 13 | ||||
| -rw-r--r-- | src/qmmp/qmmp.h | 13 |
2 files changed, 24 insertions, 2 deletions
diff --git a/src/qmmp/audioparameters.cpp b/src/qmmp/audioparameters.cpp index 7163c2996..3082a8dcf 100644 --- a/src/qmmp/audioparameters.cpp +++ b/src/qmmp/audioparameters.cpp @@ -87,12 +87,23 @@ int AudioParameters::sampleSize(Qmmp::AudioFormat format) switch(format) { case Qmmp::PCM_S8: + case Qmmp::PCM_U8: return 1; - case Qmmp::PCM_S16LE: case Qmmp::PCM_UNKNOWM: + case Qmmp::PCM_S16LE: + case Qmmp::PCM_S16BE: + case Qmmp::PCM_U16LE: + case Qmmp::PCM_U16BE: return 2; case Qmmp::PCM_S24LE: + case Qmmp::PCM_S24BE: + case Qmmp::PCM_U24LE: + case Qmmp::PCM_U24BE: case Qmmp::PCM_S32LE: + case Qmmp::PCM_S32BE: + case Qmmp::PCM_U32LE: + case Qmmp::PCM_U32BE: + case Qmmp::PCM_FLOAT: return 4; } return 2; diff --git a/src/qmmp/qmmp.h b/src/qmmp/qmmp.h index 473c190b3..892b43141 100644 --- a/src/qmmp/qmmp.h +++ b/src/qmmp/qmmp.h @@ -83,9 +83,20 @@ public: { PCM_UNKNOWM = -1, /*!< Unknown format */ PCM_S8 = 0, /*!< Signed 8 bit */ + PCM_U8, /*!< Unsigned 8 bit */ PCM_S16LE, /*!< Signed 16 bit Little Endian */ + PCM_S16BE, /*!< Signed 16 bit Big Endian */ + PCM_U16LE, /*!< Unsigned 16 bit Little Endian */ + PCM_U16BE, /*!< Unsigned 16 bit Big Endian */ PCM_S24LE, /*!< Signed 24 bit Little Endian using low three bytes in 32-bit word */ - PCM_S32LE /*!< Signed 32 bit Little Endian */ + PCM_S24BE, /*!< Signed 24 bit Big Endian using low three bytes in 32-bit word */ + PCM_U24LE, /*!< Unsigned 24 bit Little Endian using low three bytes in 32-bit word */ + PCM_U24BE, /*!< Unsigned 24 bit Big Endian using low three bytes in 32-bit word */ + PCM_S32LE, /*!< Signed 32 bit Little Endian */ + PCM_S32BE, /*!< Signed 32 bit Big Endian */ + PCM_U32LE, /*!< Unsigned 32 bit Little Endian */ + PCM_U32BE, /*!< Unsigned 32 bit Big Endian */ + PCM_FLOAT /*!< Float 32 bit Native Endian, Range -1.0 to 1.0 */ }; /*! |