[SCM] libav/experimental: BMP encoder by Michel Bardiaux, mbardiaux mediaxim be
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:55:55 UTC 2013
The following commit has been merged in the experimental branch:
commit 52548eeede51e43c811b813d0b9c7144f5939046
Author: Diego Biurrun <diego at biurrun.de>
Date: Mon Feb 5 15:05:29 2007 +0000
BMP encoder by Michel Bardiaux, mbardiaux mediaxim be
Originally committed as revision 7824 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/Changelog b/Changelog
index 99ff32e..9c655e8 100644
--- a/Changelog
+++ b/Changelog
@@ -69,6 +69,7 @@ version <next>
- Musepack decoder
- Flash Screen Video encoder
- Theora encoding via libtheora
+- BMP encoder
version 0.4.9-pre1:
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 0b8c724..8b3c96b 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -55,6 +55,7 @@ OBJS-$(CONFIG_ASV2_DECODER) += asv1.o
OBJS-$(CONFIG_ASV2_ENCODER) += asv1.o
OBJS-$(CONFIG_AVS_DECODER) += avs.o
OBJS-$(CONFIG_BMP_DECODER) += bmp.o
+OBJS-$(CONFIG_BMP_ENCODER) += bmpenc.o
OBJS-$(CONFIG_CAVS_DECODER) += cavs.o cavsdsp.o
OBJS-$(CONFIG_CINEPAK_DECODER) += cinepak.o
OBJS-$(CONFIG_CLJR_DECODER) += cljr.o
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 5ae88fc..a2c88c8 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -54,7 +54,7 @@ void avcodec_register_all(void)
REGISTER_ENCDEC (ASV1, asv1);
REGISTER_ENCDEC (ASV2, asv2);
REGISTER_DECODER(AVS, avs);
- REGISTER_DECODER(BMP, bmp);
+ REGISTER_ENCDEC (BMP, bmp);
REGISTER_DECODER(CAVS, cavs);
REGISTER_DECODER(CINEPAK, cinepak);
REGISTER_DECODER(CLJR, cljr);
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 379414b..416d8ea 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -37,8 +37,8 @@ extern "C" {
#define AV_STRINGIFY(s) AV_TOSTRING(s)
#define AV_TOSTRING(s) #s
-#define LIBAVCODEC_VERSION_INT ((51<<16)+(30<<8)+0)
-#define LIBAVCODEC_VERSION 51.30.0
+#define LIBAVCODEC_VERSION_INT ((51<<16)+(31<<8)+0)
+#define LIBAVCODEC_VERSION 51.31.0
#define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT
#define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
@@ -2148,6 +2148,7 @@ extern AVCodec amr_nb_encoder;
extern AVCodec amr_wb_encoder;
extern AVCodec asv1_encoder;
extern AVCodec asv2_encoder;
+extern AVCodec bmp_encoder;
extern AVCodec dvvideo_encoder;
extern AVCodec faac_encoder;
extern AVCodec ffv1_encoder;
diff --git a/libavcodec/bmpenc.c b/libavcodec/bmpenc.c
new file mode 100644
index 0000000..3510385
--- /dev/null
+++ b/libavcodec/bmpenc.c
@@ -0,0 +1,98 @@
+/*
+ * BMP image format encoder
+ * Copyright (c) 2006, 2007 Michel Bardiaux
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg 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,
+ * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "avcodec.h"
+#include "bytestream.h"
+#include "bmp.h"
+
+static int bmp_encode_init(AVCodecContext *avctx){
+ BMPContext *s = avctx->priv_data;
+
+ avcodec_get_frame_defaults((AVFrame*)&s->picture);
+ avctx->coded_frame = (AVFrame*)&s->picture;
+
+ 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;
+
+ // 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;
+ 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;
+ }
+ bytestream_put_byte(&buf, 'B'); // BITMAPFILEHEADER.bfType
+ bytestream_put_byte(&buf, 'M'); // do.
+ bytestream_put_le32(&buf, n_bytes); // BITMAPFILEHEADER.bfSize
+ bytestream_put_le16(&buf, 0); // BITMAPFILEHEADER.bfReserved1
+ bytestream_put_le16(&buf, 0); // BITMAPFILEHEADER.bfReserved2
+ bytestream_put_le32(&buf, hsize); // BITMAPFILEHEADER.bfOffBits
+ bytestream_put_le32(&buf, SIZE_BITMAPINFOHEADER); // BITMAPINFOHEADER.biSize
+ 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_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
+ // 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;
+ 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;
+ ptr -= p->linesize[0]; // ... and go back
+ }
+ return n_bytes;
+}
+
+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},
+};
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list