mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-19 16:21:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

pnm: Support ASCII format for encoding and handle unsupported formats better in the decoder

Browse source 
Fixes bug #595215.
This commit is contained in:
Lutz Mueller 2009-09-16 08:22:19 +02:00 committed by Sebastian Dröge
parent 50d08ce732
commit f270259cc8
5 changed files with 127 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gst/pnm/gstpnm.c
View file

@ -57,16 +57,13 @@ gst_my_typefind_function (GstTypeFind * tf, gpointer d)
return; return;
case GST_PNM_INFO_MNGR_RESULT_FINISHED: case GST_PNM_INFO_MNGR_RESULT_FINISHED:
switch (mngr.info.type) { switch (mngr.info.type) {
case GST_PNM_TYPE_BITMAP_ASCII: case GST_PNM_TYPE_BITMAP:
case GST_PNM_TYPE_BITMAP_RAW:
gst_type_find_suggest (tf, GST_TYPE_FIND_LIKELY, BITMAP_CAPS); gst_type_find_suggest (tf, GST_TYPE_FIND_LIKELY, BITMAP_CAPS);
return; return;
case GST_PNM_TYPE_GRAYMAP_ASCII: case GST_PNM_TYPE_GRAYMAP:
case GST_PNM_TYPE_GRAYMAP_RAW:
gst_type_find_suggest (tf, GST_TYPE_FIND_LIKELY, GRAYMAP_CAPS); gst_type_find_suggest (tf, GST_TYPE_FIND_LIKELY, GRAYMAP_CAPS);
return; return;
case GST_PNM_TYPE_PIXMAP_ASCII: case GST_PNM_TYPE_PIXMAP:
case GST_PNM_TYPE_PIXMAP_RAW:
gst_type_find_suggest (tf, GST_TYPE_FIND_LIKELY, PIXMAP_CAPS); gst_type_find_suggest (tf, GST_TYPE_FIND_LIKELY, PIXMAP_CAPS);
return; return;
} }

25
gst/pnm/gstpnmdec.c
View file

@ -68,8 +68,7 @@ gst_pnmdec_push (GstPnmdec * s, GstPad * src, GstBuffer * buf)
GstBuffer *obuf; GstBuffer *obuf;
guint i; guint i;
if (s->mngr.info.type == GST_PNM_TYPE_PIXMAP_RAW || if (s->mngr.info.type == GST_PNM_TYPE_PIXMAP) {
s->mngr.info.type == GST_PNM_TYPE_PIXMAP_ASCII) {
i_rowstride = 3 * s->mngr.info.width; i_rowstride = 3 * s->mngr.info.width;
o_rowstride = GST_ROUND_UP_4 (i_rowstride); o_rowstride = GST_ROUND_UP_4 (i_rowstride);
} else { } else {
@ -115,17 +114,25 @@ gst_pnmdec_chain (GstPad * pad, GstBuffer * data)
goto out; goto out;
case GST_PNM_INFO_MNGR_RESULT_FINISHED: case GST_PNM_INFO_MNGR_RESULT_FINISHED:
offset = s->mngr.data_offset; offset = s->mngr.data_offset;
if (s->mngr.info.encoding == GST_PNM_ENCODING_ASCII) {
GST_DEBUG_OBJECT (s, "FIXME: ASCII encoding not implemented!");
gst_buffer_unref (data);
r = GST_FLOW_ERROR;
goto out;
}
caps = gst_caps_copy (gst_pad_get_pad_template_caps (src)); caps = gst_caps_copy (gst_pad_get_pad_template_caps (src));
switch (s->mngr.info.type) { switch (s->mngr.info.type) {
case GST_PNM_TYPE_BITMAP_RAW: case GST_PNM_TYPE_BITMAP:
case GST_PNM_TYPE_BITMAP_ASCII: GST_DEBUG_OBJECT (s, "FIXME: BITMAP format not implemented!");
case GST_PNM_TYPE_GRAYMAP_RAW: gst_caps_unref (caps);
case GST_PNM_TYPE_GRAYMAP_ASCII: gst_buffer_unref (data);
r = GST_FLOW_ERROR;
goto out;
case GST_PNM_TYPE_GRAYMAP:
gst_caps_remove_structure (caps, 0); gst_caps_remove_structure (caps, 0);
s->size = s->mngr.info.width * s->mngr.info.height * 1; s->size = s->mngr.info.width * s->mngr.info.height * 1;
break; break;
case GST_PNM_TYPE_PIXMAP_RAW: case GST_PNM_TYPE_PIXMAP:
case GST_PNM_TYPE_PIXMAP_ASCII:
gst_caps_remove_structure (caps, 1); gst_caps_remove_structure (caps, 1);
s->size = s->mngr.info.width * s->mngr.info.height * 3; s->size = s->mngr.info.width * s->mngr.info.height * 3;
break; break;
@ -136,6 +143,7 @@ gst_pnmdec_chain (GstPad * pad, GstBuffer * data)
GST_TYPE_FRACTION, 0, 1, NULL); GST_TYPE_FRACTION, 0, 1, NULL);
if (!gst_pad_set_caps (src, caps)) { if (!gst_pad_set_caps (src, caps)) {
gst_caps_unref (caps); gst_caps_unref (caps);
gst_buffer_unref (data);
r = GST_FLOW_ERROR; r = GST_FLOW_ERROR;
goto out; goto out;
} }
@ -144,6 +152,7 @@ gst_pnmdec_chain (GstPad * pad, GstBuffer * data)
} }
if (offset == GST_BUFFER_SIZE (data)) { if (offset == GST_BUFFER_SIZE (data)) {
gst_buffer_unref (data);
r = GST_FLOW_OK; r = GST_FLOW_OK;
goto out; goto out;
} }

