X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fvmnc.c;h=b1c4cbd1b78ee5c99cdd01087630ea402f1b0faf;hb=ddcf67c8a51c67b122a826d8b5819e96d591d813;hp=739962a38213e41e399838a09b5d5f6428afd929;hpb=429914a330b17833adefcb1fbb9d07f0e858b1d5;p=ffmpeg diff --git a/libavcodec/vmnc.c b/libavcodec/vmnc.c index 739962a3821..b1c4cbd1b78 100644 --- a/libavcodec/vmnc.c +++ b/libavcodec/vmnc.c @@ -2,24 +2,25 @@ * VMware Screen Codec (VMnc) decoder * Copyright (c) 2006 Konstantin Shishkov * - * This library is free software; you can redistribute it and/or + * This file is part of Libav. + * + * Libav is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, + * Libav is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ /** - * @file vmnc.c + * @file * VMware Screen Codec (VMnc) decoder * As Alex Beregszaszi discovered, this is effectively RFB data dump */ @@ -27,7 +28,7 @@ #include #include -#include "common.h" +#include "libavutil/intreadwrite.h" #include "avcodec.h" enum EncTypes { @@ -70,19 +71,19 @@ typedef struct VmncContext { } VmncContext; /* read pixel value from stream */ -static always_inline int vmnc_get_pixel(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 LE_16(buf); - case 5: return BE_16(buf); - case 8: return LE_32(buf); - case 9: return BE_32(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; } } -static void load_cursor(VmncContext *c, uint8_t *src) +static void load_cursor(VmncContext *c, const uint8_t *src) { int i, j, p; const int bpp = c->bpp2; @@ -115,7 +116,7 @@ static void load_cursor(VmncContext *c, uint8_t *src) static void put_cursor(uint8_t *dst, int stride, VmncContext *c, int dx, int dy) { - int i, j, t; + 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; @@ -169,8 +170,8 @@ static void put_cursor(uint8_t *dst, int stride, VmncContext *c, int dx, int dy) } } -/* fill rectangle with given colour */ -static always_inline void paint_rect(uint8_t *dst, int dx, int dy, int w, int h, int color, int bpp, int stride) +/* 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) { int i, j; dst += dx * bpp + dy * stride; @@ -200,7 +201,7 @@ static always_inline void paint_rect(uint8_t *dst, int dx, int dy, int w, int h, } } -static always_inline void paint_raw(uint8_t *dst, int w, int h, 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++) { @@ -223,14 +224,14 @@ static always_inline void paint_raw(uint8_t *dst, int w, int h, uint8_t* src, in } } -static int decode_hextile(VmncContext *c, uint8_t* dst, 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; const int bpp = c->bpp2; uint8_t *dst2; int bw = 16, bh = 16; - uint8_t *ssrc=src; + const uint8_t *ssrc=src; for(j = 0; j < h; j += 16) { dst2 = dst; @@ -283,11 +284,13 @@ static int decode_hextile(VmncContext *c, uint8_t* dst, uint8_t* src, int ssize, return src - ssrc; } -static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size) +static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt) { - VmncContext * const c = (VmncContext *)avctx->priv_data; + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; + VmncContext * const c = avctx->priv_data; uint8_t *outptr; - uint8_t *src = buf; + const uint8_t *src = buf; int dx, dy, w, h, depth, enc, chunks, res, size_left; c->pic.reference = 1; @@ -298,7 +301,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 } c->pic.key_frame = 0; - c->pic.pict_type = FF_P_TYPE; + c->pic.pict_type = AV_PICTURE_TYPE_P; //restore screen after cursor if(c->screendta) { @@ -326,13 +329,13 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 } } src += 2; - chunks = BE_16(src); src += 2; + chunks = AV_RB16(src); src += 2; while(chunks--) { - dx = BE_16(src); src += 2; - dy = BE_16(src); src += 2; - w = BE_16(src); src += 2; - h = BE_16(src); src += 2; - enc = BE_32(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 = c->pic.data[0] + dx * c->bpp2 + dy * c->pic.linesize[0]; size_left = buf_size - (src - buf); switch(enc) { @@ -371,7 +374,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 break; case MAGIC_WMVi: // ServerInitialization struct c->pic.key_frame = 1; - c->pic.pict_type = FF_I_TYPE; + c->pic.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); @@ -456,21 +459,16 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 * Init VMnc decoder * */ -static int decode_init(AVCodecContext *avctx) +static av_cold int decode_init(AVCodecContext *avctx) { - VmncContext * const c = (VmncContext *)avctx->priv_data; + VmncContext * const c = avctx->priv_data; c->avctx = avctx; - avctx->has_b_frames = 0; - c->pic.data[0] = NULL; c->width = avctx->width; c->height = avctx->height; - if (avcodec_check_dimensions(avctx, avctx->width, avctx->height) < 0) { - return 1; - } - c->bpp = avctx->bits_per_sample; + c->bpp = avctx->bits_per_coded_sample; c->bpp2 = c->bpp/8; switch(c->bpp){ @@ -485,6 +483,7 @@ static int decode_init(AVCodecContext *avctx) break; default: av_log(avctx, AV_LOG_ERROR, "Unsupported bitdepth %i\n", c->bpp); + return AVERROR_INVALIDDATA; } return 0; @@ -497,9 +496,9 @@ static int decode_init(AVCodecContext *avctx) * Uninit VMnc decoder * */ -static int decode_end(AVCodecContext *avctx) +static av_cold int decode_end(AVCodecContext *avctx) { - VmncContext * const c = (VmncContext *)avctx->priv_data; + VmncContext * const c = avctx->priv_data; if (c->pic.data[0]) avctx->release_buffer(avctx, &c->pic); @@ -510,14 +509,14 @@ static int decode_end(AVCodecContext *avctx) return 0; } -AVCodec vmnc_decoder = { - "VMware video", - CODEC_TYPE_VIDEO, - CODEC_ID_VMNC, - sizeof(VmncContext), - decode_init, - NULL, - decode_end, - decode_frame +AVCodec ff_vmnc_decoder = { + .name = "vmnc", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_VMNC, + .priv_data_size = sizeof(VmncContext), + .init = decode_init, + .close = decode_end, + .decode = decode_frame, + .capabilities = CODEC_CAP_DR1, + .long_name = NULL_IF_CONFIG_SMALL("VMware Screen Codec / VMware Video"), }; -