mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 01:30:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

oggdemux: avoid memcpy in pull mode

Browse source 
In pull mode, we can now ask the upstream element to write directly into the
memory provided by libogg.
This commit is contained in:
Wim Taymans 2012-03-20 13:18:19 +01:00
parent a619d3a8b0
commit d7c42e6680
1 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
ext/ogg/gstoggdemux.c
View file

@ -2183,7 +2183,9 @@ static GstFlowReturn
gst_ogg_demux_get_data (GstOggDemux * ogg, gint64 end_offset) gst_ogg_demux_get_data (GstOggDemux * ogg, gint64 end_offset)
{ {
GstFlowReturn ret; GstFlowReturn ret;
GstBuffer *buffer = NULL; GstBuffer *buffer;
gchar *oggbuffer;
gsize size;
GST_LOG_OBJECT (ogg, GST_LOG_OBJECT (ogg,
"get data %" G_GINT64_FORMAT " %" G_GINT64_FORMAT " %" G_GINT64_FORMAT, "get data %" G_GINT64_FORMAT " %" G_GINT64_FORMAT " %" G_GINT64_FORMAT,
@ -2195,13 +2197,25 @@ gst_ogg_demux_get_data (GstOggDemux * ogg, gint64 end_offset)
if (ogg->read_offset == ogg->length) if (ogg->read_offset == ogg->length)
goto eos; goto eos;
oggbuffer = ogg_sync_buffer (&ogg->sync, CHUNKSIZE);
if (G_UNLIKELY (oggbuffer == NULL))
goto no_buffer;
buffer =
gst_buffer_new_wrapped_full (0, oggbuffer, CHUNKSIZE, 0, CHUNKSIZE, NULL,
NULL);
ret = gst_pad_pull_range (ogg->sinkpad, ogg->read_offset, CHUNKSIZE, &buffer); ret = gst_pad_pull_range (ogg->sinkpad, ogg->read_offset, CHUNKSIZE, &buffer);
if (ret != GST_FLOW_OK) if (ret != GST_FLOW_OK)
goto error; goto error;
ogg->read_offset += gst_buffer_get_size (buffer); size = gst_buffer_get_size (buffer);
ret = gst_ogg_demux_submit_buffer (ogg, buffer); if (G_UNLIKELY (ogg_sync_wrote (&ogg->sync, size) < 0))
goto write_failed;
ogg->read_offset += size;
gst_buffer_unref (buffer);
return ret; return ret;
@ -2216,12 +2230,26 @@ eos:
GST_LOG_OBJECT (ogg, "reached EOS"); GST_LOG_OBJECT (ogg, "reached EOS");
return GST_FLOW_EOS; return GST_FLOW_EOS;
} }
no_buffer:
{
GST_ELEMENT_ERROR (ogg, STREAM, DECODE,
(NULL), ("failed to get ogg sync buffer"));
return GST_FLOW_ERROR;
}
error: error:
{ {
GST_WARNING_OBJECT (ogg, "got %d (%s) from pull range", ret, GST_WARNING_OBJECT (ogg, "got %d (%s) from pull range", ret,
gst_flow_get_name (ret)); gst_flow_get_name (ret));
gst_buffer_unref (buffer);
return ret; return ret;
} }
write_failed:
{
GST_ELEMENT_ERROR (ogg, STREAM, DECODE, (NULL),
("failed to write %" G_GSIZE_FORMAT " bytes to the sync buffer", size));
gst_buffer_unref (buffer);
return GST_FLOW_ERROR;
}
} }
/* Read the next page from the current offset. /* Read the next page from the current offset.