[FFmpeg-devel] [PATCH 0/2] PNG sBIT chunk support

[FFmpeg-devel] [PATCH 0/2] PNG sBIT chunk support

[Leo Izen]

Add support to the PNG decoder and encoder to support sBIT chunks.

Leo Izen (2):
  avcodec/pngdec: support sBIT chunks
  avcodec/pngenc: write sBIT chunks

 libavcodec/pngdec.c | 57 +++++++++++++++++++++++++++++++++++++++++++++
 libavcodec/pngenc.c |  7 ++++++
 2 files changed, 64 insertions(+)

-- 
2.39.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 1/2] avcodec/pngdec: support sBIT chunks

[Leo Izen]

Add support for reading sBIT chunks, which mark the significant
bit depth of the PNG file. This passes the metadata using the field
bits_per_raw_sample of AVCodecContext.

Signed-off-by: Leo Izen <leo.izen@gmail.com>
---
 libavcodec/pngdec.c | 57 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index 0d969decf2..48313db671 100644
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@@ -97,6 +97,7 @@ typedef struct PNGDecContext {
     int bpp;
     int has_trns;
     uint8_t transparent_color_be[6];
+    int significant_bits;
 
     uint32_t palette[256];
     uint8_t *crow_buf;
@@ -916,6 +917,55 @@ fail:
     return ret;
 }
 
+static int decode_sbit_chunk(AVCodecContext *avctx, PNGDecContext *s,
+                             GetByteContext *gb)
+{
+    int bits = 0;
+
+    if (!(s->hdr_state & PNG_IHDR)) {
+        av_log(avctx, AV_LOG_ERROR, "sBIT before IHDR\n");
+        return AVERROR_INVALIDDATA;
+    }
+
+    switch (s->color_type) {
+        case 0:
+            bits = bytestream2_get_byteu(gb);
+            break;
+        case 2:
+        case 3: {
+            int r = bytestream2_get_byteu(gb);
+            int g = bytestream2_get_byteu(gb);
+            int b = bytestream2_get_byteu(gb);
+            bits = FFMAX3(r, g, b);
+            break;
+        }
+        case 4: {
+            int y = bytestream2_get_byteu(gb);
+            int a = bytestream2_get_byteu(gb);
+            bits = FFMAX(y, a);
+            break;
+        }
+        case 6: {
+            int r = bytestream2_get_byteu(gb);
+            int g = bytestream2_get_byteu(gb);
+            int b = bytestream2_get_byteu(gb);
+            int a = bytestream2_get_byteu(gb);
+            bits = FFMAX(FFMAX3(r, g, b), a);
+            break;
+        }
+        default:
+            return AVERROR_INVALIDDATA;
+    }
+
+    if (bits < 0 || bits > s->bit_depth) {
+        av_log(avctx, AV_LOG_ERROR, "Invalid significant bits: %d\n", bits);
+        return AVERROR_INVALIDDATA;
+    }
+    s->significant_bits = bits;
+
+    return 0;
+}
+
 static void handle_small_bpp(PNGDecContext *s, AVFrame *p)
 {
     if (s->bits_per_pixel == 1 && s->color_type == PNG_COLOR_TYPE_PALETTE) {
@@ -1355,6 +1405,9 @@ static int decode_frame_common(AVCodecContext *avctx, PNGDecContext *s,
 
             break;
         }
+        case MKTAG('s', 'B', 'I', 'T'):
+            decode_sbit_chunk(avctx, s, &gb_chunk);
+            break;
         case MKTAG('g', 'A', 'M', 'A'): {
             AVBPrint bp;
             char *gamma_str;
@@ -1560,6 +1613,10 @@ static int output_frame(PNGDecContext *s, AVFrame *f)
         stereo3d->flags = s->stereo_mode ? 0 : AV_STEREO3D_FLAG_INVERT;
     }
 
+    /* tRNS sets alpha depth to full, so we ignore sBIT if set */
+    if (!s->has_trns && s->significant_bits > 0)
+        avctx->bits_per_raw_sample = s->significant_bits;
+
     FFSWAP(AVDictionary*, f->metadata, s->frame_metadata);
 
     return 0;
-- 
2.39.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 2/2] avcodec/pngenc: write sBIT chunks

[Leo Izen]

Add support for writing sBIT chunks, which mark the significant
bit depth of the PNG file. This obtains the metadata using the field
bits_per_raw_sample of AVCodecContext.

Signed-off-by: Leo Izen <leo.izen@gmail.com>
---
 libavcodec/pngenc.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c
index 2393161c3b..0961125f0a 100644
--- a/libavcodec/pngenc.c
+++ b/libavcodec/pngenc.c
@@ -432,6 +432,13 @@ static int encode_headers(AVCodecContext *avctx, const AVFrame *pict)
     if (png_get_gama(pict->color_trc, s->buf))
         png_write_chunk(&s->bytestream, MKTAG('g', 'A', 'M', 'A'), s->buf, 4);
 
+    if (avctx->bits_per_raw_sample > 0 && avctx->bits_per_raw_sample < s->bit_depth) {
+        size_t len = s->color_type == 0 ? 1 : s->color_type == 2 || s->color_type == 3 ? 3 :
+                     s->color_type == 4 ? 2 : 4;
+        memset(s->buf, avctx->bits_per_raw_sample, len);
+        png_write_chunk(&s->bytestream, MKTAG('s', 'B', 'I', 'T'), s->buf, len);
+    }
+
     side_data = av_frame_get_side_data(pict, AV_FRAME_DATA_ICC_PROFILE);
     if ((ret = png_write_iccp(s, side_data)))
         return ret;
-- 
2.39.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".