[FFmpeg-cvslog] Merge commit '95a8a03a191204c3ca5c8cf6b69ab166765d5ff3'
James Almer
git at videolan.org
Sat Oct 28 03:27:30 EEST 2017
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Fri Oct 27 21:15:34 2017 -0300| [b94eda7194c2c4233d9b1c27f58098410f462fed] | committer: James Almer
Merge commit '95a8a03a191204c3ca5c8cf6b69ab166765d5ff3'
* commit '95a8a03a191204c3ca5c8cf6b69ab166765d5ff3':
Add FM Screen Capture Codec decoder
Merged-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b94eda7194c2c4233d9b1c27f58098410f462fed
---
libavcodec/fmvc.c | 76 ++++++++++++++++++++++++++++++-------------------------
1 file changed, 41 insertions(+), 35 deletions(-)
diff --git a/libavcodec/fmvc.c b/libavcodec/fmvc.c
index 74e9bdd8a0..a06b90c6fe 100644
--- a/libavcodec/fmvc.c
+++ b/libavcodec/fmvc.c
@@ -44,11 +44,11 @@ typedef struct FMVCContext {
size_t buffer_size;
uint8_t *pbuffer;
size_t pbuffer_size;
- int stride;
+ ptrdiff_t stride;
int bpp;
int yb, xb;
InterBlock *blocks;
- int nb_blocks;
+ unsigned nb_blocks;
} FMVCContext;
static int decode_type2(GetByteContext *gb, PutByteContext *pb)
@@ -150,7 +150,7 @@ static int decode_type2(GetByteContext *gb, PutByteContext *pb)
if (opcode >= 0x40) {
bytestream2_skip(gb, 1);
pos = - ((opcode >> 2) & 7) - 1 - 8 * bytestream2_get_byte(gb);
- len = (opcode >> 5) - 1;
+ len = (opcode >> 5) - 1;
bytestream2_init(&gbc, pb->buffer_start, pb->buffer_end - pb->buffer_start);
bytestream2_seek(&gbc, bytestream2_tell_p(pb) + pos, SEEK_SET);
@@ -305,7 +305,7 @@ static int decode_type1(GetByteContext *gb, PutByteContext *pb)
break;
opcode = bytestream2_get_byte(gb);
if (opcode < 0xF8) {
- opcode = opcode + 32;
+ opcode += 32;
break;
}
i = opcode - 0xF8;
@@ -393,9 +393,8 @@ static int decode_type1(GetByteContext *gb, PutByteContext *pb)
return 0;
}
-static int decode_frame(AVCodecContext *avctx,
- void *data, int *got_frame,
- AVPacket *avpkt)
+static int decode_frame(AVCodecContext *avctx, void *data,
+ int *got_frame, AVPacket *avpkt)
{
FMVCContext *s = avctx->priv_data;
GetByteContext *gb = &s->gb;
@@ -414,7 +413,7 @@ static int decode_frame(AVCodecContext *avctx,
if (frame->key_frame) {
const uint8_t *src;
- int type, size;
+ unsigned type, size;
uint8_t *dst;
type = bytestream2_get_le16(gb);
@@ -428,7 +427,7 @@ static int decode_frame(AVCodecContext *avctx,
} else if (type == 2){
decode_type2(gb, pb);
} else {
- avpriv_report_missing_feature(avctx, "compression %d", type);
+ avpriv_report_missing_feature(avctx, "Compression type %d", type);
return AVERROR_PATCHWELCOME;
}
@@ -440,7 +439,8 @@ static int decode_frame(AVCodecContext *avctx,
src += s->stride * 4;
}
} else {
- int block, nb_blocks, type, k, l;
+ unsigned block, nb_blocks;
+ int type, k, l;
uint8_t *ssrc, *ddst;
const uint32_t *src;
uint32_t *dst;
@@ -456,7 +456,8 @@ static int decode_frame(AVCodecContext *avctx,
type = bytestream2_get_le16(gb);
for (block = 0; block < nb_blocks; block++) {
- int size, offset, start = 0;
+ unsigned size, offset;
+ int start = 0;
offset = bytestream2_get_le16(gb);
if (offset >= s->nb_blocks)
@@ -472,7 +473,7 @@ static int decode_frame(AVCodecContext *avctx,
} else if (type == 2){
decode_type2(gb, pb);
} else {
- avpriv_report_missing_feature(avctx, "compression %d", type);
+ avpriv_report_missing_feature(avctx, "Compression type %d", type);
return AVERROR_PATCHWELCOME;
}
@@ -497,9 +498,8 @@ static int decode_frame(AVCodecContext *avctx,
if (s->blocks[block].xor) {
for (k = 0; k < block_h; k++) {
uint32_t *column = dst;
- for (l = 0; l < block_w; l++) {
+ for (l = 0; l < block_w; l++)
*dst++ ^= *src++;
- }
dst = &column[s->stride];
}
}
@@ -529,17 +529,24 @@ static av_cold int decode_init(AVCodecContext *avctx)
int i, j, m, block = 0, h = BLOCK_HEIGHT, w = BLOCK_WIDTH;
switch (avctx->bits_per_coded_sample) {
- case 16: avctx->pix_fmt = AV_PIX_FMT_RGB555; break;
- case 24: avctx->pix_fmt = AV_PIX_FMT_BGR24; break;
- case 32: avctx->pix_fmt = AV_PIX_FMT_BGRA; break;
+ case 16:
+ avctx->pix_fmt = AV_PIX_FMT_RGB555;
+ break;
+ case 24:
+ avctx->pix_fmt = AV_PIX_FMT_BGR24;
+ break;
+ case 32:
+ avctx->pix_fmt = AV_PIX_FMT_BGRA;
+ break;
default:
- av_log(avctx, AV_LOG_ERROR, "Unsupported bitdepth %i\n", avctx->bits_per_coded_sample);
+ av_log(avctx, AV_LOG_ERROR, "Unsupported bitdepth %i\n",
+ avctx->bits_per_coded_sample);
return AVERROR_INVALIDDATA;
}
s->stride = (avctx->width * avctx->bits_per_coded_sample + 31) / 32;
- s->xb = s->stride / BLOCK_WIDTH;
- m = s->stride % BLOCK_WIDTH;
+ s->xb = s->stride / BLOCK_WIDTH;
+ m = s->stride % BLOCK_WIDTH;
if (m) {
if (m < 37) {
w = m + BLOCK_WIDTH;
@@ -550,7 +557,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
}
s->yb = avctx->height / BLOCK_HEIGHT;
- m = avctx->height % BLOCK_HEIGHT;
+ m = avctx->height % BLOCK_HEIGHT;
if (m) {
if (m < 49) {
h = m + BLOCK_HEIGHT;
@@ -563,8 +570,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
s->nb_blocks = s->xb * s->yb;
if (!s->nb_blocks)
return AVERROR_INVALIDDATA;
-
- s->blocks = av_calloc(s->nb_blocks, sizeof(*s->blocks));
+ s->blocks = av_calloc(s->nb_blocks, sizeof(*s->blocks));
if (!s->blocks)
return AVERROR(ENOMEM);
@@ -572,32 +578,32 @@ static av_cold int decode_init(AVCodecContext *avctx)
for (j = 0; j < s->xb; j++) {
if (i != (s->yb - 1) || j != (s->xb - 1)) {
if (i == s->yb - 1) {
- s->blocks[block].w = BLOCK_WIDTH;
- s->blocks[block].h = h;
+ s->blocks[block].w = BLOCK_WIDTH;
+ s->blocks[block].h = h;
s->blocks[block].size = BLOCK_WIDTH * h;
} else if (j == s->xb - 1) {
- s->blocks[block].w = w;
- s->blocks[block].h = BLOCK_HEIGHT;
+ s->blocks[block].w = w;
+ s->blocks[block].h = BLOCK_HEIGHT;
s->blocks[block].size = BLOCK_HEIGHT * w;
} else {
- s->blocks[block].w = BLOCK_WIDTH;
- s->blocks[block].h = BLOCK_HEIGHT;
+ s->blocks[block].w = BLOCK_WIDTH;
+ s->blocks[block].h = BLOCK_HEIGHT;
s->blocks[block].size = BLOCK_WIDTH * BLOCK_HEIGHT;
}
} else {
- s->blocks[block].w = w;
- s->blocks[block].h = h;
+ s->blocks[block].w = w;
+ s->blocks[block].h = h;
s->blocks[block].size = w * h;
}
block++;
}
}
- s->bpp = avctx->bits_per_coded_sample >> 3;
- s->buffer_size = avctx->width * avctx->height * 4;
+ s->bpp = avctx->bits_per_coded_sample >> 3;
+ s->buffer_size = avctx->width * avctx->height * 4;
s->pbuffer_size = avctx->width * avctx->height * 4;
- s->buffer = av_mallocz(s->buffer_size);
- s->pbuffer = av_mallocz(s->pbuffer_size);
+ s->buffer = av_mallocz(s->buffer_size);
+ s->pbuffer = av_mallocz(s->pbuffer_size);
if (!s->buffer || !s->pbuffer)
return AVERROR(ENOMEM);
======================================================================
diff --cc libavcodec/fmvc.c
index 74e9bdd8a0,64136e392d..a06b90c6fe
--- a/libavcodec/fmvc.c
+++ b/libavcodec/fmvc.c
@@@ -437,10 -436,11 +436,11 @@@ static int decode_frame(AVCodecContext
for (y = 0; y < avctx->height; y++) {
memcpy(dst, src, avctx->width * s->bpp);
dst -= frame->linesize[0];
- src += avctx->width * s->bpp;
+ src += s->stride * 4;
}
} else {
- int block, nb_blocks, type, k, l;
+ unsigned block, nb_blocks;
+ int type, k, l;
uint8_t *ssrc, *ddst;
const uint32_t *src;
uint32_t *dst;
@@@ -456,10 -456,11 +456,11 @@@
type = bytestream2_get_le16(gb);
for (block = 0; block < nb_blocks; block++) {
- int size, offset, start = 0;
+ unsigned size, offset;
+ int start = 0;
offset = bytestream2_get_le16(gb);
- if (offset > s->nb_blocks)
+ if (offset >= s->nb_blocks)
return AVERROR_INVALIDDATA;
size = bytestream2_get_le16(gb);
@@@ -563,8 -570,7 +570,7 @@@ static av_cold int decode_init(AVCodecC
s->nb_blocks = s->xb * s->yb;
if (!s->nb_blocks)
return AVERROR_INVALIDDATA;
-
- s->blocks = av_calloc(s->nb_blocks, sizeof(*s->blocks));
- s->blocks = av_mallocz(s->nb_blocks * sizeof(*s->blocks));
++ s->blocks = av_calloc(s->nb_blocks, sizeof(*s->blocks));
if (!s->blocks)
return AVERROR(ENOMEM);
@@@ -593,11 -599,11 +599,11 @@@
}
}
- s->bpp = avctx->bits_per_coded_sample >> 3;
- s->buffer_size = avctx->width * avctx->height * 4;
+ s->bpp = avctx->bits_per_coded_sample >> 3;
+ s->buffer_size = avctx->width * avctx->height * 4;
s->pbuffer_size = avctx->width * avctx->height * 4;
- s->buffer = av_mallocz(s->buffer_size);
- s->pbuffer = av_mallocz(s->pbuffer_size);
- s->buffer = av_malloc(s->buffer_size);
- s->pbuffer = av_malloc(s->pbuffer_size);
++ s->buffer = av_mallocz(s->buffer_size);
++ s->pbuffer = av_mallocz(s->pbuffer_size);
if (!s->buffer || !s->pbuffer)
return AVERROR(ENOMEM);
More information about the ffmpeg-cvslog
mailing list