eden-emu/FFmpeg
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avutil/pixelutils: avoid on stack arrays

Browse source 
The arrays are fairly large and could cause problems on some embedded systems
also they are not endian safe as they mix 32 and 8bit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-06 01:27:38 +02:00
parent 1b168e3bcf
commit 84ac2f93ca
2 changed files with 30 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

32
libavutil/pixelutils.c
View file

@ -92,13 +92,13 @@ av_pixelutils_sad_fn av_pixelutils_get_sad_fn(int w_bits, int h_bits, int aligne
#define H2 480
static int run_test(const char *test,
const uint32_t *b1, const uint32_t *b2)
const uint8_t *b1, const uint8_t *b2)
{
int i, a, ret = 0;
for (a = 0; a < 3; a++) {
const uint8_t *block1 = (const uint8_t *)b1;
const uint8_t *block2 = (const uint8_t *)b2;
const uint8_t *block1 = b1;
const uint8_t *block2 = b2;
switch (a) {
case 0: block1++; block2++; break;
@ -124,30 +124,34 @@ static int run_test(const char *test,
int main(void)
{
int i, ret;
DECLARE_ALIGNED(32, uint32_t, buf1)[W1*H1];
DECLARE_ALIGNED(32, uint32_t, buf2)[W2*H2];
uint8_t *buf1 = av_malloc(W1*H1);
uint8_t *buf2 = av_malloc(W2*H2);
uint32_t state = 0;
for (i = 0; i < W1*H1; i++) {
state = state * 1664525 + 1013904223;
buf1[i] = state;
buf1[i] = state>>24;
}
for (i = 0; i < W2*H2; i++) {
state = state * 1664525 + 1013904223;
buf2[i] = state;
buf2[i] = state>>24;
}
ret = run_test("random", buf1, buf2);
if (ret < 0)
return ret;
goto end;
memset(buf1, 0xff, sizeof(buf1));
memset(buf2, 0x00, sizeof(buf2));
memset(buf1, 0xff, W1*H1);
memset(buf2, 0x00, W2*H2);
ret = run_test("max", buf1, buf2);
if (ret < 0)
return ret;
goto end;
memset(buf1, 0x90, sizeof(buf1));
memset(buf2, 0x90, sizeof(buf2));
return run_test("min", buf1, buf2);
memset(buf1, 0x90, W1*H1);
memset(buf2, 0x90, W2*H2);
ret = run_test("min", buf1, buf2);
end:
av_free(buf1);
av_free(buf2);
return ret;
}
#endif /* TEST */