diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-05 22:10:45 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-05 22:22:09 +0400 |
commit | 517dcc9b5fc4294669c0b6edaaa3ff166d412219 (patch) | |
tree | afff025f131c22971259fd339a1663191fbb3a20 /tests/videogen.c | |
parent | 5f4e18cd162be2375cdd623816de58207b0b8a31 (diff) | |
parent | f0ccd53a3b0bbe704a7bc94dbc8caac7be81e079 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
tests: Refactor rotozoom/videogen common code into a separate file.
tests: Mark some file-internal symbols as static.
build: Drop leftover .exp pattern from LIBSUFFIXES list.
vsrc_buffer: return EAGAIN if no frame is available.
WMAL: Shift output samples by the specified number of padding zeroes.
WMAL: Restore removed code in mclms_predict()
rtpdec_h264: Remove a useless ifdef
rtpdec_h264: Remove outdated/useless/incorrect comments
rtpdec_h264: Remove useless memory corruption checks
rtpdec_h264: Return proper error codes
rtpdec_h264: Check the available data length before reading
rtpdec_h264: Add input size checks
png: check bit depth for PAL8/Y400A pixel formats.
ea: check chunk_size for validity.
celp filters: Do not read earlier than the start of the 'out' vector.
Conflicts:
libavcodec/pngdec.c
libavfilter/src_buffer.c
tests/rotozoom.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/videogen.c')
-rw-r--r-- | tests/videogen.c | 133 |
1 files changed, 3 insertions, 130 deletions
diff --git a/tests/videogen.c b/tests/videogen.c index bdd8c8e204..f151f3edf8 100644 --- a/tests/videogen.c +++ b/tests/videogen.c @@ -25,134 +25,7 @@ #include <stdint.h> #include <stdio.h> -#define SCALEBITS 8 -#define ONE_HALF (1 << (SCALEBITS - 1)) -#define FIX(x) ((int) ((x) * (1L << SCALEBITS) + 0.5)) - -static void rgb24_to_yuv420p(uint8_t *lum, uint8_t *cb, uint8_t *cr, - uint8_t *src, int width, int height) -{ - int wrap, wrap3, x, y; - int r, g, b, r1, g1, b1; - uint8_t *p; - - wrap = width; - wrap3 = width * 3; - p = src; - for (y = 0; y < height; y += 2) { - for (x = 0; x < width; x += 2) { - r = p[0]; - g = p[1]; - b = p[2]; - r1 = r; - g1 = g; - b1 = b; - lum[0] = (FIX(0.29900) * r + FIX(0.58700) * g + - FIX(0.11400) * b + ONE_HALF) >> SCALEBITS; - r = p[3]; - g = p[4]; - b = p[5]; - r1 += r; - g1 += g; - b1 += b; - lum[1] = (FIX(0.29900) * r + FIX(0.58700) * g + - FIX(0.11400) * b + ONE_HALF) >> SCALEBITS; - p += wrap3; - lum += wrap; - - r = p[0]; - g = p[1]; - b = p[2]; - r1 += r; - g1 += g; - b1 += b; - lum[0] = (FIX(0.29900) * r + FIX(0.58700) * g + - FIX(0.11400) * b + ONE_HALF) >> SCALEBITS; - r = p[3]; - g = p[4]; - b = p[5]; - r1 += r; - g1 += g; - b1 += b; - lum[1] = (FIX(0.29900) * r + FIX(0.58700) * g + - FIX(0.11400) * b + ONE_HALF) >> SCALEBITS; - - cb[0] = 128 + ((- FIX(0.16874) * r1 - - FIX(0.33126) * g1 + - FIX(0.50000) * b1 + - 4 * ONE_HALF - 1) - >> (SCALEBITS + 2)); - cr[0] = 128 + ((FIX(0.50000) * r1 - - FIX(0.41869) * g1 - - FIX(0.08131) * b1 + - 4 * ONE_HALF - 1) - >> (SCALEBITS + 2)); - - cb++; - cr++; - p += -wrap3 + 2 * 3; - lum += -wrap + 2; - } - p += wrap3; - lum += wrap; - } -} - -/* cif format */ -#define DEFAULT_WIDTH 352 -#define DEFAULT_HEIGHT 288 -#define DEFAULT_NB_PICT 50 /* 2 seconds */ - -static void pgmyuv_save(const char *filename, int w, int h, - unsigned char *rgb_tab) -{ - FILE *f; - int i, h2, w2; - unsigned char *cb, *cr; - unsigned char *lum_tab, *cb_tab, *cr_tab; - - lum_tab = malloc(w * h); - cb_tab = malloc((w * h) / 4); - cr_tab = malloc((w * h) / 4); - - rgb24_to_yuv420p(lum_tab, cb_tab, cr_tab, rgb_tab, w, h); - - f = fopen(filename, "wb"); - fprintf(f, "P5\n%d %d\n%d\n", w, (h * 3) / 2, 255); - fwrite(lum_tab, 1, w * h, f); - h2 = h / 2; - w2 = w / 2; - cb = cb_tab; - cr = cr_tab; - for (i = 0; i < h2; i++) { - fwrite(cb, 1, w2, f); - fwrite(cr, 1, w2, f); - cb += w2; - cr += w2; - } - fclose(f); - - free(lum_tab); - free(cb_tab); - free(cr_tab); -} - -unsigned char *rgb_tab; -int width, height, wrap; - -static void put_pixel(int x, int y, int r, int g, int b) -{ - unsigned char *p; - - if (x < 0 || x >= width || - y < 0 || y >= height) - return; - - p = rgb_tab + y * wrap + x * 3; - p[0] = r; - p[1] = g; - p[2] = b; -} +#include "utils.c" static unsigned int myrnd(unsigned int *seed_ptr, int n) { @@ -200,9 +73,9 @@ typedef struct VObj { int r, g, b; } VObj; -VObj objs[NB_OBJS]; +static VObj objs[NB_OBJS]; -unsigned int seed = 1; +static unsigned int seed = 1; static void gen_image(int num, int w, int h) { |