Re: [FFmpeg-devel] [PATCH v3] lavc/rawdec: Use AV_PIX_FMT_PAL8 for 1-bit raw QuickTime video

2016-01-18 Thread Michael Niedermayer 
On Sun, Jan 17, 2016 at 10:50:42PM +0100, Mats Peterson wrote:
> Alright Michael, I'm not entirely sure of what I'm doing regarding
> the FFALIGN(avctx->width, 32), but at least the two odd-width (113
> and 129 pixels) 1 bpp files that failed to render correctly with the
> last patch now seem to be OK. Please give it a try. Original
> description follows:
> 
> Match the use of AV_PIX_FMT_PAL8 for 1-bit QuickTime Animation in
> lavc/qtrle. To reiterate, 1-bit video is not necessary black & white
> in QuickTime, merely bi-level. The two colors can be any color. The
> palette, either included in the sample description, or the default
> Macintosh palette (black & white for 1-bit video) will be set in
> lavf/qtpalette. See the QuickTime File Format Specification for
> details.
> 
> Mats
> 
> -- 
> Mats Peterson
> http://matsp888.no-ip.org/~mats/

>  raw.c|4 ++--
>  rawdec.c |   31 ++-
>  2 files changed, 24 insertions(+), 11 deletions(-)
> 3e94120d14979d5c9c477dc67d055e15597f899e  
> 0001-lavf-rawdec-Use-AV_PIX_FMT_PAL8-for-1-bit-raw-QuickT.patch
> From 6c6d2650faf82a9c2fe5c1463b1795117a13863c Mon Sep 17 00:00:00 2001
> From: Mats Peterson 
> Date: Sun, 17 Jan 2016 22:27:52 +0100
> Subject: [PATCH v3] lavc/rawdec: Use AV_PIX_FMT_PAL8 for 1-bit raw QuickTime 
> video
> 
> Match the use of AV_PIX_FMT_PAL8 for 1-bit QuickTime Animation in
> lavc/qtrle. To reiterate, 1-bit video is not necessary black & white in
> QuickTime, merely bi-level. The two colors can be any color. The palette,
> either included in the sample description, or the default Macintosh
> palette (black & white for 1-bit video) will be set in lavf/qtpalette.
> See the QuickTime File Format Specification for details.

applied

thanks

[...]

-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

He who knows, does not speak. He who speaks, does not know. -- Lao Tsu


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH v3] lavc/rawdec: Use AV_PIX_FMT_PAL8 for 1-bit raw QuickTime video

2016-01-17 Thread Mats Peterson 
Alright Michael, I'm not entirely sure of what I'm doing regarding the 
FFALIGN(avctx->width, 32), but at least the two odd-width (113 and 129 
pixels) 1 bpp files that failed to render correctly with the last patch 
now seem to be OK. Please give it a try. Original description follows:


Match the use of AV_PIX_FMT_PAL8 for 1-bit QuickTime Animation in 
lavc/qtrle. To reiterate, 1-bit video is not necessary black & white in 
QuickTime, merely bi-level. The two colors can be any color. The 
palette, either included in the sample description, or the default 
Macintosh palette (black & white for 1-bit video) will be set in 
lavf/qtpalette. See the QuickTime File Format Specification for details.


Mats

--
Mats Peterson
http://matsp888.no-ip.org/~mats/
>From 6c6d2650faf82a9c2fe5c1463b1795117a13863c Mon Sep 17 00:00:00 2001
From: Mats Peterson 
Date: Sun, 17 Jan 2016 22:27:52 +0100
Subject: [PATCH v3] lavc/rawdec: Use AV_PIX_FMT_PAL8 for 1-bit raw QuickTime video

Match the use of AV_PIX_FMT_PAL8 for 1-bit QuickTime Animation in
lavc/qtrle. To reiterate, 1-bit video is not necessary black & white in
QuickTime, merely bi-level. The two colors can be any color. The palette,
either included in the sample description, or the default Macintosh
palette (black & white for 1-bit video) will be set in lavf/qtpalette.
See the QuickTime File Format Specification for details.

Mats

