Skip to content
Snippets Groups Projects
Commit f0ccd53a authored by Diego Biurrun's avatar Diego Biurrun
Browse files

tests: Refactor rotozoom/videogen common code into a separate file.

parent 814208a7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
tests/Makefile
+ 3
− 0
View file @ f0ccd53a
...@@ -7,6 +7,9 @@ $(AREF): avconv$(EXESUF) tests/data/asynth1.sw ...@@ -7,6 +7,9 @@ $(AREF): avconv$(EXESUF) tests/data/asynth1.sw
OBJDIRS += tests/data tests/vsynth1 tests/vsynth2 OBJDIRS += tests/data tests/vsynth1 tests/vsynth2
# Required due to missing automatic dependency tracking for HOSTOBJS.
tests/rotozoom.o tests/videogen.o: tests/utils.c
tests/vsynth1/00.pgm: tests/videogen$(HOSTEXESUF) | tests/vsynth1 tests/vsynth1/00.pgm: tests/videogen$(HOSTEXESUF) | tests/vsynth1
$(M)./$< 'tests/vsynth1/' $(M)./$< 'tests/vsynth1/'
......
tests/rotozoom.c
+ 2
− 124
View file @ f0ccd53a
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
#include <stdio.h> #include <stdio.h>
#include <inttypes.h> #include <inttypes.h>
#include "utils.c"
#define FIXP (1 << 16) #define FIXP (1 << 16)
#define MY_PI 205887 // (M_PI * FIX) #define MY_PI 205887 // (M_PI * FIX)
...@@ -53,130 +55,6 @@ static int64_t int_sin(int64_t a) ...@@ -53,130 +55,6 @@ static int64_t int_sin(int64_t a)
return a - int_pow(a, 3) / 6 + int_pow(a, 5) / 120 - int_pow(a, 7) / 5040; return a - int_pow(a, 3) / 6 + int_pow(a, 5) / 120 - int_pow(a, 7) / 5040;
} }
#define SCALEBITS 8
#define ONE_HALF (1 << (SCALEBITS - 1))
#define FIX(x) ((int) ((x) * (1L << SCALEBITS) + 0.5))
static void rgb24_to_yuv420p(unsigned char *lum, unsigned char *cb,
unsigned char *cr, unsigned char *src,
int width, int height)
{
int wrap, wrap3, x, y;
int r, g, b, r1, g1, b1;
unsigned char *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] = ((- FIX(0.16874) * r1 - FIX(0.33126) * g1 +
FIX(0.50000) * b1 + 4 * ONE_HALF - 1) >> (SCALEBITS + 2)) + 128;
cr[0] = ((FIX(0.50000) * r1 - FIX(0.41869) * g1 -
FIX(0.08131) * b1 + 4 * ONE_HALF - 1) >> (SCALEBITS + 2)) + 128;
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
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);
}
static unsigned char *rgb_tab;
static 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;
}
static unsigned char tab_r[256 * 256]; static unsigned char tab_r[256 * 256];
static unsigned char tab_g[256 * 256]; static unsigned char tab_g[256 * 256];
static unsigned char tab_b[256 * 256]; static unsigned char tab_b[256 * 256];
......
tests/utils.c 0 → 100644
+ 144
− 0
View file @ f0ccd53a
/*
* This file is part of Libav.
*
* Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <stdio.h>
#include <stdlib.h>
#define SCALEBITS 8
#define ONE_HALF (1 << (SCALEBITS - 1))
#define FIX(x) ((int) ((x) * (1L << SCALEBITS) + 0.5))
static void rgb24_to_yuv420p(unsigned char *lum, unsigned char *cb,
unsigned char *cr, unsigned char *src,
int width, int height)
{
int wrap, wrap3, x, y;
int r, g, b, r1, g1, b1;
unsigned char *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] = ((- FIX(0.16874) * r1 - FIX(0.33126) * g1 +
FIX(0.50000) * b1 + 4 * ONE_HALF - 1) >> (SCALEBITS + 2)) + 128;
cr[0] = ((FIX(0.50000) * r1 - FIX(0.41869) * g1 -
FIX(0.08131) * b1 + 4 * ONE_HALF - 1) >> (SCALEBITS + 2)) + 128;
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
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);
}
static unsigned char *rgb_tab;
static 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;
}
tests/videogen.c
+ 1
− 128
View file @ f0ccd53a
...@@ -25,134 +25,7 @@ ...@@ -25,134 +25,7 @@
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#define SCALEBITS 8 #include "utils.c"
#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);
}
static unsigned char *rgb_tab;
static 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;
}
static unsigned int myrnd(unsigned int *seed_ptr, int n) static unsigned int myrnd(unsigned int *seed_ptr, int n)
{ {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment