diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-01-25 14:50:50 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-01-25 14:51:25 +0100 |
| commit | 21073e98cf0c939318d90cc1b07eecd308e70732 (patch) | |
| tree | b06149ea0bbde911e85e6e1e2bc1d3356e0d6c27 /gst/bayer | |
| parent | f5cf0caf9fd0eae937e5de5002c5de8f9c9b2765 (diff) | |
| download | gstreamer-plugins-bad-21073e98cf0c939318d90cc1b07eecd308e70732.tar.gz | |
port to new memory API
Diffstat (limited to 'gst/bayer')
| -rw-r--r-- | gst/bayer/gstbayer2rgb.c | 9 | ||||
| -rw-r--r-- | gst/bayer/gstrgb2bayer.c | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/gst/bayer/gstbayer2rgb.c b/gst/bayer/gstbayer2rgb.c index 8c2e31b14..69d439056 100644 --- a/gst/bayer/gstbayer2rgb.c +++ b/gst/bayer/gstbayer2rgb.c @@ -447,18 +447,19 @@ gst_bayer2rgb_transform (GstBaseTransform * base, GstBuffer * inbuf, GstBuffer * outbuf) { GstBayer2RGB *filter = GST_BAYER2RGB (base); - uint8_t *input, *output; + GstMapInfo map; + uint8_t *output; GstVideoFrame frame; GST_DEBUG ("transforming buffer"); - input = gst_buffer_map (inbuf, NULL, NULL, GST_MAP_READ); + gst_buffer_map (inbuf, &map, GST_MAP_READ); gst_video_frame_map (&frame, &filter->info, inbuf, GST_MAP_WRITE); output = GST_VIDEO_FRAME_PLANE_DATA (&frame, 0); gst_bayer2rgb_process (filter, output, filter->width * 4, - input, filter->width); + map.data, filter->width); gst_video_frame_unmap (&frame); - gst_buffer_unmap (inbuf, input, -1); + gst_buffer_unmap (inbuf, &map); return GST_FLOW_OK; } diff --git a/gst/bayer/gstrgb2bayer.c b/gst/bayer/gstrgb2bayer.c index 69aedb908..9213e5e1d 100644 --- a/gst/bayer/gstrgb2bayer.c +++ b/gst/bayer/gstrgb2bayer.c @@ -229,6 +229,7 @@ gst_rgb2bayer_transform (GstBaseTransform * trans, GstBuffer * inbuf, GstBuffer * outbuf) { GstRGB2Bayer *rgb2bayer = GST_RGB_2_BAYER (trans); + GstMapInfo map; guint8 *dest; guint8 *src; int i, j; @@ -238,7 +239,8 @@ gst_rgb2bayer_transform (GstBaseTransform * trans, GstBuffer * inbuf, gst_video_frame_map (&frame, &rgb2bayer->info, inbuf, GST_MAP_READ); - dest = gst_buffer_map (outbuf, NULL, NULL, GST_MAP_READ); + gst_buffer_map (outbuf, &map, GST_MAP_READ); + dest = map.data; src = GST_VIDEO_FRAME_PLANE_DATA (&frame, 0); for (j = 0; j < height; j++) { @@ -256,7 +258,7 @@ gst_rgb2bayer_transform (GstBaseTransform * trans, GstBuffer * inbuf, } } } - gst_buffer_unmap (outbuf, dest, -1); + gst_buffer_unmap (outbuf, &map); gst_video_frame_unmap (&frame); return GST_FLOW_OK; |