virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

Merge commit 'f337c29017b10c98ccb4dce20efced4c74b665f6'

Browse Source 
* commit 'f337c29017b10c98ccb4dce20efced4c74b665f6':
  eatgq: return meaningful error codes.
  eatgv: cosmetics, reformat

Conflicts:
	libavcodec/eatgq.c
	libavcodec/eatgv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-01-26 14:47:08 +01:00
commit 325ee4ed7a
2 changed files with 81 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/eatgq.c
View File

@ -194,12 +194,12 @@ static int tgq_decode_frame(AVCodecContext *avctx,
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size; int buf_size = avpkt->size;
TgqContext *s = avctx->priv_data; TgqContext *s = avctx->priv_data;
int x,y; int x, y, ret;
int big_endian; int big_endian;
if (buf_size < 16) { if (buf_size < 16) {
av_log(avctx, AV_LOG_WARNING, "truncated header\n"); av_log(avctx, AV_LOG_WARNING, "truncated header\n");
return -1; return AVERROR_INVALIDDATA;
} }
big_endian = AV_RL32(&buf[4]) > 0x000FFFFF; big_endian = AV_RL32(&buf[4]) > 0x000FFFFF;
bytestream2_init(&s->gb, buf + 8, buf_size - 8); bytestream2_init(&s->gb, buf + 8, buf_size - 8);
@ -223,9 +223,9 @@ static int tgq_decode_frame(AVCodecContext *avctx,
s->frame.key_frame = 1; s->frame.key_frame = 1;
s->frame.pict_type = AV_PICTURE_TYPE_I; s->frame.pict_type = AV_PICTURE_TYPE_I;
s->frame.buffer_hints = FF_BUFFER_HINTS_VALID; s->frame.buffer_hints = FF_BUFFER_HINTS_VALID;
if (ff_get_buffer(avctx, &s->frame)) { if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1; return ret;
} }
} }

149
libavcodec/eatgv.c
View File

