---
libavcodec/bethsoftvideo.c | 58 +++++++++++++++++++++++--------------------
1 files changed, 31 insertions(+), 27 deletions(-)
diff --git a/libavcodec/bethsoftvideo.c b/libavcodec/bethsoftvideo.c
index f4020d6..8403af6 100644
--- a/libavcodec/bethsoftvideo.c
+++ b/libavcodec/bethsoftvideo.c
@@ -39,39 +39,40 @@ typedef struct BethsoftvidContext {
static av_cold int bethsoftvid_decode_init(AVCodecContext *avctx)
{
BethsoftvidContext *vid = avctx->priv_data;
- vid->frame.reference = 1;
+ vid->frame.reference = 1;
vid->frame.buffer_hints = FF_BUFFER_HINTS_VALID |
FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
avctx->pix_fmt = PIX_FMT_PAL8;
return 0;
}
-static int set_palette(AVFrame * frame, const uint8_t * palette_buffer, int
buf_size)
+static int set_palette(AVFrame *frame, const uint8_t *palette_buffer,
+ int buf_size)
{
- uint32_t * palette = (uint32_t *)frame->data[1];
+ uint32_t *palette = (uint32_t *)frame->data[1];
int a;
- if (buf_size < 256*3)
+ if (buf_size < 256 * 3)
return AVERROR_INVALIDDATA;
- for(a = 0; a < 256; a++){
+ for (a = 0; a < 256; a++) {
palette[a] = AV_RB24(&palette_buffer[a * 3]) * 4;
}
frame->palette_has_changed = 1;
- return 256*3;
+ return 256 * 3;
}
static int bethsoftvid_decode_frame(AVCodecContext *avctx,
- void *data, int *data_size,
- AVPacket *avpkt)
+ void *data, int *data_size,
+ AVPacket *avpkt)
{
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
- BethsoftvidContext * vid = avctx->priv_data;
+ BethsoftvidContext *vid = avctx->priv_data;
char block_type;
- uint8_t * dst;
- uint8_t * frame_end;
- int remaining = avctx->width; // number of bytes remaining on a
line
+ uint8_t *dst;
+ uint8_t *frame_end;
+ int remaining = avctx->width; // number of bytes remaining on a line
const int wrap_to_next_line = vid->frame.linesize[0] - avctx->width;
int code;
int yoffset;
@@ -83,37 +84,40 @@ static int bethsoftvid_decode_frame(AVCodecContext *avctx,
dst = vid->frame.data[0];
frame_end = vid->frame.data[0] + vid->frame.linesize[0] * avctx->height;
- switch(block_type = *buf++){
+ switch (block_type = *buf++) {
case PALETTE_BLOCK:
return set_palette(&vid->frame, buf, buf_size);
case VIDEO_YOFF_P_FRAME:
yoffset = bytestream_get_le16(&buf);
- if(yoffset >= avctx->height)
+ if (yoffset >= avctx->height)
return -1;
dst += vid->frame.linesize[0] * yoffset;
}
// main code
- while((code = *buf++)){
+ while ((code = *buf++)) {
int length = code & 0x7f;
- // copy any bytes starting at the current position, and ending at the
frame width
- while(length > remaining){
- if(code < 0x80)
+ // copy any bytes starting at the current position, and ending at
+ // the frame width
+ while (length > remaining) {
+ if (code < 0x80)
bytestream_get_buffer(&buf, dst, remaining);
- else if(block_type == VIDEO_I_FRAME)
+ else if (block_type == VIDEO_I_FRAME)
memset(dst, buf[0], remaining);
- length -= remaining; // decrement the number of bytes to be
copied
- dst += remaining + wrap_to_next_line; // skip over extra bytes
at end of frame
+ // decrement the number of bytes to be copied
+ length -= remaining;
+ // skip over extra bytes at end of frame
+ dst += remaining + wrap_to_next_line;
remaining = avctx->width;
- if(dst == frame_end)
+ if (dst == frame_end)
goto end;
}
// copy any remaining bytes after / if line overflows
- if(code < 0x80)
+ if (code < 0x80)
bytestream_get_buffer(&buf, dst, length);
- else if(block_type == VIDEO_I_FRAME)
+ else if (block_type == VIDEO_I_FRAME)
memset(dst, *buf++, length);
remaining -= length;
dst += length;
@@ -121,15 +125,15 @@ static int bethsoftvid_decode_frame(AVCodecContext *avctx,
end:
*data_size = sizeof(AVFrame);
- *(AVFrame*)data = vid->frame;
+ *(AVFrame *)data = vid->frame;
return buf_size;
}
static av_cold int bethsoftvid_decode_end(AVCodecContext *avctx)
{
- BethsoftvidContext * vid = avctx->priv_data;
- if(vid->frame.data[0])
+ BethsoftvidContext *vid = avctx->priv_data;
+ if (vid->frame.data[0])
avctx->release_buffer(avctx, &vid->frame);
return 0;
}
--
1.7.7.3
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
