virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

sunrast: Cosmetics

Browse Source 
Signed-off-by: Aneesh Dogra <lionaneesh@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
This commit is contained in:
Aneesh Dogra
2012-01-28 18:34:14 +05:30
committed by Ronald S. Bultje
parent 4ffb8e2c14
commit 415f358a1f
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
libavcodec/sunrast.c
View File

@@ -57,18 +57,18 @@ static av_cold int sunrast_init(AVCodecContext *avctx) {
SUNRASTContext *s = avctx->priv_data; SUNRASTContext *s = avctx->priv_data;
avcodec_get_frame_defaults(&s->picture); avcodec_get_frame_defaults(&s->picture);
avctx->coded_frame= &s->picture; avctx->coded_frame = &s->picture;
return 0; return 0;
} }
static int sunrast_decode_frame(AVCodecContext *avctx, void *data, static int sunrast_decode_frame(AVCodecContext *avctx, void *data,
int *data_size, AVPacket *avpkt) { int *data_size, AVPacket *avpkt) {
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
const uint8_t *buf_end = avpkt->data + avpkt->size; const uint8_t *buf_end = avpkt->data + avpkt->size;
SUNRASTContext * const s = avctx->priv_data; SUNRASTContext * const s = avctx->priv_data;
AVFrame *picture = data; AVFrame *picture = data;
AVFrame * const p = &s->picture; AVFrame * const p = &s->picture;
unsigned int w, h, depth, type, maptype, maplength, stride, x, y, len, alen; unsigned int w, h, depth, type, maptype, maplength, stride, x, y, len, alen;
uint8_t *ptr; uint8_t *ptr;
const uint8_t *bufstart = buf; const uint8_t *bufstart = buf;
@@ -81,12 +81,12 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data,
return -1; return -1;
} }
w = AV_RB32(buf+4); w = AV_RB32(buf + 4);
h = AV_RB32(buf+8); h = AV_RB32(buf + 8);
depth = AV_RB32(buf+12); depth = AV_RB32(buf + 12);
type = AV_RB32(buf+20); type = AV_RB32(buf + 20);
maptype = AV_RB32(buf+24); maptype = AV_RB32(buf + 24);
maplength = AV_RB32(buf+28); maplength = AV_RB32(buf + 28);
buf += 32; buf += 32;
if (type == RT_FORMAT_TIFF || type == RT_FORMAT_IFF || type == RT_EXPERIMENTAL) { if (type == RT_FORMAT_TIFF || type == RT_FORMAT_IFF || type == RT_EXPERIMENTAL) {
@@ -153,8 +153,8 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data,
} }
ptr = p->data[1]; ptr = p->data[1];
for (x=0; x<len; x++, ptr+=4) for (x = 0; x < len; x++, ptr += 4)
*(uint32_t *)ptr = (buf[x]<<16) + (buf[len+x]<<8) + buf[len+len+x]; *(uint32_t *)ptr = (buf[x] << 16) + (buf[len + x] << 8) + buf[len + len + x];
} }
buf += maplength; buf += maplength;
@@ -164,11 +164,11 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data,
/* scanlines are aligned on 16 bit boundaries */ /* scanlines are aligned on 16 bit boundaries */
len = (depth * w + 7) >> 3; len = (depth * w + 7) >> 3;
alen = len + (len&1); alen = len + (len & 1);
if (type == RT_BYTE_ENCODED) { if (type == RT_BYTE_ENCODED) {
int value, run; int value, run;
uint8_t *end = ptr + h*stride; uint8_t *end = ptr + h * stride;
x = 0; x = 0;
while (ptr != end && buf < buf_end) { while (ptr != end && buf < buf_end) {
@@ -193,7 +193,7 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data,
} }
} }
} else { } else {
for (y=0; y<h; y++) { for (y = 0; y < h; y++) {
if (buf_end - buf < len) if (buf_end - buf < len)
break; break;
memcpy(ptr, buf, len); memcpy(ptr, buf, len);
@@ -202,7 +202,7 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data,
} }
} }
*picture = s->picture; *picture = s->picture;
*data_size = sizeof(AVFrame); *data_size = sizeof(AVFrame);
return buf - bufstart; return buf - bufstart;