From 48ba9063b0f96b1dafc74738322e49e3b4b7302a Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 30 Mar 2012 18:13:26 +0200 Subject: [PATCH] update for buffer api change --- ext/schroedinger/gstschroutils.c | 2 +- gst/audiovisualizers/gstbaseaudiovisualizer.c | 2 +- sys/applemedia/coremediabuffer.c | 2 +- sys/applemedia/corevideobuffer.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/schroedinger/gstschroutils.c b/ext/schroedinger/gstschroutils.c index 6af3692f88..22d3a34d34 100644 --- a/ext/schroedinger/gstschroutils.c +++ b/ext/schroedinger/gstschroutils.c @@ -141,7 +141,7 @@ gst_schro_wrap_gst_buffer (GstBuffer * buffer) GstMemory *mem; GstMapInfo info; - mem = gst_buffer_get_merged_memory (buffer); + mem = gst_buffer_get_all_memory (buffer); if (!gst_memory_map (mem, &info, GST_MAP_READ)) { GST_ERROR ("Couldn't get readable memory from gstbuffer"); return NULL; diff --git a/gst/audiovisualizers/gstbaseaudiovisualizer.c b/gst/audiovisualizers/gstbaseaudiovisualizer.c index b36dd328ff..9d68ca88cc 100644 --- a/gst/audiovisualizers/gstbaseaudiovisualizer.c +++ b/gst/audiovisualizers/gstbaseaudiovisualizer.c @@ -881,7 +881,7 @@ gst_base_audio_visualizer_chain (GstPad * pad, GstObject * parent, if (!(adata = (gpointer) gst_adapter_map (scope->adapter, sbpf))) break; - gst_buffer_take_memory (inbuf, -1, + gst_buffer_append_memory (inbuf, gst_memory_new_wrapped (GST_MEMORY_FLAG_READONLY, adata, sbpf, 0, sbpf, NULL, NULL)); diff --git a/sys/applemedia/coremediabuffer.c b/sys/applemedia/coremediabuffer.c index 14ff9cd9a3..b5e199f8a8 100644 --- a/sys/applemedia/coremediabuffer.c +++ b/sys/applemedia/coremediabuffer.c @@ -108,7 +108,7 @@ gst_core_media_buffer_new (GstCoreMediaCtx * ctx, CMSampleBufferRef sample_buf) meta->pixel_buf = pixel_buf; meta->block_buf = block_buf; - gst_buffer_take_memory (buf, -1, + gst_buffer_append_memory (buf, gst_memory_new_wrapped (GST_MEMORY_FLAG_NO_SHARE, data, size, 0, size, NULL, NULL)); diff --git a/sys/applemedia/corevideobuffer.c b/sys/applemedia/corevideobuffer.c index eee0a8fc07..bfadd4b2b9 100644 --- a/sys/applemedia/corevideobuffer.c +++ b/sys/applemedia/corevideobuffer.c @@ -105,7 +105,7 @@ gst_core_video_buffer_new (GstCoreMediaCtx * ctx, CVBufferRef cvbuf, size = cv->CVPixelBufferGetBytesPerRow (pixbuf) * height; } - gst_buffer_take_memory (buf, -1, + gst_buffer_append_memory (buf, gst_memory_new_wrapped (GST_MEMORY_FLAG_NO_SHARE, data, size, 0, size, NULL, NULL));