|
|
@ -62,18 +62,18 @@ static int bethsoftvid_decode_frame(AVCodecContext *avctx, |
|
|
|
{ |
|
|
|
{ |
|
|
|
BethsoftvidContext * vid = avctx->priv_data; |
|
|
|
BethsoftvidContext * vid = avctx->priv_data; |
|
|
|
char block_type; |
|
|
|
char block_type; |
|
|
|
uint8_t * destination; |
|
|
|
uint8_t * dst; |
|
|
|
uint8_t * frame_end; |
|
|
|
uint8_t * frame_end; |
|
|
|
int line_remaining = avctx->width; // number of bytes remaining on a line
|
|
|
|
int remaining = avctx->width; // number of bytes remaining on a line
|
|
|
|
const int wrap_to_next_line = vid->frame.linesize[0] - avctx->width; |
|
|
|
const int wrap_to_next_line = vid->frame.linesize[0] - avctx->width; |
|
|
|
int rle_num_bytes; |
|
|
|
int code; |
|
|
|
int yoffset; |
|
|
|
int yoffset; |
|
|
|
|
|
|
|
|
|
|
|
if (avctx->reget_buffer(avctx, &vid->frame)) { |
|
|
|
if (avctx->reget_buffer(avctx, &vid->frame)) { |
|
|
|
av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); |
|
|
|
av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); |
|
|
|
return -1; |
|
|
|
return -1; |
|
|
|
} |
|
|
|
} |
|
|
|
destination = vid->frame.data[0]; |
|
|
|
dst = vid->frame.data[0]; |
|
|
|
frame_end = vid->frame.data[0] + vid->frame.linesize[0] * avctx->height; |
|
|
|
frame_end = vid->frame.data[0] + vid->frame.linesize[0] * avctx->height; |
|
|
|
|
|
|
|
|
|
|
|
switch(block_type = *buf++){ |
|
|
|
switch(block_type = *buf++){ |
|
|
@ -84,33 +84,33 @@ static int bethsoftvid_decode_frame(AVCodecContext *avctx, |
|
|
|
yoffset = bytestream_get_le16(&buf); |
|
|
|
yoffset = bytestream_get_le16(&buf); |
|
|
|
if(yoffset >= avctx->height) |
|
|
|
if(yoffset >= avctx->height) |
|
|
|
return -1; |
|
|
|
return -1; |
|
|
|
destination += vid->frame.linesize[0] * yoffset; |
|
|
|
dst += vid->frame.linesize[0] * yoffset; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// main code
|
|
|
|
// main code
|
|
|
|
while((rle_num_bytes = *buf++)){ |
|
|
|
while((code = *buf++)){ |
|
|
|
int length = rle_num_bytes & 0x7f; |
|
|
|
int length = code & 0x7f; |
|
|
|
|
|
|
|
|
|
|
|
// copy any bytes starting at the current position, and ending at the frame width
|
|
|
|
// copy any bytes starting at the current position, and ending at the frame width
|
|
|
|
while(length > line_remaining){ |
|
|
|
while(length > remaining){ |
|
|
|
if(rle_num_bytes < 0x80) |
|
|
|
if(code < 0x80) |
|
|
|
bytestream_get_buffer(&buf, destination, line_remaining); |
|
|
|
bytestream_get_buffer(&buf, dst, remaining); |
|
|
|
else if(block_type == VIDEO_I_FRAME) |
|
|
|
else if(block_type == VIDEO_I_FRAME) |
|
|
|
memset(destination, buf[0], line_remaining); |
|
|
|
memset(dst, buf[0], remaining); |
|
|
|
length -= line_remaining; // decrement the number of bytes to be copied
|
|
|
|
length -= remaining; // decrement the number of bytes to be copied
|
|
|
|
destination += line_remaining + wrap_to_next_line; // skip over extra bytes at end of frame
|
|
|
|
dst += remaining + wrap_to_next_line; // skip over extra bytes at end of frame
|
|
|
|
line_remaining = avctx->width; |
|
|
|
remaining = avctx->width; |
|
|
|
if(destination == frame_end) |
|
|
|
if(dst == frame_end) |
|
|
|
goto end; |
|
|
|
goto end; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// copy any remaining bytes after / if line overflows
|
|
|
|
// copy any remaining bytes after / if line overflows
|
|
|
|
if(rle_num_bytes < 0x80) |
|
|
|
if(code < 0x80) |
|
|
|
bytestream_get_buffer(&buf, destination, length); |
|
|
|
bytestream_get_buffer(&buf, dst, length); |
|
|
|
else if(block_type == VIDEO_I_FRAME) |
|
|
|
else if(block_type == VIDEO_I_FRAME) |
|
|
|
memset(destination, *buf++, length); |
|
|
|
memset(dst, *buf++, length); |
|
|
|
line_remaining -= length; |
|
|
|
remaining -= length; |
|
|
|
destination += length; |
|
|
|
dst += length; |
|
|
|
} |
|
|
|
} |
|
|
|
end: |
|
|
|
end: |
|
|
|
|
|
|
|
|
|
|
|