From a9ec4d62a89dd53aa295af02c7d5f57ef936359b Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 28 Mar 2012 12:49:54 +0200 Subject: [PATCH] update for buffer changes --- ext/jp2k/gstjasperdec.c | 4 +++- ext/rtmp/gstrtmpsink.c | 2 +- ext/spc/gstspc.c | 2 +- gst/asfmux/gstasfparse.c | 4 ++-- gst/asfmux/gstrtpasfpay.c | 2 +- gst/dvdspu/gstdvdspu.c | 2 +- gst/hls/gsthlsdemux.c | 2 +- gst/mpegtsdemux/tsdemux.c | 2 +- gst/nsf/gstnsf.c | 2 +- gst/rtpvp8/gstrtpvp8pay.c | 2 +- gst/videoparsers/gstmpeg4videoparse.c | 4 +++- sys/decklink/gstdecklinksink.cpp | 2 +- sys/dxr3/dxr3videosink.c | 6 +----- sys/vdpau/mpeg/gstvdpmpegframe.c | 2 +- tests/check/elements/faad.c | 2 +- tests/check/elements/parser.c | 2 +- win32/common/config.h | 4 ++-- 17 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ext/jp2k/gstjasperdec.c b/ext/jp2k/gstjasperdec.c index 0c69db3e38..84de1d9fce 100644 --- a/ext/jp2k/gstjasperdec.c +++ b/ext/jp2k/gstjasperdec.c @@ -635,7 +635,9 @@ gst_jasper_dec_chain (GstPad * pad, GstBuffer * buf) if (dec->codec_data) { GstBuffer *tmp; - tmp = gst_buffer_merge (dec->codec_data, buf); + tmp = + gst_buffer_append (gst_buffer_ref (dec->codec_data), + gst_buffer_ref (buf)); gst_buffer_copy_metadata (tmp, buf, GST_BUFFER_COPY_TIMESTAMPS); gst_buffer_unref (buf); buf = tmp; diff --git a/ext/rtmp/gstrtmpsink.c b/ext/rtmp/gstrtmpsink.c index 669073c455..d55d652c98 100644 --- a/ext/rtmp/gstrtmpsink.c +++ b/ext/rtmp/gstrtmpsink.c @@ -232,7 +232,7 @@ gst_rtmp_sink_render (GstBaseSink * bsink, GstBuffer * buf) GST_LOG_OBJECT (sink, "Joining 2nd buffer of size %" G_GSIZE_FORMAT " to cached buf", gst_buffer_get_size (buf)); gst_buffer_ref (buf); - reffed_buf = buf = gst_buffer_join (sink->cache, buf); + reffed_buf = buf = gst_buffer_append (sink->cache, buf); sink->cache = NULL; } diff --git a/ext/spc/gstspc.c b/ext/spc/gstspc.c index 9167182352..60ad33d3ec 100644 --- a/ext/spc/gstspc.c +++ b/ext/spc/gstspc.c @@ -179,7 +179,7 @@ gst_spc_dec_chain (GstPad * pad, GstBuffer * buffer) GstSpcDec *spc = GST_SPC_DEC (gst_pad_get_parent (pad)); if (spc->buf) { - spc->buf = gst_buffer_join (spc->buf, buffer); + spc->buf = gst_buffer_append (spc->buf, buffer); } else { spc->buf = buffer; } diff --git a/gst/asfmux/gstasfparse.c b/gst/asfmux/gstasfparse.c index 40231f6d8e..9efb3902ef 100644 --- a/gst/asfmux/gstasfparse.c +++ b/gst/asfmux/gstasfparse.c @@ -181,7 +181,7 @@ gst_asf_parse_pull_headers (GstAsfParse * asfparse) GST_ERROR_OBJECT (asfparse, "Failed to pull data from headers"); goto leave; } - headers = gst_buffer_join (guid_and_size, headers); + headers = gst_buffer_append (guid_and_size, headers); guid_and_size = NULL; asfparse->offset += size - ASF_GUID_OBJSIZE_SIZE; if (!gst_asf_parse_headers (headers, asfparse->asfinfo)) { @@ -282,7 +282,7 @@ gst_asf_parse_pull_indexes (GstAsfParse * asfparse) } asfparse->offset += obj_size - ASF_GUID_OBJSIZE_SIZE; - buf = gst_buffer_join (guid_and_size, buf); + buf = gst_buffer_append (guid_and_size, buf); ret = gst_asf_parse_push (asfparse, buf); if (ret != GST_FLOW_OK) break; diff --git a/gst/asfmux/gstrtpasfpay.c b/gst/asfmux/gstrtpasfpay.c index 157533f924..1bc4dd6114 100644 --- a/gst/asfmux/gstrtpasfpay.c +++ b/gst/asfmux/gstrtpasfpay.c @@ -425,7 +425,7 @@ gst_rtp_asf_pay_handle_buffer (GstBaseRTPPayload * rtppay, GstBuffer * buffer) if (gst_asf_match_guid (GST_BUFFER_DATA (buffer), &(guids[ASF_DATA_OBJECT_INDEX]))) { GST_DEBUG_OBJECT (rtpasfpay, "Received data object header"); - rtpasfpay->headers = gst_buffer_join (rtpasfpay->headers, buffer); + rtpasfpay->headers = gst_buffer_append (rtpasfpay->headers, buffer); rtpasfpay->state = ASF_PACKETS; return gst_rtp_asf_pay_parse_headers (rtpasfpay); diff --git a/gst/dvdspu/gstdvdspu.c b/gst/dvdspu/gstdvdspu.c index 2088581f0c..98dcc2fb47 100644 --- a/gst/dvdspu/gstdvdspu.c +++ b/gst/dvdspu/gstdvdspu.c @@ -912,7 +912,7 @@ gst_dvd_spu_subpic_chain (GstPad * pad, GstObject * parent, GstBuffer * buf) if (GST_BUFFER_TIMESTAMP_IS_VALID (buf)) GST_WARNING_OBJECT (dvdspu, "Joining subpicture buffer with timestamp to previous"); - dvdspu->partial_spu = gst_buffer_join (dvdspu->partial_spu, buf); + dvdspu->partial_spu = gst_buffer_append (dvdspu->partial_spu, buf); } else { /* If we don't yet have a buffer, wait for one with a timestamp, * since that will avoid collecting the 2nd half of a partial buf */ diff --git a/gst/hls/gsthlsdemux.c b/gst/hls/gsthlsdemux.c index f0f4b522dc..eeb2ff38ab 100644 --- a/gst/hls/gsthlsdemux.c +++ b/gst/hls/gsthlsdemux.c @@ -603,7 +603,7 @@ gst_hls_demux_chain (GstPad * pad, GstBuffer * buf) if (demux->playlist == NULL) demux->playlist = buf; else - demux->playlist = gst_buffer_join (demux->playlist, buf); + demux->playlist = gst_buffer_append (demux->playlist, buf); gst_object_unref (demux); diff --git a/gst/mpegtsdemux/tsdemux.c b/gst/mpegtsdemux/tsdemux.c index 8cce9cd23c..06f8139107 100644 --- a/gst/mpegtsdemux/tsdemux.c +++ b/gst/mpegtsdemux/tsdemux.c @@ -2360,7 +2360,7 @@ gst_ts_demux_push_pending_data (GstTSDemux * demux, TSDemuxStream * stream) } for (tmp = stream->currentlist->next; tmp; tmp = tmp->next) { - buf = gst_buffer_join (buf, (GstBuffer *) tmp->data); + buf = gst_buffer_append (buf, (GstBuffer *) tmp->data); } GST_BUFFER_TIMESTAMP (buf) = ts; diff --git a/gst/nsf/gstnsf.c b/gst/nsf/gstnsf.c index 63ab00141f..95f390d0e8 100644 --- a/gst/nsf/gstnsf.c +++ b/gst/nsf/gstnsf.c @@ -451,7 +451,7 @@ gst_nsfdec_chain (GstPad * pad, GstBuffer * buffer) /* collect all data, we start doing something when we get an EOS * event */ if (nsfdec->tune_buffer) { - nsfdec->tune_buffer = gst_buffer_join (nsfdec->tune_buffer, buffer); + nsfdec->tune_buffer = gst_buffer_append (nsfdec->tune_buffer, buffer); } else { nsfdec->tune_buffer = buffer; } diff --git a/gst/rtpvp8/gstrtpvp8pay.c b/gst/rtpvp8/gstrtpvp8pay.c index e96a0448bd..082de2c3e1 100644 --- a/gst/rtpvp8/gstrtpvp8pay.c +++ b/gst/rtpvp8/gstrtpvp8pay.c @@ -372,7 +372,7 @@ gst_rtp_vp8_payload_next (GstRtpVP8Pay * self, offset == self->partition_offset[partition], mark, buffer); sub = gst_buffer_copy_region (buffer, GST_BUFFER_COPY_ALL, offset, available); - out = gst_buffer_join (header, sub); + out = gst_buffer_append (header, sub); gst_buffer_list_insert (list, -1, out); diff --git a/gst/videoparsers/gstmpeg4videoparse.c b/gst/videoparsers/gstmpeg4videoparse.c index d359439e43..e0f982b6aa 100644 --- a/gst/videoparsers/gstmpeg4videoparse.c +++ b/gst/videoparsers/gstmpeg4videoparse.c @@ -696,7 +696,9 @@ gst_mpeg4vparse_pre_push_frame (GstBaseParse * parse, GstBaseParseFrame * frame) GstBuffer *superbuf; /* insert header */ - superbuf = gst_buffer_merge (mp4vparse->config, buffer); + superbuf = + gst_buffer_append (gst_buffer_ref (mp4vparse->config), + gst_buffer_ref (buffer)); gst_buffer_copy_into (superbuf, buffer, GST_BUFFER_COPY_METADATA, 0, csize); gst_buffer_replace (&frame->out_buffer, superbuf); diff --git a/sys/decklink/gstdecklinksink.cpp b/sys/decklink/gstdecklinksink.cpp index a09e49bf8d..1f4ccc8d05 100644 --- a/sys/decklink/gstdecklinksink.cpp +++ b/sys/decklink/gstdecklinksink.cpp @@ -973,7 +973,7 @@ gst_decklink_sink_audiosink_chain (GstPad * pad, GstBuffer * buffer) // concatenate both buffers g_mutex_lock (decklinksink->audio_mutex); decklinksink->audio_buffer = - gst_buffer_join (decklinksink->audio_buffer, buffer); + gst_buffer_append (decklinksink->audio_buffer, buffer); g_mutex_unlock (decklinksink->audio_mutex); // GST_DEBUG("Audio Buffer Size: %d", GST_BUFFER_SIZE (decklinksink->audio_buffer)); diff --git a/sys/dxr3/dxr3videosink.c b/sys/dxr3/dxr3videosink.c index 1c69295ab8..9ee27b4e12 100644 --- a/sys/dxr3/dxr3videosink.c +++ b/sys/dxr3/dxr3videosink.c @@ -599,7 +599,6 @@ dxr3videosink_chain (GstPad * pad, GstData * _data) { GstBuffer *buf = GST_BUFFER (_data); Dxr3VideoSink *sink; - GstBuffer *merged; g_return_if_fail (pad != NULL); g_return_if_fail (GST_IS_PAD (pad)); @@ -617,10 +616,7 @@ dxr3videosink_chain (GstPad * pad, GstData * _data) if (sink->cur_buf == NULL) { sink->cur_buf = buf; } else { - merged = gst_buffer_merge (sink->cur_buf, buf); - gst_buffer_unref (sink->cur_buf); - gst_buffer_unref (buf); - sink->cur_buf = merged; + sink->cur_buf = gst_buffer_append (sink->cur_buf, buf); } sink->last_ts = GST_BUFFER_TIMESTAMP (buf); diff --git a/sys/vdpau/mpeg/gstvdpmpegframe.c b/sys/vdpau/mpeg/gstvdpmpegframe.c index 54e1a3c287..a3e9060cf4 100644 --- a/sys/vdpau/mpeg/gstvdpmpegframe.c +++ b/sys/vdpau/mpeg/gstvdpmpegframe.c @@ -36,7 +36,7 @@ gst_vdp_mpeg_frame_add_slice (GstVdpMpegFrame * mpeg_frame, GstBuffer * buf) if (!mpeg_frame->slices) mpeg_frame->slices = buf; else - mpeg_frame->slices = gst_buffer_join (mpeg_frame->slices, buf); + mpeg_frame->slices = gst_buffer_append (mpeg_frame->slices, buf); mpeg_frame->n_slices++; } diff --git a/tests/check/elements/faad.c b/tests/check/elements/faad.c index fc18a1864a..a97b8735b2 100644 --- a/tests/check/elements/faad.c +++ b/tests/check/elements/faad.c @@ -159,7 +159,7 @@ GST_START_TEST (test_adts) buf = gst_buffer_new_and_alloc (size); gst_buffer_fill (buf, 0, raw_data_block, size); - buf = gst_buffer_join (header_buf, buf); + buf = gst_buffer_append (header_buf, buf); caps = gst_caps_from_string (AAC_CAPS_STRING); do_test (buf, caps); gst_caps_unref (caps); diff --git a/tests/check/elements/parser.c b/tests/check/elements/parser.c index 26805019d2..356b7738b7 100644 --- a/tests/check/elements/parser.c +++ b/tests/check/elements/parser.c @@ -247,7 +247,7 @@ gst_parser_test_run (GstParserTest * test, GstCaps ** out_caps) if (!k) buffer = buffer_new (test->series[j].data, test->series[j].size); else { - buffer = gst_buffer_join (buffer, + buffer = gst_buffer_append (buffer, buffer_new (test->series[j].data, test->series[j].size)); } } diff --git a/win32/common/config.h b/win32/common/config.h index 2a16b2e05e..382a51cd62 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -24,7 +24,7 @@ #define GST_LICENSE "LGPL" /* package name in plugins */ -#define GST_PACKAGE_NAME "GStreamer Bad Plug-ins source release" +#define GST_PACKAGE_NAME "GStreamer Bad Plug-ins git" /* package origin */ #define GST_PACKAGE_ORIGIN "Unknown package origin" @@ -199,7 +199,7 @@ #undef USE_POISONING /* Version number of package */ -#define VERSION "0.11.2" +#define VERSION "0.11.2.1" /* Define to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ -- 2.34.1