---
 libavcodec/raw.c|4 ++--
 libavcodec/rawdec.c |   31 ++-
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/libavcodec/raw.c b/libavcodec/raw.c
index cda70ac..3f2cc11 100644
--- a/libavcodec/raw.c
+++ b/libavcodec/raw.c
@@ -255,13 +255,13 @@ const PixelFormatTag avpriv_pix_fmt_bps_avi[] = {
 };
 
 const PixelFormatTag avpriv_pix_fmt_bps_mov[] = {
-{ 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 },
 { AV_PIX_FMT_RGB555BE, 16 },
 { AV_PIX_FMT_RGB24,24 },
 { AV_PIX_FMT_ARGB, 32 },
-{ AV_PIX_FMT_MONOWHITE,33 },
+{ AV_PIX_FMT_PAL8, 33 },
 { AV_PIX_FMT_NONE,  0 },
 };
diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c
index 50cee39..cb0364c 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_2_4_bpp; // 2 or 4 bpp raw in avi/mov
+int is_1_2_4_bpp; // 1 bpp raw in mov, and 2 or 4 bpp raw in avi/mov
 int is_yuv2;
 int is_lt_16bpp; // 16bpp pixfmt and bits_per_coded_sample < 16
 int tff;
@@ -159,12 +159,13 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame,
 
 AVFrame   *frame   = data;
 
-if ((avctx->bits_per_coded_sample == 4 || avctx->bits_per_coded_sample == 2) &&
+if ((avctx->bits_per_coded_sample == 4 || avctx->bits_per_coded_sample == 2
+|| avctx->bits_per_coded_sample == 1) &&
 avctx->pix_fmt == AV_PIX_FMT_PAL8 &&
(!avctx->codec_tag || avctx->codec_tag == MKTAG('r','a','w',' '))) {
-context->is_2_4_bpp = 1;
+context->is_1_2_4_bpp = 1;
 context->frame_size = av_image_get_buffer_size(avctx->pix_fmt,
-   FFALIGN(avctx->width, 16),
+   FFALIGN(avctx->width, 32),
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;
@@ -174,7 +175,7 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame,
 if (context->frame_size < 0)
 return context->frame_size;
 
-need_copy = !avpkt->buf || context->is_2_4_bpp || context->is_yuv2 || context->is_lt_16bpp;
+need_copy = !avpkt->buf || context->is_1_2_4_bpp || context->is_yuv2 || context->is_lt_16bpp;
 
 frame->pict_type= AV_PICTURE_TYPE_I;
 frame->key_frame= 1;
@@ -201,8 +202,8 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame,
 if (!frame->buf[0])
 return AVERROR(ENOMEM);
 
-//2bpp and 4bpp raw in avi and mov (yes this is ugly ...)
-if (context->is_2_4_bpp) {
+// 1 bpp raw in mov, and 2 or 4 bpp raw in avi/mov
+if (context->is_1_2_4_bpp) {
 int i;
 uint8_t *dst = frame->buf[0]->data;
 buf_size = context->frame_size - AVPALETTE_SIZE;
@@ -212,8 +213,7 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame,
 dst[2 * i + 1] = buf[i] & 15;
 }
 linesize_align = 8;
-} else {
-av_assert0(avctx->bits_per_coded_sample == 2);
+} else if (avctx->bits_per_coded_sample == 2) {
 for (i = 0; 4 * i + 3 < buf_size && isize; i++)

Re: [FFmpeg-devel] [PATCH v3] lavc/rawdec: Use AV_PIX_FMT_PAL8 for 1-bit raw QuickTime video

2016-01-17 Thread Mats Peterson 

On 01/17/2016 10:50 PM, Mats Peterson wrote:

Alright Michael, I'm not entirely sure of what I'm doing regarding the
FFALIGN(avctx->width, 32), but at least the two odd-width (113 and 129


In fact, I *am* sure of what I'm doing, since the original rows are 
obviously 4-byte aligned, and for 1 bpp to 8 bpp conversion the row 
alignment of the 8 bpp data will be 8 * 4 = 32 bytes. The question is 
whether the overhead of using 32-byte rather than 16-byte alignment is 
acceptable. I suppose it is. It only concerns 1, 2 and 4 bpp files.


Mats

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel