mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-09-09 05:38:58 +00:00
pngdec: Handle 16-bit-per-channel images
This commit is contained in:
parent
367adf2b69
commit
13d441315f
1 changed files with 15 additions and 10 deletions
|
@ -82,11 +82,18 @@ gst_pngdec_get_type (void)
|
||||||
return pngdec_type;
|
return pngdec_type;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* FIXME remove this after -good depends on -base-0.10.33 */
|
||||||
|
#ifdef GST_VIDEO_CAPS_ARGB_64
|
||||||
|
#define CAPS GST_VIDEO_CAPS_RGBA ";" GST_VIDEO_CAPS_RGB ";" GST_VIDEO_CAPS_ARGB_64
|
||||||
|
#else
|
||||||
|
#define CAPS GST_VIDEO_CAPS_RGBA ";" GST_VIDEO_CAPS_RGB
|
||||||
|
#endif
|
||||||
|
|
||||||
static GstStaticPadTemplate gst_pngdec_src_pad_template =
|
static GstStaticPadTemplate gst_pngdec_src_pad_template =
|
||||||
GST_STATIC_PAD_TEMPLATE ("src",
|
GST_STATIC_PAD_TEMPLATE ("src",
|
||||||
GST_PAD_SRC,
|
GST_PAD_SRC,
|
||||||
GST_PAD_ALWAYS,
|
GST_PAD_ALWAYS,
|
||||||
GST_STATIC_CAPS (GST_VIDEO_CAPS_RGBA ";" GST_VIDEO_CAPS_RGB)
|
GST_STATIC_CAPS (CAPS)
|
||||||
);
|
);
|
||||||
|
|
||||||
static GstStaticPadTemplate gst_pngdec_sink_pad_template =
|
static GstStaticPadTemplate gst_pngdec_sink_pad_template =
|
||||||
|
@ -370,12 +377,10 @@ gst_pngdec_caps_create_and_set (GstPngDec * pngdec)
|
||||||
|
|
||||||
/* Get bits per channel */
|
/* Get bits per channel */
|
||||||
bpc = png_get_bit_depth (pngdec->png, pngdec->info);
|
bpc = png_get_bit_depth (pngdec->png, pngdec->info);
|
||||||
|
if (bpc > 8) {
|
||||||
/* We don't handle 16 bits per color, strip down to 8 */
|
/* Add alpha channel if 16-bit depth */
|
||||||
if (bpc == 16) {
|
png_set_add_alpha (pngdec->png, 0xffff, PNG_FILLER_BEFORE);
|
||||||
GST_LOG_OBJECT (pngdec,
|
png_set_swap (pngdec->png);
|
||||||
"this is a 16 bits per channel PNG image, strip down to 8 bits");
|
|
||||||
png_set_strip_16 (pngdec->png);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Get Color type */
|
/* Get Color type */
|
||||||
|
@ -428,11 +433,11 @@ gst_pngdec_caps_create_and_set (GstPngDec * pngdec)
|
||||||
switch (pngdec->color_type) {
|
switch (pngdec->color_type) {
|
||||||
case PNG_COLOR_TYPE_RGB:
|
case PNG_COLOR_TYPE_RGB:
|
||||||
GST_LOG_OBJECT (pngdec, "we have no alpha channel, depth is 24 bits");
|
GST_LOG_OBJECT (pngdec, "we have no alpha channel, depth is 24 bits");
|
||||||
pngdec->bpp = 24;
|
pngdec->bpp = 3 * bpc;
|
||||||
break;
|
break;
|
||||||
case PNG_COLOR_TYPE_RGB_ALPHA:
|
case PNG_COLOR_TYPE_RGB_ALPHA:
|
||||||
GST_LOG_OBJECT (pngdec, "we have an alpha channel, depth is 32 bits");
|
GST_LOG_OBJECT (pngdec, "we have an alpha channel, depth is 32 bits");
|
||||||
pngdec->bpp = 32;
|
pngdec->bpp = 4 * bpc;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
GST_ELEMENT_ERROR (pngdec, STREAM, NOT_IMPLEMENTED, (NULL),
|
GST_ELEMENT_ERROR (pngdec, STREAM, NOT_IMPLEMENTED, (NULL),
|
||||||
|
|
Loading…
Reference in a new issue