mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
eatgv: cosmetics, reformat
This commit is contained in:
Anton Khirnov
parent
ade402804a
commit
4b7598e2fe
@ -50,11 +50,12 @@ typedef struct TgvContext {
|
||||
int num_blocks_packed; ///< current length of block_codebook
|
||||
} TgvContext;
|
||||
|
||||
static av_cold int tgv_decode_init(AVCodecContext *avctx){
|
||||
static av_cold int tgv_decode_init(AVCodecContext *avctx)
|
||||
{
|
||||
TgvContext *s = avctx->priv_data;
|
||||
s->avctx = avctx;
|
||||
s->avctx = avctx;
|
||||
avctx->time_base = (AVRational){1, 15};
|
||||
avctx->pix_fmt = AV_PIX_FMT_PAL8;
|
||||
avctx->pix_fmt = AV_PIX_FMT_PAL8;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -62,7 +63,9 @@ static av_cold int tgv_decode_init(AVCodecContext *avctx){
|
||||
* Unpack buffer
|
||||
* @return 0 on success, -1 on critical buffer underflow
|
||||
*/
|
||||
static int unpack(const uint8_t *src, const uint8_t *src_end, unsigned char *dst, int width, int height) {
|
||||
static int unpack(const uint8_t *src, const uint8_t *src_end,
|
||||
unsigned char *dst, int width, int height)
|
||||
{
|
||||
unsigned char *dst_end = dst + width*height;
|
||||
int size, size1, size2, offset, run;
|
||||
unsigned char *dst_start = dst;
|
||||
@ -72,57 +75,57 @@ static int unpack(const uint8_t *src, const uint8_t *src_end, unsigned char *dst
|
||||
else
|
||||
src += 2;
|
||||
|
||||
if (src+3>src_end)
|
||||
if (src + 3 > src_end)
|
||||
return AVERROR_INVALIDDATA;
|
||||
size = AV_RB24(src);
|
||||
src += 3;
|
||||
|
||||
while(size>0 && src<src_end) {
|
||||
while (size > 0 && src < src_end) {
|
||||
|
||||
/* determine size1 and size2 */
|
||||
size1 = (src[0] & 3);
|
||||
if ( src[0] & 0x80 ) { // 1
|
||||
if (src[0] & 0x80) { // 1
|
||||
if (src[0] & 0x40 ) { // 11
|
||||
if ( src[0] & 0x20 ) { // 111
|
||||
if ( src[0] < 0xFC ) // !(111111)
|
||||
if (src[0] & 0x20) { // 111
|
||||
if (src[0] < 0xFC) // !(111111)
|
||||
size1 = (((src[0] & 31) + 1) << 2);
|
||||
src++;
|
||||
size2 = 0;
|
||||
} else { // 110
|
||||
offset = ((src[0] & 0x10) << 12) + AV_RB16(&src[1]) + 1;
|
||||
size2 = ((src[0] & 0xC) << 6) + src[3] + 5;
|
||||
src += 4;
|
||||
size2 = ((src[0] & 0xC) << 6) + src[3] + 5;
|
||||
src += 4;
|
||||
}
|
||||
} else { // 10
|
||||
size1 = ( ( src[1] & 0xC0) >> 6 );
|
||||
size1 = ((src[1] & 0xC0) >> 6);
|
||||
offset = (AV_RB16(&src[1]) & 0x3FFF) + 1;
|
||||
size2 = (src[0] & 0x3F) + 4;
|
||||
src += 3;
|
||||
size2 = (src[0] & 0x3F) + 4;
|
||||
src += 3;
|
||||
}
|
||||
} else { // 0
|
||||
offset = ((src[0] & 0x60) << 3) + src[1] + 1;
|
||||
size2 = ((src[0] & 0x1C) >> 2) + 3;
|
||||
src += 2;
|
||||
size2 = ((src[0] & 0x1C) >> 2) + 3;
|
||||
src += 2;
|
||||
}
|
||||
|
||||
|
||||
/* fetch strip from src */
|
||||
if (size1>src_end-src)
|
||||
if (size1 > src_end - src)
|
||||
break;
|
||||
|
||||
if (size1>0) {
|
||||
if (size1 > 0) {
|
||||
size -= size1;
|
||||
run = FFMIN(size1, dst_end-dst);
|
||||
run = FFMIN(size1, dst_end - dst);
|
||||
memcpy(dst, src, run);
|
||||
dst += run;
|
||||
src += run;
|
||||
}
|
||||
|
||||
if (size2>0) {
|
||||
if (dst-dst_start<offset)
|
||||
if (size2 > 0) {
|
||||
if (dst - dst_start < offset)
|
||||
return 0;
|
||||
size -= size2;
|
||||
run = FFMIN(size2, dst_end-dst);
|
||||
run = FFMIN(size2, dst_end - dst);
|
||||
av_memcpy_backptr(dst, offset, run);
|
||||
dst += run;
|
||||
}
|
||||
@ -135,7 +138,9 @@ static int unpack(const uint8_t *src, const uint8_t *src_end, unsigned char *dst
|
||||
* Decode inter-frame
|
||||
* @return 0 on success, -1 on critical buffer underflow
|
||||
*/
|
||||
static int tgv_decode_inter(TgvContext * s, const uint8_t *buf, const uint8_t *buf_end){
|
||||
static int tgv_decode_inter(TgvContext *s, const uint8_t *buf,
|
||||
const uint8_t *buf_end)
|
||||
{
|
||||
int num_mvs;
|
||||
int num_blocks_raw;
|
||||
int num_blocks_packed;
|
||||
@ -145,7 +150,7 @@ static int tgv_decode_inter(TgvContext * s, const uint8_t *buf, const uint8_t *b
|
||||
int mvbits;
|
||||
const unsigned char *blocks_raw;
|
||||
|
||||
if(buf+12>buf_end)
|
||||
if (buf + 12 > buf_end)
|
||||
return AVERROR_INVALIDDATA;
|
||||
|
||||
num_mvs = AV_RL16(&buf[0]);
|
||||
@ -172,68 +177,68 @@ static int tgv_decode_inter(TgvContext * s, const uint8_t *buf, const uint8_t *b
|
||||
}
|
||||
|
||||
/* read motion vectors */
|
||||
mvbits = (num_mvs*2*10+31) & ~31;
|
||||
mvbits = (num_mvs * 2 * 10 + 31) & ~31;
|
||||
|
||||
if (buf+(mvbits>>3)+16*num_blocks_raw+8*num_blocks_packed>buf_end)
|
||||
if (buf + (mvbits >> 3) + 16 * num_blocks_raw + 8 * num_blocks_packed > buf_end)
|
||||
return AVERROR_INVALIDDATA;
|
||||
|
||||
init_get_bits(&gb, buf, mvbits);
|
||||
for (i=0; i<num_mvs; i++) {
|
||||
for (i = 0; i < num_mvs; i++) {
|
||||
s->mv_codebook[i][0] = get_sbits(&gb, 10);
|
||||
s->mv_codebook[i][1] = get_sbits(&gb, 10);
|
||||
}
|
||||
buf += mvbits>>3;
|
||||
buf += mvbits >> 3;
|
||||
|
||||
/* note ptr to uncompressed blocks */
|
||||
blocks_raw = buf;
|
||||
buf += num_blocks_raw*16;
|
||||
buf += num_blocks_raw * 16;
|
||||
|
||||
/* read compressed blocks */
|
||||
init_get_bits(&gb, buf, (buf_end-buf)<<3);
|
||||
for (i=0; i<num_blocks_packed; i++) {
|
||||
init_get_bits(&gb, buf, (buf_end - buf) << 3);
|
||||
for (i = 0; i < num_blocks_packed; i++) {
|
||||
int tmp[4];
|
||||
for(j=0; j<4; j++)
|
||||
for (j = 0; j < 4; j++)
|
||||
tmp[j] = get_bits(&gb, 8);
|
||||
for(j=0; j<16; j++)
|
||||
for (j = 0; j < 16; j++)
|
||||
s->block_codebook[i][15-j] = tmp[get_bits(&gb, 2)];
|
||||
}
|
||||
|
||||
if (get_bits_left(&gb) < vector_bits *
|
||||
(s->avctx->height/4) * (s->avctx->width/4))
|
||||
(s->avctx->height / 4) * (s->avctx->width / 4))
|
||||
return AVERROR_INVALIDDATA;
|
||||
|
||||
/* read vectors and build frame */
|
||||
for(y=0; y<s->avctx->height/4; y++)
|
||||
for(x=0; x<s->avctx->width/4; x++) {
|
||||
unsigned int vector = get_bits(&gb, vector_bits);
|
||||
const unsigned char *src;
|
||||
int src_stride;
|
||||
for (y = 0; y < s->avctx->height / 4; y++)
|
||||
for (x = 0; x < s->avctx->width / 4; x++) {
|
||||
unsigned int vector = get_bits(&gb, vector_bits);
|
||||
const unsigned char *src;
|
||||
int src_stride;
|
||||
|
||||
if (vector < num_mvs) {
|
||||
int mx = x * 4 + s->mv_codebook[vector][0];
|
||||
int my = y * 4 + s->mv_codebook[vector][1];
|
||||
if (vector < num_mvs) {
|
||||
int mx = x * 4 + s->mv_codebook[vector][0];
|
||||
int my = y * 4 + s->mv_codebook[vector][1];
|
||||
|
||||
if ( mx < 0 || mx + 4 > s->avctx->width
|
||||
|| my < 0 || my + 4 > s->avctx->height)
|
||||
continue;
|
||||
if (mx < 0 || mx + 4 > s->avctx->width ||
|
||||
my < 0 || my + 4 > s->avctx->height)
|
||||
continue;
|
||||
|
||||
src = s->last_frame.data[0] + mx + my * s->last_frame.linesize[0];
|
||||
src_stride = s->last_frame.linesize[0];
|
||||
}else{
|
||||
int offset = vector - num_mvs;
|
||||
if (offset<num_blocks_raw)
|
||||
src = blocks_raw + 16*offset;
|
||||
else if (offset-num_blocks_raw<num_blocks_packed)
|
||||
src = s->block_codebook[offset-num_blocks_raw];
|
||||
else
|
||||
continue;
|
||||
src_stride = 4;
|
||||
}
|
||||
src = s->last_frame.data[0] + mx + my * s->last_frame.linesize[0];
|
||||
src_stride = s->last_frame.linesize[0];
|
||||
} else {
|
||||
int offset = vector - num_mvs;
|
||||
if (offset < num_blocks_raw)
|
||||
src = blocks_raw + 16*offset;
|
||||
else if (offset - num_blocks_raw < num_blocks_packed)
|
||||
src = s->block_codebook[offset - num_blocks_raw];
|
||||
else
|
||||
continue;
|
||||
src_stride = 4;
|
||||
}
|
||||
|
||||
for(j=0; j<4; j++)
|
||||
for(i=0; i<4; i++)
|
||||
s->frame.data[0][ (y*4+j)*s->frame.linesize[0] + (x*4+i) ] =
|
||||
src[j*src_stride + i];
|
||||
for (j = 0; j < 4; j++)
|
||||
for (i = 0; i < 4; i++)
|
||||
s->frame.data[0][(y * 4 + j) * s->frame.linesize[0] + (x * 4 + i)] =
|
||||
src[j * src_stride + i];
|
||||
}
|
||||
|
||||
return 0;
|
||||
@ -252,25 +257,25 @@ static int tgv_decode_frame(AVCodecContext *avctx,
|
||||
void *data, int *got_frame,
|
||||
AVPacket *avpkt)
|
||||
{
|
||||
const uint8_t *buf = avpkt->data;
|
||||
int buf_size = avpkt->size;
|
||||
TgvContext *s = avctx->priv_data;
|
||||
const uint8_t *buf = avpkt->data;
|
||||
int buf_size = avpkt->size;
|
||||
TgvContext *s = avctx->priv_data;
|
||||
const uint8_t *buf_end = buf + buf_size;
|
||||
int chunk_type, ret;
|
||||
|
||||
chunk_type = AV_RL32(&buf[0]);
|
||||
buf += EA_PREAMBLE_SIZE;
|
||||
buf += EA_PREAMBLE_SIZE;
|
||||
|
||||
if (chunk_type==kVGT_TAG) {
|
||||
if (chunk_type == kVGT_TAG) {
|
||||
int pal_count, i;
|
||||
if(buf+12>buf_end) {
|
||||
if (buf + 12 > buf_end) {
|
||||
av_log(avctx, AV_LOG_WARNING, "truncated header\n");
|
||||
return AVERROR_INVALIDDATA;
|
||||
}
|
||||
|
||||
s->width = AV_RL16(&buf[0]);
|
||||
s->height = AV_RL16(&buf[2]);
|
||||
if (s->avctx->width!=s->width || s->avctx->height!=s->height) {
|
||||
if (s->avctx->width != s->width || s->avctx->height != s->height) {
|
||||
avcodec_set_dimensions(s->avctx, s->width, s->height);
|
||||
cond_release_buffer(&s->frame);
|
||||
cond_release_buffer(&s->last_frame);
|
||||
@ -278,7 +283,7 @@ static int tgv_decode_frame(AVCodecContext *avctx,
|
||||
|
||||
pal_count = AV_RL16(&buf[6]);
|
||||
buf += 12;
|
||||
for(i=0; i<pal_count && i<AVPALETTE_COUNT && buf+2<buf_end; i++) {
|
||||
for (i = 0; i < pal_count && i < AVPALETTE_COUNT && buf + 2 < buf_end; i++) {
|
||||
s->palette[i] = AV_RB24(buf);
|
||||
buf += 3;
|
||||
}
|
||||
@ -305,21 +310,21 @@ static int tgv_decode_frame(AVCodecContext *avctx,
|
||||
}
|
||||
memcpy(s->frame.data[1], s->palette, AVPALETTE_SIZE);
|
||||
|
||||
if(chunk_type==kVGT_TAG) {
|
||||
if (chunk_type == kVGT_TAG) {
|
||||
s->frame.key_frame = 1;
|
||||
s->frame.pict_type = AV_PICTURE_TYPE_I;
|
||||
if (unpack(buf, buf_end, s->frame.data[0], s->avctx->width, s->avctx->height)<0) {
|
||||
if (unpack(buf, buf_end, s->frame.data[0], s->avctx->width, s->avctx->height) < 0) {
|
||||
av_log(avctx, AV_LOG_WARNING, "truncated intra frame\n");
|
||||
return AVERROR_INVALIDDATA;
|
||||
}
|
||||
}else{
|
||||
} else {
|
||||
if (!s->last_frame.data[0]) {
|
||||
av_log(avctx, AV_LOG_WARNING, "inter frame without corresponding intra frame\n");
|
||||
return buf_size;
|
||||
}
|
||||
s->frame.key_frame = 0;
|
||||
s->frame.pict_type = AV_PICTURE_TYPE_P;
|
||||
if (tgv_decode_inter(s, buf, buf_end)<0) {
|
||||
if (tgv_decode_inter(s, buf, buf_end) < 0) {
|
||||
av_log(avctx, AV_LOG_WARNING, "truncated inter frame\n");
|
||||
return AVERROR_INVALIDDATA;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user