[pulseaudio-commits] r1710 - /branches/lennart/src/pulse/sample.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Fri Aug 24 00:34:10 2007
New Revision: 1710

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=3D1710&root=3Dpulseaudio&vi=
ew=3Drev
Log:
a couple of modernizations; parse RE sample types properly

Modified:
    branches/lennart/src/pulse/sample.c

Modified: branches/lennart/src/pulse/sample.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/pulse/samp=
le.c?rev=3D1710&root=3Dpulseaudio&r1=3D1709&r2=3D1710&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/pulse/sample.c (original)
+++ branches/lennart/src/pulse/sample.c Fri Aug 24 00:34:10 2007
@@ -27,58 +27,58 @@
 #endif
 =

 #include <stdio.h>
-#include <assert.h>
 #include <math.h>
 #include <string.h>
 =

 #include <pulsecore/core-util.h>
+#include <pulsecore/macro.h>
+
 #include "sample.h"
 =

 size_t pa_sample_size(const pa_sample_spec *spec) {
-    assert(spec);
+    =

+    static const size_t table[] =3D {
+        [PA_SAMPLE_U8] =3D 1,
+        [PA_SAMPLE_ULAW] =3D 1,
+        [PA_SAMPLE_ALAW] =3D 1,
+        [PA_SAMPLE_S16LE] =3D 2,
+        [PA_SAMPLE_S16BE] =3D 2,
+        [PA_SAMPLE_FLOAT32LE] =3D 4,
+        [PA_SAMPLE_FLOAT32BE] =3D 4
+    };
 =

-    switch (spec->format) {
-        case PA_SAMPLE_U8:
-        case PA_SAMPLE_ULAW:
-        case PA_SAMPLE_ALAW:
-            return 1;
-        case PA_SAMPLE_S16LE:
-        case PA_SAMPLE_S16BE:
-            return 2;
-        case PA_SAMPLE_FLOAT32LE:
-        case PA_SAMPLE_FLOAT32BE:
-            return 4;
-        default:
-            assert(0);
-            return 0;
-    }
+    pa_assert(spec);
+    pa_assert(spec->format >=3D 0);
+    pa_assert(spec->format < PA_SAMPLE_MAX);
+    =

+    return table[spec->format];
 }
 =

 size_t pa_frame_size(const pa_sample_spec *spec) {
-    assert(spec);
+    pa_assert(spec);
 =

     return pa_sample_size(spec) * spec->channels;
 }
 =

 size_t pa_bytes_per_second(const pa_sample_spec *spec) {
-    assert(spec);
+    pa_assert(spec);
     return spec->rate*pa_frame_size(spec);
 }
 =

 pa_usec_t pa_bytes_to_usec(uint64_t length, const pa_sample_spec *spec) {
-    assert(spec);
+    pa_assert(spec);
 =

     return (pa_usec_t) (((double) length/pa_frame_size(spec)*1000000)/spec=
->rate);
 }
 =

 size_t pa_usec_to_bytes(pa_usec_t t, const pa_sample_spec *spec) {
-    assert(spec);
+    pa_assert(spec);
 =

     return (size_t) (((double) t * spec->rate / 1000000))*pa_frame_size(sp=
ec);
 }
 =

 int pa_sample_spec_valid(const pa_sample_spec *spec) {
-    assert(spec);
+    pa_assert(spec);
 =

     if (spec->rate <=3D 0 ||
         spec->rate > PA_RATE_MAX ||
@@ -92,7 +92,8 @@
 }
 =

 int pa_sample_spec_equal(const pa_sample_spec*a, const pa_sample_spec*b) {
-    assert(a && b);
+    pa_assert(a);
+    pa_assert(b);
 =

     return (a->format =3D=3D b->format) && (a->rate =3D=3D b->rate) && (a-=
>channels =3D=3D b->channels);
 }
@@ -108,14 +109,16 @@
         [PA_SAMPLE_FLOAT32BE] =3D "float32be",
     };
 =

-    if (f >=3D PA_SAMPLE_MAX)
+    if (f < 0 || f >=3D PA_SAMPLE_MAX)
         return NULL;
 =

     return table[f];
 }
 =

 char *pa_sample_spec_snprint(char *s, size_t l, const pa_sample_spec *spec=
) {
-    assert(s && l && spec);
+    pa_assert(s);
+    pa_assert(l);
+    pa_assert(spec);
 =

     if (!pa_sample_spec_valid(spec))
         pa_snprintf(s, l, "Invalid");
@@ -126,6 +129,8 @@
 }
 =

 char* pa_bytes_snprint(char *s, size_t l, unsigned v) {
+    pa_assert(s);
+    =

     if (v >=3D ((unsigned) 1024)*1024*1024)
         pa_snprintf(s, l, "%0.1f GiB", ((double) v)/1024/1024/1024);
     else if (v >=3D ((unsigned) 1024)*1024)
@@ -139,6 +144,7 @@
 }
 =

 pa_sample_format_t pa_parse_sample_format(const char *format) {
+    pa_assert(format);
 =

     if (strcasecmp(format, "s16le") =3D=3D 0)
         return PA_SAMPLE_S16LE;
@@ -146,15 +152,19 @@
         return PA_SAMPLE_S16BE;
     else if (strcasecmp(format, "s16ne") =3D=3D 0 || strcasecmp(format, "s=
16") =3D=3D 0 || strcasecmp(format, "16") =3D=3D 0)
         return PA_SAMPLE_S16NE;
+    else if (strcasecmp(format, "s16re") =3D=3D 0)
+        return PA_SAMPLE_S16RE;
     else if (strcasecmp(format, "u8") =3D=3D 0 || strcasecmp(format, "8") =
=3D=3D 0)
         return PA_SAMPLE_U8;
     else if (strcasecmp(format, "float32") =3D=3D 0 || strcasecmp(format, =
"float32ne") =3D=3D 0)
-        return PA_SAMPLE_FLOAT32;
+        return PA_SAMPLE_FLOAT32NE;
+    else if (strcasecmp(format, "float32re") =3D=3D 0)
+        return PA_SAMPLE_FLOAT32RE;
     else if (strcasecmp(format, "float32le") =3D=3D 0)
         return PA_SAMPLE_FLOAT32LE;
     else if (strcasecmp(format, "float32be") =3D=3D 0)
         return PA_SAMPLE_FLOAT32BE;
-    else if (strcasecmp(format, "ulaw") =3D=3D 0)
+    else if (strcasecmp(format, "ulaw") =3D=3D 0 || strcasecmp(format, "mu=
law") =3D=3D 0)
         return PA_SAMPLE_ULAW;
     else if (strcasecmp(format, "alaw") =3D=3D 0)
         return PA_SAMPLE_ALAW;