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] patch

fix_smpeg2_for_sdl2_mixer.patch (text/plain), 3.30 KB, created by Holger Schemel on 2017-09-18 18:27:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Holger Schemel

Created: 2017-09-18 18:27:21 UTC

Size: 3.30 KB

patch

obsolete

>diff -r fb0562cc1559 external/smpeg2-2.0.0/MPEGaudio.h
>--- a/external/smpeg2-2.0.0/MPEGaudio.h	Fri Jan 29 12:44:13 2016 -0800
>+++ b/external/smpeg2-2.0.0/MPEGaudio.h	Mon Sep 18 19:48:35 2017 +0200
>@@ -186,6 +186,7 @@
>     double rate_in_s;
>     Uint32 frags_playing;
>     Uint32 frag_time;
>+    SDL_AudioFormat format;
> #ifdef THREADED_AUDIO
>     bool decoding;
>     SDL_Thread *decode_thread;
>diff -r fb0562cc1559 external/smpeg2-2.0.0/audio/MPEGaudio.cpp
>--- a/external/smpeg2-2.0.0/audio/MPEGaudio.cpp	Fri Jan 29 12:44:13 2016 -0800
>+++ b/external/smpeg2-2.0.0/audio/MPEGaudio.cpp	Mon Sep 18 19:48:35 2017 +0200
>@@ -34,6 +34,7 @@
>     , rate_in_s(0.0)
>     , frags_playing(0)
>     , frag_time(0)
>+    , format(0)
> #ifdef THREADED_AUDIO
>     , decoding(false)
>     , decode_thread(NULL)
>@@ -155,6 +156,8 @@
>     }
>     rate_in_s=((double)((actual->format&0xFF)/8)*actual->channels*actual->freq);
>     stereo=((actual->channels-1) > 0);
>+
>+    format = actual->format;
> }
> 
> #ifdef THREADED_AUDIO
>diff -r fb0562cc1559 external/smpeg2-2.0.0/audio/mpegtoraw.cpp
>--- a/external/smpeg2-2.0.0/audio/mpegtoraw.cpp	Fri Jan 29 12:44:13 2016 -0800
>+++ b/external/smpeg2-2.0.0/audio/mpegtoraw.cpp	Mon Sep 18 19:48:35 2017 +0200
>@@ -429,7 +429,7 @@
> 	   quite right */
>         copylen = audio->ring->NextReadBuffer(&rbuf);
>         if ( copylen > len ) {
>-            SDL_MixAudio(stream, rbuf, len, volume);
>+	    SDL_MixAudioFormat(stream, rbuf, audio->format, len, volume);
>             mixed += len;
>             audio->ring->ReadSome(len);
>             len = 0;
>@@ -437,7 +437,7 @@
> 		audio->timestamp[i] = audio->timestamp[i+1];
> 	    audio->timestamp[N_TIMESTAMPS-1] = audio->ring->ReadTimeStamp();
>         } else {
>-            SDL_MixAudio(stream, rbuf, copylen, volume);
>+	    SDL_MixAudioFormat(stream, rbuf, audio->format, copylen, volume);
>             mixed += copylen;
>             ++audio->currentframe;
>             audio->ring->ReadDone();
>@@ -477,14 +477,14 @@
>         copylen = (audio->rawdatawriteoffset-audio->rawdatareadoffset);
>         assert(copylen >= 0);
>         if ( copylen >= len ) {
>-            SDL_MixAudio(stream, (Uint8 *)&audio->spillover[audio->rawdatareadoffset],
>-                                                       len*2, volume);
>+            SDL_MixAudioFormat(stream, (Uint8 *)&audio->spillover[audio->rawdatareadoffset],
>+                                                       audio->format, len*2, volume);
>             mixed += len*2;
>             audio->rawdatareadoffset += len;
>             goto finished_mixing;
>         }
>-        SDL_MixAudio(stream, (Uint8 *)&audio->spillover[audio->rawdatareadoffset],
>-                                                       copylen*2, volume);
>+        SDL_MixAudioFormat(stream, (Uint8 *)&audio->spillover[audio->rawdatareadoffset],
>+                                                       audio->format, copylen*2, volume);
>         mixed += copylen*2;
>         len -= copylen;
>         stream += copylen*2;
>@@ -503,7 +503,7 @@
>     audio->rawdatawriteoffset = 0;
>     if ( audio->run(1) ) {
>         assert(audio->rawdatawriteoffset > len);
>-        SDL_MixAudio(stream, (Uint8 *) audio->spillover, len*2, volume);
>+        SDL_MixAudioFormat(stream, (Uint8 *) audio->spillover, audio->format, len*2, volume);
>         mixed += len*2;
>         audio->rawdatareadoffset = len;
>     } else {

Actions: View | Diff

Attachments on bug 3833: 2949

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.