correctly swap the channels for vorbis audio encoding

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8744 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cap_ogg.c b/cap_ogg.c
index 71d05cd071b0eaea58bf3fea9e0d93ef5594bcb4..bc25d2ded76174ba4e3b2cbe28c52a7e16e99397 100644 (file)
--- a/cap_ogg.c
+++ b/cap_ogg.c
@@ -889,6 +889,19 @@ static void SCR_CaptureVideo_Ogg_VideoFrames(int num)
        // TODO maybe send num-1 frames from here already
 }
 
+typedef int channelmapping_t[8];
+channelmapping_t mapping[8] =
+{
+       { 0, -1, -1, -1, -1, -1, -1, -1 }, // mono
+       { 0, 1, -1, -1, -1, -1, -1, -1 }, // stereo
+       { 0, 1, 2, -1, -1, -1, -1, -1 }, // L C R
+       { 0, 1, 2, 3, -1, -1, -1, -1 }, // surround40
+       { 0, 4, 1, 2, 3, -1, -1, -1 }, // FL FC FR RL RR
+       { 0, 4, 1, 2, 3, 5, -1, -1 }, // surround51
+       { 0, 4, 1, 2, 3, 5, 6, -1 }, // (not defined by vorbis spec)
+       { 0, 4, 1, 2, 3, 5, 6, 7 } // surround71 (not defined by vorbis spec)
+};
+
 static void SCR_CaptureVideo_Ogg_SoundFrame(const portable_sampleframe_t *paintbuffer, size_t length)
 {
        LOAD_FORMATSPECIFIC_OGG();
@@ -896,12 +909,14 @@ static void SCR_CaptureVideo_Ogg_SoundFrame(const portable_sampleframe_t *paintb
        size_t i;
        int j;
        ogg_packet pt;
+       int *map = mapping[bound(1, cls.capturevideo.soundchannels, 8) - 1];
 
        vorbis_buffer = qvorbis_analysis_buffer(&format->vd, length);
-       for(i = 0; i < length; ++i)
+       for(j = 0; j < cls.capturevideo.soundchannels; ++j)
        {
-               for(j = 0; j < cls.capturevideo.soundchannels; ++j)
-                       vorbis_buffer[j][i] = paintbuffer[i].sample[j] / 32768.0f;
+               float *b = vorbis_buffer[map[j]];
+               for(i = 0; i < length; ++i)
+                       b[i] = paintbuffer[i].sample[j] / 32768.0f;
        }
        qvorbis_analysis_wrote(&format->vd, length);
 

diff --git a/snd_main.c b/snd_main.c
index 5f676678bd9c811c5a121585be78d9a0ec9c28fe..c4218af8e28c246b3e28d1df298cd0b6230936ad 100644 (file)
--- a/snd_main.c
+++ b/snd_main.c
@@ -33,27 +33,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define SND_MAX_WIDTH 2
 #define SND_MIN_CHANNELS 1
 #define SND_MAX_CHANNELS 8
-
 #if SND_LISTENERS != 8
 #      error this data only supports up to 8 channel, update it!
 #endif
-typedef struct listener_s
-{
-       float yawangle;
-       float dotscale;
-       float dotbias;
-       float ambientvolume;
-}
-listener_t;
-typedef struct speakerlayout_s
-{
-       const char *name;
-       unsigned int channels;
-       listener_t listeners[SND_LISTENERS];
-}
-speakerlayout_t;
 
-static speakerlayout_t snd_speakerlayout;
+speakerlayout_t snd_speakerlayout;
 
 // Our speaker layouts are based on ALSA. They differ from those
 // Win32 and Mac OS X APIs use when there's more than 4 channels.
@@ -64,27 +48,27 @@ static const speakerlayout_t snd_speakerlayouts[] =
        {
                "surround71", 8,
                {
-                       {45, 0.2, 0.2, 0.5}, // front left
-                       {315, 0.2, 0.2, 0.5}, // front right
-                       {135, 0.2, 0.2, 0.5}, // rear left
-                       {225, 0.2, 0.2, 0.5}, // rear right
-                       {0, 0.2, 0.2, 0.5}, // front center
-                       {0, 0, 0, 0}, // lfe (we don't have any good lfe sound sources and it would take some filtering work to generate them (and they'd probably still be wrong), so...  no lfe)
-                       {90, 0.2, 0.2, 0.5}, // side left
-                       {180, 0.2, 0.2, 0.5}, // side right
+                       {0, 45, 0.2, 0.2, 0.5}, // front left
+                       {1, 315, 0.2, 0.2, 0.5}, // front right
+                       {2, 135, 0.2, 0.2, 0.5}, // rear left
+                       {3, 225, 0.2, 0.2, 0.5}, // rear right
+                       {4, 0, 0.2, 0.2, 0.5}, // front center
+                       {5, 0, 0, 0, 0}, // lfe (we don't have any good lfe sound sources and it would take some filtering work to generate them (and they'd probably still be wrong), so...  no lfe)
+                       {6, 90, 0.2, 0.2, 0.5}, // side left
+                       {7, 180, 0.2, 0.2, 0.5}, // side right
                }
        },
        {
                "surround51", 6,
                {
-                       {45, 0.2, 0.2, 0.5}, // front left
-                       {315, 0.2, 0.2, 0.5}, // front right
-                       {135, 0.2, 0.2, 0.5}, // rear left
-                       {225, 0.2, 0.2, 0.5}, // rear right
-                       {0, 0.2, 0.2, 0.5}, // front center
-                       {0, 0, 0, 0}, // lfe (we don't have any good lfe sound sources and it would take some filtering work to generate them (and they'd probably still be wrong), so...  no lfe)
-                       {0, 0, 0, 0},
-                       {0, 0, 0, 0},
+                       {0, 45, 0.2, 0.2, 0.5}, // front left
+                       {1, 315, 0.2, 0.2, 0.5}, // front right
+                       {2, 135, 0.2, 0.2, 0.5}, // rear left
+                       {3, 225, 0.2, 0.2, 0.5}, // rear right
+                       {4, 0, 0.2, 0.2, 0.5}, // front center
+                       {5, 0, 0, 0, 0}, // lfe (we don't have any good lfe sound sources and it would take some filtering work to generate them (and they'd probably still be wrong), so...  no lfe)
+                       {0, 0, 0, 0, 0},
+                       {0, 0, 0, 0, 0},
                }
        },
        {
@@ -92,14 +76,14 @@ static const speakerlayout_t snd_speakerlayouts[] =
                // channel of its own
                "surround40", 4,
                {
-                       {45, 0.3, 0.3, 0.8}, // front left
-                       {315, 0.3, 0.3, 0.8}, // front right
-                       {135, 0.3, 0.3, 0.8}, // rear left
-                       {225, 0.3, 0.3, 0.8}, // rear right
-                       {0, 0, 0, 0},
-                       {0, 0, 0, 0},
-                       {0, 0, 0, 0},
-                       {0, 0, 0, 0},
+                       {0, 45, 0.3, 0.3, 0.8}, // front left
+                       {1, 315, 0.3, 0.3, 0.8}, // front right
+                       {2, 135, 0.3, 0.3, 0.8}, // rear left
+                       {3, 225, 0.3, 0.3, 0.8}, // rear right
+                       {0, 0, 0, 0, 0},
+                       {0, 0, 0, 0, 0},
+                       {0, 0, 0, 0, 0},
+                       {0, 0, 0, 0, 0},
                }
        },
        {
@@ -107,27 +91,27 @@ static const speakerlayout_t snd_speakerlayouts[] =
                // channel of its own
                "stereo", 2,
                {
-                       {90, 0.5, 0.5, 1}, // side left
-                       {270, 0.5, 0.5, 1}, // side right
-                       {0, 0, 0, 0},
-                       {0, 0, 0, 0},
-                       {0, 0, 0, 0},
-                       {0, 0, 0, 0},
-                       {0, 0, 0, 0},
-                       {0, 0, 0, 0},
+                       {0, 90, 0.5, 0.5, 1}, // side left
+                       {1, 270, 0.5, 0.5, 1}, // side right
+                       {0, 0, 0, 0, 0},
+                       {0, 0, 0, 0, 0},
+                       {0, 0, 0, 0, 0},
+                       {0, 0, 0, 0, 0},
+                       {0, 0, 0, 0, 0},
+                       {0, 0, 0, 0, 0},
                }
        },
        {
                "mono", 1,
                {
-                       {0, 0, 1, 1}, // center
-                       {0, 0, 0, 0},
-                       {0, 0, 0, 0},
-                       {0, 0, 0, 0},
-                       {0, 0, 0, 0},
-                       {0, 0, 0, 0},
-                       {0, 0, 0, 0},
-                       {0, 0, 0, 0},
+                       {0, 0, 0, 1, 1}, // center
+                       {0, 0, 0, 0, 0},
+                       {0, 0, 0, 0, 0},
+                       {0, 0, 0, 0, 0},
+                       {0, 0, 0, 0, 0},
+                       {0, 0, 0, 0, 0},
+                       {0, 0, 0, 0, 0},
+                       {0, 0, 0, 0, 0},
                }
        }
 };

diff --git a/snd_main.h b/snd_main.h
index 61c43b5c2166b3ebc40180156601220e5a3782bf..a56227854fe9f0b72dbd3a97343dece28925c446 100644 (file)
--- a/snd_main.h
+++ b/snd_main.h
@@ -193,4 +193,21 @@ typedef struct portable_samplepair_s
 // LordHavoc: was 512, expanded to 2048
 #define        PAINTBUFFER_SIZE 2048
 
+typedef struct listener_s
+{
+       int channel_unswapped; // for un-swapping
+       float yawangle;
+       float dotscale;
+       float dotbias;
+       float ambientvolume;
+}
+listener_t;
+typedef struct speakerlayout_s
+{
+       const char *name;
+       unsigned int channels;
+       listener_t listeners[SND_LISTENERS];
+}
+speakerlayout_t;
+
 #endif

diff --git a/snd_mix.c b/snd_mix.c
index 1e013f4eb1b7e10fe7b3f45d636a3719cbbeffff..28fd81ef00ebedccb6ac8df466eea77510dfe3b7 100644 (file)
--- a/snd_mix.c
+++ b/snd_mix.c
@@ -23,15 +23,28 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
 static portable_sampleframe_t paintbuffer[PAINTBUFFER_SIZE];
+static portable_sampleframe_t paintbuffer_unswapped[PAINTBUFFER_SIZE];
 
+extern speakerlayout_t snd_speakerlayout; // for querying the listeners
 
 extern void SCR_CaptureVideo_SoundFrame(const portable_sampleframe_t *paintbuffer, size_t length);
 static void S_CaptureAVISound(size_t length)
 {
+       size_t i;
+       unsigned int j;
+
        if (!cls.capturevideo.active)
                return;
 
-       SCR_CaptureVideo_SoundFrame(paintbuffer, length);
+       // undo whatever swapping the channel layout (swapstereo, ALSA) did
+       for(j = 0; j < snd_speakerlayout.channels; ++j)
+       {
+               unsigned int j0 = snd_speakerlayout.listeners[j].channel_unswapped;
+               for(i = 0; i < length; ++i)
+                       paintbuffer_unswapped[i].sample[j0] = paintbuffer[i].sample[j];
+       }
+
+       SCR_CaptureVideo_SoundFrame(paintbuffer_unswapped, length);
 }
 
 static void S_ConvertPaintBuffer(const portable_sampleframe_t *painted_ptr, void *rb_ptr, int nbframes, int width, int channels)