X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fbmpenc.c;h=915c3968a7732ba563fd3cd4dc8c24ba41b51ff6;hb=901f9c0a32985f48672fd68594111dc55d88a57a;hp=3510385042f6bc32d17444f71584733223bb7f7f;hpb=52548eeede51e43c811b813d0b9c7144f5939046;p=ffmpeg diff --git a/libavcodec/bmpenc.c b/libavcodec/bmpenc.c index 3510385042f..915c3968a77 100644 --- a/libavcodec/bmpenc.c +++ b/libavcodec/bmpenc.c @@ -1,60 +1,120 @@ /* * BMP image format encoder * Copyright (c) 2006, 2007 Michel Bardiaux + * Copyright (c) 2009 Daniel Verkamp * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * 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.1 of the License, or (at your option) any later version. * - * FFmpeg 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 FFmpeg; 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 "libavutil/imgutils.h" #include "avcodec.h" #include "bytestream.h" #include "bmp.h" +#include "internal.h" -static int bmp_encode_init(AVCodecContext *avctx){ - BMPContext *s = avctx->priv_data; +static const uint32_t monoblack_pal[] = { 0x000000, 0xFFFFFF }; +static const uint32_t rgb565_masks[] = { 0xF800, 0x07E0, 0x001F }; +static const uint32_t rgb444_masks[] = { 0x0F00, 0x00F0, 0x000F }; - avcodec_get_frame_defaults((AVFrame*)&s->picture); - avctx->coded_frame = (AVFrame*)&s->picture; +static av_cold int bmp_encode_init(AVCodecContext *avctx){ + switch (avctx->pix_fmt) { + case AV_PIX_FMT_BGR24: + avctx->bits_per_coded_sample = 24; + break; + case AV_PIX_FMT_RGB555: + case AV_PIX_FMT_RGB565: + case AV_PIX_FMT_RGB444: + avctx->bits_per_coded_sample = 16; + break; + case AV_PIX_FMT_RGB8: + case AV_PIX_FMT_BGR8: + case AV_PIX_FMT_RGB4_BYTE: + case AV_PIX_FMT_BGR4_BYTE: + case AV_PIX_FMT_GRAY8: + case AV_PIX_FMT_PAL8: + avctx->bits_per_coded_sample = 8; + break; + case AV_PIX_FMT_MONOBLACK: + avctx->bits_per_coded_sample = 1; + break; + default: + av_log(avctx, AV_LOG_INFO, "unsupported pixel format\n"); + return -1; + } return 0; } -static int bmp_encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){ - BMPContext *s = avctx->priv_data; - AVFrame *pict = data; - AVFrame * const p= (AVFrame*)&s->picture; - int n_bytes_image, n_bytes_per_row, n_bytes, i, n, hsize; - uint8_t *ptr; - unsigned char* buf0 = buf; - *p = *pict; - p->pict_type= FF_I_TYPE; - p->key_frame= 1; - n_bytes_per_row = (avctx->width*3 + 3) & ~3; - n_bytes_image = avctx->height*n_bytes_per_row; +static int bmp_encode_frame(AVCodecContext *avctx, AVPacket *pkt, + const AVFrame *pict, int *got_packet) +{ + const AVFrame * const p = pict; + int n_bytes_image, n_bytes_per_row, n_bytes, i, n, hsize, ret; + const uint32_t *pal = NULL; + int pad_bytes_per_row, pal_entries = 0, compression = BMP_RGB; + int bit_count = avctx->bits_per_coded_sample; + uint8_t *ptr, *buf; + +#if FF_API_CODED_FRAME +FF_DISABLE_DEPRECATION_WARNINGS + avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; + avctx->coded_frame->key_frame = 1; +FF_ENABLE_DEPRECATION_WARNINGS +#endif + switch (avctx->pix_fmt) { + case AV_PIX_FMT_RGB444: + compression = BMP_BITFIELDS; + pal = rgb444_masks; // abuse pal to hold color masks + pal_entries = 3; + break; + case AV_PIX_FMT_RGB565: + compression = BMP_BITFIELDS; + pal = rgb565_masks; // abuse pal to hold color masks + pal_entries = 3; + break; + case AV_PIX_FMT_RGB8: + case AV_PIX_FMT_BGR8: + case AV_PIX_FMT_RGB4_BYTE: + case AV_PIX_FMT_BGR4_BYTE: + case AV_PIX_FMT_GRAY8: + avpriv_set_systematic_pal2((uint32_t*)p->data[1], avctx->pix_fmt); + case AV_PIX_FMT_PAL8: + pal = (uint32_t *)p->data[1]; + break; + case AV_PIX_FMT_MONOBLACK: + pal = monoblack_pal; + break; + } + if (pal && !pal_entries) pal_entries = 1 << bit_count; + n_bytes_per_row = ((int64_t)avctx->width * (int64_t)bit_count + 7LL) >> 3LL; + pad_bytes_per_row = (4 - n_bytes_per_row) & 3; + n_bytes_image = avctx->height * (n_bytes_per_row + pad_bytes_per_row); // STRUCTURE.field refer to the MSVC documentation for BITMAPFILEHEADER // and related pages. #define SIZE_BITMAPFILEHEADER 14 #define SIZE_BITMAPINFOHEADER 40 - hsize = SIZE_BITMAPFILEHEADER + SIZE_BITMAPINFOHEADER; + hsize = SIZE_BITMAPFILEHEADER + SIZE_BITMAPINFOHEADER + (pal_entries << 2); n_bytes = n_bytes_image + hsize; - if(n_bytes>buf_size) { - av_log(avctx, AV_LOG_ERROR, "buf size too small (need %d, got %d)\n", n_bytes, buf_size); - return -1; + if ((ret = ff_alloc_packet(pkt, n_bytes)) < 0) { + av_log(avctx, AV_LOG_ERROR, "Error getting output packet.\n"); + return ret; } + buf = pkt->data; bytestream_put_byte(&buf, 'B'); // BITMAPFILEHEADER.bfType bytestream_put_byte(&buf, 'M'); // do. bytestream_put_le32(&buf, n_bytes); // BITMAPFILEHEADER.bfSize @@ -65,34 +125,50 @@ static int bmp_encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_s bytestream_put_le32(&buf, avctx->width); // BITMAPINFOHEADER.biWidth bytestream_put_le32(&buf, avctx->height); // BITMAPINFOHEADER.biHeight bytestream_put_le16(&buf, 1); // BITMAPINFOHEADER.biPlanes - bytestream_put_le16(&buf, 24); // BITMAPINFOHEADER.biBitCount - bytestream_put_le32(&buf, BMP_RGB); // BITMAPINFOHEADER.biCompression + bytestream_put_le16(&buf, bit_count); // BITMAPINFOHEADER.biBitCount + bytestream_put_le32(&buf, compression); // BITMAPINFOHEADER.biCompression bytestream_put_le32(&buf, n_bytes_image); // BITMAPINFOHEADER.biSizeImage bytestream_put_le32(&buf, 0); // BITMAPINFOHEADER.biXPelsPerMeter bytestream_put_le32(&buf, 0); // BITMAPINFOHEADER.biYPelsPerMeter bytestream_put_le32(&buf, 0); // BITMAPINFOHEADER.biClrUsed bytestream_put_le32(&buf, 0); // BITMAPINFOHEADER.biClrImportant + for (i = 0; i < pal_entries; i++) + bytestream_put_le32(&buf, pal[i] & 0xFFFFFF); // BMP files are bottom-to-top so we start from the end... ptr = p->data[0] + (avctx->height - 1) * p->linesize[0]; - buf = buf0 + hsize; + buf = pkt->data + hsize; for(i = 0; i < avctx->height; i++) { - n = 3*avctx->width; - memcpy(buf, ptr, n); - buf += n; - memset(buf, 0, n_bytes_per_row-n); - buf += n_bytes_per_row-n; + if (bit_count == 16) { + const uint16_t *src = (const uint16_t *) ptr; + uint16_t *dst = (uint16_t *) buf; + for(n = 0; n < avctx->width; n++) + AV_WL16(dst + n, src[n]); + } else { + memcpy(buf, ptr, n_bytes_per_row); + } + buf += n_bytes_per_row; + memset(buf, 0, pad_bytes_per_row); + buf += pad_bytes_per_row; ptr -= p->linesize[0]; // ... and go back } - return n_bytes; + + pkt->flags |= AV_PKT_FLAG_KEY; + *got_packet = 1; + return 0; } -AVCodec bmp_encoder = { - "bmp", - CODEC_TYPE_VIDEO, - CODEC_ID_BMP, - sizeof(BMPContext), - bmp_encode_init, - bmp_encode_frame, - NULL, //encode_end, - .pix_fmts= (enum PixelFormat[]){PIX_FMT_BGR24, -1}, +AVCodec ff_bmp_encoder = { + .name = "bmp", + .long_name = NULL_IF_CONFIG_SMALL("BMP (Windows and OS/2 bitmap)"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_BMP, + .init = bmp_encode_init, + .encode2 = bmp_encode_frame, + .pix_fmts = (const enum AVPixelFormat[]){ + AV_PIX_FMT_BGR24, + AV_PIX_FMT_RGB555, AV_PIX_FMT_RGB444, AV_PIX_FMT_RGB565, + AV_PIX_FMT_RGB8, AV_PIX_FMT_BGR8, AV_PIX_FMT_RGB4_BYTE, AV_PIX_FMT_BGR4_BYTE, AV_PIX_FMT_GRAY8, AV_PIX_FMT_PAL8, + AV_PIX_FMT_MONOBLACK, + AV_PIX_FMT_NONE + }, };