virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

bmp: cosmetics, reformat

Browse Source
This commit is contained in:
Anton Khirnov 2012-11-15 09:23:55 +01:00
parent 4a9f7d2bf9
commit 3eab600752
1 changed files with 68 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
libavcodec/bmp.c
View File

@ -25,7 +25,8 @@
#include "internal.h" #include "internal.h"
#include "msrledec.h" #include "msrledec.h"
static av_cold int bmp_decode_init(AVCodecContext *avctx){ static av_cold int bmp_decode_init(AVCodecContext *avctx)
{
BMPContext *s = avctx->priv_data; BMPContext *s = avctx->priv_data;
avcodec_get_frame_defaults(&s->picture); avcodec_get_frame_defaults(&s->picture);
@ -55,19 +56,19 @@ static int bmp_decode_frame(AVCodecContext *avctx,
const uint8_t *buf0 = buf; const uint8_t *buf0 = buf;
GetByteContext gb; GetByteContext gb;
if(buf_size < 14){ if (buf_size < 14) {
av_log(avctx, AV_LOG_ERROR, "buf size too small (%d)\n", buf_size); av_log(avctx, AV_LOG_ERROR, "buf size too small (%d)\n", buf_size);
return -1; return -1;
} }
if(bytestream_get_byte(&buf) != 'B' || if (bytestream_get_byte(&buf) != 'B' ||
bytestream_get_byte(&buf) != 'M') { bytestream_get_byte(&buf) != 'M') {
av_log(avctx, AV_LOG_ERROR, "bad magic number\n"); av_log(avctx, AV_LOG_ERROR, "bad magic number\n");
return -1; return -1;
} }
fsize = bytestream_get_le32(&buf); fsize = bytestream_get_le32(&buf);
if(buf_size < fsize){ if (buf_size < fsize) {
av_log(avctx, AV_LOG_ERROR, "not enough data (%d < %d), trying to decode anyway\n", av_log(avctx, AV_LOG_ERROR, "not enough data (%d < %d), trying to decode anyway\n",
buf_size, fsize); buf_size, fsize);
fsize = buf_size; fsize = buf_size;
@ -78,22 +79,22 @@ static int bmp_decode_frame(AVCodecContext *avctx,
hsize = bytestream_get_le32(&buf); /* header size */ hsize = bytestream_get_le32(&buf); /* header size */
ihsize = bytestream_get_le32(&buf); /* more header size */ ihsize = bytestream_get_le32(&buf); /* more header size */
if(ihsize + 14 > hsize){ if (ihsize + 14 > hsize) {
av_log(avctx, AV_LOG_ERROR, "invalid header size %d\n", hsize); av_log(avctx, AV_LOG_ERROR, "invalid header size %d\n", hsize);
return -1; return -1;
} }
/* sometimes file size is set to some headers size, set a real size in that case */ /* sometimes file size is set to some headers size, set a real size in that case */
if(fsize == 14 || fsize == ihsize + 14) if (fsize == 14 || fsize == ihsize + 14)
fsize = buf_size - 2; fsize = buf_size - 2;
if(fsize <= hsize){ if (fsize <= hsize) {
av_log(avctx, AV_LOG_ERROR, "declared file size is less than header size (%d < %d)\n", av_log(avctx, AV_LOG_ERROR, "declared file size is less than header size (%d < %d)\n",
fsize, hsize); fsize, hsize);
return -1; return -1;
} }
switch(ihsize){ switch (ihsize) {
case 40: // windib v3 case 40: // windib v3
case 64: // OS/2 v2 case 64: // OS/2 v2
case 108: // windib v4 case 108: // windib v4
@ -110,24 +111,26 @@ static int bmp_decode_frame(AVCodecContext *avctx,
return -1; return -1;
} }
if(bytestream_get_le16(&buf) != 1){ /* planes */ /* planes */
if (bytestream_get_le16(&buf) != 1) {
av_log(avctx, AV_LOG_ERROR, "invalid BMP header\n"); av_log(avctx, AV_LOG_ERROR, "invalid BMP header\n");
return -1; return -1;
} }
depth = bytestream_get_le16(&buf); depth = bytestream_get_le16(&buf);
if(ihsize == 40) if (ihsize == 40)
comp = bytestream_get_le32(&buf); comp = bytestream_get_le32(&buf);
else else
comp = BMP_RGB; comp = BMP_RGB;
if(comp != BMP_RGB && comp != BMP_BITFIELDS && comp != BMP_RLE4 && comp != BMP_RLE8){ if (comp != BMP_RGB && comp != BMP_BITFIELDS && comp != BMP_RLE4 &&
comp != BMP_RLE8) {
av_log(avctx, AV_LOG_ERROR, "BMP coding %d not supported\n", comp); av_log(avctx, AV_LOG_ERROR, "BMP coding %d not supported\n", comp);
return -1; return -1;
} }
if(comp == BMP_BITFIELDS){ if (comp == BMP_BITFIELDS) {
buf += 20; buf += 20;
rgb[0] = bytestream_get_le32(&buf); rgb[0] = bytestream_get_le32(&buf);
rgb[1] = bytestream_get_le32(&buf); rgb[1] = bytestream_get_le32(&buf);
@ -135,19 +138,19 @@ static int bmp_decode_frame(AVCodecContext *avctx,
} }
avctx->width = width; avctx->width = width;
avctx->height = height > 0? height: -height; avctx->height = height > 0 ? height : -height;
avctx->pix_fmt = AV_PIX_FMT_NONE; avctx->pix_fmt = AV_PIX_FMT_NONE;
switch(depth){ switch (depth) {
case 32: case 32:
if(comp == BMP_BITFIELDS){ if (comp == BMP_BITFIELDS) {
rgb[0] = (rgb[0] >> 15) & 3; rgb[0] = (rgb[0] >> 15) & 3;
rgb[1] = (rgb[1] >> 15) & 3; rgb[1] = (rgb[1] >> 15) & 3;
rgb[2] = (rgb[2] >> 15) & 3; rgb[2] = (rgb[2] >> 15) & 3;
if(rgb[0] + rgb[1] + rgb[2] != 3 || if (rgb[0] + rgb[1] + rgb[2] != 3 ||
rgb[0] == rgb[1] || rgb[0] == rgb[2] || rgb[1] == rgb[2]){ rgb[0] == rgb[1] || rgb[0] == rgb[2] || rgb[1] == rgb[2]) {
break; break;
} }
} else { } else {
@ -162,7 +165,7 @@ static int bmp_decode_frame(AVCodecContext *avctx,
avctx->pix_fmt = AV_PIX_FMT_BGR24; avctx->pix_fmt = AV_PIX_FMT_BGR24;
break; break;
case 16: case 16:
if(comp == BMP_RGB) if (comp == BMP_RGB)
avctx->pix_fmt = AV_PIX_FMT_RGB555; avctx->pix_fmt = AV_PIX_FMT_RGB555;
else if (comp == BMP_BITFIELDS) { else if (comp == BMP_BITFIELDS) {
if (rgb[0] == 0xF800 && rgb[1] == 0x07E0 && rgb[2] == 0x001F) if (rgb[0] == 0xF800 && rgb[1] == 0x07E0 && rgb[2] == 0x001F)
@ -178,16 +181,16 @@ static int bmp_decode_frame(AVCodecContext *avctx,
} }
break; break;
case 8: case 8:
if(hsize - ihsize - 14 > 0) if (hsize - ihsize - 14 > 0)
avctx->pix_fmt = AV_PIX_FMT_PAL8; avctx->pix_fmt = AV_PIX_FMT_PAL8;
else else
avctx->pix_fmt = AV_PIX_FMT_GRAY8; avctx->pix_fmt = AV_PIX_FMT_GRAY8;
break; break;
case 1: case 1:
case 4: case 4:
if(hsize - ihsize - 14 > 0){ if (hsize - ihsize - 14 > 0) {
avctx->pix_fmt = AV_PIX_FMT_PAL8; avctx->pix_fmt = AV_PIX_FMT_PAL8;
}else{ } else {
av_log(avctx, AV_LOG_ERROR, "Unknown palette for %d-colour BMP\n", 1<<depth); av_log(avctx, AV_LOG_ERROR, "Unknown palette for %d-colour BMP\n", 1<<depth);
return -1; return -1;
} }
@ -197,16 +200,16 @@ static int bmp_decode_frame(AVCodecContext *avctx,
return -1; return -1;
} }
if(avctx->pix_fmt == AV_PIX_FMT_NONE){ if (avctx->pix_fmt == AV_PIX_FMT_NONE) {
av_log(avctx, AV_LOG_ERROR, "unsupported pixel format\n"); av_log(avctx, AV_LOG_ERROR, "unsupported pixel format\n");
return -1; return -1;
} }
if(p->data[0]) if (p->data[0])
avctx->release_buffer(avctx, p); avctx->release_buffer(avctx, p);
p->reference = 0; p->reference = 0;
if(ff_get_buffer(avctx, p) < 0){ if (ff_get_buffer(avctx, p) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1; return -1;
} }
@ -219,17 +222,17 @@ static int bmp_decode_frame(AVCodecContext *avctx,
/* Line size in file multiple of 4 */ /* Line size in file multiple of 4 */
n = ((avctx->width * depth) / 8 + 3) & ~3; n = ((avctx->width * depth) / 8 + 3) & ~3;
if(n * avctx->height > dsize && comp != BMP_RLE4 && comp != BMP_RLE8){ if (n * avctx->height > dsize && comp != BMP_RLE4 && comp != BMP_RLE8) {
av_log(avctx, AV_LOG_ERROR, "not enough data (%d < %d)\n", av_log(avctx, AV_LOG_ERROR, "not enough data (%d < %d)\n",
dsize, n * avctx->height); dsize, n * avctx->height);
return -1; return -1;
} }
// RLE may skip decoding some picture areas, so blank picture before decoding // RLE may skip decoding some picture areas, so blank picture before decoding
if(comp == BMP_RLE4 || comp == BMP_RLE8) if (comp == BMP_RLE4 || comp == BMP_RLE8)
memset(p->data[0], 0, avctx->height * p->linesize[0]); memset(p->data[0], 0, avctx->height * p->linesize[0]);
if(height > 0){ if (height > 0) {
ptr = p->data[0] + (avctx->height - 1) * p->linesize[0]; ptr = p->data[0] + (avctx->height - 1) * p->linesize[0];
linesize = -p->linesize[0]; linesize = -p->linesize[0];
} else { } else {
@ -237,44 +240,45 @@ static int bmp_decode_frame(AVCodecContext *avctx,
linesize = p->linesize[0]; linesize = p->linesize[0];
} }
if(avctx->pix_fmt == AV_PIX_FMT_PAL8){ if (avctx->pix_fmt == AV_PIX_FMT_PAL8) {
int colors = 1 << depth; int colors = 1 << depth;
memset(p->data[1], 0, 1024); memset(p->data[1], 0, 1024);
if(ihsize >= 36){ if (ihsize >= 36) {
int t; int t;
buf = buf0 + 46; buf = buf0 + 46;
t = bytestream_get_le32(&buf); t = bytestream_get_le32(&buf);
if(t < 0 || t > (1 << depth)){ if (t < 0 || t > (1 << depth)) {
av_log(avctx, AV_LOG_ERROR, "Incorrect number of colors - %X for bitdepth %d\n", t, depth); av_log(avctx, AV_LOG_ERROR, "Incorrect number of colors - %X for bitdepth %d\n", t, depth);
}else if(t){ } else if (t) {
colors = t; colors = t;
} }
} }
buf = buf0 + 14 + ihsize; //palette location buf = buf0 + 14 + ihsize; //palette location
if((hsize-ihsize-14) < (colors << 2)){ // OS/2 bitmap, 3 bytes per palette entry // OS/2 bitmap, 3 bytes per palette entry
for(i = 0; i < colors; i++) if ((hsize-ihsize-14) < (colors << 2)) {
for (i = 0; i < colors; i++)
((uint32_t*)p->data[1])[i] = bytestream_get_le24(&buf); ((uint32_t*)p->data[1])[i] = bytestream_get_le24(&buf);
}else{ } else {
for(i = 0; i < colors; i++) for (i = 0; i < colors; i++)
((uint32_t*)p->data[1])[i] = bytestream_get_le32(&buf); ((uint32_t*)p->data[1])[i] = bytestream_get_le32(&buf);
} }
buf = buf0 + hsize; buf = buf0 + hsize;
} }
if(comp == BMP_RLE4 || comp == BMP_RLE8){ if (comp == BMP_RLE4 || comp == BMP_RLE8) {
if(height < 0){ if (height < 0) {
p->data[0] += p->linesize[0] * (avctx->height - 1); p->data[0] += p->linesize[0] * (avctx->height - 1);
p->linesize[0] = -p->linesize[0]; p->linesize[0] = -p->linesize[0];
} }
bytestream2_init(&gb, buf, dsize); bytestream2_init(&gb, buf, dsize);
ff_msrle_decode(avctx, (AVPicture*)p, depth, &gb); ff_msrle_decode(avctx, (AVPicture*)p, depth, &gb);
if(height < 0){ if (height < 0) {
p->data[0] += p->linesize[0] * (avctx->height - 1); p->data[0] += p->linesize[0] * (avctx->height - 1);
p->linesize[0] = -p->linesize[0]; p->linesize[0] = -p->linesize[0];
} }
}else{ } else {
switch(depth){ switch (depth) {
case 1: case 1:
for (i = 0; i < avctx->height; i++) { for (i = 0; i < avctx->height; i++) {
int j; int j;
@ -294,16 +298,16 @@ static int bmp_decode_frame(AVCodecContext *avctx,
break; break;
case 8: case 8:
case 24: case 24:
for(i = 0; i < avctx->height; i++){ for (i = 0; i < avctx->height; i++) {
memcpy(ptr, buf, n); memcpy(ptr, buf, n);
buf += n; buf += n;
ptr += linesize; ptr += linesize;
} }
break; break;
case 4: case 4:
for(i = 0; i < avctx->height; i++){ for (i = 0; i < avctx->height; i++) {
int j; int j;
for(j = 0; j < n; j++){ for (j = 0; j < n; j++) {
ptr[j*2+0] = (buf[j] >> 4) & 0xF; ptr[j*2+0] = (buf[j] >> 4) & 0xF;
ptr[j*2+1] = buf[j] & 0xF; ptr[j*2+1] = buf[j] & 0xF;
} }
@ -312,11 +316,11 @@ static int bmp_decode_frame(AVCodecContext *avctx,
} }
break; break;
case 16: case 16:
for(i = 0; i < avctx->height; i++){ for (i = 0; i < avctx->height; i++) {
const uint16_t *src = (const uint16_t *) buf; const uint16_t *src = (const uint16_t *) buf;
uint16_t *dst = (uint16_t *) ptr; uint16_t *dst = (uint16_t *) ptr;
for(j = 0; j < avctx->width; j++) for (j = 0; j < avctx->width; j++)
*dst++ = av_le2ne16(*src++); *dst++ = av_le2ne16(*src++);
buf += n; buf += n;
@ -324,11 +328,11 @@ static int bmp_decode_frame(AVCodecContext *avctx,
} }
break; break;
case 32: case 32:
for(i = 0; i < avctx->height; i++){ for (i = 0; i < avctx->height; i++) {
const uint8_t *src = buf; const uint8_t *src = buf;
uint8_t *dst = ptr; uint8_t *dst = ptr;
for(j = 0; j < avctx->width; j++){ for (j = 0; j < avctx->width; j++) {
dst[0] = src[rgb[2]]; dst[0] = src[rgb[2]];
dst[1] = src[rgb[1]]; dst[1] = src[rgb[1]];
dst[2] = src[rgb[0]]; dst[2] = src[rgb[0]];