mirrors/SDL
0
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2024-11-23 19:03:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

testautomation_pixels/audio: use SDL_arraysize and fix warnings

Browse Source
This commit is contained in:
Sylvain 2023-03-01 22:12:30 +01:00 committed by Sylvain Becker
parent 6fc32491c7
commit ac3fd00018
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/testautomation_audio.c
View File

@ -508,10 +508,10 @@ static const char *g_audioFormatsVerbose[] = { "AUDIO_S8", "AUDIO_U8", "AUDIO_S1
"AUDIO_S32LSB", "AUDIO_S32MSB", "AUDIO_S32SYS", "AUDIO_S32", "AUDIO_S32LSB", "AUDIO_S32MSB", "AUDIO_S32SYS", "AUDIO_S32",
"AUDIO_F32LSB", "AUDIO_F32MSB", "AUDIO_F32SYS", "AUDIO_F32" }; "AUDIO_F32LSB", "AUDIO_F32MSB", "AUDIO_F32SYS", "AUDIO_F32" };
static const int g_numAudioFormats = SDL_arraysize(g_audioFormats); static const int g_numAudioFormats = SDL_arraysize(g_audioFormats);
static const int g_numAudioChannels = 4;
static Uint8 g_audioChannels[] = { 1, 2, 4, 6 }; static Uint8 g_audioChannels[] = { 1, 2, 4, 6 };
static const int g_numAudioFrequencies = 4; static const int g_numAudioChannels = SDL_arraysize(g_audioChannels);
static int g_audioFrequencies[] = { 11025, 22050, 44100, 48000 }; static int g_audioFrequencies[] = { 11025, 22050, 44100, 48000 };
static const int g_numAudioFrequencies = SDL_arraysize(g_audioFrequencies);
/** /**
* \brief Builds various audio conversion structures * \brief Builds various audio conversion structures

16
test/testautomation_pixels.c
View File

@ -7,8 +7,7 @@
/* Test case functions */ /* Test case functions */
/* Definition of all RGB formats used to test pixel conversions */ /* Definition of all RGB formats used to test pixel conversions */
const int g_numAllFormats = 38; static const Uint32 g_AllFormats[] = {
Uint32 g_AllFormats[] = {
SDL_PIXELFORMAT_INDEX1LSB, SDL_PIXELFORMAT_INDEX1LSB,
SDL_PIXELFORMAT_INDEX1MSB, SDL_PIXELFORMAT_INDEX1MSB,
SDL_PIXELFORMAT_INDEX4LSB, SDL_PIXELFORMAT_INDEX4LSB,
@ -48,8 +47,9 @@ Uint32 g_AllFormats[] = {
SDL_PIXELFORMAT_NV12, SDL_PIXELFORMAT_NV12,
SDL_PIXELFORMAT_NV21 SDL_PIXELFORMAT_NV21
}; };
static const int g_numAllFormats = SDL_arraysize(g_AllFormats);
const char *g_AllFormatsVerbose[] = { static const char *g_AllFormatsVerbose[] = {
"SDL_PIXELFORMAT_INDEX1LSB", "SDL_PIXELFORMAT_INDEX1LSB",
"SDL_PIXELFORMAT_INDEX1MSB", "SDL_PIXELFORMAT_INDEX1MSB",
"SDL_PIXELFORMAT_INDEX4LSB", "SDL_PIXELFORMAT_INDEX4LSB",
@ -91,12 +91,12 @@ const char *g_AllFormatsVerbose[] = {
}; };
/* Definition of some invalid formats for negative tests */ /* Definition of some invalid formats for negative tests */
const int g_numInvalidPixelFormats = 2;
static Uint32 g_invalidPixelFormats[] = { static Uint32 g_invalidPixelFormats[] = {
SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_ABGR, SDL_PACKEDLAYOUT_1010102 + 1, 32, 4), SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_ABGR, SDL_PACKEDLAYOUT_1010102 + 1, 32, 4),
SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_ABGR, SDL_PACKEDLAYOUT_1010102 + 2, 32, 4) SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_ABGR, SDL_PACKEDLAYOUT_1010102 + 2, 32, 4)
}; };
const char *g_invalidPixelFormatsVerbose[] = { static const int g_numInvalidPixelFormats = SDL_arraysize(g_invalidPixelFormats);
static const char *g_invalidPixelFormatsVerbose[] = {
"SDL_PIXELFORMAT_UNKNOWN", "SDL_PIXELFORMAT_UNKNOWN",
"SDL_PIXELFORMAT_UNKNOWN" "SDL_PIXELFORMAT_UNKNOWN"
}; };
@ -109,7 +109,7 @@ const char *g_invalidPixelFormatsVerbose[] = {
* \sa SDL_CreatePixelFormat * \sa SDL_CreatePixelFormat
* \sa SDL_DestroyPixelFormat * \sa SDL_DestroyPixelFormat
*/ */
int pixels_allocFreeFormat(void *arg) static int pixels_allocFreeFormat(void *arg)
{ {
const char *unknownFormat = "SDL_PIXELFORMAT_UNKNOWN"; const char *unknownFormat = "SDL_PIXELFORMAT_UNKNOWN";
const char *expectedError = "Parameter 'format' is invalid"; const char *expectedError = "Parameter 'format' is invalid";
@ -204,7 +204,7 @@ int pixels_allocFreeFormat(void *arg)
* *
* \sa SDL_GetPixelFormatName * \sa SDL_GetPixelFormatName
*/ */
int pixels_getPixelFormatName(void *arg) static int pixels_getPixelFormatName(void *arg)
{ {
const char *unknownFormat = "SDL_PIXELFORMAT_UNKNOWN"; const char *unknownFormat = "SDL_PIXELFORMAT_UNKNOWN";
const char *error; const char *error;
@ -272,7 +272,7 @@ int pixels_getPixelFormatName(void *arg)
* \sa SDL_CreatePalette * \sa SDL_CreatePalette
* \sa SDL_DestroyPalette * \sa SDL_DestroyPalette
*/ */
int pixels_allocFreePalette(void *arg) static int pixels_allocFreePalette(void *arg)
{ {
const char *expectedError1 = "Parameter 'ncolors' is invalid"; const char *expectedError1 = "Parameter 'ncolors' is invalid";
const char *expectedError2 = "Parameter 'palette' is invalid"; const char *expectedError2 = "Parameter 'palette' is invalid";