Ticket #8870: audiostream.patch

audiostream.cpp

@@ -99 +99 @@
 }
 
 #pragma mark -
+#pragma mark --- FixedLengthAudioStream ---
+#pragma mark -
+
+uint32 FixedLengthAudioStream::getPlayTime(int rate) const {
+        const uint32 samples = getSampleCount();
+        uint32 usedRate = (rate == -1) ? getRate() : rate;
+
+        uint32 seconds = samples / usedRate;
+        uint32 milliseconds = (1000 * (samples % usedRate)) / usedRate;
+
+        return 1000 * seconds + milliseconds;
+}
+
+#pragma mark -
 #pragma mark --- LinearMemoryStream ---
 #pragma mark -
 
@@ -114 +128 @@
  * case. This results in a total of 12 versions of the code being generated.
  */
 template<bool stereo, bool is16Bit, bool isUnsigned, bool isLE>
-class LinearMemoryStream : public AudioStream {
+class LinearMemoryStream : public FixedLengthAudioStream {
 protected:
         const byte *_ptr;
         const byte *_end;
         const byte *_loopPtr;
         const byte *_loopEnd;
         const int _rate;
+        uint _samples;
         const byte *_origPtr;
 
 public:
         LinearMemoryStream(int rate, const byte *ptr, uint len, uint loopOffset, uint loopLen, bool autoFreeMemory)
-                : _ptr(ptr), _end(ptr+len), _loopPtr(0), _loopEnd(0), _rate(rate) {
+                : _ptr(ptr), _end(ptr+len), _loopPtr(0), _loopEnd(0), _rate(rate), _samples(len) {
 
                 // Verify the buffer sizes are sane
                 if (is16Bit && stereo)
@@ -133 +148 @@
                 else if (is16Bit || stereo)
                         assert((len & 1) == 0 && (loopLen & 1) == 0);
 
+                if (is16Bit)
+                        _samples /= 2;
+                if (stereo)
+                        _samples /= 2;
+
                 if (loopLen) {
                         _loopPtr = _ptr + loopOffset;
                         _loopEnd = _loopPtr + loopLen;
@@ -151 +171 @@
         bool endOfData() const          { return _ptr >= _end; }
 
         int getRate() const                     { return _rate; }
+
+        uint getSampleCount() const     { return _samples; }
 };
 
 template<bool stereo, bool is16Bit, bool isUnsigned, bool isLE>
@@ -172 +194 @@
         return numSamples-samples;
 }
 
-
 #pragma mark -
 #pragma mark --- Input stream factory ---
 #pragma mark -
@@ -195 +216 @@
                 } else \
                         return new LinearMemoryStream<STEREO, false, UNSIGNED, false>(rate, ptr, len, loopOffset, loopLen, autoFree)
 
-AudioStream *makeLinearInputStream(const byte *ptr, uint32 len, int rate, byte flags, uint loopStart, uint loopEnd) {
+FixedLengthAudioStream *makeLinearInputStream(const byte *ptr, uint32 len, int rate, byte flags, uint loopStart, uint loopEnd) {
         const bool isStereo   = (flags & Audio::Mixer::FLAG_STEREO) != 0;
         const bool is16Bit    = (flags & Audio::Mixer::FLAG_16BITS) != 0;
         const bool isUnsigned = (flags & Audio::Mixer::FLAG_UNSIGNED) != 0;

voc.cpp

@@ -156 +156 @@
         return loadVOCFromStream(stream, size, rate, loops, begin_loop, end_loop);
 }
 
-AudioStream *makeVOCStream(Common::ReadStream &stream) {
+FixedLengthAudioStream *makeVOCStream(Common::ReadStream &stream) {
         int size, rate;
         byte *data = loadVOCFromStream(stream, size, rate);
 

audiostream.h

@@ -96 +96 @@
 };
 
 /**
+ * An audio stream with fixed length
+ */
+class FixedLengthAudioStream : public Audio::AudioStream {
+public:
+
+        /**
+         * Returns the number of samples of the stream.
+         */
+        virtual uint getSampleCount() const = 0;
+
+        /**
+         * Returns play time in milliseconds.
+         *
+         * @param rate  sample rate the stream will be played at, -1 is sample rate from the stream itself
+         */
+        virtual uint32 getPlayTime(int rate = -1) const;
+};
+
+/**
  * Factory function for a raw linear AudioStream, which will simply treat all data
  * in the buffer described by ptr and len as raw sample data in the specified
  * format. It will then simply pass this data directly to the mixer, after converting
  * it to the sample format used by the mixer (i.e. 16 bit signed native endian).
  * Optionally supports (infinite) looping of a portion of the data.
  */
-AudioStream *makeLinearInputStream(const byte *ptr, uint32 len, int rate, byte flags, uint loopStart, uint loopEnd);
+FixedLengthAudioStream *makeLinearInputStream(const byte *ptr, uint32 len, int rate, byte flags, uint loopStart, uint loopEnd);
 
 /**
  * An audio stream to which additional data can be appended on-the-fly.
@@ -134 +153 @@
  */
 AppendableAudioStream *makeAppendableAudioStream(int rate, byte flags);
 
-
 } // End of namespace Audio
 
 #endif

voc.h

@@ -32 +32 @@
 
 namespace Audio {
 
-class AudioStream;
+class FixedLengthAudioStream;
 
 
 #include "common/pack-start.h"  // START STRUCT PACKING
@@ -80 +80 @@
  *
  * This function uses loadVOCFromStream() internally.
  */
-AudioStream *makeVOCStream(Common::ReadStream &stream);
+FixedLengthAudioStream *makeVOCStream(Common::ReadStream &stream);
 
 } // End of namespace Audio