openharmony/third_party_ffmpeg
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_ffmpeg synced 2024-11-23 19:30:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit 'a66aa0daf290ef157cb3322b034b43d6201c43e9'

Browse Source 
* commit 'a66aa0daf290ef157cb3322b034b43d6201c43e9':
  vmnc: K&R formatting cosmetics

Conflicts:
	libavcodec/vmnc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-10-10 09:04:22 +02:00
commit 7824b5f6f5
1 changed files with 196 additions and 158 deletions
Show Stats 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;
/* 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) {
case 2:
case 3: return *buf;
case 4: return AV_RL16(buf);
case 5: return AV_RB16(buf);
case 8: return AV_RL32(buf);
case 9: return AV_RB32(buf);
default: return 0;
case 3:
return *buf;
case 4:
return AV_RL16(buf);
case 5:
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++) {
p = vmnc_get_pixel(src, bpp, c->bigendian);
src += bpp;
if(bpp == 1) *dst8++ = p;
if(bpp == 2) *dst16++ = p;
if(bpp == 4) *dst32++ = p;
if (bpp == 1)
*dst8++ = p;
if (bpp == 2)
*dst16++ = p;
if (bpp == 4)
*dst32++ = p;
}
}
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++) {
p = vmnc_get_pixel(src, bpp, c->bigendian);
src += bpp;
if(bpp == 1) *dst8++ = p;
if(bpp == 2) *dst16++ = p;
if(bpp == 4) *dst32++ = p;
if (bpp == 1)
*dst8++ = 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 w, h, x, y;
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;
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;
y = c->cur_y;
if (x < 0) {
@ -135,7 +150,8 @@ static void put_cursor(uint8_t *dst, int stride, VmncContext *c, int dx, int dy)
y = 0;
}
if((w < 1) || (h < 1)) return;
if ((w < 1) || (h < 1))
return;
dst += x * c->bpp2 + y * stride;
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 */
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;
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;
for (j = 0; j < h; j++) {
dst2 = (uint16_t*)dst;
for(i = 0; i < w; i++) {
for (i = 0; i < w; i++)
*dst2++ = color;
}
dst += stride;
}
} else if (bpp == 4) {
uint32_t *dst2;
for (j = 0; j < h; j++) {
dst2 = (uint32_t*)dst;
for(i = 0; i < w; i++) {
for (i = 0; i < w; i++)
dst2[i] = color;
}
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;
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 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) {
dst2 = dst;
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) {
if (src - ssrc >= ssize) {
av_log(c->avctx, AV_LOG_ERROR, "Premature end of data!\n");
return -1;
}
if(i + 16 > w) bw = w - i;
if (i + 16 > w)
bw = w - i;
flags = *src++;
if (flags & HT_RAW) {
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;
} else {
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) {
fg = vmnc_get_pixel(src, bpp, c->bigendian); src += bpp;
fg = vmnc_get_pixel(src, bpp, c->bigendian);
src += bpp;
}
rects = 0;
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++) {
if (color) {
fg = vmnc_get_pixel(src, bpp, c->bigendian); src += bpp;
fg = vmnc_get_pixel(src, bpp, c->bigendian);
src += bpp;
}
xy = *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);
}
}
}
@ -307,9 +332,11 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
if (c->screendta) {
int i;
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;
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;
if (dx < 0) {
w += dx;
@ -323,23 +350,30 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
if ((w > 0) && (h > 0)) {
outptr = frame->data[0] + dx * c->bpp2 + dy * frame->linesize[0];
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 += frame->linesize[0];
}
}
}
src += 2;
chunks = AV_RB16(src); src += 2;
chunks = AV_RB16(src);
src += 2;
while (chunks--) {
if (buf_size - (src - buf) < 12) {
av_log(avctx, AV_LOG_ERROR, "Premature end of data!\n");
return -1;
}
dx = AV_RB16(src); src += 2;
dy = AV_RB16(src); src += 2;
w = AV_RB16(src); src += 2;
h = AV_RB16(src); src += 2;
enc = AV_RB32(src); src += 4;
dx = AV_RB16(src);
src += 2;
dy = AV_RB16(src);
src += 2;
w = AV_RB16(src);
src += 2;
h = AV_RB16(src);
src += 2;
enc = AV_RB32(src);
src += 4;
outptr = frame->data[0] + dx * c->bpp2 + dy * frame->linesize[0];
size_left = buf_size - (src - buf);
switch (enc) {
@ -349,7 +383,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
return AVERROR_INVALIDDATA;
}
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;
}
src += 2;
@ -358,7 +394,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
c->cur_hx = dx;
c->cur_hy = dy;
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->curbits = av_realloc_f(c->curbits, c->cur_w * c->cur_h, c->bpp2);
@ -387,12 +426,16 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
frame->pict_type = AV_PICTURE_TYPE_I;
depth = *src++;
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++;
c->bigendian = *src++;
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;
}
// skip the rest of pixel format data
@ -403,22 +446,30 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
break;
case 0x00000000: // raw rectangle data
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;
}
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;
}
paint_raw(outptr, w, h, src, c->bpp2, c->bigendian, frame->linesize[0]);
paint_raw(outptr, w, h, src, c->bpp2, c->bigendian,
frame->linesize[0]);
src += w * h * c->bpp2;
break;
case 0x00000005: // HexTile encoded rectangle
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;
}
res = decode_hextile(c, outptr, src, size_left, w, h, frame->linesize[0]);
res = decode_hextile(c, outptr, src, size_left, w, h,
frame->linesize[0]);
if (res < 0)
return -1;
src += res;
@ -432,9 +483,11 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
int i;
// save screen data before painting cursor
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;
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;
if (dx < 0) {
w += dx;
@ -448,7 +501,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
if ((w > 0) && (h > 0)) {
outptr = frame->data[0] + dx * c->bpp2 + dy * frame->linesize[0];
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 += frame->linesize[0];
}
outptr = frame->data[0];
@ -463,22 +517,13 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
return buf_size;
}
/*
*
* Init VMnc decoder
*
*/
static av_cold int decode_init(AVCodecContext *avctx)
{
VmncContext * const c = avctx->priv_data;
c->avctx = avctx;
c->width = avctx->width;
c->height = avctx->height;
c->bpp = avctx->bits_per_coded_sample;
c->bpp2 = c->bpp / 8;
@ -504,13 +549,6 @@ static av_cold int decode_init(AVCodecContext *avctx)
return 0;
}
/*
*
* Uninit VMnc decoder
*
*/
static av_cold int decode_end(AVCodecContext *avctx)
{
VmncContext * const c = avctx->priv_data;