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

pnm: Correctly convert from/to GStreamer rowstride

Browse source
This commit is contained in:
Sebastian Dröge 2009-09-13 19:33:57 +02:00
parent 751843ff86
commit f09b1adf70
2 changed files with 44 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
gst/pnm/gstpnmdec.c
View file

@ -58,6 +58,32 @@ static GstStaticPadTemplate gst_pnmdec_sink_pad_template =
GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
GST_STATIC_CAPS (MIME_ALL)); GST_STATIC_CAPS (MIME_ALL));
static GstFlowReturn
gst_pnmdec_push (GstPnmdec * s, GstPad * src, GstBuffer * buf)
{
/* Need to convert from PNM rowstride to GStreamer rowstride */
if ((s->mngr.info.type == GST_PNM_TYPE_PIXMAP_ASCII ||
s->mngr.info.type == GST_PNM_TYPE_PIXMAP_RAW)
&& s->mngr.info.width % 4 != 0) {
guint i_rowstride = 3 * s->mngr.info.width;
guint o_rowstride = GST_ROUND_UP_4 (3 * s->mngr.info.width);
GstBuffer *obuf =
gst_buffer_new_and_alloc (o_rowstride * s->mngr.info.height);
guint i;
gst_buffer_copy_metadata (obuf, buf, GST_BUFFER_COPY_ALL);
for (i = 0; i < s->mngr.info.height; i++)
memcpy (GST_BUFFER_DATA (obuf) + i * o_rowstride,
GST_BUFFER_DATA (buf) + i * i_rowstride, i_rowstride);
gst_buffer_unref (buf);
return gst_pad_push (src, obuf);
} else {
return gst_pad_push (src, buf);
}
}
static GstFlowReturn static GstFlowReturn
gst_pnmdec_chain (GstPad * pad, GstBuffer * data) gst_pnmdec_chain (GstPad * pad, GstBuffer * data)
{ {
@ -121,7 +147,7 @@ gst_pnmdec_chain (GstPad * pad, GstBuffer * data)
memset (&s->mngr, 0, sizeof (GstPnmInfoMngr)); memset (&s->mngr, 0, sizeof (GstPnmInfoMngr));
s->size = 0; s->size = 0;
gst_buffer_set_caps (buf, GST_PAD_CAPS (src)); gst_buffer_set_caps (buf, GST_PAD_CAPS (src));
r = gst_pad_push (src, buf); r = gst_pnmdec_push (s, src, buf);
goto out; goto out;
} }
@ -143,7 +169,7 @@ gst_pnmdec_chain (GstPad * pad, GstBuffer * data)
/* Do we now have the full image? If yes, push. */ /* Do we now have the full image? If yes, push. */
if (GST_BUFFER_SIZE (s->buf) == s->size) { if (GST_BUFFER_SIZE (s->buf) == s->size) {
gst_buffer_set_caps (s->buf, GST_PAD_CAPS (src)); gst_buffer_set_caps (s->buf, GST_PAD_CAPS (src));
r = gst_pad_push (src, s->buf); r = gst_pnmdec_push (s, src, s->buf);
s->buf = NULL; s->buf = NULL;
memset (&s->mngr, 0, sizeof (GstPnmInfoMngr)); memset (&s->mngr, 0, sizeof (GstPnmInfoMngr));
s->size = 0; s->size = 0;

18
gst/pnm/gstpnmenc.c
View file

@ -79,8 +79,22 @@ gst_pnmenc_chain (GstPad * pad, GstBuffer * buf)
if ((r = gst_pad_push (s->src, out)) != GST_FLOW_OK) if ((r = gst_pad_push (s->src, out)) != GST_FLOW_OK)
goto out; goto out;
/* Pass through the data. */ /* Need to convert from GStreamer rowstride to PNM rowstride */
buf = gst_buffer_make_metadata_writable (buf); if (s->info.type == GST_PNM_TYPE_PIXMAP_RAW && s->info.width % 4 != 0) {
guint i_rowstride = GST_ROUND_UP_4 (s->info.width * 3);
guint o_rowstride = s->info.width * 3;
GstBuffer *obuf = gst_buffer_new_and_alloc (o_rowstride * s->info.height);
guint i;
for (i = 0; i < s->info.height; i++)
memcpy (GST_BUFFER_DATA (obuf) + o_rowstride * i,
GST_BUFFER_DATA (buf) + i_rowstride * i, o_rowstride);
gst_buffer_unref (buf);
buf = obuf;
} else {
/* Pass through the data. */
buf = gst_buffer_make_metadata_writable (buf);
}
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);