mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 14:26:43 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/libpng/gstpngenc.*: Preallocate the output buffer so that g_memdup() and gst_buffer_merge() aren't needed anymore...

Browse source 
Original commit message from CVS:
Patch by: Alessandro Decina <alessandro at nnva dot org>
* ext/libpng/gstpngenc.c: (user_write_data), (gst_pngenc_chain):
* ext/libpng/gstpngenc.h:
Preallocate the output buffer so that g_memdup() and
gst_buffer_merge() aren't needed anymore. This greatly improves
performances and fixes #512544.
This commit is contained in:
Alessandro Decina 2008-01-29 18:43:32 +00:00 committed by Wim Taymans
parent bc1734ac89
commit 3ad8e778d7
3 changed files with 36 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2008-01-29 Wim Taymans <wim.taymans@collabora.co.uk>
Patch by: Alessandro Decina <alessandro at nnva dot org>
* ext/libpng/gstpngenc.c: (user_write_data), (gst_pngenc_chain):
* ext/libpng/gstpngenc.h:
Preallocate the output buffer so that g_memdup() and
gst_buffer_merge() aren't needed anymore. This greatly improves
performances and fixes #512544.
2008-01-29 Wim Taymans <wim.taymans@collabora.co.uk> 2008-01-29 Wim Taymans <wim.taymans@collabora.co.uk>
* gst/avi/gstavidemux.c: (gst_avi_demux_process_next_entry), * gst/avi/gstavidemux.c: (gst_avi_demux_process_next_entry),

44
ext/libpng/gstpngenc.c
View file

@ -222,25 +222,21 @@ user_flush_data (png_structp png_ptr)
static void static void
user_write_data (png_structp png_ptr, png_bytep data, png_uint_32 length) user_write_data (png_structp png_ptr, png_bytep data, png_uint_32 length)
{ {
GstBuffer *buffer;
GstPngEnc *pngenc; GstPngEnc *pngenc;
pngenc = (GstPngEnc *) png_get_io_ptr (png_ptr); pngenc = (GstPngEnc *) png_get_io_ptr (png_ptr);
buffer = gst_buffer_new (); if (pngenc->written + length >= GST_BUFFER_SIZE (pngenc->buffer_out)) {
GST_BUFFER_MALLOCDATA (buffer) = g_memdup (data, length); GST_ERROR_OBJECT (pngenc, "output buffer bigger than the input buffer!?");
GST_BUFFER_DATA (buffer) = GST_BUFFER_MALLOCDATA (buffer); /* yuck */
GST_BUFFER_SIZE (buffer) = length; longjmp (pngenc->png_struct_ptr->jmpbuf, 1);
if (pngenc->buffer_out) { /* never reached */
GstBuffer *merge; return;
}
merge = gst_buffer_merge (pngenc->buffer_out, buffer); memcpy (GST_BUFFER_DATA (pngenc->buffer_out) + pngenc->written, data, length);
gst_buffer_unref (buffer); pngenc->written += length;
gst_buffer_unref (pngenc->buffer_out);
pngenc->buffer_out = merge;
} else
pngenc->buffer_out = buffer;
} }
static GstFlowReturn static GstFlowReturn
@ -250,13 +246,12 @@ gst_pngenc_chain (GstPad * pad, GstBuffer * buf)
gint row_index; gint row_index;
png_byte *row_pointers[MAX_HEIGHT]; png_byte *row_pointers[MAX_HEIGHT];
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;
GstBuffer *encoded_buf = NULL;
pngenc = GST_PNGENC (gst_pad_get_parent (pad)); pngenc = GST_PNGENC (gst_pad_get_parent (pad));
GST_DEBUG_OBJECT (pngenc, "BEGINNING"); GST_DEBUG_OBJECT (pngenc, "BEGINNING");
pngenc->buffer_out = NULL;
/* initialize png struct stuff */ /* initialize png struct stuff */
pngenc->png_struct_ptr = png_create_write_struct (PNG_LIBPNG_VER_STRING, pngenc->png_struct_ptr = png_create_write_struct (PNG_LIBPNG_VER_STRING,
(png_voidp) NULL, user_error_fn, user_warning_fn); (png_voidp) NULL, user_error_fn, user_warning_fn);
@ -309,20 +304,26 @@ gst_pngenc_chain (GstPad * pad, GstBuffer * buf)
(row_index * pngenc->stride); (row_index * pngenc->stride);
} }
/* allocate the output buffer */
pngenc->buffer_out =
gst_buffer_new_and_alloc (pngenc->height * pngenc->stride);
pngenc->written = 0;
png_write_info (pngenc->png_struct_ptr, pngenc->png_info_ptr); png_write_info (pngenc->png_struct_ptr, pngenc->png_info_ptr);
png_write_image (pngenc->png_struct_ptr, row_pointers); png_write_image (pngenc->png_struct_ptr, row_pointers);
png_write_end (pngenc->png_struct_ptr, NULL); png_write_end (pngenc->png_struct_ptr, NULL);
user_flush_data (pngenc->png_struct_ptr); user_flush_data (pngenc->png_struct_ptr);
encoded_buf = gst_buffer_create_sub (pngenc->buffer_out, 0, pngenc->written);
png_destroy_info_struct (pngenc->png_struct_ptr, &pngenc->png_info_ptr); png_destroy_info_struct (pngenc->png_struct_ptr, &pngenc->png_info_ptr);
png_destroy_write_struct (&pngenc->png_struct_ptr, (png_infopp) NULL); png_destroy_write_struct (&pngenc->png_struct_ptr, (png_infopp) NULL);
gst_buffer_copy_metadata (pngenc->buffer_out, buf, gst_buffer_copy_metadata (encoded_buf, buf, GST_BUFFER_COPY_TIMESTAMPS);
GST_BUFFER_COPY_TIMESTAMPS);
gst_buffer_unref (buf); gst_buffer_unref (buf);
gst_buffer_set_caps (pngenc->buffer_out, GST_PAD_CAPS (pngenc->srcpad)); gst_buffer_set_caps (encoded_buf, GST_PAD_CAPS (pngenc->srcpad));
if ((ret = gst_pad_push (pngenc->srcpad, pngenc->buffer_out)) != GST_FLOW_OK) if ((ret = gst_pad_push (pngenc->srcpad, encoded_buf)) != GST_FLOW_OK)
goto done; goto done;
if (pngenc->snapshot) { if (pngenc->snapshot) {
@ -339,6 +340,11 @@ gst_pngenc_chain (GstPad * pad, GstBuffer * buf)
done: done:
GST_DEBUG_OBJECT (pngenc, "END, ret:%d", ret); GST_DEBUG_OBJECT (pngenc, "END, ret:%d", ret);
if (pngenc->buffer_out != NULL) {
gst_buffer_unref (pngenc->buffer_out);
pngenc->buffer_out = NULL;
}
gst_object_unref (pngenc); gst_object_unref (pngenc);
return ret; return ret;
} }

1
ext/libpng/gstpngenc.h
View file

@ -44,6 +44,7 @@ struct _GstPngEnc
GstPad *sinkpad, *srcpad; GstPad *sinkpad, *srcpad;
GstBuffer *buffer_out; GstBuffer *buffer_out;
guint written;
png_structp png_struct_ptr; png_structp png_struct_ptr;
png_infop png_info_ptr; png_infop png_info_ptr;