apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-11-01 04:53:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '676da248cad49debc40720baa13214f0b94dcc71'

Browse Source 
* commit '676da248cad49debc40720baa13214f0b94dcc71':
  vmd: refactor the inner decode loop

Conflicts:
	libavcodec/vmdav.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-05-30 09:44:57 +02:00
parent 8ef89833d0 676da248ca
commit ab78e21ea2
1 changed files with 85 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

166
libavcodec/vmdav.c
View File

@@ -270,91 +270,95 @@ static int vmd_decode(VmdVideoContext *s, AVFrame *frame)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
} }
if (s->size > 0) {
/* originally UnpackFrame in VAG's code */
bytestream2_init(&gb, gb.buffer, s->buf + s->size - gb.buffer);
if (bytestream2_get_bytes_left(&gb) < 1)
return AVERROR_INVALIDDATA;
meth = bytestream2_get_byteu(&gb);
if (meth & 0x80) {
lz_unpack(gb.buffer, bytestream2_get_bytes_left(&gb),
s->unpack_buffer, s->unpack_buffer_size);
meth &= 0x7F;
bytestream2_init(&gb, s->unpack_buffer, s->unpack_buffer_size);
}
dp = &frame->data[0][frame_y * frame->linesize[0] + frame_x]; if (!s->size)
pp = &s->prev_frame.data[0][frame_y * s->prev_frame.linesize[0] + frame_x]; return 0;
switch (meth) {
case 1: /* originally UnpackFrame in VAG's code */
for (i = 0; i < frame_height; i++) { if (bytestream2_get_bytes_left(&gb) < 1)
ofs = 0; return AVERROR_INVALIDDATA;
do { meth = bytestream2_get_byteu(&gb);
len = bytestream2_get_byte(&gb); if (meth & 0x80) {
if (len & 0x80) { lz_unpack(gb.buffer, bytestream2_get_bytes_left(&gb),
len = (len & 0x7F) + 1; s->unpack_buffer, s->unpack_buffer_size);
if (ofs + len > frame_width || bytestream2_get_bytes_left(&gb) < len) meth &= 0x7F;
return AVERROR_INVALIDDATA; bytestream2_init(&gb, s->unpack_buffer, s->unpack_buffer_size);
bytestream2_get_bufferu(&gb, &dp[ofs], len); }
ofs += len;
} else { dp = &frame->data[0][frame_y * frame->linesize[0] + frame_x];
/* interframe pixel copy */ pp = &s->prev_frame.data[0][frame_y * s->prev_frame.linesize[0] + frame_x];
if (ofs + len + 1 > frame_width || !s->prev_frame.data[0]) switch (meth) {
return AVERROR_INVALIDDATA; case 1:
memcpy(&dp[ofs], &pp[ofs], len + 1); for (i = 0; i < frame_height; i++) {
ofs += len + 1; ofs = 0;
} do {
} while (ofs < frame_width); len = bytestream2_get_byte(&gb);
if (ofs > frame_width) { if (len & 0x80) {
av_log(s->avctx, AV_LOG_ERROR, "offset > width (%d > %d)\n", len = (len & 0x7F) + 1;
ofs, frame_width); if (ofs + len > frame_width ||
return AVERROR_INVALIDDATA; bytestream2_get_bytes_left(&gb) < len)
return AVERROR_INVALIDDATA;
bytestream2_get_bufferu(&gb, &dp[ofs], len);
ofs += len;
} else {
/* interframe pixel copy */
if (ofs + len + 1 > frame_width || !s->prev_frame.data[0])
return AVERROR_INVALIDDATA;
memcpy(&dp[ofs], &pp[ofs], len + 1);
ofs += len + 1;
} }
dp += frame->linesize[0]; } while (ofs < frame_width);
pp += s->prev_frame.linesize[0]; if (ofs > frame_width) {
av_log(s->avctx, AV_LOG_ERROR,
"offset > width (%d > %d)\n",
ofs, frame_width);
return AVERROR_INVALIDDATA;
} }
break; dp += frame->linesize[0];
pp += s->prev_frame.linesize[0];
case 2:
for (i = 0; i < frame_height; i++) {
bytestream2_get_buffer(&gb, dp, frame_width);
dp += frame->linesize[0];
pp += s->prev_frame.linesize[0];
}
break;
case 3:
for (i = 0; i < frame_height; i++) {
ofs = 0;
do {
len = bytestream2_get_byte(&gb);
if (len & 0x80) {
len = (len & 0x7F) + 1;
if (bytestream2_get_byte(&gb) == 0xFF)
len = rle_unpack(gb.buffer, &dp[ofs],
len, bytestream2_get_bytes_left(&gb),
frame_width - ofs);
else
bytestream2_get_buffer(&gb, &dp[ofs], len);
bytestream2_skip(&gb, len);
} else {
/* interframe pixel copy */
if (ofs + len + 1 > frame_width || !s->prev_frame.data[0])
return AVERROR_INVALIDDATA;
memcpy(&dp[ofs], &pp[ofs], len + 1);
ofs += len + 1;
}
} while (ofs < frame_width);
if (ofs > frame_width) {
av_log(s->avctx, AV_LOG_ERROR, "offset > width (%d > %d)\n",
ofs, frame_width);
return AVERROR_INVALIDDATA;
}
dp += frame->linesize[0];
pp += s->prev_frame.linesize[0];
}
break;
} }
break;
case 2:
for (i = 0; i < frame_height; i++) {
bytestream2_get_buffer(&gb, dp, frame_width);
dp += frame->linesize[0];
pp += s->prev_frame.linesize[0];
}
break;
case 3:
for (i = 0; i < frame_height; i++) {
ofs = 0;
do {
len = bytestream2_get_byte(&gb);
if (len & 0x80) {
len = (len & 0x7F) + 1;
if (bytestream2_get_byte(&gb) == 0xFF)
len = rle_unpack(gb.buffer, &dp[ofs],
len, bytestream2_get_bytes_left(&gb),
frame_width - ofs);
else
bytestream2_get_buffer(&gb, &dp[ofs], len);
bytestream2_skip(&gb, len);
} else {
/* interframe pixel copy */
if (ofs + len + 1 > frame_width || !s->prev_frame.data[0])
return AVERROR_INVALIDDATA;
memcpy(&dp[ofs], &pp[ofs], len + 1);
ofs += len + 1;
}
} while (ofs < frame_width);
if (ofs > frame_width) {
av_log(s->avctx, AV_LOG_ERROR,
"offset > width (%d > %d)\n",
ofs, frame_width);
return AVERROR_INVALIDDATA;
}
dp += frame->linesize[0];
pp += s->prev_frame.linesize[0];
}
break;
} }
return 0; return 0;
} }