mirror of https://github.com/FFmpeg/FFmpeg.git
Reviewed-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Peter Ross <pross@xvid.org>pull/388/head
Peter Ross
2 years ago
parent
d93e29154f
commit
23758380d0
14 changed files with 205 additions and 4 deletions
@ -0,0 +1,92 @@ |
||||
/*
|
||||
* WBMP (Wireless Application Protocol Bitmap) image |
||||
* |
||||
* This file is part of FFmpeg. |
||||
* |
||||
* FFmpeg 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.1 of the License, or (at your option) any later version. |
||||
* |
||||
* FFmpeg 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 FFmpeg; if not, write to the Free Software |
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
||||
*/ |
||||
|
||||
#include "avcodec.h" |
||||
#include "bytestream.h" |
||||
#include "codec_internal.h" |
||||
#include "internal.h" |
||||
#include "thread.h" |
||||
|
||||
static unsigned int getv(GetByteContext * gb) |
||||
{ |
||||
int i; |
||||
unsigned int v = 0; |
||||
|
||||
do { |
||||
i = bytestream2_get_byte(gb); |
||||
v = (v << 7) | (i & 0x7F); |
||||
} while (i & 0x80); |
||||
return v; |
||||
} |
||||
|
||||
static void readbits(uint8_t * dst, int width, int height, int linesize, const uint8_t * src, int size) |
||||
{ |
||||
int wpad = (width + 7) / 8; |
||||
for (int j = 0; j < height && size > 0; j++) { |
||||
memcpy(dst, src, FFMIN(wpad, size)); |
||||
src += wpad; |
||||
size -= wpad; |
||||
dst += linesize; |
||||
} |
||||
} |
||||
|
||||
static int wbmp_decode_frame(AVCodecContext *avctx, AVFrame *p, |
||||
int *got_frame, AVPacket *avpkt) |
||||
{ |
||||
const uint8_t *buf = avpkt->data; |
||||
int buf_size = avpkt->size, width, height, ret; |
||||
GetByteContext gb; |
||||
|
||||
bytestream2_init(&gb, buf, buf_size); |
||||
|
||||
if (getv(&gb)) |
||||
return AVERROR_INVALIDDATA; |
||||
bytestream2_skip(&gb, 1); |
||||
width = getv(&gb); |
||||
height = getv(&gb); |
||||
|
||||
if ((ret = ff_set_dimensions(avctx, width, height)) < 0) |
||||
return ret; |
||||
|
||||
avctx->pix_fmt = AV_PIX_FMT_MONOBLACK; |
||||
if ((ret = ff_thread_get_buffer(avctx, p, 0)) < 0) |
||||
return ret; |
||||
|
||||
if (p->linesize[0] == (width + 7) / 8) |
||||
bytestream2_get_buffer(&gb, p->data[0], height * ((width + 7) / 8)); |
||||
else |
||||
readbits(p->data[0], width, height, p->linesize[0], gb.buffer, gb.buffer_end - gb.buffer_start); |
||||
|
||||
p->key_frame = 1; |
||||
p->pict_type = AV_PICTURE_TYPE_I; |
||||
|
||||
*got_frame = 1; |
||||
|
||||
return buf_size; |
||||
} |
||||
|
||||
const FFCodec ff_wbmp_decoder = { |
||||
.p.name = "wbmp", |
||||
.p.long_name = NULL_IF_CONFIG_SMALL("WBMP (Wireless Application Protocol Bitmap) image"), |
||||
.p.type = AVMEDIA_TYPE_VIDEO, |
||||
.p.id = AV_CODEC_ID_WBMP, |
||||
.p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, |
||||
FF_CODEC_DECODE_CB(wbmp_decode_frame), |
||||
}; |
||||
@ -0,0 +1,89 @@ |
||||
/*
|
||||
* WBMP (Wireless Application Protocol Bitmap) image |
||||
* |
||||
* This file is part of FFmpeg. |
||||
* |
||||
* FFmpeg 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.1 of the License, or (at your option) any later version. |
||||
* |
||||
* FFmpeg 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 FFmpeg; if not, write to the Free Software |
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
||||
*/ |
||||
|
||||
#include "avcodec.h" |
||||
#include "bytestream.h" |
||||
#include "codec_internal.h" |
||||
#include "encode.h" |
||||
|
||||
static void putv(uint8_t ** bufp, unsigned int v) |
||||
{ |
||||
unsigned int vv = 0; |
||||
int n = 0; |
||||
|
||||
while (vv != v) |
||||
vv += v & (0x7F << 7 * n++); |
||||
|
||||
while (--n > 0) |
||||
bytestream_put_byte(bufp, 0x80 | (v & (0x7F << 7 * n)) >> 7 * n); |
||||
|
||||
bytestream_put_byte(bufp, v & 0x7F); |
||||
} |
||||
|
||||
static void writebits(uint8_t ** bufp, const uint8_t * src, int width, int height, int linesize) |
||||
{ |
||||
int wpad = (width + 7) / 8; |
||||
for (int j = 0; j < height; j++) { |
||||
memcpy(*bufp, src, wpad); |
||||
*bufp += wpad; |
||||
src += linesize; |
||||
} |
||||
} |
||||
|
||||
static int wbmp_encode_frame(AVCodecContext *avctx, AVPacket *pkt, |
||||
const AVFrame *frame, int *got_packet) |
||||
{ |
||||
int64_t size = avctx->height * ((avctx->width + 7) / 8) + 32; |
||||
uint8_t *buf; |
||||
int ret; |
||||
|
||||
if ((ret = ff_get_encode_buffer(avctx, pkt, size, 0)) < 0) |
||||
return ret; |
||||
|
||||
buf = pkt->data; |
||||
|
||||
putv(&buf, 0); |
||||
bytestream_put_byte(&buf, 0); |
||||
putv(&buf, avctx->width); |
||||
putv(&buf, avctx->height); |
||||
|
||||
if (frame->linesize[0] == (avctx->width + 7) / 8) |
||||
bytestream_put_buffer(&buf, frame->data[0], avctx->height * ((avctx->width + 7) / 8)); |
||||
else |
||||
writebits(&buf, frame->data[0], avctx->width, avctx->height, frame->linesize[0]); |
||||
|
||||
av_shrink_packet(pkt, buf - pkt->data); |
||||
|
||||
*got_packet = 1; |
||||
return 0; |
||||
} |
||||
|
||||
const FFCodec ff_wbmp_encoder = { |
||||
.p.name = "wbmp", |
||||
.p.long_name = NULL_IF_CONFIG_SMALL("WBMP (Wireless Application Protocol Bitmap) image"), |
||||
.p.type = AVMEDIA_TYPE_VIDEO, |
||||
.p.id = AV_CODEC_ID_WBMP, |
||||
.p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, |
||||
FF_CODEC_ENCODE_CB(wbmp_encode_frame), |
||||
.p.pix_fmts = (const enum AVPixelFormat[]){ |
||||
AV_PIX_FMT_MONOBLACK, |
||||
AV_PIX_FMT_NONE |
||||
}, |
||||
}; |
||||
@ -0,0 +1,3 @@ |
||||
ebe2a887bd3098ac50502063257b4275 *tests/data/images/wbmp/02.wbmp |
||||
12678 tests/data/images/wbmp/02.wbmp |
||||
tests/data/images/wbmp/%02d.wbmp CRC=0xab19200d |
||||
Loading…
Reference in new issue