@ -50,11 +50,12 @@ typedef struct TgvContext {
int num_blocks_packed; ///< current length of block_codebook int num_blocks_packed; ///< current length of block_codebook
} TgvContext; } TgvContext;
static av_cold int tgv_decode_init(AVCodecContext *avctx){ static av_cold int tgv_decode_init(AVCodecContext *avctx)
{
TgvContext *s = avctx->priv_data; TgvContext *s = avctx->priv_data;
s->avctx = avctx; s->avctx = avctx;
avctx->time_base = (AVRational){1, 15}; avctx->time_base = (AVRational){1, 15};
avctx->pix_fmt = AV_PIX_FMT_PAL8; avctx->pix_fmt = AV_PIX_FMT_PAL8;
avcodec_get_frame_defaults(&s->frame); avcodec_get_frame_defaults(&s->frame);
avcodec_get_frame_defaults(&s->last_frame); avcodec_get_frame_defaults(&s->last_frame);
return 0; return 0;
@ -64,7 +65,9 @@ static av_cold int tgv_decode_init(AVCodecContext *avctx){
* Unpack buffer * Unpack buffer
* @return 0 on success, -1 on critical buffer underflow * @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; unsigned char *dst_end = dst + width*height;
int size, size1, size2, offset, run; int size, size1, size2, offset, run;
unsigned char *dst_start = dst; unsigned char *dst_start = dst;
@ -79,52 +82,52 @@ static int unpack(const uint8_t *src, const uint8_t *src_end, unsigned char *dst
size = AV_RB24(src); size = AV_RB24(src);
src += 3; src += 3;
while(size>0 && src<src_end) { while (size > 0 && src < src_end) {
/* determine size1 and size2 */ /* determine size1 and size2 */
size1 = (src[0] & 3); size1 = (src[0] & 3);
if ( src[0] & 0x80 ) { // 1 if (src[0] & 0x80) { // 1
if (src[0] & 0x40 ) { // 11 if (src[0] & 0x40 ) { // 11
if ( src[0] & 0x20 ) { // 111 if (src[0] & 0x20) { // 111
if ( src[0] < 0xFC ) // !(111111) if (src[0] < 0xFC) // !(111111)
size1 = (((src[0] & 31) + 1) << 2); size1 = (((src[0] & 31) + 1) << 2);
src++; src++;
size2 = 0; size2 = 0;
} else { // 110 } else { // 110
offset = ((src[0] & 0x10) << 12) + AV_RB16(&src[1]) + 1; offset = ((src[0] & 0x10) << 12) + AV_RB16(&src[1]) + 1;
size2 = ((src[0] & 0xC) << 6) + src[3] + 5; size2 = ((src[0] & 0xC) << 6) + src[3] + 5;
src += 4; src += 4;
} }
} else { // 10 } else { // 10
size1 = ( ( src[1] & 0xC0) >> 6 ); size1 = ((src[1] & 0xC0) >> 6);
offset = (AV_RB16(&src[1]) & 0x3FFF) + 1; offset = (AV_RB16(&src[1]) & 0x3FFF) + 1;
size2 = (src[0] & 0x3F) + 4; size2 = (src[0] & 0x3F) + 4;
src += 3; src += 3;
} }
} else { // 0 } else { // 0
offset = ((src[0] & 0x60) << 3) + src[1] + 1; offset = ((src[0] & 0x60) << 3) + src[1] + 1;
size2 = ((src[0] & 0x1C) >> 2) + 3; size2 = ((src[0] & 0x1C) >> 2) + 3;
src += 2; src += 2;
} }
/* fetch strip from src */ /* fetch strip from src */
if (size1>src_end-src) if (size1 > src_end - src)
break; break;
if (size1>0) { if (size1 > 0) {
size -= size1; size -= size1;
run = FFMIN(size1, dst_end-dst); run = FFMIN(size1, dst_end - dst);
memcpy(dst, src, run); memcpy(dst, src, run);
dst += run; dst += run;
src += run; src += run;
} }
if (size2>0) { if (size2 > 0) {
if (dst-dst_start<offset) if (dst - dst_start < offset)
return 0; return 0;
size -= size2; size -= size2;
run = FFMIN(size2, dst_end-dst); run = FFMIN(size2, dst_end - dst);
av_memcpy_backptr(dst, offset, run); av_memcpy_backptr(dst, offset, run);
dst += run; dst += run;
} }
@ -137,7 +140,9 @@ static int unpack(const uint8_t *src, const uint8_t *src_end, unsigned char *dst
* Decode inter-frame * Decode inter-frame
* @return 0 on success, -1 on critical buffer underflow * @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_mvs;
int num_blocks_raw; int num_blocks_raw;
int num_blocks_packed; int num_blocks_packed;
@ -174,70 +179,70 @@ static int tgv_decode_inter(TgvContext * s, const uint8_t *buf, const uint8_t *b
} }
/* read motion vectors */ /* read motion vectors */
mvbits = (num_mvs*2*10+31) & ~31; mvbits = (num_mvs * 2 * 10 + 31) & ~31;
if (buf_end - buf < (mvbits>>3)+16*num_blocks_raw+8*num_blocks_packed) if (buf_end - buf < (mvbits>>3) + 16*num_blocks_raw + 8*num_blocks_packed)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
init_get_bits(&gb, buf, mvbits); 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][0] = get_sbits(&gb, 10);
s->mv_codebook[i][1] = get_sbits(&gb, 10); s->mv_codebook[i][1] = get_sbits(&gb, 10);
} }
buf += mvbits>>3; buf += mvbits >> 3;
/* note ptr to uncompressed blocks */ /* note ptr to uncompressed blocks */
blocks_raw = buf; blocks_raw = buf;
buf += num_blocks_raw*16; buf += num_blocks_raw * 16;
/* read compressed blocks */ /* read compressed blocks */
init_get_bits(&gb, buf, (buf_end-buf)<<3); init_get_bits(&gb, buf, (buf_end - buf) << 3);
for (i=0; i<num_blocks_packed; i++) { for (i = 0; i < num_blocks_packed; i++) {
int tmp[4]; int tmp[4];
for(j=0; j<4; j++) for (j = 0; j < 4; j++)
tmp[j] = get_bits(&gb, 8); 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)]; s->block_codebook[i][15-j] = tmp[get_bits(&gb, 2)];
} }
if (get_bits_left(&gb) < vector_bits * 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; return AVERROR_INVALIDDATA;
/* read vectors and build frame */ /* read vectors and build frame */
for(y=0; y<s->avctx->height/4; y++) for (y = 0; y < s->avctx->height / 4; y++)
for(x=0; x<s->avctx->width/4; x++) { for (x = 0; x < s->avctx->width / 4; x++) {
unsigned int vector = get_bits(&gb, vector_bits); unsigned int vector = get_bits(&gb, vector_bits);
const unsigned char *src; const unsigned char *src;
int src_stride; int src_stride;
if (vector < num_mvs) { if (vector < num_mvs) {
int mx = x * 4 + s->mv_codebook[vector][0]; int mx = x * 4 + s->mv_codebook[vector][0];
int my = y * 4 + s->mv_codebook[vector][1]; int my = y * 4 + s->mv_codebook[vector][1];
if ( mx < 0 || mx + 4 > s->avctx->width if (mx < 0 || mx + 4 > s->avctx->width ||
|| my < 0 || my + 4 > s->avctx->height) { my < 0 || my + 4 > s->avctx->height) {
av_log(s->avctx, AV_LOG_ERROR, "MV %d %d out of picture\n", mx, my); av_log(s->avctx, AV_LOG_ERROR, "MV %d %d out of picture\n", mx, my);
continue; 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]; for (j = 0; j < 4; j++)
src_stride = s->last_frame.linesize[0]; for (i = 0; i < 4; i++)
}else{ s->frame.data[0][(y * 4 + j) * s->frame.linesize[0] + (x * 4 + i)] =
int offset = vector - num_mvs; src[j * src_stride + i];
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];
} }
return 0; return 0;
@ -256,9 +261,9 @@ static int tgv_decode_frame(AVCodecContext *avctx,
void *data, int *got_frame, void *data, int *got_frame,
AVPacket *avpkt) AVPacket *avpkt)
{ {
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size; int buf_size = avpkt->size;
TgvContext *s = avctx->priv_data; TgvContext *s = avctx->priv_data;
const uint8_t *buf_end = buf + buf_size; const uint8_t *buf_end = buf + buf_size;
int chunk_type, ret; int chunk_type, ret;
@ -266,9 +271,9 @@ static int tgv_decode_frame(AVCodecContext *avctx,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
chunk_type = AV_RL32(&buf[0]); 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; int pal_count, i;
if(buf_end - buf < 12) { if(buf_end - buf < 12) {
av_log(avctx, AV_LOG_WARNING, "truncated header\n"); av_log(avctx, AV_LOG_WARNING, "truncated header\n");
@ -277,7 +282,7 @@ static int tgv_decode_frame(AVCodecContext *avctx,
s->width = AV_RL16(&buf[0]); s->width = AV_RL16(&buf[0]);
s->height = AV_RL16(&buf[2]); 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); avcodec_set_dimensions(s->avctx, s->width, s->height);
cond_release_buffer(&s->frame); cond_release_buffer(&s->frame);
cond_release_buffer(&s->last_frame); cond_release_buffer(&s->last_frame);
@ -285,7 +290,7 @@ static int tgv_decode_frame(AVCodecContext *avctx,
pal_count = AV_RL16(&buf[6]); pal_count = AV_RL16(&buf[6]);
buf += 12; buf += 12;
for(i=0; i<pal_count && i<AVPALETTE_COUNT && buf_end - buf >= 3; i++) { for(i = 0; i < pal_count && i < AVPALETTE_COUNT && buf_end - buf >= 3; i++) {
s->palette[i] = 0xFFU << 24 | AV_RB24(buf); s->palette[i] = 0xFFU << 24 | AV_RB24(buf);
buf += 3; buf += 3;
} }
@ -312,21 +317,21 @@ static int tgv_decode_frame(AVCodecContext *avctx,
} }
memcpy(s->frame.data[1], s->palette, AVPALETTE_SIZE); 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.key_frame = 1;
s->frame.pict_type = AV_PICTURE_TYPE_I; 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"); av_log(avctx, AV_LOG_WARNING, "truncated intra frame\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
}else{ } else {
if (!s->last_frame.data[0]) { if (!s->last_frame.data[0]) {
av_log(avctx, AV_LOG_WARNING, "inter frame without corresponding intra frame\n"); av_log(avctx, AV_LOG_WARNING, "inter frame without corresponding intra frame\n");
return buf_size; return buf_size;
} }
s->frame.key_frame = 0; s->frame.key_frame = 0;
s->frame.pict_type = AV_PICTURE_TYPE_P; 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"); av_log(avctx, AV_LOG_WARNING, "truncated inter frame\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }