This version uses 8-byte alignment of lines. However, this generates
"Warning. Data is not aligned!" messages for odd widths. Don't know how
important this is.
Mats
--
Mats Peterson
http://matsp888.no-ip.org/~mats/
>From 6e872d39ad8b087c5c510e71f6b1be1127a16229 Mon Sep 17 00:00:00 2001
From: Mats Peterson <matsp...@yahoo.com>
Date: Wed, 20 Jan 2016 14:52:17 +0100
Subject: [PATCH v4] lavc/rawdec: Use AV_PIX_FMT_PAL8 for 1-bit raw AVI video
The stuff about 1-bit video not necessarily being black & white in
QuickTime goes for AVI as well. Being 1 bit per pixel only means that
the data is bi-level. The two colors can be any color. Since many
1 bpp AVI files don't have a palette following the BITMAPINFOHEADER,
I'm setting a "default" black & white palette in raw_init().
Mats
---
libavcodec/raw.c | 2 +-
libavcodec/rawdec.c | 37 +++++++++++++++++++++++--------------
2 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/libavcodec/raw.c b/libavcodec/raw.c
index 3f2cc11..3979c5c 100644
--- a/libavcodec/raw.c
+++ b/libavcodec/raw.c
@@ -242,7 +242,7 @@ unsigned int avcodec_pix_fmt_to_codec_tag(enum AVPixelFormat fmt)
}
const PixelFormatTag avpriv_pix_fmt_bps_avi[] = {
- { AV_PIX_FMT_MONOWHITE, 1 },
+ { AV_PIX_FMT_PAL8, 1 },
{ AV_PIX_FMT_PAL8, 2 },
{ AV_PIX_FMT_PAL8, 4 },
{ AV_PIX_FMT_PAL8, 8 },
diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c
index cb0364c..996b9e0 100644
--- a/libavcodec/rawdec.c
+++ b/libavcodec/rawdec.c
@@ -41,7 +41,7 @@ typedef struct RawVideoContext {
AVBufferRef *palette;
int frame_size; /* size of the frame in bytes */
int flip;
- int is_1_2_4_bpp; // 1 bpp raw in mov, and 2 or 4 bpp raw in avi/mov
+ int is_1_2_4_bpp; // 1, 2 and 4 bpp raw in avi/mov
int is_yuv2;
int is_lt_16bpp; // 16bpp pixfmt and bits_per_coded_sample < 16
int tff;
@@ -94,8 +94,11 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx)
return AVERROR(ENOMEM);
if (desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL)
avpriv_set_systematic_pal2((uint32_t*)context->palette->data, avctx->pix_fmt);
- else
+ else {
memset(context->palette->data, 0, AVPALETTE_SIZE);
+ if (avctx->bits_per_coded_sample == 1)
+ memset(context->palette->data, 0xff, 4);
+ }
}
if ((avctx->extradata_size >= 9 &&
@@ -165,7 +168,7 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame,
(!avctx->codec_tag || avctx->codec_tag == MKTAG('r','a','w',' '))) {
context->is_1_2_4_bpp = 1;
context->frame_size = av_image_get_buffer_size(avctx->pix_fmt,
- FFALIGN(avctx->width, 32),
+ FFALIGN(avctx->width, 16),
avctx->height, 1);
} else {
context->is_lt_16bpp = av_get_bits_per_pixel(desc) == 16 && avctx->bits_per_coded_sample && avctx->bits_per_coded_sample < 16;
@@ -202,7 +205,7 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame,
if (!frame->buf[0])
return AVERROR(ENOMEM);
- // 1 bpp raw in mov, and 2 or 4 bpp raw in avi/mov
+ // 1, 2 and 4 bpp raw in avi/mov
if (context->is_1_2_4_bpp) {
int i;
uint8_t *dst = frame->buf[0]->data;
@@ -222,18 +225,24 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame,
}
linesize_align = 16;
} else {
+ int j, row_pix = 0;
av_assert0(avctx->bits_per_coded_sample == 1);
- for (i = 0; 8 * i + 7 < buf_size && i<avpkt->size; i++) {
- dst[8 * i + 0] = buf[i] >> 7 & 1;
- dst[8 * i + 1] = buf[i] >> 6 & 1;
- dst[8 * i + 2] = buf[i] >> 5 & 1;
- dst[8 * i + 3] = buf[i] >> 4 & 1;
- dst[8 * i + 4] = buf[i] >> 3 & 1;
- dst[8 * i + 5] = buf[i] >> 2 & 1;
- dst[8 * i + 6] = buf[i] >> 1 & 1;
- dst[8 * i + 7] = buf[i] & 1;
+ for (i = 0, j = 0; 8 * j + 7 < buf_size && i<avpkt->size; i++, j++) {
+ dst[8 * j + 0] = buf[i] >> 7 & 1;
+ dst[8 * j + 1] = buf[i] >> 6 & 1;
+ dst[8 * j + 2] = buf[i] >> 5 & 1;
+ dst[8 * j + 3] = buf[i] >> 4 & 1;
+ dst[8 * j + 4] = buf[i] >> 3 & 1;
+ dst[8 * j + 5] = buf[i] >> 2 & 1;
+ dst[8 * j + 6] = buf[i] >> 1 & 1;
+ dst[8 * j + 7] = buf[i] & 1;
+ row_pix += 8;
+ if (row_pix >= avctx->width) {
+ i += 4 - (i % 4) - 1;
+ row_pix = 0;
+ }
}
- linesize_align = 32;
+ linesize_align = 8;
}
buf = dst;
} else if (context->is_lt_16bpp) {
--
1.7.10.4
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
