Skip to content

F
ffmpeg.wasm-core
Commit 3865ba7b authored by Luca Barbato's avatar Luca Barbato
Browse files
Options

iff: K&R formatting cosmetics

parent 4ecdb5ed
Show whitespace changes
Inline Side-by-side
Showing with 44 additions and 42 deletions
libavcodec/iff.c
View file @ 3865ba7b
...@@ -133,16 +133,14 @@ static int cmap_read_palette(AVCodecContext *avctx, uint32_t *pal) ...@@ -133,16 +133,14 @@ static int cmap_read_palette(AVCodecContext *avctx, uint32_t *pal)
// If extradata is smaller than actually needed, fill the remaining with black. // If extradata is smaller than actually needed, fill the remaining with black.
count = FFMIN(avctx->extradata_size / 3, count); count = FFMIN(avctx->extradata_size / 3, count);
if (count) { if (count) {
for (i=0; i < count; i++) { for (i = 0; i < count; i++)
pal[i] = 0xFF000000 | AV_RB24( avctx->extradata + i*3 ); pal[i] = 0xFF000000 | AV_RB24(avctx->extradata + i * 3);
}
} else { // Create gray-scale color palette for bps < 8 } else { // Create gray-scale color palette for bps < 8
count = 1 << avctx->bits_per_coded_sample; count = 1 << avctx->bits_per_coded_sample;
for (i=0; i < count; i++) { for (i = 0; i < count; i++)
pal[i] = 0xFF000000 | gray2rgb((i * 255) >> avctx->bits_per_coded_sample); pal[i] = 0xFF000000 | gray2rgb((i * 255) >> avctx->bits_per_coded_sample);
} }
}
return 0; return 0;
} }
...@@ -223,9 +221,10 @@ static void decodeplane32(uint32_t *dst, const uint8_t *buf, int buf_size, int p ...@@ -223,9 +221,10 @@ static void decodeplane32(uint32_t *dst, const uint8_t *buf, int buf_size, int p
* @param buf the source byterun1 compressed bitstream * @param buf the source byterun1 compressed bitstream
* @param buf_end the EOF of source byterun1 compressed bitstream * @param buf_end the EOF of source byterun1 compressed bitstream
* @return number of consumed bytes in byterun1 compressed bitstream * @return number of consumed bytes in byterun1 compressed bitstream
*/ */
static int decode_byterun(uint8_t *dst, int dst_size, static int decode_byterun(uint8_t *dst, int dst_size,
const uint8_t *buf, const uint8_t *const buf_end) { const uint8_t *buf, const uint8_t *const buf_end)
{
const uint8_t *const buf_start = buf; const uint8_t *const buf_start = buf;
unsigned x; unsigned x;
for (x = 0; x < dst_size && buf < buf_end;) { for (x = 0; x < dst_size && buf < buf_end;) {
...@@ -253,7 +252,7 @@ static int decode_frame_ilbm(AVCodecContext *avctx, ...@@ -253,7 +252,7 @@ static int decode_frame_ilbm(AVCodecContext *avctx,
IffContext *s = avctx->priv_data; IffContext *s = avctx->priv_data;
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size; int buf_size = avpkt->size;
const uint8_t *buf_end = buf+buf_size; const uint8_t *buf_end = buf + buf_size;
int y, plane, res; int y, plane, res;
if ((res = ff_reget_buffer(avctx, &s->frame)) < 0) if ((res = ff_reget_buffer(avctx, &s->frame)) < 0)
...@@ -261,33 +260,36 @@ static int decode_frame_ilbm(AVCodecContext *avctx, ...@@ -261,33 +260,36 @@ static int decode_frame_ilbm(AVCodecContext *avctx,
if (!s->init && avctx->bits_per_coded_sample <= 8 && if (!s->init && avctx->bits_per_coded_sample <= 8 &&
avctx->pix_fmt != AV_PIX_FMT_GRAY8) { avctx->pix_fmt != AV_PIX_FMT_GRAY8) {
if ((res = cmap_read_palette(avctx, (uint32_t*)s->frame.data[1])) < 0) if ((res = cmap_read_palette(avctx, (uint32_t *)s->frame.data[1])) < 0)
return res; return res;
} }
s->init = 1; s->init = 1;
if (avctx->codec_tag == MKTAG('I','L','B','M')) { // interleaved if (avctx->codec_tag == MKTAG('I', 'L', 'B', 'M')) { // interleaved
if (avctx->pix_fmt == AV_PIX_FMT_PAL8 || avctx->pix_fmt == AV_PIX_FMT_GRAY8) { if (avctx->pix_fmt == AV_PIX_FMT_PAL8 || avctx->pix_fmt == AV_PIX_FMT_GRAY8) {
for(y = 0; y < avctx->height; y++ ) { for (y = 0; y < avctx->height; y++) {
uint8_t *row = &s->frame.data[0][ y*s->frame.linesize[0] ]; uint8_t *row = &s->frame.data[0][y * s->frame.linesize[0]];
memset(row, 0, avctx->width); memset(row, 0, avctx->width);
for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end; plane++) { for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end;
plane++) {
decodeplane8(row, buf, FFMIN(s->planesize, buf_end - buf), plane); decodeplane8(row, buf, FFMIN(s->planesize, buf_end - buf), plane);
buf += s->planesize; buf += s->planesize;
} }
} }
} else { // AV_PIX_FMT_BGR32 } else { // AV_PIX_FMT_BGR32
for(y = 0; y < avctx->height; y++ ) { for (y = 0; y < avctx->height; y++) {
uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]]; uint8_t *row = &s->frame.data[0][y * s->frame.linesize[0]];
memset(row, 0, avctx->width << 2); memset(row, 0, avctx->width << 2);
for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end; plane++) { for (plane = 0; plane < avctx->bits_per_coded_sample && buf < buf_end;
decodeplane32((uint32_t *) row, buf, FFMIN(s->planesize, buf_end - buf), plane); plane++) {
decodeplane32((uint32_t *)row, buf,
FFMIN(s->planesize, buf_end - buf), plane);
buf += s->planesize; buf += s->planesize;
} }
} }
} }
} else if (avctx->pix_fmt == AV_PIX_FMT_PAL8 || avctx->pix_fmt == AV_PIX_FMT_GRAY8) { // IFF-PBM } else if (avctx->pix_fmt == AV_PIX_FMT_PAL8 || avctx->pix_fmt == AV_PIX_FMT_GRAY8) { // IFF-PBM
for(y = 0; y < avctx->height; y++ ) { for (y = 0; y < avctx->height; y++) {
uint8_t *row = &s->frame.data[0][y * s->frame.linesize[0]]; uint8_t *row = &s->frame.data[0][y * s->frame.linesize[0]];
memcpy(row, buf, FFMIN(avctx->width, buf_end - buf)); memcpy(row, buf, FFMIN(avctx->width, buf_end - buf));
buf += avctx->width + (avctx->width % 2); // padding if odd buf += avctx->width + (avctx->width % 2); // padding if odd
...@@ -309,7 +311,7 @@ static int decode_frame_byterun1(AVCodecContext *avctx, ...@@ -309,7 +311,7 @@ static int decode_frame_byterun1(AVCodecContext *avctx,
IffContext *s = avctx->priv_data; IffContext *s = avctx->priv_data;
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size; int buf_size = avpkt->size;
const uint8_t *buf_end = buf+buf_size; const uint8_t *buf_end = buf + buf_size;
int y, plane, res; int y, plane, res;
if ((res = ff_reget_buffer(avctx, &s->frame)) < 0) if ((res = ff_reget_buffer(avctx, &s->frame)) < 0)
...@@ -317,34 +319,34 @@ static int decode_frame_byterun1(AVCodecContext *avctx, ...@@ -317,34 +319,34 @@ static int decode_frame_byterun1(AVCodecContext *avctx,
if (!s->init && avctx->bits_per_coded_sample <= 8 && if (!s->init && avctx->bits_per_coded_sample <= 8 &&
avctx->pix_fmt != AV_PIX_FMT_GRAY8) { avctx->pix_fmt != AV_PIX_FMT_GRAY8) {
if ((res = cmap_read_palette(avctx, (uint32_t*)s->frame.data[1])) < 0) if ((res = cmap_read_palette(avctx, (uint32_t *)s->frame.data[1])) < 0)
return res; return res;
} }
s->init = 1; s->init = 1;
if (avctx->codec_tag == MKTAG('I','L','B','M')) { //interleaved if (avctx->codec_tag == MKTAG('I', 'L', 'B', 'M')) { // interleaved
if (avctx->pix_fmt == AV_PIX_FMT_PAL8 || avctx->pix_fmt == AV_PIX_FMT_GRAY8) { if (avctx->pix_fmt == AV_PIX_FMT_PAL8 || avctx->pix_fmt == AV_PIX_FMT_GRAY8) {
for(y = 0; y < avctx->height ; y++ ) { for (y = 0; y < avctx->height; y++) {
uint8_t *row = &s->frame.data[0][ y*s->frame.linesize[0] ]; uint8_t *row = &s->frame.data[0][y * s->frame.linesize[0]];
memset(row, 0, avctx->width); memset(row, 0, avctx->width);
for (plane = 0; plane < avctx->bits_per_coded_sample; plane++) { for (plane = 0; plane < avctx->bits_per_coded_sample; plane++) {
buf += decode_byterun(s->planebuf, s->planesize, buf, buf_end); buf += decode_byterun(s->planebuf, s->planesize, buf, buf_end);
decodeplane8(row, s->planebuf, s->planesize, plane); decodeplane8(row, s->planebuf, s->planesize, plane);
} }
} }
} else { //AV_PIX_FMT_BGR32 } else { // AV_PIX_FMT_BGR32
for(y = 0; y < avctx->height ; y++ ) { for (y = 0; y < avctx->height; y++) {
uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]]; uint8_t *row = &s->frame.data[0][y * s->frame.linesize[0]];
memset(row, 0, avctx->width << 2); memset(row, 0, avctx->width << 2);
for (plane = 0; plane < avctx->bits_per_coded_sample; plane++) { for (plane = 0; plane < avctx->bits_per_coded_sample; plane++) {
buf += decode_byterun(s->planebuf, s->planesize, buf, buf_end); buf += decode_byterun(s->planebuf, s->planesize, buf, buf_end);
decodeplane32((uint32_t *) row, s->planebuf, s->planesize, plane); decodeplane32((uint32_t *)row, s->planebuf, s->planesize, plane);
} }
} }
} }
} else { } else {
for(y = 0; y < avctx->height ; y++ ) { for (y = 0; y < avctx->height; y++) {
uint8_t *row = &s->frame.data[0][y*s->frame.linesize[0]]; uint8_t *row = &s->frame.data[0][y * s->frame.linesize[0]];
buf += decode_byterun(row, avctx->width, buf, buf_end); buf += decode_byterun(row, avctx->width, buf, buf_end);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment