diff --git a/libavcodec/fraps.c b/libavcodec/fraps.c
index 6cdb0d99a3..cc2f52b609 100644
--- a/libavcodec/fraps.c
+++ b/libavcodec/fraps.c
@@ -43,7 +43,7 @@
/**
* local variable storage
*/
-typedef struct FrapsContext{
+typedef struct FrapsContext {
AVCodecContext *avctx;
AVFrame frame;
uint8_t *tmpbuf;
@@ -64,7 +64,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
avcodec_get_frame_defaults(&s->frame);
avctx->coded_frame = &s->frame;
- s->avctx = avctx;
+ s->avctx = avctx;
s->tmpbuf = NULL;
ff_dsputil_init(&s->dsp, avctx);
@@ -76,7 +76,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
* Comparator - our nodes should ascend by count
* but with preserved symbol order
*/
-static int huff_cmp(const void *va, const void *vb){
+static int huff_cmp(const void *va, const void *vb)
+{
const Node *a = va, *b = vb;
return (a->count - b->count)*256 + a->sym - b->sym;
}
@@ -93,7 +94,7 @@ static int fraps2_decode_plane(FrapsContext *s, uint8_t *dst, int stride, int w,
VLC vlc;
Node nodes[512];
- for(i = 0; i < 256; i++)
+ for (i = 0; i < 256; i++)
nodes[i].count = bytestream_get_le32(&src);
size -= 1024;
if ((ret = ff_huff_build_tree(s->avctx, &vlc, 256, nodes, huff_cmp,
@@ -105,14 +106,16 @@ static int fraps2_decode_plane(FrapsContext *s, uint8_t *dst, int stride, int w,
s->dsp.bswap_buf((uint32_t *)s->tmpbuf, (const uint32_t *)src, size >> 2);
init_get_bits(&gb, s->tmpbuf, size * 8);
- for(j = 0; j < h; j++){
- for(i = 0; i < w*step; i += step){
+ for (j = 0; j < h; j++) {
+ for (i = 0; i < w*step; i += step) {
dst[i] = get_vlc2(&gb, vlc.table, 9, 3);
/* lines are stored as deltas between previous lines
* and we need to add 0x80 to the first lines of chroma planes
*/
- if(j) dst[i] += dst[i - stride];
- else if(Uoff) dst[i] += 0x80;
+ if (j)
+ dst[i] += dst[i - stride];
+ else if (Uoff)
+ dst[i] += 0x80;
if (get_bits_left(&gb) < 0) {
ff_free_vlc(&vlc);
return AVERROR_INVALIDDATA;
@@ -128,11 +131,11 @@ static int decode_frame(AVCodecContext *avctx,
void *data, int *got_frame,
AVPacket *avpkt)
{
- const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
FrapsContext * const s = avctx->priv_data;
- AVFrame *frame = data;
- AVFrame * const f = &s->frame;
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
+ AVFrame *frame = data;
+ AVFrame * const f = &s->frame;
uint32_t header;
unsigned int version,header_size;
unsigned int x, y;
@@ -144,8 +147,8 @@ static int decode_frame(AVCodecContext *avctx,
uint8_t *out;
enum AVPixelFormat pix_fmt;
- header = AV_RL32(buf);
- version = header & 0xff;
+ header = AV_RL32(buf);
+ version = header & 0xff;
header_size = (header & (1<<30))? 8 : 4; /* bit 30 means pad to 8 bytes */
if (version > 5) {
@@ -158,7 +161,7 @@ static int decode_frame(AVCodecContext *avctx,
buf += header_size;
if (version < 2) {
- unsigned needed_size = avctx->width*avctx->height*3;
+ unsigned needed_size = avctx->width * avctx->height * 3;
if (version == 0) needed_size /= 2;
needed_size += header_size;
/* bit 31 means same as previous pic */
@@ -182,15 +185,15 @@ static int decode_frame(AVCodecContext *avctx,
av_log(avctx, AV_LOG_ERROR, "Fraps: error in data stream\n");
return AVERROR_INVALIDDATA;
}
- for(i = 0; i < planes; i++) {
+ for (i = 0; i < planes; i++) {
offs[i] = AV_RL32(buf + 4 + i * 4);
- if(offs[i] >= buf_size - header_size || (i && offs[i] <= offs[i - 1] + 1024)) {
+ if (offs[i] >= buf_size - header_size || (i && offs[i] <= offs[i - 1] + 1024)) {
av_log(avctx, AV_LOG_ERROR, "Fraps: plane %i offset is out of bounds\n", i);
return AVERROR_INVALIDDATA;
}
}
offs[planes] = buf_size - header_size;
- for(i = 0; i < planes; i++) {
+ for (i = 0; i < planes; i++) {
av_fast_padded_malloc(&s->tmpbuf, &s->tmpbuf_size, offs[i + 1] - offs[i] - 1024);
if (!s->tmpbuf)
return AVERROR(ENOMEM);
@@ -215,23 +218,23 @@ static int decode_frame(AVCodecContext *avctx,
return ret;
}
- switch(version) {
+ switch (version) {
case 0:
default:
/* Fraps v0 is a reordered YUV420 */
- if ( (avctx->width % 8) != 0 || (avctx->height % 2) != 0 ) {
+ if (((avctx->width % 8) != 0) || ((avctx->height % 2) != 0)) {
av_log(avctx, AV_LOG_ERROR, "Invalid frame size %dx%d\n",
avctx->width, avctx->height);
return AVERROR_INVALIDDATA;
}
- buf32=(const uint32_t*)buf;
- for(y=0; y<avctx->height/2; y++){
- luma1=(uint32_t*)&f->data[0][ y*2*f->linesize[0] ];
- luma2=(uint32_t*)&f->data[0][ (y*2+1)*f->linesize[0] ];
- cr=(uint32_t*)&f->data[1][ y*f->linesize[1] ];
- cb=(uint32_t*)&f->data[2][ y*f->linesize[2] ];
- for(x=0; x<avctx->width; x+=8){
+ buf32 = (const uint32_t*)buf;
+ for (y = 0; y < avctx->height / 2; y++) {
+ luma1 = (uint32_t*)&f->data[0][ y * 2 * f->linesize[0] ];
+ luma2 = (uint32_t*)&f->data[0][ (y * 2 + 1) * f->linesize[0] ];
+ cr = (uint32_t*)&f->data[1][ y * f->linesize[1] ];
+ cb = (uint32_t*)&f->data[2][ y * f->linesize[2] ];
+ for (x = 0; x < avctx->width; x += 8) {
*luma1++ = *buf32++;
*luma1++ = *buf32++;
*luma2++ = *buf32++;
@@ -244,10 +247,11 @@ static int decode_frame(AVCodecContext *avctx,
case 1:
/* Fraps v1 is an upside-down BGR24 */
- for(y=0; y<avctx->height; y++)
- memcpy(&f->data[0][ (avctx->height-y)*f->linesize[0] ],
- &buf[y*avctx->width*3],
- 3*avctx->width);
+ for (y=0; y<avctx->height; y++)
+ memcpy(&f->data[0][(avctx->height - y) * f->linesize[0]],
+ &buf[y * avctx->width * 3],
+ 3 * avctx->width);
+
break;
@@ -257,7 +261,7 @@ static int decode_frame(AVCodecContext *avctx,
* Fraps v2 is Huffman-coded YUV420 planes
* Fraps v4 is virtually the same
*/
- for(i = 0; i < planes; i++){
+ for (i = 0; i < planes; i++) {
is_chroma = !!i;
if ((ret = fraps2_decode_plane(s, f->data[i], f->linesize[i],
avctx->width >> is_chroma,
@@ -272,7 +276,7 @@ static int decode_frame(AVCodecContext *avctx,
case 3:
case 5:
/* Virtually the same as version 4, but is for RGB24 */
- for(i = 0; i < planes; i++){
+ for (i = 0; i < planes; i++) {
if ((ret = fraps2_decode_plane(s, f->data[0] + i + (f->linesize[0] * (avctx->height - 1)),
-f->linesize[0], avctx->width, avctx->height,
buf + offs[i], offs[i + 1] - offs[i], 0, 3)) < 0) {
@@ -282,7 +286,7 @@ static int decode_frame(AVCodecContext *avctx,
}
out = f->data[0];
// convert pseudo-YUV into real RGB
- for(j = 0; j < avctx->height; j++){
+ for (j = 0; j < avctx->height; j++) {
uint8_t *line_end = out + 3*avctx->width;
while (out < line_end) {
out[0] += out[1];
diff --git a/libavcodec/rl2.c b/libavcodec/rl2.c
index 642d31af32..a7115c555b 100644
--- a/libavcodec/rl2.c
+++ b/libavcodec/rl2.c
@@ -43,10 +43,10 @@ typedef struct Rl2Context {
AVCodecContext *avctx;
AVFrame frame;
- unsigned short video_base; ///< initial drawing offset
- unsigned int clr_count; ///< number of used colors (currently unused)
- unsigned char* back_frame; ///< background frame
- unsigned int palette[AVPALETTE_COUNT];
+ uint16_t video_base; ///< initial drawing offset
+ uint32_t clr_count; ///< number of used colors (currently unused)
+ uint8_t *back_frame; ///< background frame
+ uint32_t palette[AVPALETTE_COUNT];
} Rl2Context;
/**
@@ -58,16 +58,17 @@ typedef struct Rl2Context {
* @param stride stride of the output buffer
* @param video_base offset of the rle data inside the frame
*/
-static void rl2_rle_decode(Rl2Context *s,const unsigned char* in,int size,
- unsigned char* out,int stride,int video_base){
+static void rl2_rle_decode(Rl2Context *s, const uint8_t *in, int size,
+ uint8_t *out, int stride, int video_base)
+{
int base_x = video_base % s->avctx->width;
int base_y = video_base / s->avctx->width;
int stride_adj = stride - s->avctx->width;
int i;
- const unsigned char* back_frame = s->back_frame;
- const unsigned char* in_end = in + size;
- const unsigned char* out_end = out + stride * s->avctx->height;
- unsigned char* line_end;
+ const uint8_t *back_frame = s->back_frame;
+ const uint8_t *in_end = in + size;
+ const uint8_t *out_end = out + stride * s->avctx->height;
+ uint8_t *line_end;
/** copy start of the background frame */
for(i=0;i<=base_y;i++){
@@ -82,7 +83,7 @@ static void rl2_rle_decode(Rl2Context *s,const unsigned char* in,int size,
/** decode the variable part of the frame */
while(in < in_end){
- unsigned char val = *in++;
+ uint8_t val = *in++;
int len = 1;
if(val >= 0x80){
if(in >= in_end)
@@ -141,7 +142,7 @@ static av_cold int rl2_decode_init(AVCodecContext *avctx)
/** parse extra data */
if(!avctx->extradata || avctx->extradata_size < EXTRADATA1_SIZE){
av_log(avctx, AV_LOG_ERROR, "invalid extradata size\n");
- return AVERROR_INVALIDDATA;
+ return AVERROR(EINVAL);
}
/** get frame_offset */
@@ -161,7 +162,7 @@ static av_cold int rl2_decode_init(AVCodecContext *avctx)
back_size = avctx->extradata_size - EXTRADATA1_SIZE;
if(back_size > 0){
- unsigned char* back_frame = av_mallocz(avctx->width*avctx->height);
+ uint8_t *back_frame = av_mallocz(avctx->width*avctx->height);
if(!back_frame)
return AVERROR(ENOMEM);
rl2_rle_decode(s,avctx->extradata + EXTRADATA1_SIZE,back_size,
@@ -177,9 +178,8 @@ static int rl2_decode_frame(AVCodecContext *avctx,
AVPacket *avpkt)
{
const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
+ int ret, buf_size = avpkt->size;
Rl2Context *s = avctx->priv_data;
- int ret;
if(s->frame.data[0])
avctx->release_buffer(avctx, &s->frame);