generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vmnc: K&R formatting cosmetics

Browse Source 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
This commit is contained in:
Luca Barbato
2013-10-09 12:58:42 +02:00
parent ad7d7d4f6a
commit a66aa0daf2
1 changed files with 195 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

170
libavcodec/vmnc.c
View File

@@ -73,15 +73,22 @@ typedef struct VmncContext {
} VmncContext; } VmncContext;
/* read pixel value from stream */ /* read pixel value from stream */
static av_always_inline int vmnc_get_pixel(const uint8_t* buf, int bpp, int be) { static av_always_inline int vmnc_get_pixel(const uint8_t *buf, int bpp, int be)
{
switch (bpp * 2 + be) { switch (bpp * 2 + be) {
case 2: case 2:
case 3: return *buf; case 3:
case 4: return AV_RL16(buf); return *buf;
case 5: return AV_RB16(buf); case 4:
case 8: return AV_RL32(buf); return AV_RL16(buf);
case 9: return AV_RB32(buf); case 5:
default: return 0; return AV_RB16(buf);
case 8:
return AV_RL32(buf);
case 9:
return AV_RB32(buf);
default:
return 0;
} }
} }
@@ -97,9 +104,12 @@ static void load_cursor(VmncContext *c, const uint8_t *src)
for (i = 0; i < c->cur_w; i++) { for (i = 0; i < c->cur_w; i++) {
p = vmnc_get_pixel(src, bpp, c->bigendian); p = vmnc_get_pixel(src, bpp, c->bigendian);
src += bpp; src += bpp;
if(bpp == 1) *dst8++ = p; if (bpp == 1)
if(bpp == 2) *dst16++ = p; *dst8++ = p;
if(bpp == 4) *dst32++ = p; if (bpp == 2)
*dst16++ = p;
if (bpp == 4)
*dst32++ = p;
} }
} }
dst8 = c->curmask; dst8 = c->curmask;
@@ -109,9 +119,12 @@ static void load_cursor(VmncContext *c, const uint8_t *src)
for (i = 0; i < c->cur_w; i++) { for (i = 0; i < c->cur_w; i++) {
p = vmnc_get_pixel(src, bpp, c->bigendian); p = vmnc_get_pixel(src, bpp, c->bigendian);
src += bpp; src += bpp;
if(bpp == 1) *dst8++ = p; if (bpp == 1)
if(bpp == 2) *dst16++ = p; *dst8++ = p;
if(bpp == 4) *dst32++ = p; if (bpp == 2)
*dst16++ = p;
if (bpp == 4)
*dst32++ = p;
} }
} }
} }
@@ -121,9 +134,11 @@ static void put_cursor(uint8_t *dst, int stride, VmncContext *c, int dx, int dy)
int i, j; int i, j;
int w, h, x, y; int w, h, x, y;
w = c->cur_w; w = c->cur_w;
if(c->width < c->cur_x + c->cur_w) w = c->width - c->cur_x; if (c->width < c->cur_x + c->cur_w)
w = c->width - c->cur_x;
h = c->cur_h; h = c->cur_h;
if(c->height < c->cur_y + c->cur_h) h = c->height - c->cur_y; if (c->height < c->cur_y + c->cur_h)
h = c->height - c->cur_y;
x = c->cur_x; x = c->cur_x;
y = c->cur_y; y = c->cur_y;
if (x < 0) { if (x < 0) {
@@ -135,7 +150,8 @@ static void put_cursor(uint8_t *dst, int stride, VmncContext *c, int dx, int dy)
y = 0; y = 0;
} }
if((w < 1) || (h < 1)) return; if ((w < 1) || (h < 1))
return;
dst += x * c->bpp2 + y * stride; dst += x * c->bpp2 + y * stride;
if (c->bpp2 == 1) { if (c->bpp2 == 1) {
@@ -173,7 +189,9 @@ static void put_cursor(uint8_t *dst, int stride, VmncContext *c, int dx, int dy)
} }
/* fill rectangle with given color */ /* fill rectangle with given color */
static av_always_inline void paint_rect(uint8_t *dst, int dx, int dy, int w, int h, int color, int bpp, int stride) static av_always_inline void paint_rect(uint8_t *dst, int dx, int dy,
int w, int h, int color,
int bpp, int stride)
{ {
int i, j; int i, j;
dst += dx * bpp + dy * stride; dst += dx * bpp + dy * stride;
@@ -186,24 +204,24 @@ static av_always_inline void paint_rect(uint8_t *dst, int dx, int dy, int w, int
uint16_t *dst2; uint16_t *dst2;
for (j = 0; j < h; j++) { for (j = 0; j < h; j++) {
dst2 = (uint16_t*)dst; dst2 = (uint16_t*)dst;
for(i = 0; i < w; i++) { for (i = 0; i < w; i++)
*dst2++ = color; *dst2++ = color;
}
dst += stride; dst += stride;
} }
} else if (bpp == 4) { } else if (bpp == 4) {
uint32_t *dst2; uint32_t *dst2;
for (j = 0; j < h; j++) { for (j = 0; j < h; j++) {
dst2 = (uint32_t*)dst; dst2 = (uint32_t*)dst;
for(i = 0; i < w; i++) { for (i = 0; i < w; i++)
dst2[i] = color; dst2[i] = color;
}
dst += stride; dst += stride;
} }
} }
} }
static av_always_inline void paint_raw(uint8_t *dst, int w, int h, const uint8_t* src, int bpp, int be, int stride) static av_always_inline void paint_raw(uint8_t *dst, int w, int h,
const uint8_t *src, int bpp,
int be, int stride)
{ {
int i, j, p; int i, j, p;
for (j = 0; j < h; j++) { for (j = 0; j < h; j++) {
@@ -226,7 +244,8 @@ static av_always_inline void paint_raw(uint8_t *dst, int w, int h, const uint8_t
} }
} }
static int decode_hextile(VmncContext *c, uint8_t* dst, const uint8_t* src, int ssize, int w, int h, int stride) static int decode_hextile(VmncContext *c, uint8_t *dst, const uint8_t *src,
int ssize, int w, int h, int stride)
{ {
int i, j, k; int i, j, k;
int bg = 0, fg = 0, rects, color, flags, xy, wh; int bg = 0, fg = 0, rects, color, flags, xy, wh;
@@ -238,13 +257,15 @@ static int decode_hextile(VmncContext *c, uint8_t* dst, const uint8_t* src, int
for (j = 0; j < h; j += 16) { for (j = 0; j < h; j += 16) {
dst2 = dst; dst2 = dst;
bw = 16; bw = 16;
if(j + 16 > h) bh = h - j; if (j + 16 > h)
bh = h - j;
for (i = 0; i < w; i += 16, dst2 += 16 * bpp) { for (i = 0; i < w; i += 16, dst2 += 16 * bpp) {
if (src - ssrc >= ssize) { if (src - ssrc >= ssize) {
av_log(c->avctx, AV_LOG_ERROR, "Premature end of data!\n"); av_log(c->avctx, AV_LOG_ERROR, "Premature end of data!\n");
return -1; return -1;
} }
if(i + 16 > w) bw = w - i; if (i + 16 > w)
bw = w - i;
flags = *src++; flags = *src++;
if (flags & HT_RAW) { if (flags & HT_RAW) {
if (src - ssrc > ssize - bw * bh * bpp) { if (src - ssrc > ssize - bw * bh * bpp) {
@@ -255,10 +276,12 @@ static int decode_hextile(VmncContext *c, uint8_t* dst, const uint8_t* src, int
src += bw * bh * bpp; src += bw * bh * bpp;
} else { } else {
if (flags & HT_BKG) { if (flags & HT_BKG) {
bg = vmnc_get_pixel(src, bpp, c->bigendian); src += bpp; bg = vmnc_get_pixel(src, bpp, c->bigendian);
src += bpp;
} }
if (flags & HT_FG) { if (flags & HT_FG) {
fg = vmnc_get_pixel(src, bpp, c->bigendian); src += bpp; fg = vmnc_get_pixel(src, bpp, c->bigendian);
src += bpp;
} }
rects = 0; rects = 0;
if (flags & HT_SUB) if (flags & HT_SUB)
@@ -273,11 +296,13 @@ static int decode_hextile(VmncContext *c, uint8_t* dst, const uint8_t* src, int
} }
for (k = 0; k < rects; k++) { for (k = 0; k < rects; k++) {
if (color) { if (color) {
fg = vmnc_get_pixel(src, bpp, c->bigendian); src += bpp; fg = vmnc_get_pixel(src, bpp, c->bigendian);
src += bpp;
} }
xy = *src++; xy = *src++;
wh = *src++; wh = *src++;
paint_rect(dst2, xy >> 4, xy & 0xF, (wh>>4)+1, (wh & 0xF)+1, fg, bpp, stride); paint_rect(dst2, xy >> 4, xy & 0xF, (wh >> 4) + 1,
(wh & 0xF) + 1, fg, bpp, stride);
} }
} }
} }
@@ -308,9 +333,11 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
if (c->screendta) { if (c->screendta) {
int i; int i;
w = c->cur_w; w = c->cur_w;
if(c->width < c->cur_x + w) w = c->width - c->cur_x; if (c->width < c->cur_x + w)
w = c->width - c->cur_x;
h = c->cur_h; h = c->cur_h;
if(c->height < c->cur_y + h) h = c->height - c->cur_y; if (c->height < c->cur_y + h)
h = c->height - c->cur_y;
dx = c->cur_x; dx = c->cur_x;
if (dx < 0) { if (dx < 0) {
w += dx; w += dx;
@@ -324,25 +351,34 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
if ((w > 0) && (h > 0)) { if ((w > 0) && (h > 0)) {
outptr = c->pic.data[0] + dx * c->bpp2 + dy * c->pic.linesize[0]; outptr = c->pic.data[0] + dx * c->bpp2 + dy * c->pic.linesize[0];
for (i = 0; i < h; i++) { for (i = 0; i < h; i++) {
memcpy(outptr, c->screendta + i * c->cur_w * c->bpp2, w * c->bpp2); memcpy(outptr, c->screendta + i * c->cur_w * c->bpp2,
w * c->bpp2);
outptr += c->pic.linesize[0]; outptr += c->pic.linesize[0];
} }
} }
} }
src += 2; src += 2;
chunks = AV_RB16(src); src += 2; chunks = AV_RB16(src);
src += 2;
while (chunks--) { while (chunks--) {
dx = AV_RB16(src); src += 2; dx = AV_RB16(src);
dy = AV_RB16(src); src += 2; src += 2;
w = AV_RB16(src); src += 2; dy = AV_RB16(src);
h = AV_RB16(src); src += 2; src += 2;
enc = AV_RB32(src); src += 4; w = AV_RB16(src);
src += 2;
h = AV_RB16(src);
src += 2;
enc = AV_RB32(src);
src += 4;
outptr = c->pic.data[0] + dx * c->bpp2 + dy * c->pic.linesize[0]; outptr = c->pic.data[0] + dx * c->bpp2 + dy * c->pic.linesize[0];
size_left = buf_size - (src - buf); size_left = buf_size - (src - buf);
switch (enc) { switch (enc) {
case MAGIC_WMVd: // cursor case MAGIC_WMVd: // cursor
if (size_left < 2 + w * h * c->bpp2 * 2) { if (size_left < 2 + w * h * c->bpp2 * 2) {
av_log(avctx, AV_LOG_ERROR, "Premature end of data! (need %i got %i)\n", 2 + w * h * c->bpp2 * 2, size_left); av_log(avctx, AV_LOG_ERROR,
"Premature end of data! (need %i got %i)\n",
2 + w * h * c->bpp2 * 2, size_left);
return -1; return -1;
} }
src += 2; src += 2;
@@ -351,7 +387,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
c->cur_hx = dx; c->cur_hx = dx;
c->cur_hy = dy; c->cur_hy = dy;
if ((c->cur_hx > c->cur_w) || (c->cur_hy > c->cur_h)) { if ((c->cur_hx > c->cur_w) || (c->cur_hy > c->cur_h)) {
av_log(avctx, AV_LOG_ERROR, "Cursor hot spot is not in image: %ix%i of %ix%i cursor size\n", c->cur_hx, c->cur_hy, c->cur_w, c->cur_h); av_log(avctx, AV_LOG_ERROR,
"Cursor hot spot is not in image: "
"%ix%i of %ix%i cursor size\n",
c->cur_hx, c->cur_hy, c->cur_w, c->cur_h);
c->cur_hx = c->cur_hy = 0; c->cur_hx = c->cur_hy = 0;
} }
c->curbits = av_realloc(c->curbits, c->cur_w * c->cur_h * c->bpp2); c->curbits = av_realloc(c->curbits, c->cur_w * c->cur_h * c->bpp2);
@@ -378,12 +417,16 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
c->pic.pict_type = AV_PICTURE_TYPE_I; c->pic.pict_type = AV_PICTURE_TYPE_I;
depth = *src++; depth = *src++;
if (depth != c->bpp) { if (depth != c->bpp) {
av_log(avctx, AV_LOG_INFO, "Depth mismatch. Container %i bpp, Frame data: %i bpp\n", c->bpp, depth); av_log(avctx, AV_LOG_INFO,
"Depth mismatch. Container %i bpp, "
"Frame data: %i bpp\n",
c->bpp, depth);
} }
src++; src++;
c->bigendian = *src++; c->bigendian = *src++;
if (c->bigendian & (~1)) { if (c->bigendian & (~1)) {
av_log(avctx, AV_LOG_INFO, "Invalid header: bigendian flag = %i\n", c->bigendian); av_log(avctx, AV_LOG_INFO,
"Invalid header: bigendian flag = %i\n", c->bigendian);
return -1; return -1;
} }
// skip the rest of pixel format data // skip the rest of pixel format data
@@ -394,22 +437,30 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
break; break;
case 0x00000000: // raw rectangle data case 0x00000000: // raw rectangle data
if ((dx + w > c->width) || (dy + h > c->height)) { if ((dx + w > c->width) || (dy + h > c->height)) {
av_log(avctx, AV_LOG_ERROR, "Incorrect frame size: %ix%i+%ix%i of %ix%i\n", w, h, dx, dy, c->width, c->height); av_log(avctx, AV_LOG_ERROR,
"Incorrect frame size: %ix%i+%ix%i of %ix%i\n",
w, h, dx, dy, c->width, c->height);
return -1; return -1;
} }
if (size_left < w * h * c->bpp2) { if (size_left < w * h * c->bpp2) {
av_log(avctx, AV_LOG_ERROR, "Premature end of data! (need %i got %i)\n", w * h * c->bpp2, size_left); av_log(avctx, AV_LOG_ERROR,
"Premature end of data! (need %i got %i)\n",
w * h * c->bpp2, size_left);
return -1; return -1;
} }
paint_raw(outptr, w, h, src, c->bpp2, c->bigendian, c->pic.linesize[0]); paint_raw(outptr, w, h, src, c->bpp2, c->bigendian,
c->pic.linesize[0]);
src += w * h * c->bpp2; src += w * h * c->bpp2;
break; break;
case 0x00000005: // HexTile encoded rectangle case 0x00000005: // HexTile encoded rectangle
if ((dx + w > c->width) || (dy + h > c->height)) { if ((dx + w > c->width) || (dy + h > c->height)) {
av_log(avctx, AV_LOG_ERROR, "Incorrect frame size: %ix%i+%ix%i of %ix%i\n", w, h, dx, dy, c->width, c->height); av_log(avctx, AV_LOG_ERROR,
"Incorrect frame size: %ix%i+%ix%i of %ix%i\n",
w, h, dx, dy, c->width, c->height);
return -1; return -1;
} }
res = decode_hextile(c, outptr, src, size_left, w, h, c->pic.linesize[0]); res = decode_hextile(c, outptr, src, size_left, w, h,
c->pic.linesize[0]);
if (res < 0) if (res < 0)
return -1; return -1;
src += res; src += res;
@@ -423,9 +474,11 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
int i; int i;
// save screen data before painting cursor // save screen data before painting cursor
w = c->cur_w; w = c->cur_w;
if(c->width < c->cur_x + w) w = c->width - c->cur_x; if (c->width < c->cur_x + w)
w = c->width - c->cur_x;
h = c->cur_h; h = c->cur_h;
if(c->height < c->cur_y + h) h = c->height - c->cur_y; if (c->height < c->cur_y + h)
h = c->height - c->cur_y;
dx = c->cur_x; dx = c->cur_x;
if (dx < 0) { if (dx < 0) {
w += dx; w += dx;
@@ -439,7 +492,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
if ((w > 0) && (h > 0)) { if ((w > 0) && (h > 0)) {
outptr = c->pic.data[0] + dx * c->bpp2 + dy * c->pic.linesize[0]; outptr = c->pic.data[0] + dx * c->bpp2 + dy * c->pic.linesize[0];
for (i = 0; i < h; i++) { for (i = 0; i < h; i++) {
memcpy(c->screendta + i * c->cur_w * c->bpp2, outptr, w * c->bpp2); memcpy(c->screendta + i * c->cur_w * c->bpp2, outptr,
w * c->bpp2);
outptr += c->pic.linesize[0]; outptr += c->pic.linesize[0];
} }
outptr = c->pic.data[0]; outptr = c->pic.data[0];
@@ -454,22 +508,13 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
return buf_size; return buf_size;
} }
/*
*
* Init VMnc decoder
*
*/
static av_cold int decode_init(AVCodecContext *avctx) static av_cold int decode_init(AVCodecContext *avctx)
{ {
VmncContext * const c = avctx->priv_data; VmncContext * const c = avctx->priv_data;
c->avctx = avctx; c->avctx = avctx;
c->width = avctx->width; c->width = avctx->width;
c->height = avctx->height; c->height = avctx->height;
c->bpp = avctx->bits_per_coded_sample; c->bpp = avctx->bits_per_coded_sample;
c->bpp2 = c->bpp / 8; c->bpp2 = c->bpp / 8;
@@ -493,13 +538,6 @@ static av_cold int decode_init(AVCodecContext *avctx)
return 0; return 0;
} }
/*
*
* Uninit VMnc decoder
*
*/
static av_cold int decode_end(AVCodecContext *avctx) static av_cold int decode_end(AVCodecContext *avctx)
{ {
VmncContext * const c = avctx->priv_data; VmncContext * const c = avctx->priv_data;