aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/vmnc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-17 02:09:29 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-07 03:31:57 +0100
commitdcb91e3dfe077c3ac0717b24288834d851312e04 (patch)
tree53951ccfd471f0a81fb1b7452006d4bb25403ae2 /libavcodec/vmnc.c
parentbfe4aa892a53a7586b5e51211171e61c4b5c461c (diff)
downloadandroid_external_ffmpeg-dcb91e3dfe077c3ac0717b24288834d851312e04.tar.gz
android_external_ffmpeg-dcb91e3dfe077c3ac0717b24288834d851312e04.tar.bz2
android_external_ffmpeg-dcb91e3dfe077c3ac0717b24288834d851312e04.zip
Merge commit '3c8ea9d4a74fd4d7493d40c818ca64ee492709f3'
* commit '3c8ea9d4a74fd4d7493d40c818ca64ee492709f3': vmnc: use the AVFrame API properly. xan: use the AVFrame API properly. xxan: use the AVFrame API properly. zerocodec: use the AVFrame API properly. Conflicts: libavcodec/vmnc.c libavcodec/xan.c libavcodec/xxan.c See: cf5ab8b6f71699a48a6384d5e5779630b4be7b56 See: ad438f450b83882a1277a79c1c3d6dfe55573b1c See: 67607e20e882eb5639a4e9099caecb52a863ab68 Merged-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 8af7774c7aca6f3b595d0417b92f543ce0c7b537) Author of the merged code: Anton Khirnov Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vmnc.c')
-rw-r--r--libavcodec/vmnc.c39
1 files changed, 19 insertions, 20 deletions
diff --git a/libavcodec/vmnc.c b/libavcodec/vmnc.c
index c1b6d4e85d..5f91ab1b31 100644
--- a/libavcodec/vmnc.c
+++ b/libavcodec/vmnc.c
@@ -57,7 +57,7 @@ enum HexTile_Flags {
*/
typedef struct VmncContext {
AVCodecContext *avctx;
- AVFrame *frame;
+ AVFrame *pic;
int bpp;
int bpp2;
@@ -320,15 +320,14 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
GetByteContext *gb = &c->gb;
uint8_t *outptr;
int dx, dy, w, h, depth, enc, chunks, res, size_left, ret;
- AVFrame *frame = c->frame;
- if ((ret = ff_reget_buffer(avctx, frame)) < 0)
+ if ((ret = ff_reget_buffer(avctx, c->pic)) < 0)
return ret;
bytestream2_init(gb, buf, buf_size);
- frame->key_frame = 0;
- frame->pict_type = AV_PICTURE_TYPE_P;
+ c->pic->key_frame = 0;
+ c->pic->pict_type = AV_PICTURE_TYPE_P;
// restore screen after cursor
if (c->screendta) {
@@ -350,11 +349,11 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
dy = 0;
}
if ((w > 0) && (h > 0)) {
- outptr = frame->data[0] + dx * c->bpp2 + dy * frame->linesize[0];
+ outptr = c->pic->data[0] + dx * c->bpp2 + dy * c->pic->linesize[0];
for (i = 0; i < h; i++) {
memcpy(outptr, c->screendta + i * c->cur_w * c->bpp2,
w * c->bpp2);
- outptr += frame->linesize[0];
+ outptr += c->pic->linesize[0];
}
}
}
@@ -370,7 +369,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
w = bytestream2_get_be16(gb);
h = bytestream2_get_be16(gb);
enc = bytestream2_get_be32(gb);
- outptr = frame->data[0] + dx * c->bpp2 + dy * frame->linesize[0];
+ outptr = c->pic->data[0] + dx * c->bpp2 + dy * c->pic->linesize[0];
size_left = bytestream2_get_bytes_left(gb);
switch (enc) {
case MAGIC_WMVd: // cursor
@@ -424,8 +423,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
bytestream2_skip(gb, 4);
break;
case MAGIC_WMVi: // ServerInitialization struct
- frame->key_frame = 1;
- frame->pict_type = AV_PICTURE_TYPE_I;
+ c->pic->key_frame = 1;
+ c->pic->pict_type = AV_PICTURE_TYPE_I;
depth = bytestream2_get_byte(gb);
if (depth != c->bpp) {
av_log(avctx, AV_LOG_INFO,
@@ -460,7 +459,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
return AVERROR_INVALIDDATA;
}
paint_raw(outptr, w, h, gb, c->bpp2, c->bigendian,
- frame->linesize[0]);
+ c->pic->linesize[0]);
break;
case 0x00000005: // HexTile encoded rectangle
if ((dx + w > c->width) || (dy + h > c->height)) {
@@ -469,7 +468,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
w, h, dx, dy, c->width, c->height);
return AVERROR_INVALIDDATA;
}
- res = decode_hextile(c, outptr, gb, w, h, frame->linesize[0]);
+ res = decode_hextile(c, outptr, gb, w, h, c->pic->linesize[0]);
if (res < 0)
return res;
break;
@@ -498,18 +497,18 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
dy = 0;
}
if ((w > 0) && (h > 0)) {
- outptr = frame->data[0] + dx * c->bpp2 + dy * frame->linesize[0];
+ outptr = c->pic->data[0] + dx * c->bpp2 + dy * c->pic->linesize[0];
for (i = 0; i < h; i++) {
memcpy(c->screendta + i * c->cur_w * c->bpp2, outptr,
w * c->bpp2);
- outptr += frame->linesize[0];
+ outptr += c->pic->linesize[0];
}
- outptr = frame->data[0];
- put_cursor(outptr, frame->linesize[0], c, c->cur_x, c->cur_y);
+ outptr = c->pic->data[0];
+ put_cursor(outptr, c->pic->linesize[0], c, c->cur_x, c->cur_y);
}
}
*got_frame = 1;
- if ((ret = av_frame_ref(data, frame)) < 0)
+ if ((ret = av_frame_ref(data, c->pic)) < 0)
return ret;
/* always report that the buffer was completely consumed */
@@ -541,8 +540,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
return AVERROR_INVALIDDATA;
}
- c->frame = av_frame_alloc();
- if (!c->frame)
+ c->pic = av_frame_alloc();
+ if (!c->pic)
return AVERROR(ENOMEM);
return 0;
@@ -552,7 +551,7 @@ static av_cold int decode_end(AVCodecContext *avctx)
{
VmncContext * const c = avctx->priv_data;
- av_frame_free(&c->frame);
+ av_frame_free(&c->pic);
av_freep(&c->curbits);
av_freep(&c->curmask);