[prev in list] [next in list] [prev in thread] [next in thread]
List: gstreamer-cvs
Subject: gstreamer: filesink: use writev() in ::render() to write out memories without merging them
From: tpm () kemper ! freedesktop ! org (Tim Müller)
Date: 2014-11-30 15:01:22
Message-ID: 20141130150122.DA54676339 () kemper ! freedesktop ! org
[Download RAW message or body]
Module: gstreamer
Branch: master
Commit: 5b50f39015b970af61f0f7f8b688327ea742cf0b
URL: http://cgit.freedesktop.org/gstreamer/gstreamer/commit/?id=5b50f39015b970af61f0f7f8b688327ea742cf0b
Author: Tim-Philipp Müller <tim@centricular.com>
Date: Fri Nov 28 15:09:16 2014 +0000
filesink: use writev() in ::render() to write out memories without merging them
---
plugins/elements/gstfilesink.c | 45 ++++++++++++----------------------------
1 file changed, 13 insertions(+), 32 deletions(-)
diff --git a/plugins/elements/gstfilesink.c b/plugins/elements/gstfilesink.c
index 1a717c5..c13cac7 100644
--- a/plugins/elements/gstfilesink.c
+++ b/plugins/elements/gstfilesink.c
@@ -656,6 +656,10 @@ static GstFlowReturn
gst_file_sink_render_buffers (GstFileSink * sink, GstBuffer ** buffers,
guint num_buffers, guint8 * mem_nums, guint total_mems)
{
+ GST_DEBUG_OBJECT (sink,
+ "writing %u buffers (%u memories) at position %" G_GUINT64_FORMAT,
+ num_buffers, total_mems, sink->current_pos);
+
return gst_writev_buffers (GST_OBJECT_CAST (sink), fileno (sink->file), NULL,
buffers, num_buffers, mem_nums, total_mems, NULL, &sink->current_pos);
}
@@ -702,42 +706,19 @@ static GstFlowReturn
gst_file_sink_render (GstBaseSink * sink, GstBuffer * buffer)
{
GstFileSink *filesink;
- GstMapInfo info;
-
- filesink = GST_FILE_SINK (sink);
-
- gst_buffer_map (buffer, &info, GST_MAP_READ);
-
- GST_DEBUG_OBJECT (filesink,
- "writing %" G_GSIZE_FORMAT " bytes at %" G_GUINT64_FORMAT,
- info.size, filesink->current_pos);
+ GstFlowReturn flow;
+ guint8 n_mem;
- if (info.size > 0 && info.data != NULL) {
- if (fwrite (info.data, info.size, 1, filesink->file) != 1)
- goto handle_error;
+ filesink = GST_FILE_SINK_CAST (sink);
- filesink->current_pos += info.size;
- }
- gst_buffer_unmap (buffer, &info);
+ n_mem = gst_buffer_n_memory (buffer);
- return GST_FLOW_OK;
+ if (n_mem > 0)
+ flow = gst_file_sink_render_buffers (filesink, &buffer, 1, &n_mem, n_mem);
+ else
+ flow = GST_FLOW_OK;
-handle_error:
- {
- switch (errno) {
- case ENOSPC:{
- GST_ELEMENT_ERROR (filesink, RESOURCE, NO_SPACE_LEFT, (NULL), (NULL));
- break;
- }
- default:{
- GST_ELEMENT_ERROR (filesink, RESOURCE, WRITE,
- (_("Error while writing to file \"%s\"."), filesink->filename),
- ("%s", g_strerror (errno)));
- }
- }
- gst_buffer_unmap (buffer, &info);
- return GST_FLOW_ERROR;
- }
+ return flow;
}
static gboolean
[Attachment #3 (text/plain)]
_______________________________________________
gstreamer-commits mailing list
gstreamer-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/gstreamer-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic