* #9979: ulaw: normalize types

daemon/src/audio/codecs/ulaw.cpp

@@ -44,27 +44,24 @@ class Ulaw : public sfl::AudioCodec {
             hasDynamicPayload_ = false;
         }
 
-        virtual int decode(short *dst, unsigned char *src, size_t buf_size) {
+        virtual int decode(SFLDataFormat *dst, unsigned char *src, size_t buf_size) {
             assert(buf_size == frameSize_ / 2 /* compression factor = 2:1 */ * sizeof(SFLDataFormat));
-            unsigned char* end = src+buf_size;
-
-            while (src<end)
-                *dst++ = ULawDecode(*src++);
+            for (unsigned char* end = src + buf_size; src < end; ++src, ++dst)
+                *dst = ULawDecode(*src);
 
             return frameSize_;
         }
 
-        virtual int encode(unsigned char *dst, short *src, size_t buf_size) {
+        virtual int encode(unsigned char *dst, SFLDataFormat *src, size_t buf_size) {
             assert(buf_size >= frameSize_ / 2 /* compression factor = 2:1 */ * sizeof(SFLDataFormat));
-            uint8* end = dst + frameSize_;
-
-            while (dst<end)
-                *dst++ = ULawEncode(*src++);
+            for (uint8* end = dst + frameSize_; dst < end; ++src, ++dst)
+                *dst = ULawEncode(*src);
 
             return frameSize_ / 2 /* compression factor = 2:1 */ * sizeof(SFLDataFormat);;
         }
 
-        int ULawDecode(uint8 ulaw) {
+        SFLDataFormat ULawDecode(uint8 ulaw)
+        {
             ulaw ^= 0xff;  // u-law has all bits inverted for transmission
             int linear = ulaw & 0x0f;
             linear <<= 3;
@@ -81,7 +78,8 @@ class Ulaw : public sfl::AudioCodec {
                 return linear;
         }
 
-        uint8 ULawEncode(int16 pcm16) {
+        uint8 ULawEncode(SFLDataFormat pcm16)
+        {
             int p = pcm16;
             uint u;  // u-law value we are forming