X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fbmp.c;h=648fa68e1ff7c5b551e173ff05143ea38afa3d45;hb=081961f819c0b16c7a860d7da7d39f1fd91bd2f0;hp=dc9030634728b5b0020e3117fb54f8cd3b7389d4;hpb=5509bffa88238d1f445a84a32e3791bfb9e532fd;p=ffmpeg

diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c
index dc903063472..648fa68e1ff 100644
--- a/libavcodec/bmp.c
+++ b/libavcodec/bmp.c
@@ -1,142 +1,147 @@
 /*
- * BMP image format
+ * BMP image format decoder
  * Copyright (c) 2005 Mans Rullgard
  *
- * This library is free software; you can redistribute it and/or
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "avcodec.h"
-#include "bitstream.h"
-#include "bswap.h"
-
-typedef struct BMPContext {
-    AVFrame picture;
-} BMPContext;
-
-#define BMP_RGB       0
-#define BMP_RLE8      1
-#define BMP_RLE4      2
-#define BMP_BITFIELDS 3
-
-#define read16(bits) bswap_16(get_bits(bits, 16))
-#define read32(bits) bswap_32(get_bits_long(bits, 32))
-
-static int bmp_decode_init(AVCodecContext *avctx){
-    BMPContext *s = avctx->priv_data;
+#include <inttypes.h>
 
-    avcodec_get_frame_defaults((AVFrame*)&s->picture);
-    avctx->coded_frame = (AVFrame*)&s->picture;
-
-    return 0;
-}
+#include "avcodec.h"
+#include "bytestream.h"
+#include "bmp.h"
+#include "internal.h"
+#include "msrledec.h"
 
 static int bmp_decode_frame(AVCodecContext *avctx,
-                            void *data, int *data_size,
-                            uint8_t *buf, int buf_size)
+                            void *data, int *got_frame,
+                            AVPacket *avpkt)
 {
-    BMPContext *s = avctx->priv_data;
-    AVFrame *picture = data;
-    AVFrame *p = &s->picture;
-    GetBitContext bits;
+    const uint8_t *buf = avpkt->data;
+    int buf_size       = avpkt->size;
+    AVFrame *p         = data;
     unsigned int fsize, hsize;
     int width, height;
     unsigned int depth;
-    unsigned int comp;
+    BiCompression comp;
     unsigned int ihsize;
-    int i, j, n, linesize;
+    int i, j, n, linesize, ret;
     uint32_t rgb[3];
     uint8_t *ptr;
     int dsize;
+    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;
+        return AVERROR_INVALIDDATA;
     }
 
-    init_get_bits(&bits, buf, buf_size);
-
-    if(get_bits(&bits, 16) != 0x424d){ /* 'BM' */
+    if (bytestream_get_byte(&buf) != 'B' ||
+        bytestream_get_byte(&buf) != 'M') {
         av_log(avctx, AV_LOG_ERROR, "bad magic number\n");
-        return -1;
+        return AVERROR_INVALIDDATA;
     }
 