93
gst/pnm/gstpnmenc.c
View file

@ -19,13 +19,15 @@
/** /**
* SECTION:element-pnmenc * SECTION:element-pnmenc
* *
* Encodes pnm images. * Encodes pnm images. This plugin supports both raw and ASCII encoding.
* To enable ASCII encoding, set the parameter ascii to TRUE. If you omit
* the parameter or set it to FALSE, the output will be raw encoded.
* *
* <refsect"> * <refsect">
* <title>Example launch line</title> * <title>Example launch line</title>
* |[ * |[
* gst-launch videotestsrc num_buffers=1 ! pnmenc ! ffmpegcolorspace ! "video/x-raw-gray" ! pnmenc ! filesink location=test.pnm * gst-launch videotestsrc num_buffers=1 ! ffmpegcolorspace ! "video/x-raw-gray" ! pnmenc ascii=true ! filesink location=test.pnm
* ]| The above pipeline writes a test pnm file. * ]| The above pipeline writes a test pnm file (ASCII encoding).
* </refsect2> * </refsect2>
*/ */
@ -41,6 +43,13 @@
#include <string.h> #include <string.h>
enum
{
GST_PNMENC_PROP_0,
GST_PNMENC_PROP_ASCII
/* Add here. */
};
static GstElementDetails pnmenc_details = static GstElementDetails pnmenc_details =
GST_ELEMENT_DETAILS ("PNM converter", "Codec/Encoder/Image", GST_ELEMENT_DETAILS ("PNM converter", "Codec/Encoder/Image",
"Encodes in PNM format", "Encodes in PNM format",
@ -57,6 +66,42 @@ static GstStaticPadTemplate src_pad_template =
GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
GST_STATIC_CAPS (MIME_ALL)); GST_STATIC_CAPS (MIME_ALL));
static void
gst_pnmenc_set_property (GObject * object, guint prop_id, const GValue * value,
GParamSpec * pspec)
{
GstPnmenc *s = GST_PNMENC (object);
switch (prop_id) {
case GST_PNMENC_PROP_ASCII:
if (g_value_get_boolean (value))
s->info.encoding = GST_PNM_ENCODING_ASCII;
else
s->info.encoding = GST_PNM_ENCODING_RAW;
s->info.fields |= GST_PNM_INFO_FIELDS_ENCODING;
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void
gst_pnmenc_get_property (GObject * object, guint prop_id, GValue * value,
GParamSpec * pspec)
{
GstPnmenc *s = GST_PNMENC (object);
switch (prop_id) {
case GST_PNMENC_PROP_ASCII:
g_value_set_boolean (value, s->info.encoding == GST_PNM_ENCODING_ASCII);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static GstFlowReturn static GstFlowReturn
gst_pnmenc_chain (GstPad * pad, GstBuffer * buf) gst_pnmenc_chain (GstPad * pad, GstBuffer * buf)
{ {
@ -65,14 +110,10 @@ gst_pnmenc_chain (GstPad * pad, GstBuffer * buf)
gchar *header; gchar *header;
GstBuffer *out; GstBuffer *out;
if (s->info.fields != GST_PNM_INFO_FIELDS_ALL) {
r = GST_FLOW_NOT_NEGOTIATED;
goto out;
}
/* Assumption: One buffer, one image. That is, always first write header. */ /* Assumption: One buffer, one image. That is, always first write header. */
header = g_strdup_printf ("P%i\n%i %i\n%i\n", header = g_strdup_printf ("P%i\n%i %i\n%i\n",
s->info.type, s->info.width, s->info.height, s->info.max); s->info.type + 3 * (1 - s->info.encoding), s->info.width, s->info.height,
s->info.max);
out = gst_buffer_new (); out = gst_buffer_new ();
gst_buffer_set_data (out, (guchar *) header, strlen (header)); gst_buffer_set_data (out, (guchar *) header, strlen (header));
gst_buffer_set_caps (out, GST_PAD_CAPS (s->src)); gst_buffer_set_caps (out, GST_PAD_CAPS (s->src));
@ -86,7 +127,7 @@ gst_pnmenc_chain (GstPad * pad, GstBuffer * buf)
GstBuffer *obuf; GstBuffer *obuf;
guint i; guint i;
if (s->info.type == GST_PNM_TYPE_PIXMAP_RAW) { if (s->info.type == GST_PNM_TYPE_PIXMAP) {
o_rowstride = 3 * s->info.width; o_rowstride = 3 * s->info.width;
i_rowstride = GST_ROUND_UP_4 (o_rowstride); i_rowstride = GST_ROUND_UP_4 (o_rowstride);
} else { } else {
@ -104,6 +145,25 @@ gst_pnmenc_chain (GstPad * pad, GstBuffer * buf)
/* Pass through the data. */ /* Pass through the data. */
buf = gst_buffer_make_metadata_writable (buf); buf = gst_buffer_make_metadata_writable (buf);
} }
/* We might need to convert to ASCII... */
if (s->info.encoding == GST_PNM_ENCODING_ASCII) {
GstBuffer *obuf;
guint i, o;
obuf = gst_buffer_new_and_alloc (GST_BUFFER_SIZE (buf) * (4 + 1 / 20.));
for (i = o = 0; i < GST_BUFFER_SIZE (buf); i++) {
g_snprintf ((char *) GST_BUFFER_DATA (obuf) + o, 4, "%3i",
GST_BUFFER_DATA (buf)[i]);
o += 3;
GST_BUFFER_DATA (obuf)[o++] = ' ';
if (!(i % 20))
GST_BUFFER_DATA (obuf)[o++] = '\n';
}
gst_buffer_unref (buf);
buf = obuf;
}
gst_buffer_set_caps (buf, GST_PAD_CAPS (s->src)); gst_buffer_set_caps (buf, GST_PAD_CAPS (s->src));
r = gst_pad_push (s->src, buf); r = gst_pad_push (s->src, buf);
@ -127,10 +187,10 @@ gst_pnmenc_setcaps_func_sink (GstPad * pad, GstCaps * caps)
/* Set caps on the source. */ /* Set caps on the source. */
if (!strcmp (mime, "video/x-raw-rgb")) { if (!strcmp (mime, "video/x-raw-rgb")) {
s->info.type = GST_PNM_TYPE_PIXMAP_RAW; s->info.type = GST_PNM_TYPE_PIXMAP;
srccaps = gst_caps_from_string (MIME_PM); srccaps = gst_caps_from_string (MIME_PM);
} else if (!strcmp (mime, "video/x-raw-gray")) { } else if (!strcmp (mime, "video/x-raw-gray")) {
s->info.type = GST_PNM_TYPE_GRAYMAP_RAW; s->info.type = GST_PNM_TYPE_GRAYMAP;
srccaps = gst_caps_from_string (MIME_GM); srccaps = gst_caps_from_string (MIME_GM);
} else { } else {
r = FALSE; r = FALSE;
@ -187,7 +247,14 @@ gst_pnmenc_base_init (gpointer g_class)
static void static void
gst_pnmenc_class_init (GstPnmencClass * klass) gst_pnmenc_class_init (GstPnmencClass * klass)
{ {
/* Nothing to see here. Move along. */ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
gobject_class->set_property = gst_pnmenc_set_property;
gobject_class->get_property = gst_pnmenc_get_property;
g_object_class_install_property (gobject_class, GST_PNMENC_PROP_ASCII,
g_param_spec_boolean ("ascii", "ASCII Encoding", "The output will be "
"ASCII encoded", FALSE, G_PARAM_READWRITE));
} }
GST_BOILERPLATE (GstPnmenc, gst_pnmenc, GstElement, GST_TYPE_ELEMENT) GST_BOILERPLATE (GstPnmenc, gst_pnmenc, GstElement, GST_TYPE_ELEMENT)

45
gst/pnm/gstpnmutils.c
View file

@ -94,27 +94,34 @@ gst_pnm_info_mngr_scan (GstPnmInfoMngr * mngr, const guint8 * buf,
case GST_PNM_INFO_MNGR_STATE_DATA_TYPE: case GST_PNM_INFO_MNGR_STATE_DATA_TYPE:
switch (buf[i++]) { switch (buf[i++]) {
case '1': case '1':
mngr->info.type = GST_PNM_TYPE_BITMAP_ASCII; mngr->info.type = GST_PNM_TYPE_BITMAP;
mngr->info.encoding = GST_PNM_ENCODING_ASCII;
break; break;
case '2': case '2':
mngr->info.type = GST_PNM_TYPE_GRAYMAP_ASCII; mngr->info.type = GST_PNM_TYPE_GRAYMAP;
mngr->info.encoding = GST_PNM_ENCODING_ASCII;
break; break;
case '3': case '3':
mngr->info.type = GST_PNM_TYPE_PIXMAP_ASCII; mngr->info.type = GST_PNM_TYPE_PIXMAP;
mngr->info.encoding = GST_PNM_ENCODING_ASCII;
break; break;
case '4': case '4':
mngr->info.type = GST_PNM_TYPE_BITMAP_RAW; mngr->info.type = GST_PNM_TYPE_BITMAP;
mngr->info.encoding = GST_PNM_ENCODING_RAW;
break; break;
case '5': case '5':
mngr->info.type = GST_PNM_TYPE_GRAYMAP_RAW; mngr->info.type = GST_PNM_TYPE_GRAYMAP;
mngr->info.encoding = GST_PNM_ENCODING_RAW;
break; break;
case '6': case '6':
mngr->info.type = GST_PNM_TYPE_PIXMAP_RAW; mngr->info.type = GST_PNM_TYPE_PIXMAP;
mngr->info.encoding = GST_PNM_ENCODING_RAW;
break; break;
default: default:
return GST_PNM_INFO_MNGR_RESULT_FAILED; return GST_PNM_INFO_MNGR_RESULT_FAILED;
} }
mngr->info.fields |= GST_PNM_INFO_FIELDS_TYPE; mngr->info.fields |=
GST_PNM_INFO_FIELDS_TYPE | GST_PNM_INFO_FIELDS_ENCODING;
mngr->state = GST_PNM_INFO_MNGR_STATE_WHITE_SPACE; mngr->state = GST_PNM_INFO_MNGR_STATE_WHITE_SPACE;
if (i == buf_len) if (i == buf_len)
return GST_PNM_INFO_MNGR_RESULT_READING; return GST_PNM_INFO_MNGR_RESULT_READING;
@ -177,27 +184,3 @@ gst_pnm_info_mngr_scan (GstPnmInfoMngr * mngr, const guint8 * buf,
} }
return GST_PNM_INFO_MNGR_RESULT_FAILED; return GST_PNM_INFO_MNGR_RESULT_FAILED;
} }
GType
gst_pnm_type_get_type (void)
{
static GType etype = 0;
if (etype == 0) {
static const GEnumValue values[] = {
{GST_PNM_TYPE_BITMAP_RAW, "GST_PNM_TYPE_BITMAP_RAW", MIME_BM " (ascii)"},
{GST_PNM_TYPE_GRAYMAP_ASCII, "GST_PNM_TYPE_BITMAP_ASCII",
MIME_BM " (raw)"},
{GST_PNM_TYPE_GRAYMAP_RAW, "GST_PNM_TYPE_GRAYMAP_RAW",
MIME_GM " (ascii)"},
{GST_PNM_TYPE_GRAYMAP_ASCII, "GST_PNM_TYPE_GRAYMAP_ASCII",
MIME_GM " (raw)"},
{GST_PNM_TYPE_PIXMAP_RAW, "GST_PNM_TYPE_PIXMAP_RAW", MIME_PM " (ascii)"},
{GST_PNM_TYPE_PIXMAP_ASCII, "GST_PNM_TYPE_PIXMAP_ASCII",
MIME_PM " (raw)"},
{0, NULL, NULL}
};
etype = g_enum_register_static ("GstPnmdecType", values);
}
return etype;
}

22
gst/pnm/gstpnmutils.h
View file

@ -33,26 +33,30 @@ typedef enum
GST_PNM_INFO_FIELDS_TYPE = 1 << 0, GST_PNM_INFO_FIELDS_TYPE = 1 << 0,
GST_PNM_INFO_FIELDS_WIDTH = 1 << 1, GST_PNM_INFO_FIELDS_WIDTH = 1 << 1,
GST_PNM_INFO_FIELDS_HEIGHT = 1 << 2, GST_PNM_INFO_FIELDS_HEIGHT = 1 << 2,
GST_PNM_INFO_FIELDS_MAX = 1 << 3 GST_PNM_INFO_FIELDS_MAX = 1 << 3,
GST_PNM_INFO_FIELDS_ENCODING = 1 << 4
} GstPnmInfoFields; } GstPnmInfoFields;
#define GST_PNM_INFO_FIELDS_ALL (GST_PNM_INFO_FIELDS_TYPE | GST_PNM_INFO_FIELDS_WIDTH | GST_PNM_INFO_FIELDS_HEIGHT | GST_PNM_INFO_FIELDS_MAX) #define GST_PNM_INFO_FIELDS_ALL (GST_PNM_INFO_FIELDS_TYPE | GST_PNM_INFO_FIELDS_WIDTH | GST_PNM_INFO_FIELDS_HEIGHT | GST_PNM_INFO_FIELDS_MAX | GST_PNM_INFO_FIELDS_ENCODING)
typedef enum typedef enum
{ {
GST_PNM_TYPE_BITMAP_ASCII = 1, GST_PNM_TYPE_BITMAP = 1,
GST_PNM_TYPE_GRAYMAP_ASCII = 2, GST_PNM_TYPE_GRAYMAP = 2,
GST_PNM_TYPE_PIXMAP_ASCII = 3, GST_PNM_TYPE_PIXMAP = 3
GST_PNM_TYPE_BITMAP_RAW = 4,
GST_PNM_TYPE_GRAYMAP_RAW = 5,
GST_PNM_TYPE_PIXMAP_RAW = 6
} GstPnmType; } GstPnmType;
GType gst_pnm_type_get_type (void);
typedef enum
{
GST_PNM_ENCODING_RAW = 0,
GST_PNM_ENCODING_ASCII = 1
} GstPnmEncoding;
typedef struct typedef struct
{ {
GstPnmInfoFields fields; GstPnmInfoFields fields;
GstPnmType type; GstPnmType type;
GstPnmEncoding encoding;
guint width, height, max; guint width, height, max;
} GstPnmInfo; } GstPnmInfo;