Commit 03c239ded90fb65f70cd70866828d2ce532b20c8
2023-03-18T20:32:14
testsurround: fix channel names Used table in include/SDL3/SDL_audio.h as reference. (cherry picked from commit e1b8a032391f4b24453d5bcbe725a35b3894ea5d)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74
diff --git a/include/SDL_audio.h b/include/SDL_audio.h
index 2c0f211..ccd3598 100644
--- a/include/SDL_audio.h
+++ b/include/SDL_audio.h
@@ -169,13 +169,13 @@ typedef void (SDLCALL * SDL_AudioCallback) (void *userdata, Uint8 * stream,
* The calculated values in this structure are calculated by SDL_OpenAudio().
*
* For multi-channel audio, the default SDL channel mapping is:
- * 2: FL FR (stereo)
- * 3: FL FR LFE (2.1 surround)
- * 4: FL FR BL BR (quad)
- * 5: FL FR LFE BL BR (4.1 surround)
- * 6: FL FR FC LFE SL SR (5.1 surround - last two can also be BL BR)
- * 7: FL FR FC LFE BC SL SR (6.1 surround)
- * 8: FL FR FC LFE BL BR SL SR (7.1 surround)
+ * 2: FL FR (stereo)
+ * 3: FL FR LFE (2.1 surround)
+ * 4: FL FR BL BR (quad)
+ * 5: FL FR LFE BL BR (4.1 surround)
+ * 6: FL FR FC LFE SL SR (5.1 surround - last two can also be BL BR)
+ * 7: FL FR FC LFE BC SL SR (6.1 surround)
+ * 8: FL FR FC LFE BL BR SL SR (7.1 surround)
*/
typedef struct SDL_AudioSpec
{
diff --git a/test/testsurround.c b/test/testsurround.c
index 28c3ee5..b284369 100644
--- a/test/testsurround.c
+++ b/test/testsurround.c
@@ -38,6 +38,7 @@ get_channel_name(int channel_index, int channel_count)
case 2:
switch (channel_count) {
case 3:
+ case 5:
return "Low Frequency Effects";
case 4:
return "Back Left";
@@ -57,27 +58,32 @@ get_channel_name(int channel_index, int channel_count)
switch (channel_count) {
case 5:
return "Back Right";
+ case 6:
+ return "Side Left";
case 7:
return "Back Center";
- case 6:
case 8:
return "Back Left";
}
+ SDL_assert(0);
case 5:
switch (channel_count) {
- case 7:
- return "Back Left";
case 6:
+ return "Side Right";
+ case 7:
+ return "Side Left";
case 8:
return "Back Right";
}
+ SDL_assert(0);
case 6:
switch (channel_count) {
case 7:
- return "Back Right";
+ return "Side Right";
case 8:
return "Side Left";
}
+ SDL_assert(0);
case 7:
return "Side Right";
}