We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

patch

fix_channel_count_conversion.diff (text/plain), 4.22 KB, created by James Legg on 2014-02-21 18:02:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: James Legg

Created: 2014-02-21 18:02:57 UTC

Size: 4.22 KB

patch

obsolete

># HG changeset patch
># User James Legg <jlegg@feralinteractive.com>
># Date 1392991073 0
>#      Fri Feb 21 13:57:53 2014 +0000
># Node ID 860efbd2e92e97d5382b26a5680b58e4e8131ec7
># Parent  437c4e5961e02d50a32015b41afb84f19196ea43
>Fix audio conversion when channel count changes
>
>- Use the SDL_AUDIO_MASK_DATATYPE bit when selecting an implementation
>  where it matters. Previously two existing AUDIO_F32 cases had been
>  written, but were unreachable.
>- Add AUDIO_F32 case for SDL_ConvertSurround_4.
>- Fix incorrect pointer arithmetic causing the 2 to 6 channel
>  conversion for 4 byte audio formats to read and write beyond the end
>  of the buffer.
>
>diff -r 437c4e5961e0 -r 860efbd2e92e src/audio/SDL_audiocvt.c
>--- a/src/audio/SDL_audiocvt.c	Fri Feb 21 08:37:57 2014 -0300
>+++ b/src/audio/SDL_audiocvt.c	Fri Feb 21 13:57:53 2014 +0000
>@@ -39,7 +39,9 @@
> #ifdef DEBUG_CONVERT
>     fprintf(stderr, "Converting to mono\n");
> #endif
>-    switch (format & (SDL_AUDIO_MASK_SIGNED | SDL_AUDIO_MASK_BITSIZE)) {
>+	switch (format & (SDL_AUDIO_MASK_SIGNED |
>+                      SDL_AUDIO_MASK_BITSIZE |
>+                      SDL_AUDIO_MASK_DATATYPE)) {
>     case AUDIO_U8:
>         {
>             Uint8 *src, *dst;
>@@ -331,7 +333,9 @@
>     fprintf(stderr, "Converting stereo to surround\n");
> #endif
> 
>-    switch (format & (SDL_AUDIO_MASK_SIGNED | SDL_AUDIO_MASK_BITSIZE)) {
>+    switch (format & (SDL_AUDIO_MASK_SIGNED  |
>+                      SDL_AUDIO_MASK_BITSIZE |
>+                      SDL_AUDIO_MASK_DATATYPE)) {
>     case AUDIO_U8:
>         {
>             Uint8 *src, *dst, lf, rf, ce;
>@@ -499,8 +503,8 @@
>     case AUDIO_S32:
>         {
>             Sint32 lf, rf, ce;
>-            const Uint32 *src = (const Uint32 *) cvt->buf + cvt->len_cvt;
>-            Uint32 *dst = (Uint32 *) cvt->buf + cvt->len_cvt * 3;
>+            const Uint32 *src = (const Uint32 *) (cvt->buf + cvt->len_cvt);
>+            Uint32 *dst = (Uint32 *) (cvt->buf + cvt->len_cvt * 3);
> 
>             if (SDL_AUDIO_ISBIGENDIAN(format)) {
>                 for (i = cvt->len_cvt / 8; i; --i) {
>@@ -537,8 +541,8 @@
>     case AUDIO_F32:
>         {
>             float lf, rf, ce;
>-            const float *src = (const float *) cvt->buf + cvt->len_cvt;
>-            float *dst = (float *) cvt->buf + cvt->len_cvt * 3;
>+            const float *src = (const float *) (cvt->buf + cvt->len_cvt);
>+            float *dst = (float *) (cvt->buf + cvt->len_cvt * 3);
> 
>             if (SDL_AUDIO_ISBIGENDIAN(format)) {
>                 for (i = cvt->len_cvt / 8; i; --i) {
>@@ -588,7 +592,9 @@
>     fprintf(stderr, "Converting stereo to quad\n");
> #endif
> 
>-    switch (format & (SDL_AUDIO_MASK_SIGNED | SDL_AUDIO_MASK_BITSIZE)) {
>+    switch (format & (SDL_AUDIO_MASK_SIGNED |
>+                      SDL_AUDIO_MASK_BITSIZE |
>+                      SDL_AUDIO_MASK_DATATYPE)) {
>     case AUDIO_U8:
>         {
>             Uint8 *src, *dst, lf, rf, ce;
>@@ -762,6 +768,40 @@
>             }
>         }
>         break;
>+
>+    case AUDIO_F32:
>+        {
>+            const float *src = (const float *) (cvt->buf + cvt->len_cvt);
>+            float *dst = (float *) (cvt->buf + cvt->len_cvt * 2);
>+            float lf, rf, ce;
>+
>+            if (SDL_AUDIO_ISBIGENDIAN(format)) {
>+                for (i = cvt->len_cvt / 8; i; --i) {
>+                    dst -= 4;
>+                    src -= 2;
>+                    lf = SDL_SwapFloatBE(src[0]);
>+                    rf = SDL_SwapFloatBE(src[1]);
>+                    ce = (lf / 2) + (rf / 2);
>+                    dst[0] = src[0];
>+                    dst[1] = src[1];
>+                    dst[2] = SDL_SwapFloatBE(lf - ce);
>+                    dst[3] = SDL_SwapFloatBE(rf - ce);
>+                }
>+            } else {
>+                for (i = cvt->len_cvt / 8; i; --i) {
>+                    dst -= 4;
>+                    src -= 2;
>+                    lf = SDL_SwapFloatLE(src[0]);
>+                    rf = SDL_SwapFloatLE(src[1]);
>+                    ce = (lf / 2) + (rf / 2);
>+                    dst[0] = src[0];
>+                    dst[1] = src[1];
>+                    dst[2] = SDL_SwapFloatLE(lf - ce);
>+                    dst[3] = SDL_SwapFloatLE(rf - ce);
>+                }
>+            }
>+        }
>+        break;
>     }
>     cvt->len_cvt *= 2;
>     if (cvt->filters[++cvt->filter_index]) {

Actions: View

Attachments on bug 2410: 1570

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.