mirror of
https://github.com/nyanmisaka/ffmpeg-rockchip.git
synced 2026-01-24 02:20:56 +01:00
Merge remote-tracking branch 'qatar/master'
* qatar/master: avprobe, cmdutils: K&R formatting cosmetics tests: K&R formatting cosmetics for test programs lavf: free packets for muxers implementing interleave_packet(). lavf: fix and extend av_interleaved_write_frame() doxy. mov: Remove dead stores for spherical coordinates for channel position. error_resilience: K&R formatting cosmetics RELEASE_NOTES: mention hiding private symbols in shared builds. RELEASE_NOTES: mention some notable API changes in 0.8 Conflicts: cmdutils.h doc/RELEASE_NOTES ffprobe.c libavcodec/error_resilience.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
commit
c130428ab5
12 changed files with 1022 additions and 841 deletions
140
tests/videogen.c
140
tests/videogen.c
|
|
@ -27,67 +27,73 @@
|
|||
|
||||
#define SCALEBITS 8
|
||||
#define ONE_HALF (1 << (SCALEBITS - 1))
|
||||
#define FIX(x) ((int) ((x) * (1L<<SCALEBITS) + 0.5))
|
||||
#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)
|
||||
uint8_t *src, int width, int height)
|
||||
{
|
||||
int wrap, wrap3, x, y;
|
||||
int r, g, b, r1, g1, b1;
|
||||
uint8_t *p;
|
||||
|
||||
wrap = width;
|
||||
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;
|
||||
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;
|
||||
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[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;
|
||||
p += -wrap3 + 2 * 3;
|
||||
lum += -wrap + 2;
|
||||
}
|
||||
p += wrap3;
|
||||
p += wrap3;
|
||||
lum += wrap;
|
||||
}
|
||||
}
|
||||
|
|
@ -106,19 +112,19 @@ static void pgmyuv_save(const char *filename, int w, int h,
|
|||
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);
|
||||
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");
|
||||
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++) {
|
||||
for (i = 0; i < h2; i++) {
|
||||
fwrite(cb, 1, w2, f);
|
||||
fwrite(cr, 1, w2, f);
|
||||
cb += w2;
|
||||
|
|
@ -142,7 +148,7 @@ static void put_pixel(int x, int y, int r, int g, int b)
|
|||
y < 0 || y >= height)
|
||||
return;
|
||||
|
||||
p = rgb_tab + y * wrap + x * 3;
|
||||
p = rgb_tab + y * wrap + x * 3;
|
||||
p[0] = r;
|
||||
p[1] = g;
|
||||
p[2] = b;
|
||||
|
|
@ -180,7 +186,7 @@ static int int_cos(int a)
|
|||
neg = 0;
|
||||
if (a > (FRAC_ONE / 4)) {
|
||||
neg = -1;
|
||||
a = (FRAC_ONE / 2) - a;
|
||||
a = (FRAC_ONE / 2) - a;
|
||||
}
|
||||
v = FRAC_ONE - ((a * a) >> 4);
|
||||
v = (v ^ neg) - neg;
|
||||
|
|
@ -204,7 +210,7 @@ static void gen_image(int num, int w, int h)
|
|||
unsigned int seed1;
|
||||
|
||||
if (num == 0) {
|
||||
for(i=0;i<NB_OBJS;i++) {
|
||||
for (i = 0; i < NB_OBJS; i++) {
|
||||
objs[i].x = myrnd(&seed, w);
|
||||
objs[i].y = myrnd(&seed, h);
|
||||
objs[i].w = myrnd(&seed, w / 4) + 10;
|
||||
|
|
@ -219,21 +225,21 @@ static void gen_image(int num, int w, int h)
|
|||
/* test motion estimation */
|
||||
dx = int_cos(num * FRAC_ONE / 50) * 35;
|
||||
dy = int_cos(num * FRAC_ONE / 50 + FRAC_ONE / 10) * 30;
|
||||
for(y=0;y<h;y++) {
|
||||
for(x=0;x<w;x++) {
|
||||
for (y = 0; y < h; y++) {
|
||||
for (x = 0; x < w; x++) {
|
||||
x1 = (x << FRAC_BITS) + dx;
|
||||
y1 = (y << FRAC_BITS) + dy;
|
||||
r = ((y1 * 7) >> FRAC_BITS) & 0xff;
|
||||
g = (((x1 + y1) * 9) >> FRAC_BITS) & 0xff;
|
||||
b = ((x1 * 5) >> FRAC_BITS) & 0xff;
|
||||
r = ((y1 * 7) >> FRAC_BITS) & 0xff;
|
||||
g = (((x1 + y1) * 9) >> FRAC_BITS) & 0xff;
|
||||
b = ((x1 * 5) >> FRAC_BITS) & 0xff;
|
||||
put_pixel(x, y, r, g, b);
|
||||
}
|
||||
}
|
||||
|
||||
/* then some noise with very high intensity to test saturation */
|
||||
seed1 = num;
|
||||
for(y=0;y<NOISE_W;y++) {
|
||||
for(x=0;x<NOISE_W;x++) {
|
||||
for (y = 0; y < NOISE_W; y++) {
|
||||
for (x = 0; x < NOISE_W; x++) {
|
||||
r = myrnd(&seed1, 256);
|
||||
g = myrnd(&seed1, 256);
|
||||
b = myrnd(&seed1, 256);
|
||||
|
|
@ -242,11 +248,11 @@ static void gen_image(int num, int w, int h)
|
|||
}
|
||||
|
||||
/* then moving objects */
|
||||
for(i=0;i<NB_OBJS;i++) {
|
||||
for (i = 0; i < NB_OBJS; i++) {
|
||||
VObj *p = &objs[i];
|
||||
seed1 = i;
|
||||
for(y=0;y<p->h;y++) {
|
||||
for(x=0;x<p->w;x++) {
|
||||
for (y = 0; y < p->h; y++) {
|
||||
for (x = 0; x < p->w; x++) {
|
||||
r = p->r;
|
||||
g = p->g;
|
||||
b = p->b;
|
||||
|
|
@ -277,11 +283,11 @@ int main(int argc, char **argv)
|
|||
h = DEFAULT_HEIGHT;
|
||||
|
||||
rgb_tab = malloc(w * h * 3);
|
||||
wrap = w * 3;
|
||||
width = w;
|
||||
height = h;
|
||||
wrap = w * 3;
|
||||
width = w;
|
||||
height = h;
|
||||
|
||||
for(i=0;i<DEFAULT_NB_PICT;i++) {
|
||||
for (i = 0; i < DEFAULT_NB_PICT; i++) {
|
||||
snprintf(buf, sizeof(buf), "%s%02d.pgm", argv[1], i);
|
||||
gen_image(i, w, h);
|
||||
pgmyuv_save(buf, w, h, rgb_tab);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue