fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

RoQ decoder: Work on RGBA-data interenally instead of YUV420-data (#250)

Browse source 
* RoQ decoder: Work on RGBA-data interenally instead of YUV420-data

This fixes color-smearing artifacts on movement (caused by uneven motion vectors not being correctly applicable on half-resolution UV-buffers) and makes RoQ-video directly uploadable as texture.

YUV-to-RGB-conversion is now done only when receiving new codebooks in the RoQ stream, which is a lot less data to be RGB-converted per-frame.

* RoQ decoder: C89-compliant variable declarations

* RoQ decoder: more consistent indentation
This commit is contained in:
RandomBrushes 2024-04-06 21:16:24 +02:00 committed by GitHub
parent b7963e6241
commit 0630ea571e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 155 additions and 211 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
engine/client/m_mp3.c
View file

@ -2211,64 +2211,12 @@ static qboolean Media_Roq_DecodeFrame (cin_t *cin, qboolean nosound, qboolean fo
if (doupdate) if (doupdate)
{ {
//#define LIMIT(x) ((x)<0xFFFF)?(x)>>16:0xFF;
#define LIMIT(x) ((((x) > 0xffffff) ? 0xff0000 : (((x) <= 0xffff) ? 0 : (x) & 0xff0000)) >> 16)
unsigned char *pa=cin->roq.roqfilm->y[0];
unsigned char *pb=cin->roq.roqfilm->u[0];
unsigned char *pc=cin->roq.roqfilm->v[0];
int pix=0;
int num_columns=(cin->roq.roqfilm->width)>>1;
int num_rows=cin->roq.roqfilm->height;
int y;
int x;
qbyte *framedata;
if (cin->roq.roqfilm->num_frames) if (cin->roq.roqfilm->num_frames)
cin->filmpercentage = cin->roq.roqfilm->frame_num / cin->roq.roqfilm->num_frames; cin->filmpercentage = cin->roq.roqfilm->frame_num / cin->roq.roqfilm->num_frames;
else else
cin->filmpercentage = 0; cin->filmpercentage = 0;
{ uploadtexture(ctx, TF_RGBX32, cin->roq.roqfilm->width, cin->roq.roqfilm->height, cin->roq.roqfilm->rgba[0], NULL);
framedata = cin->framedata;
for(y = 0; y < num_rows; ++y) //roq playing doesn't give nice data. It's still fairly raw.
{ //convert it properly.
for(x = 0; x < num_columns; ++x)
{
int r, g, b, y1, y2, u, v, t;
y1 = *(pa++); y2 = *(pa++);
u = pb[x] - 128;
v = pc[x] - 128;
y1 <<= 16;
y2 <<= 16;
r = 91881 * v;
g = -22554 * u + -46802 * v;
b = 116130 * u;
t=r+y1;
framedata[pix] =(unsigned char) LIMIT(t);
t=g+y1;
framedata[pix+1] =(unsigned char) LIMIT(t);
t=b+y1;
framedata[pix+2] =(unsigned char) LIMIT(t);
t=r+y2;
framedata[pix+4] =(unsigned char) LIMIT(t);
t=g+y2;
framedata[pix+5] =(unsigned char) LIMIT(t);
t=b+y2;
framedata[pix+6] =(unsigned char) LIMIT(t);
pix+=8;
}
if(y & 0x01) { pb += num_columns; pc += num_columns; }
}
}
uploadtexture(ctx, TF_RGBX32, cin->roq.roqfilm->width, cin->roq.roqfilm->height, cin->framedata, NULL);
if (!nosound) if (!nosound)
{ {
@ -2308,7 +2256,6 @@ static cin_t *Media_RoQ_TryLoad(char *name)
cin->roq.roqfilm = roqfilm; cin->roq.roqfilm = roqfilm;
cin->framedata = BZ_Malloc(roqfilm->width*roqfilm->height*4);
return cin; return cin;
} }
return NULL; return NULL;

7
engine/client/roq.h
View file

@ -16,6 +16,10 @@ typedef struct {
unsigned char y0, y1, y2, y3, u, v; unsigned char y0, y1, y2, y3, u, v;
} roq_cell; } roq_cell;
typedef struct {
char p[16];
} roq_cell_rgba;
typedef struct { typedef struct {
int idx[4]; int idx[4];
} roq_qcell; } roq_qcell;
@ -26,13 +30,14 @@ typedef struct roq_info_s {
int buf_size; int buf_size;
unsigned char *buf; unsigned char *buf;
roq_cell cells[256]; roq_cell cells[256];
roq_cell_rgba cells_rgba[256];
roq_qcell qcells[256]; roq_qcell qcells[256];
short snd_sqr_arr[256]; short snd_sqr_arr[256];
qofs_t roq_start, aud_pos, vid_pos; qofs_t roq_start, aud_pos, vid_pos;
long *frame_offset; long *frame_offset;
unsigned long num_frames, num_audio_bytes; unsigned long num_frames, num_audio_bytes;
int width, height, frame_num, audio_channels; int width, height, frame_num, audio_channels;
unsigned char *y[2], *u[2], *v[2]; byte_vec4_t *rgba[2];
long stream_length; long stream_length;
int audio_buf_size, audio_size; int audio_buf_size, audio_size;
unsigned char *audio; unsigned char *audio;

304
engine/client/roq_read.c
View file

@ -150,101 +150,70 @@ int max_frame;
} }
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */
static void apply_vector_2x2(roq_info *ri, int x, int y, roq_cell *cell) static void apply_vector_2x2(roq_info *ri, int x, int y, roq_cell_rgba *cell)
{ {
unsigned char *yptr; // place 2x2 vector codeword in framebuffer
yptr = ri->y[0] + (y * ri->width) + x; int idxa = (y * ri->width) + x;
*yptr++ = cell->y0; int idxb = 0;
*yptr++ = cell->y1;
yptr += (ri->width - 2); int *ptra = (int*) &ri->rgba[0][idxa][0];
*yptr++ = cell->y2; int *ptrb = (int*) &cell->p[idxb];
*yptr++ = cell->y3;
ri->u[0][(y/2) * (ri->width/2) + x/2] = cell->u; ptra[0] = ptrb[0];
ri->v[0][(y/2) * (ri->width/2) + x/2] = cell->v; ptra[1] = ptrb[1];
ptra += ri->width;
ptra[0] = ptrb[2];
ptra[1] = ptrb[3];
} }
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */
static void apply_vector_4x4(roq_info *ri, int x, int y, roq_cell *cell) static void apply_vector_4x4(roq_info *ri, int x, int y, roq_cell_rgba *cell)
{ {
unsigned long row_inc, c_row_inc; // upsample 2x2 vector codeword to 4x4 and place in framebuffer
register unsigned char y0, y1, u, v;
unsigned char *yptr, *uptr, *vptr;
yptr = ri->y[0] + (y * ri->width) + x; int idxa = (y * ri->width) + x;
uptr = ri->u[0] + (y/2) * (ri->width/2) + x/2; int idxb = 0;
vptr = ri->v[0] + (y/2) * (ri->width/2) + x/2;
row_inc = ri->width - 4; int *ptra = (int*) &ri->rgba[0][idxa][0];
c_row_inc = (ri->width/2) - 2; int *ptrb = (int*) &cell->p[idxb];
*yptr++ = y0 = cell->y0; *uptr++ = u = cell->u; *vptr++ = v = cell->v;
*yptr++ = y0;
*yptr++ = y1 = cell->y1; *uptr++ = u; *vptr++ = v;
*yptr++ = y1;
yptr += row_inc; int i;
for(i = 0; i < 4; i++) {
ptra[0] = ptrb[0];
ptra[1] = ptrb[0];
ptra[2] = ptrb[1];
ptra[3] = ptrb[1];
*yptr++ = y0; ptra += ri->width;
*yptr++ = y0; if(i & 0x1) { // increase src pointer only every second dest line
*yptr++ = y1; ptrb += 2;
*yptr++ = y1; }
}
yptr += row_inc; uptr += c_row_inc; vptr += c_row_inc;
*yptr++ = y0 = cell->y2; *uptr++ = u; *vptr++ = v;
*yptr++ = y0;
*yptr++ = y1 = cell->y3; *uptr++ = u; *vptr++ = v;
*yptr++ = y1;
yptr += row_inc;
*yptr++ = y0;
*yptr++ = y0;
*yptr++ = y1;
*yptr++ = y1;
} }
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */
static void apply_motion_4x4(roq_info *ri, int x, int y, unsigned char mv, char mean_x, char mean_y) static void apply_motion_4x4(roq_info *ri, int x, int y, unsigned char mv, char mean_x, char mean_y)
{ {
int i, mx, my; int mx = x + 8 - (mv >> 4) - mean_x;
unsigned char *pa, *pb; int my = y + 8 - (mv & 0xf) - mean_y;
int idxa = (y * ri->width) + x;
int idxb = (my * ri->width) + mx;
mx = x + 8 - (mv >> 4) - mean_x; int *ptra = (int*) &ri->rgba[0][idxa][0];
my = y + 8 - (mv & 0xf) - mean_y; int *ptrb = (int*) &ri->rgba[1][idxb][0];
int i;
for(i = 0; i < 4; i++) {
ptra[0] = ptrb[0];
ptra[1] = ptrb[1];
ptra[2] = ptrb[2];
ptra[3] = ptrb[3];
pa = ri->y[0] + (y * ri->width) + x; ptra += ri->width;
pb = ri->y[1] + (my * ri->width) + mx; ptrb += ri->width;
for(i = 0; i < 4; i++)
{
pa[0] = pb[0];
pa[1] = pb[1];
pa[2] = pb[2];
pa[3] = pb[3];
pa += ri->width;
pb += ri->width;
}
pa = ri->u[0] + (y/2) * (ri->width/2) + x/2;
pb = ri->u[1] + (my/2) * (ri->width/2) + (mx + 1)/2;
for(i = 0; i < 2; i++)
{
pa[0] = pb[0];
pa[1] = pb[1];
pa += ri->width/2;
pb += ri->width/2;
}
pa = ri->v[0] + (y/2) * (ri->width/2) + x/2;
pb = ri->v[1] + (my/2) * (ri->width/2) + (mx + 1)/2;
for(i = 0; i < 2; i++)
{
pa[0] = pb[0];
pa[1] = pb[1];
pa += ri->width/2;
pb += ri->width/2;
} }
} }
@ -252,50 +221,28 @@ unsigned char *pa, *pb;
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */
static void apply_motion_8x8(roq_info *ri, int x, int y, unsigned char mv, char mean_x, char mean_y) static void apply_motion_8x8(roq_info *ri, int x, int y, unsigned char mv, char mean_x, char mean_y)
{ {
int mx, my, i; int mx = x + 8 - (mv >> 4) - mean_x;
unsigned char *pa, *pb; int my = y + 8 - (mv & 0xf) - mean_y;
mx = x + 8 - (mv >> 4) - mean_x; int idxa = (y * ri->width) + x;
my = y + 8 - (mv & 0xf) - mean_y; int idxb = (my * ri->width) + mx;
int *ptra = (int*) &ri->rgba[0][idxa][0];
int *ptrb = (int*) &ri->rgba[1][idxb][0];
pa = ri->y[0] + (y * ri->width) + x; int i;
pb = ri->y[1] + (my * ri->width) + mx; for(i = 0; i < 8; i++) {
for(i = 0; i < 8; i++) ptra[0] = ptrb[0];
{ ptra[1] = ptrb[1];
pa[0] = pb[0]; ptra[2] = ptrb[2];
pa[1] = pb[1]; ptra[3] = ptrb[3];
pa[2] = pb[2]; ptra[4] = ptrb[4];
pa[3] = pb[3]; ptra[5] = ptrb[5];
pa[4] = pb[4]; ptra[6] = ptrb[6];
pa[5] = pb[5]; ptra[7] = ptrb[7];
pa[6] = pb[6];
pa[7] = pb[7];
pa += ri->width;
pb += ri->width;
}
pa = ri->u[0] + (y/2) * (ri->width/2) + x/2; ptra += ri->width;
pb = ri->u[1] + (my/2) * (ri->width/2) + (mx + 1)/2; ptrb += ri->width;
for(i = 0; i < 4; i++)
{
pa[0] = pb[0];
pa[1] = pb[1];
pa[2] = pb[2];
pa[3] = pb[3];
pa += ri->width/2;
pb += ri->width/2;
}
pa = ri->v[0] + (y/2) * (ri->width/2) + x/2;
pb = ri->v[1] + (my/2) * (ri->width/2) + (mx + 1)/2;
for(i = 0; i < 4; i++)
{
pa[0] = pb[0];
pa[1] = pb[1];
pa[2] = pb[2];
pa[3] = pb[3];
pa += ri->width/2;
pb += ri->width/2;
} }
} }
@ -337,9 +284,7 @@ int i;
for(i = 0; i < 2; i++) for(i = 0; i < 2; i++)
{ {
if((ri->y[i] = BZF_Malloc(ri->width * ri->height)) == NULL || if((ri->rgba[i] = BZF_Malloc(ri->width * ri->height * sizeof(byte_vec4_t))) == NULL)
(ri->u[i] = BZF_Malloc((ri->width * ri->height)/4)) == NULL ||
(ri->v[i] = BZF_Malloc((ri->width * ri->height)/4)) == NULL)
{ {
Con_Printf("Memory allocation error.\n"); Con_Printf("Memory allocation error.\n");
return NULL; return NULL;
@ -378,12 +323,8 @@ int i;
VFS_CLOSE(ri->fp); VFS_CLOSE(ri->fp);
for(i = 0; i < 2; i++) for(i = 0; i < 2; i++)
{ {
if(ri->y[i] != NULL) if(ri->rgba[i] != NULL)
BZ_Free(ri->y[i]); BZ_Free(ri->rgba[i]);
if(ri->u[i] != NULL)
BZ_Free(ri->u[i]);
if(ri->v[i] != NULL)
BZ_Free(ri->v[i]);
} }
if(ri->buf != NULL) if(ri->buf != NULL)
BZ_Free(ri->buf); BZ_Free(ri->buf);
@ -392,6 +333,64 @@ int i;
BZ_Free(ri); BZ_Free(ri);
} }
/* -------------------------------------------------------------------------- */
#define LIMIT(x) ((((x) > 0xffffff) ? 0xff0000 : (((x) <= 0xffff) ? 0 : (x) & 0xff0000)) >> 16)
void roq_cells_to_rgba(roq_info *ri)
{
char *pptr;
int i, r, g, b, y, u, v, t;
for(i = 0; i < 256; i++) {
pptr = ri->cells_rgba[i].p;
u = ri->cells[i].u - 128;
v = ri->cells[i].v - 128;
r = 91881 * v;
g = -22554 * u + -46802 * v;
b = 116130 * u;
// first pixel
y = (ri->cells[i].y0) << 16;
t = r + y;
pptr[0] = LIMIT(t); // R
t = g + y;
pptr[1] = LIMIT(t); // G
t = b + y;
pptr[2] = LIMIT(t); // B
pptr[3] = 255; // A
// second pixel
y = (ri->cells[i].y1) << 16;
t = r + y;
pptr[4] = LIMIT(t); // R
t = g + y;
pptr[5] = LIMIT(t); // G
t = b + y;
pptr[6] = LIMIT(t); // B
pptr[7] = 255; // A
// third pixel
y = (ri->cells[i].y2) << 16;
t = r + y;
pptr[8] = LIMIT(t); // R
t = g + y;
pptr[9] = LIMIT(t); // G
t = b + y;
pptr[10] = LIMIT(t); // B
pptr[11] = 255; // A
// fourth pixel
y = (ri->cells[i].y3) << 16;
t = r + y;
pptr[12] = LIMIT(t); // R
t = g + y;
pptr[13] = LIMIT(t); // G
t = b + y;
pptr[14] = LIMIT(t); // B
pptr[15] = 255; // A
}
}
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */
int roq_read_frame(roq_info *ri) int roq_read_frame(roq_info *ri)
@ -400,7 +399,7 @@ vfsfile_t *fp = ri->fp;
unsigned int chunk_id = 0, chunk_arg = 0; unsigned int chunk_id = 0, chunk_arg = 0;
unsigned long chunk_size = 0; unsigned long chunk_size = 0;
int i, j, k, nv1, nv2, vqflg = 0, vqflg_pos = -1, vqid, bpos, xpos, ypos, xp, yp, x, y; int i, j, k, nv1, nv2, vqflg = 0, vqflg_pos = -1, vqid, bpos, xpos, ypos, xp, yp, x, y;
unsigned char *tp, *buf; unsigned char *buf;
int frame_stats[2][4] = {{0},{0}}; int frame_stats[2][4] = {{0},{0}};
roq_qcell *qcell; roq_qcell *qcell;
@ -424,6 +423,7 @@ qofs_t fpos = ri->vid_pos;
if((nv2 = chunk_arg & 0xff) == 0 && nv1 * 6 < chunk_size) if((nv2 = chunk_arg & 0xff) == 0 && nv1 * 6 < chunk_size)
nv2 = 256; nv2 = 256;
VFS_READ(fp, ri->cells, nv1 * sizeof(roq_cell)); VFS_READ(fp, ri->cells, nv1 * sizeof(roq_cell));
roq_cells_to_rgba(ri);
for(i = 0; i < nv2; i++) for(i = 0; i < nv2; i++)
for(j = 0; j < 4; j++) ri->qcells[i].idx[j] = VFS_GETC(fp); for(j = 0; j < 4; j++) ri->qcells[i].idx[j] = VFS_GETC(fp);
} }
@ -472,14 +472,15 @@ qofs_t fpos = ri->vid_pos;
{ {
case RoQ_ID_MOT: break; case RoQ_ID_MOT: break;
case RoQ_ID_FCC: case RoQ_ID_FCC:
apply_motion_8x8(ri, xp, yp, buf[bpos++], (char)(chunk_arg >> 8), (char)(chunk_arg & 0xff)); apply_motion_8x8(ri, xp, yp, buf[bpos], (char)(chunk_arg >> 8), (char)(chunk_arg & 0xff));
bpos++;
break; break;
case RoQ_ID_SLD: case RoQ_ID_SLD:
qcell = ri->qcells + buf[bpos++]; qcell = ri->qcells + buf[bpos++];
apply_vector_4x4(ri, xp, yp, ri->cells + qcell->idx[0]); apply_vector_4x4(ri, xp, yp, ri->cells_rgba + qcell->idx[0]);
apply_vector_4x4(ri, xp+4, yp, ri->cells + qcell->idx[1]); apply_vector_4x4(ri, xp+4, yp, ri->cells_rgba + qcell->idx[1]);
apply_vector_4x4(ri, xp, yp+4, ri->cells + qcell->idx[2]); apply_vector_4x4(ri, xp, yp+4, ri->cells_rgba + qcell->idx[2]);
apply_vector_4x4(ri, xp+4, yp+4, ri->cells + qcell->idx[3]); apply_vector_4x4(ri, xp+4, yp+4, ri->cells_rgba + qcell->idx[3]);
break; break;
case RoQ_ID_CCC: case RoQ_ID_CCC:
for(k = 0; k < 4; k++) for(k = 0; k < 4; k++)
@ -500,20 +501,21 @@ qofs_t fpos = ri->vid_pos;
{ {
case RoQ_ID_MOT: break; case RoQ_ID_MOT: break;
case RoQ_ID_FCC: case RoQ_ID_FCC:
apply_motion_4x4(ri, x, y, buf[bpos++], (char)(chunk_arg >> 8), (char)(chunk_arg & 0xff)); apply_motion_4x4(ri, x, y, buf[bpos], (char)(chunk_arg >> 8), (char)(chunk_arg & 0xff));
bpos++;
break; break;
case RoQ_ID_SLD: case RoQ_ID_SLD:
qcell = ri->qcells + buf[bpos++]; qcell = ri->qcells + buf[bpos++];
apply_vector_2x2(ri, x, y, ri->cells + qcell->idx[0]); apply_vector_2x2(ri, x, y, ri->cells_rgba + qcell->idx[0]);
apply_vector_2x2(ri, x+2, y, ri->cells + qcell->idx[1]); apply_vector_2x2(ri, x+2, y, ri->cells_rgba + qcell->idx[1]);
apply_vector_2x2(ri, x, y+2, ri->cells + qcell->idx[2]); apply_vector_2x2(ri, x, y+2, ri->cells_rgba + qcell->idx[2]);
apply_vector_2x2(ri, x+2, y+2, ri->cells + qcell->idx[3]); apply_vector_2x2(ri, x+2, y+2, ri->cells_rgba + qcell->idx[3]);
break; break;
case RoQ_ID_CCC: case RoQ_ID_CCC:
apply_vector_2x2(ri, x, y, ri->cells + buf[bpos]); apply_vector_2x2(ri, x, y, ri->cells_rgba + buf[bpos]);
apply_vector_2x2(ri, x+2, y, ri->cells + buf[bpos+1]); apply_vector_2x2(ri, x+2, y, ri->cells_rgba + buf[bpos+1]);
apply_vector_2x2(ri, x, y+2, ri->cells + buf[bpos+2]); apply_vector_2x2(ri, x, y+2, ri->cells_rgba + buf[bpos+2]);
apply_vector_2x2(ri, x+2, y+2, ri->cells + buf[bpos+3]); apply_vector_2x2(ri, x+2, y+2, ri->cells_rgba + buf[bpos+3]);
bpos += 4; bpos += 4;
break; break;
} }
@ -544,23 +546,13 @@ qofs_t fpos = ri->vid_pos;
if(ri->frame_num == 1) if(ri->frame_num == 1)
{ {
memcpy(ri->y[1], ri->y[0], ri->width * ri->height); memcpy(ri->rgba[1], ri->rgba[0], ri->width * ri->height * sizeof(byte_vec4_t));
memcpy(ri->u[1], ri->u[0], (ri->width * ri->height)/4);
memcpy(ri->v[1], ri->v[0], (ri->width * ri->height)/4);
} }
else else
{ {
tp = ri->y[0]; byte_vec4_t *tp = ri->rgba[0];
ri->y[0] = ri->y[1]; ri->rgba[0] = ri->rgba[1];
ri->y[1] = tp; ri->rgba[1] = tp;
tp = ri->u[0];
ri->u[0] = ri->u[1];
ri->u[1] = tp;
tp = ri->v[0];
ri->v[0] = ri->v[1];
ri->v[1] = tp;
} }
return 1; return 1;