[FFmpeg-cvslog] bmp: cosmetics, reformat
Anton Khirnov
git at videolan.org
Mon Dec 24 15:54:03 CET 2012
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Thu Nov 15 09:23:55 2012 +0100| [3eab60075240bd9855661a20667077d5435e065a] | committer: Anton Khirnov
bmp: cosmetics, reformat
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3eab60075240bd9855661a20667077d5435e065a
---
libavcodec/bmp.c | 132 ++++++++++++++++++++++++++++--------------------------
1 file changed, 68 insertions(+), 64 deletions(-)
diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c
index 648d0ac..9c8988c 100644
--- a/libavcodec/bmp.c
+++ b/libavcodec/bmp.c
@@ -25,7 +25,8 @@
#include "internal.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;
avcodec_get_frame_defaults(&s->picture);
@@ -39,10 +40,10 @@ static int bmp_decode_frame(AVCodecContext *avctx,
AVPacket *avpkt)
{
const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
- BMPContext *s = avctx->priv_data;
- AVFrame *picture = data;
- AVFrame *p = &s->picture;
+ int buf_size = avpkt->size;
+ BMPContext *s = avctx->priv_data;
+ AVFrame *picture = data;
+ AVFrame *p = &s->picture;
unsigned int fsize, hsize;
int width, height;
unsigned int depth;
@@ -55,19 +56,19 @@ static int bmp_decode_frame(AVCodecContext *avctx,
const uint8_t *buf0 = buf;
GetByteContext gb;
- if(buf_size < 14){
+ if (buf_size < 14) {
av_log(avctx, AV_LOG_ERROR, "buf size too small (%d)\n", buf_size);
return -1;
}
- if(bytestream_get_byte(&buf) != 'B' ||
- bytestream_get_byte(&buf) != 'M') {
+ if (bytestream_get_byte(&buf) != 'B' ||
+ bytestream_get_byte(&buf) != 'M') {
av_log(avctx, AV_LOG_ERROR, "bad magic number\n");
return -1;
}
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",
buf_size, fsize);
fsize = buf_size;
@@ -76,29 +77,29 @@ static int bmp_decode_frame(AVCodecContext *avctx,
buf += 2; /* reserved1 */
buf += 2; /* reserved2 */
- hsize = bytestream_get_le32(&buf); /* header size */
- ihsize = bytestream_get_le32(&buf); /* more header size */
- if(ihsize + 14 > hsize){
+ hsize = bytestream_get_le32(&buf); /* header size */
+ ihsize = bytestream_get_le32(&buf); /* more header size */
+ if (ihsize + 14 > hsize) {
av_log(avctx, AV_LOG_ERROR, "invalid header size %d\n", hsize);
return -1;
}
/* 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;
- if(fsize <= hsize){
+ if (fsize <= hsize) {
av_log(avctx, AV_LOG_ERROR, "declared file size is less than header size (%d < %d)\n",
fsize, hsize);
return -1;
}
- switch(ihsize){
+ switch (ihsize) {
case 40: // windib v3
case 64: // OS/2 v2
case 108: // windib v4
case 124: // windib v5
- width = bytestream_get_le32(&buf);
+ width = bytestream_get_le32(&buf);
height = bytestream_get_le32(&buf);
break;
case 12: // OS/2 v1
@@ -110,44 +111,46 @@ static int bmp_decode_frame(AVCodecContext *avctx,
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");
return -1;
}
depth = bytestream_get_le16(&buf);
- if(ihsize == 40)
+ if (ihsize == 40)
comp = bytestream_get_le32(&buf);
else
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);
return -1;
}
- if(comp == BMP_BITFIELDS){
+ if (comp == BMP_BITFIELDS) {
buf += 20;
rgb[0] = bytestream_get_le32(&buf);
rgb[1] = bytestream_get_le32(&buf);
rgb[2] = bytestream_get_le32(&buf);
}
- avctx->width = width;
- avctx->height = height > 0? height: -height;
+ avctx->width = width;
+ avctx->height = height > 0 ? height : -height;
avctx->pix_fmt = AV_PIX_FMT_NONE;
- switch(depth){
+ switch (depth) {
case 32:
- if(comp == BMP_BITFIELDS){
+ if (comp == BMP_BITFIELDS) {
rgb[0] = (rgb[0] >> 15) & 3;
rgb[1] = (rgb[1] >> 15) & 3;
rgb[2] = (rgb[2] >> 15) & 3;
- if(rgb[0] + rgb[1] + rgb[2] != 3 ||
- rgb[0] == rgb[1] || rgb[0] == rgb[2] || rgb[1] == rgb[2]){
+ if (rgb[0] + rgb[1] + rgb[2] != 3 ||
+ rgb[0] == rgb[1] || rgb[0] == rgb[2] || rgb[1] == rgb[2]) {
break;
}
} else {
@@ -162,7 +165,7 @@ static int bmp_decode_frame(AVCodecContext *avctx,
avctx->pix_fmt = AV_PIX_FMT_BGR24;
break;
case 16:
- if(comp == BMP_RGB)
+ if (comp == BMP_RGB)
avctx->pix_fmt = AV_PIX_FMT_RGB555;
else if (comp == BMP_BITFIELDS) {
if (rgb[0] == 0xF800 && rgb[1] == 0x07E0 && rgb[2] == 0x001F)
@@ -178,16 +181,16 @@ static int bmp_decode_frame(AVCodecContext *avctx,
}
break;
case 8:
- if(hsize - ihsize - 14 > 0)
+ if (hsize - ihsize - 14 > 0)
avctx->pix_fmt = AV_PIX_FMT_PAL8;
else
avctx->pix_fmt = AV_PIX_FMT_GRAY8;
break;
case 1:
case 4:
- if(hsize - ihsize - 14 > 0){
+ if (hsize - ihsize - 14 > 0) {
avctx->pix_fmt = AV_PIX_FMT_PAL8;
- }else{
+ } else {
av_log(avctx, AV_LOG_ERROR, "Unknown palette for %d-colour BMP\n", 1<<depth);
return -1;
}
@@ -197,84 +200,85 @@ static int bmp_decode_frame(AVCodecContext *avctx,
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");
return -1;
}
- if(p->data[0])
+ if (p->data[0])
avctx->release_buffer(avctx, p);
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");
return -1;
}
p->pict_type = AV_PICTURE_TYPE_I;
p->key_frame = 1;
- buf = buf0 + hsize;
+ buf = buf0 + hsize;
dsize = buf_size - hsize;
/* Line size in file multiple of 4 */
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",
dsize, n * avctx->height);
return -1;
}
// 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]);
- if(height > 0){
- ptr = p->data[0] + (avctx->height - 1) * p->linesize[0];
+ if (height > 0) {
+ ptr = p->data[0] + (avctx->height - 1) * p->linesize[0];
linesize = -p->linesize[0];
} else {
- ptr = p->data[0];
+ ptr = p->data[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;
memset(p->data[1], 0, 1024);
- if(ihsize >= 36){
+ if (ihsize >= 36) {
int t;
buf = buf0 + 46;
- t = bytestream_get_le32(&buf);
- if(t < 0 || t > (1 << depth)){
+ t = bytestream_get_le32(&buf);
+ if (t < 0 || t > (1 << 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;
}
}
buf = buf0 + 14 + ihsize; //palette location
- if((hsize-ihsize-14) < (colors << 2)){ // OS/2 bitmap, 3 bytes per palette entry
- for(i = 0; i < colors; i++)
+ // OS/2 bitmap, 3 bytes per palette entry
+ if ((hsize-ihsize-14) < (colors << 2)) {
+ for (i = 0; i < colors; i++)
((uint32_t*)p->data[1])[i] = bytestream_get_le24(&buf);
- }else{
- for(i = 0; i < colors; i++)
+ } else {
+ for (i = 0; i < colors; i++)
((uint32_t*)p->data[1])[i] = bytestream_get_le32(&buf);
}
buf = buf0 + hsize;
}
- if(comp == BMP_RLE4 || comp == BMP_RLE8){
- if(height < 0){
- p->data[0] += p->linesize[0] * (avctx->height - 1);
+ if (comp == BMP_RLE4 || comp == BMP_RLE8) {
+ if (height < 0) {
+ p->data[0] += p->linesize[0] * (avctx->height - 1);
p->linesize[0] = -p->linesize[0];
}
bytestream2_init(&gb, buf, dsize);
ff_msrle_decode(avctx, (AVPicture*)p, depth, &gb);
- if(height < 0){
- p->data[0] += p->linesize[0] * (avctx->height - 1);
+ if (height < 0) {
+ p->data[0] += p->linesize[0] * (avctx->height - 1);
p->linesize[0] = -p->linesize[0];
}
- }else{
- switch(depth){
+ } else {
+ switch (depth) {
case 1:
for (i = 0; i < avctx->height; i++) {
int j;
@@ -294,16 +298,16 @@ static int bmp_decode_frame(AVCodecContext *avctx,
break;
case 8:
case 24:
- for(i = 0; i < avctx->height; i++){
+ for (i = 0; i < avctx->height; i++) {
memcpy(ptr, buf, n);
buf += n;
ptr += linesize;
}
break;
case 4:
- for(i = 0; i < avctx->height; i++){
+ for (i = 0; i < avctx->height; i++) {
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+1] = buf[j] & 0xF;
}
@@ -312,11 +316,11 @@ static int bmp_decode_frame(AVCodecContext *avctx,
}
break;
case 16:
- for(i = 0; i < avctx->height; i++){
+ for (i = 0; i < avctx->height; i++) {
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++);
buf += n;
@@ -324,11 +328,11 @@ static int bmp_decode_frame(AVCodecContext *avctx,
}
break;
case 32:
- for(i = 0; i < avctx->height; i++){
+ for (i = 0; i < avctx->height; i++) {
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[1] = src[rgb[1]];
dst[2] = src[rgb[0]];
More information about the ffmpeg-cvslog
mailing list