diff options
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/bmpenc.c | 42 |
1 files changed, 30 insertions, 12 deletions
diff --git a/libavcodec/bmpenc.c b/libavcodec/bmpenc.c index ee85f3cfae..12cb6de404 100644 --- a/libavcodec/bmpenc.c +++ b/libavcodec/bmpenc.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavcore/internal.h" #include "avcodec.h" #include "bytestream.h" #include "bmp.h" @@ -33,6 +34,32 @@ static av_cold int bmp_encode_init(AVCodecContext *avctx){ avcodec_get_frame_defaults((AVFrame*)&s->picture); avctx->coded_frame = (AVFrame*)&s->picture; + switch (avctx->pix_fmt) { + case PIX_FMT_BGR24: + avctx->bits_per_coded_sample = 24; + break; + case PIX_FMT_RGB555: + avctx->bits_per_coded_sample = 16; + break; + case PIX_FMT_RGB565: + avctx->bits_per_coded_sample = 16; + break; + case PIX_FMT_RGB8: + case PIX_FMT_BGR8: + case PIX_FMT_RGB4_BYTE: + case PIX_FMT_BGR4_BYTE: + case PIX_FMT_GRAY8: + case PIX_FMT_PAL8: + avctx->bits_per_coded_sample = 8; + break; + case 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; } @@ -42,21 +69,15 @@ static int bmp_encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_s AVFrame * const p= (AVFrame*)&s->picture; int n_bytes_image, n_bytes_per_row, n_bytes, i, n, hsize; const uint32_t *pal = NULL; - int pad_bytes_per_row, bit_count, pal_entries = 0, compression = BMP_RGB; + int pad_bytes_per_row, pal_entries = 0, compression = BMP_RGB; + int bit_count = avctx->bits_per_coded_sample; uint8_t *ptr; unsigned char* buf0 = buf; *p = *pict; p->pict_type= FF_I_TYPE; p->key_frame= 1; switch (avctx->pix_fmt) { - case PIX_FMT_BGR24: - bit_count = 24; - break; - case PIX_FMT_RGB555: - bit_count = 16; - break; case PIX_FMT_RGB565: - bit_count = 16; compression = BMP_BITFIELDS; pal = rgb565_masks; // abuse pal to hold color masks pal_entries = 3; @@ -66,16 +87,13 @@ static int bmp_encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_s case PIX_FMT_RGB4_BYTE: case PIX_FMT_BGR4_BYTE: case PIX_FMT_GRAY8: + ff_set_systematic_pal2((uint32_t*)p->data[1], avctx->pix_fmt); case PIX_FMT_PAL8: - bit_count = 8; pal = (uint32_t *)p->data[1]; break; case PIX_FMT_MONOBLACK: - bit_count = 1; pal = monoblack_pal; break; - default: - return -1; } if (pal && !pal_entries) pal_entries = 1 << bit_count; n_bytes_per_row = ((int64_t)avctx->width * (int64_t)bit_count + 7LL) >> 3LL; |