From f1be514540dc2a6d89b8d487eabf69827bfd1c60 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Fri, 5 Oct 2012 18:53:12 +0200 Subject: [PATCH 1/3] rangecoder-test: Drop timer output that clutters stderr --- libavcodec/rangecoder.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/libavcodec/rangecoder.c b/libavcodec/rangecoder.c index df1000844e..fcadfe47d1 100644 --- a/libavcodec/rangecoder.c +++ b/libavcodec/rangecoder.c @@ -136,11 +136,8 @@ int main(void) for (i = 0; i < SIZE; i++) r[i] = av_lfg_get(&prng) % 7; - for (i = 0; i < SIZE; i++) { -START_TIMER + for (i = 0; i < SIZE; i++) put_rac(&c, state, r[i] & 1); -STOP_TIMER("put_rac") - } ff_rac_terminate(&c); @@ -148,14 +145,11 @@ STOP_TIMER("put_rac") memset(state, 128, sizeof(state)); - for (i = 0; i < SIZE; i++) { -START_TIMER + for (i = 0; i < SIZE; i++) if ((r[i] & 1) != get_rac(&c, state)) { av_log(NULL, AV_LOG_ERROR, "rac failure at %d\n", i); return 1; } -STOP_TIMER("get_rac") - } return 0; } From 099294577c8ca5d1a7d3403a57b607791997104d Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Sun, 14 Oct 2012 15:49:25 +0100 Subject: [PATCH 2/3] fate: improve md5sum utility selection The 'md5sum' command is used with the -b flag so the presence test must also use this flag. Signed-off-by: Mans Rullgard --- tests/md5.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/md5.sh b/tests/md5.sh index 4b95127701..0b382b1a5e 100644 --- a/tests/md5.sh +++ b/tests/md5.sh @@ -1,6 +1,6 @@ # try to find an md5 program -if [ X"$(echo | md5sum 2> /dev/null)" != X ]; then +if [ X"$(echo | md5sum -b 2> /dev/null)" != X ]; then do_md5sum() { md5sum -b $1; } elif [ X"$(echo | command md5 2> /dev/null)" != X ]; then do_md5sum() { command md5 $1 | sed 's#MD5 (\(.*\)) = \(.*\)#\2 *\1#'; } From 3dc06b6972cf389269e9c36ff0a4373f80f7149b Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Mon, 15 Oct 2012 00:11:44 +0100 Subject: [PATCH 3/3] tiny_psnr: check for specified sample size less than 1 A zero or negative sample size is impossible and should be reported as an error. Signed-off-by: Mans Rullgard --- tests/tiny_psnr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tiny_psnr.c b/tests/tiny_psnr.c index 5db2662478..a53a67038b 100644 --- a/tests/tiny_psnr.c +++ b/tests/tiny_psnr.c @@ -139,7 +139,7 @@ int main(int argc, char *argv[]) } else { char *end; len = strtol(argv[3], &end, 0); - if (*end || len > 2) { + if (*end || len < 1 || len > 2) { fprintf(stderr, "Unsupported sample format: %s\n", argv[3]); return 1; }