-    fsize = read32(&bits);
-    if(buf_size < fsize){
-        av_log(avctx, AV_LOG_ERROR, "not enough data (%d < %d)\n",
+    fsize = bytestream_get_le32(&buf);
+    if (buf_size < fsize) {
+        av_log(avctx, AV_LOG_ERROR, "not enough data (%d < %u), trying to decode anyway\n",
                buf_size, fsize);
-        return -1;
+        fsize = buf_size;
     }
 
-    skip_bits(&bits, 16);       /* reserved1 */
-    skip_bits(&bits, 16);       /* reserved2 */
+    buf += 2; /* reserved1 */
+    buf += 2; /* reserved2 */
 
-    hsize = read32(&bits); /* header size */
-    if(fsize <= hsize){
-        av_log(avctx, AV_LOG_ERROR, "not enough data (%d < %d)\n",
-               fsize, hsize);
-        return -1;
+    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 %u\n", hsize);
+        return AVERROR_INVALIDDATA;
     }
 
-    ihsize = read32(&bits);       /* 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)
+        fsize = buf_size - 2;
+
+    if (fsize <= hsize) {
+        av_log(avctx, AV_LOG_ERROR,
+               "Declared file size is less than header size (%u < %u)\n",
+               fsize, hsize);
+        return AVERROR_INVALIDDATA;
     }
 
-    width = read32(&bits);
-    height = read32(&bits);
+    switch (ihsize) {
+    case  40: // windib v3
+    case  64: // OS/2 v2
+    case 108: // windib v4
+    case 124: // windib v5
+        width  = bytestream_get_le32(&buf);
+        height = bytestream_get_le32(&buf);
+        break;
+    case  12: // OS/2 v1
+        width  = bytestream_get_le16(&buf);
+        height = bytestream_get_le16(&buf);
+        break;
+    default:
+        av_log(avctx, AV_LOG_ERROR, "unsupported BMP file, patch welcome\n");
+        return AVERROR_PATCHWELCOME;
+    }
 
-    if(read16(&bits) != 1){ /* planes */
+    /* planes */
+    if (bytestream_get_le16(&buf) != 1) {
         av_log(avctx, AV_LOG_ERROR, "invalid BMP header\n");
-        return -1;
+        return AVERROR_INVALIDDATA;
     }
 
-    depth = read16(&bits);
+    depth = bytestream_get_le16(&buf);
 
-    if(ihsize > 16)
-        comp = read32(&bits);
+    if (ihsize == 40)
+        comp = bytestream_get_le32(&buf);
     else
         comp = BMP_RGB;
 
-    if(comp != BMP_RGB && comp != BMP_BITFIELDS){
+    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;
+        return AVERROR_INVALIDDATA;
     }
 
-    if(comp == BMP_BITFIELDS){
-        skip_bits(&bits, 20 * 8);
-        rgb[0] = read32(&bits);
-        rgb[1] = read32(&bits);
-        rgb[2] = read32(&bits);
+    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->codec_id = CODEC_ID_BMP;
-    avctx->width = width;
-    avctx->height = height > 0? height: -height;
+    avctx->width  = width;
+    avctx->height = height > 0 ? height : -height;
 
-    avctx->pix_fmt = PIX_FMT_NONE;
+    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 {
@@ -145,107 +150,208 @@ static int bmp_decode_frame(AVCodecContext *avctx,
             rgb[2] = 0;
         }
 
-        avctx->pix_fmt = PIX_FMT_BGR24;
+        avctx->pix_fmt = AV_PIX_FMT_BGR24;
         break;
     case 24:
-        avctx->pix_fmt = PIX_FMT_BGR24;
+        avctx->pix_fmt = AV_PIX_FMT_BGR24;
         break;
     case 16:
-        if(comp == BMP_RGB)
-            avctx->pix_fmt = PIX_FMT_RGB555;
+        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)
+               avctx->pix_fmt = AV_PIX_FMT_RGB565;
+            else if (rgb[0] == 0x7C00 && rgb[1] == 0x03E0 && rgb[2] == 0x001F)
+               avctx->pix_fmt = AV_PIX_FMT_RGB555;
+            else if (rgb[0] == 0x0F00 && rgb[1] == 0x00F0 && rgb[2] == 0x000F)
+               avctx->pix_fmt = AV_PIX_FMT_RGB444;
+            else {
+               av_log(avctx, AV_LOG_ERROR,
+                      "Unknown bitfields %0"PRIX32" %0"PRIX32" %0"PRIX32"\n",
+                      rgb[0], rgb[1], rgb[2]);
+               return AVERROR(EINVAL);
+            }
+        }
+        break;
+    case 8:
+        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) {
+            avctx->pix_fmt = AV_PIX_FMT_PAL8;
+        } else {
+            av_log(avctx, AV_LOG_ERROR, "Unknown palette for %u-colour BMP\n",
+                   1 << depth);
+            return AVERROR_INVALIDDATA;
+        }
         break;
     default:
-        av_log(avctx, AV_LOG_ERROR, "depth %d not supported\n", depth);
-        return -1;
+        av_log(avctx, AV_LOG_ERROR, "depth %u not supported\n", depth);
+        return AVERROR_INVALIDDATA;
     }
 
-    if(avctx->pix_fmt == PIX_FMT_NONE){
+    if (avctx->pix_fmt == AV_PIX_FMT_NONE) {
         av_log(avctx, AV_LOG_ERROR, "unsupported pixel format\n");
-        return -1;
+        return AVERROR_INVALIDDATA;
     }
 
-    p->reference = 0;
-    if(avctx->get_buffer(avctx, p) < 0){
+    if ((ret = ff_get_buffer(avctx, p, 0)) < 0) {
         av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
-        return -1;
+        return ret;
     }
-    p->pict_type = FF_I_TYPE;
+    p->pict_type = AV_PICTURE_TYPE_I;
     p->key_frame = 1;
 
-    buf += hsize;
+    buf   = buf0 + hsize;
     dsize = buf_size - hsize;
 
-    n = avctx->width * (depth / 8);
+    /* Line size in file multiple of 4 */
+    n = ((avctx->width * depth) / 8 + 3) & ~3;
 
-    if(n * avctx->height > dsize){
+    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;
+        return AVERROR_INVALIDDATA;
     }
 
-    if(height > 0){
-        ptr = p->data[0] + (avctx->height - 1) * p->linesize[0];
+    // RLE may skip decoding some picture areas, so blank picture before decoding
+    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];
         linesize = -p->linesize[0];
     } else {
-        ptr = p->data[0];
+        ptr      = p->data[0];
         linesize = p->linesize[0];
     }
 
-    switch(depth){
-    case 24:
-        for(i = 0; i < avctx->height; i++){
-            memcpy(ptr, buf, n);
-            buf += n;
-            ptr += linesize;
+    if (avctx->pix_fmt == AV_PIX_FMT_PAL8) {
+        int colors = 1 << depth;
+
+        memset(p->data[1], 0, 1024);
+
+        if (ihsize >= 36) {
+            int t;
+            buf = buf0 + 46;
+            t   = bytestream_get_le32(&buf);
+            if (t < 0 || t > (1 << depth)) {
+                av_log(avctx, AV_LOG_ERROR,
+                       "Incorrect number of colors - %X for bitdepth %u\n",
+                       t, depth);
+            } else if (t) {
+                colors = t;
+            }
         }
-        break;
-    case 16:
-        for(i = 0; i < avctx->height; i++){
-            uint16_t *src = (uint16_t *) buf;
-            uint16_t *dst = (uint16_t *) ptr;
-
-            for(j = 0; j < avctx->width; j++)
-                *dst++ = le2me_16(*src++);
-
-            buf += n;
-            ptr += linesize;
+        buf = buf0 + 14 + ihsize; //palette location
+        // 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++)
+                ((uint32_t*)p->data[1])[i] = bytestream_get_le32(&buf);
         }
-        break;
-    case 32:
-        for(i = 0; i < avctx->height; i++){
-            uint8_t *src = buf;
-            uint8_t *dst = ptr;
-
-            for(j = 0; j < avctx->width; j++){
-                dst[0] = src[rgb[2]];
-                dst[1] = src[rgb[1]];
-                dst[2] = src[rgb[0]];
-                dst += 3;
-                src += 4;
+        buf = buf0 + hsize;
+    }
+    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, p, depth, &gb);
+        if (height < 0) {
+            p->data[0]    +=  p->linesize[0] * (avctx->height - 1);
+            p->linesize[0] = -p->linesize[0];
+        }
+    } else {
+        switch (depth) {
+        case 1:
+            for (i = 0; i < avctx->height; i++) {
+                int j;
+                for (j = 0; j < n; j++) {
+                    ptr[j*8+0] =  buf[j] >> 7;
+                    ptr[j*8+1] = (buf[j] >> 6) & 1;
+                    ptr[j*8+2] = (buf[j] >> 5) & 1;
+                    ptr[j*8+3] = (buf[j] >> 4) & 1;
+                    ptr[j*8+4] = (buf[j] >> 3) & 1;
+                    ptr[j*8+5] = (buf[j] >> 2) & 1;
+                    ptr[j*8+6] = (buf[j] >> 1) & 1;
+                    ptr[j*8+7] =  buf[j]       & 1;
+                }
+                buf += n;
+                ptr += linesize;
+            }
+            break;
+        case 8:
+        case 24:
+            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++) {
+                int j;
+                for (j = 0; j < n; j++) {
+                    ptr[j*2+0] = (buf[j] >> 4) & 0xF;
+                    ptr[j*2+1] = buf[j] & 0xF;
+                }
+                buf += n;
+                ptr += linesize;
             }
+            break;
+        case 16:
+            for (i = 0; i < avctx->height; i++) {
+                const uint16_t *src = (const uint16_t *) buf;
+                uint16_t *dst       = (uint16_t *) ptr;
 
-            buf += n;
-            ptr += linesize;
+                for (j = 0; j < avctx->width; j++)
+                    *dst++ = av_le2ne16(*src++);
+
+                buf += n;
+                ptr += linesize;
+            }
+            break;
+        case 32:
+            for (i = 0; i < avctx->height; i++) {
+                const uint8_t *src = buf;
+                uint8_t *dst       = ptr;
+
+                for (j = 0; j < avctx->width; j++) {
+                    dst[0] = src[rgb[2]];
+                    dst[1] = src[rgb[1]];
+                    dst[2] = src[rgb[0]];
+                    dst += 3;
+                    src += 4;
+                }
+
+                buf += n;
+                ptr += linesize;
+            }
+            break;
+        default:
+            av_log(avctx, AV_LOG_ERROR, "BMP decoder is broken\n");
+            return AVERROR_INVALIDDATA;
         }
-        break;
-    default:
-        av_log(avctx, AV_LOG_ERROR, "BMP decoder is broken\n");
-        return -1;
     }
 
-    *picture = s->picture;
-    *data_size = sizeof(AVPicture);
+    *got_frame = 1;
 
     return buf_size;
 }
 
-AVCodec bmp_decoder = {
-    "bmp",
-    CODEC_TYPE_VIDEO,
-    CODEC_ID_BMP,
-    sizeof(BMPContext),
-    bmp_decode_init,
-    NULL,
-    NULL,
-    bmp_decode_frame
+AVCodec ff_bmp_decoder = {
+    .name           = "bmp",
+    .long_name      = NULL_IF_CONFIG_SMALL("BMP (Windows and OS/2 bitmap)"),
+    .type           = AVMEDIA_TYPE_VIDEO,
+    .id             = AV_CODEC_ID_BMP,
+    .decode         = bmp_decode_frame,
+    .capabilities   = AV_CODEC_CAP_DR1,
 };