From 09c161dac1fe05e9d4230254a8ea702ce008625c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Wed, 11 Jul 2007 22:31:06 +0000 Subject: [PATCH] Fix build against core CVS. Original commit message from CVS: * ext/cairo/gsttimeoverlay.c: (gst_cairo_time_overlay_transform): * ext/jpeg/gstjpegenc.c: (gst_jpegenc_chain): * ext/libpng/gstpngenc.c: (gst_pngenc_chain): * ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_chain): * gst/debug/gstnavigationtest.c: (gst_navigationtest_transform): * gst/effectv/gstaging.c: (gst_agingtv_transform): * gst/effectv/gstdice.c: (gst_dicetv_transform): * gst/effectv/gstedge.c: (gst_edgetv_transform): * gst/effectv/gstquark.c: (gst_quarktv_transform): * gst/effectv/gstrev.c: (gst_revtv_transform): * gst/effectv/gstshagadelic.c: (gst_shagadelictv_transform): * gst/effectv/gstvertigo.c: (gst_vertigotv_transform): * gst/effectv/gstwarp.c: (gst_warptv_transform): * gst/matroska/matroska-demux.c: (gst_matroska_demux_add_wvpk_header), (gst_matroska_demux_check_subtitle_buffer), (gst_matroska_decode_buffer): * gst/videofilter/gstvideoflip.c: (gst_video_flip_transform): Fix build against core CVS. --- ChangeLog | 22 ++++++++++++++++++++++ ext/cairo/gsttimeoverlay.c | 2 +- ext/jpeg/gstjpegenc.c | 2 +- ext/libpng/gstpngenc.c | 3 ++- ext/wavpack/gstwavpackdec.c | 3 ++- gst/debug/gstnavigationtest.c | 2 +- gst/effectv/gstaging.c | 2 +- gst/effectv/gstdice.c | 2 +- gst/effectv/gstedge.c | 2 +- gst/effectv/gstquark.c | 2 +- gst/effectv/gstrev.c | 2 +- gst/effectv/gstshagadelic.c | 2 +- gst/effectv/gstvertigo.c | 2 +- gst/effectv/gstwarp.c | 2 +- gst/matroska/matroska-demux.c | 6 +++--- gst/videofilter/gstvideoflip.c | 2 +- 16 files changed, 41 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 79e3b99..2003921 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,25 @@ +2007-07-11 Tim-Philipp Müller + + * ext/cairo/gsttimeoverlay.c: (gst_cairo_time_overlay_transform): + * ext/jpeg/gstjpegenc.c: (gst_jpegenc_chain): + * ext/libpng/gstpngenc.c: (gst_pngenc_chain): + * ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_chain): + * gst/debug/gstnavigationtest.c: (gst_navigationtest_transform): + * gst/effectv/gstaging.c: (gst_agingtv_transform): + * gst/effectv/gstdice.c: (gst_dicetv_transform): + * gst/effectv/gstedge.c: (gst_edgetv_transform): + * gst/effectv/gstquark.c: (gst_quarktv_transform): + * gst/effectv/gstrev.c: (gst_revtv_transform): + * gst/effectv/gstshagadelic.c: (gst_shagadelictv_transform): + * gst/effectv/gstvertigo.c: (gst_vertigotv_transform): + * gst/effectv/gstwarp.c: (gst_warptv_transform): + * gst/matroska/matroska-demux.c: + (gst_matroska_demux_add_wvpk_header), + (gst_matroska_demux_check_subtitle_buffer), + (gst_matroska_decode_buffer): + * gst/videofilter/gstvideoflip.c: (gst_video_flip_transform): + Fix build against core CVS. + 2007-07-10 Edward Hervey * gst/id3demux/gstid3demux.c: (gst_id3demux_chain): diff --git a/ext/cairo/gsttimeoverlay.c b/ext/cairo/gsttimeoverlay.c index ff6d2fc..1670791 100644 --- a/ext/cairo/gsttimeoverlay.c +++ b/ext/cairo/gsttimeoverlay.c @@ -193,7 +193,7 @@ gst_cairo_time_overlay_transform (GstBaseTransform * trans, GstBuffer * in, timeoverlay = GST_CAIRO_TIME_OVERLAY (trans); - gst_buffer_stamp (out, in); + gst_buffer_copy_metadata (out, in, GST_BUFFER_COPY_TIMESTAMPS); src = GST_BUFFER_DATA (in); dest = GST_BUFFER_DATA (out); diff --git a/ext/jpeg/gstjpegenc.c b/ext/jpeg/gstjpegenc.c index 9092a91..1161c07 100644 --- a/ext/jpeg/gstjpegenc.c +++ b/ext/jpeg/gstjpegenc.c @@ -430,7 +430,7 @@ gst_jpegenc_chain (GstPad * pad, GstBuffer * buf) if (ret != GST_FLOW_OK) goto done; - gst_buffer_stamp (outbuf, buf); + gst_buffer_copy_metadata (outbuf, buf, GST_BUFFER_COPY_TIMESTAMPS); width = jpegenc->width; height = jpegenc->height; diff --git a/ext/libpng/gstpngenc.c b/ext/libpng/gstpngenc.c index 6deb16e..5a93ccb 100644 --- a/ext/libpng/gstpngenc.c +++ b/ext/libpng/gstpngenc.c @@ -316,7 +316,8 @@ gst_pngenc_chain (GstPad * pad, GstBuffer * buf) png_destroy_info_struct (pngenc->png_struct_ptr, &pngenc->png_info_ptr); png_destroy_write_struct (&pngenc->png_struct_ptr, (png_infopp) NULL); - gst_buffer_stamp (pngenc->buffer_out, buf); + gst_buffer_copy_metadata (pngenc->buffer_out, buf, + GST_BUFFER_COPY_TIMESTAMPS); gst_buffer_unref (buf); gst_buffer_set_caps (pngenc->buffer_out, GST_PAD_CAPS (pngenc->srcpad)); diff --git a/ext/wavpack/gstwavpackdec.c b/ext/wavpack/gstwavpackdec.c index 437ba0d..80ceafa 100644 --- a/ext/wavpack/gstwavpackdec.c +++ b/ext/wavpack/gstwavpackdec.c @@ -359,7 +359,8 @@ gst_wavpack_dec_chain (GstPad * pad, GstBuffer * buf) if (ret != GST_FLOW_OK) goto out; - gst_buffer_stamp (outbuf, buf); + gst_buffer_copy_metadata (outbuf, buf, GST_BUFFER_COPY_TIMESTAMPS); + /* If we got a DISCONT buffer forward the flag. Nothing else * has to be done as libwavpack doesn't store state between * Wavpack blocks */ diff --git a/gst/debug/gstnavigationtest.c b/gst/debug/gstnavigationtest.c index 0b3e549..c81f8aa 100644 --- a/gst/debug/gstnavigationtest.c +++ b/gst/debug/gstnavigationtest.c @@ -214,7 +214,7 @@ gst_navigationtest_transform (GstBaseTransform * trans, GstBuffer * in, /* do something interesting here. This simply copies the source * to the destination. */ - gst_buffer_stamp (out, in); + gst_buffer_copy_metadata (out, in, GST_BUFFER_COPY_TIMESTAMPS); memcpy (GST_BUFFER_DATA (out), GST_BUFFER_DATA (in), MIN (GST_BUFFER_SIZE (in), GST_BUFFER_SIZE (out))); diff --git a/gst/effectv/gstaging.c b/gst/effectv/gstaging.c index 9ffb2f9..99c813e 100644 --- a/gst/effectv/gstaging.c +++ b/gst/effectv/gstaging.c @@ -316,7 +316,7 @@ gst_agingtv_transform (GstBaseTransform * trans, GstBuffer * in, gint area_scale = width * height / 64 / 480; GstFlowReturn ret = GST_FLOW_OK; - gst_buffer_stamp (out, in); + gst_buffer_copy_metadata (out, in, GST_BUFFER_COPY_TIMESTAMPS); if (area_scale <= 0) area_scale = 1; diff --git a/gst/effectv/gstdice.c b/gst/effectv/gstdice.c index e89116b..6d8b068 100644 --- a/gst/effectv/gstdice.c +++ b/gst/effectv/gstdice.c @@ -167,7 +167,7 @@ gst_dicetv_transform (GstBaseTransform * trans, GstBuffer * in, GstBuffer * out) src = (guint32 *) GST_BUFFER_DATA (in); dest = (guint32 *) GST_BUFFER_DATA (out); - gst_buffer_stamp (out, in); + gst_buffer_copy_metadata (out, in, GST_BUFFER_COPY_TIMESTAMPS); video_width = filter->width; g_cube_bits = filter->g_cube_bits; diff --git a/gst/effectv/gstedge.c b/gst/effectv/gstedge.c index 7241e19..35cdf64 100644 --- a/gst/effectv/gstedge.c +++ b/gst/effectv/gstedge.c @@ -148,7 +148,7 @@ gst_edgetv_transform (GstBaseTransform * trans, GstBuffer * in, GstBuffer * out) filter = GST_EDGETV (trans); - gst_buffer_stamp (out, in); + gst_buffer_copy_metadata (out, in, GST_BUFFER_COPY_TIMESTAMPS); src = (guint32 *) GST_BUFFER_DATA (in); dest = (guint32 *) GST_BUFFER_DATA (out); diff --git a/gst/effectv/gstquark.c b/gst/effectv/gstquark.c index 497f508..602c743 100644 --- a/gst/effectv/gstquark.c +++ b/gst/effectv/gstquark.c @@ -161,7 +161,7 @@ gst_quarktv_transform (GstBaseTransform * trans, GstBuffer * in, filter = GST_QUARKTV (trans); - gst_buffer_stamp (out, in); + gst_buffer_copy_metadata (out, in, GST_BUFFER_COPY_TIMESTAMPS); area = filter->area; src = (guint32 *) GST_BUFFER_DATA (in); diff --git a/gst/effectv/gstrev.c b/gst/effectv/gstrev.c index 532cc6e..b848f37 100644 --- a/gst/effectv/gstrev.c +++ b/gst/effectv/gstrev.c @@ -169,7 +169,7 @@ gst_revtv_transform (GstBaseTransform * trans, GstBuffer * in, GstBuffer * out) filter = GST_REVTV (trans); - gst_buffer_stamp (out, in); + gst_buffer_copy_metadata (out, in, GST_BUFFER_COPY_TIMESTAMPS); src = (guint32 *) GST_BUFFER_DATA (in); dest = (guint32 *) GST_BUFFER_DATA (out); diff --git a/gst/effectv/gstshagadelic.c b/gst/effectv/gstshagadelic.c index fb7d1ed..9c1b527 100644 --- a/gst/effectv/gstshagadelic.c +++ b/gst/effectv/gstshagadelic.c @@ -228,7 +228,7 @@ gst_shagadelictv_transform (GstBaseTransform * trans, GstBuffer * in, filter = GST_SHAGADELICTV (trans); - gst_buffer_stamp (out, in); + gst_buffer_copy_metadata (out, in, GST_BUFFER_COPY_TIMESTAMPS); src = (guint32 *) GST_BUFFER_DATA (in); dest = (guint32 *) GST_BUFFER_DATA (out); diff --git a/gst/effectv/gstvertigo.c b/gst/effectv/gstvertigo.c index d060f4d..598135d 100644 --- a/gst/effectv/gstvertigo.c +++ b/gst/effectv/gstvertigo.c @@ -210,7 +210,7 @@ gst_vertigotv_transform (GstBaseTransform * trans, GstBuffer * in, filter = GST_VERTIGOTV (trans); - gst_buffer_stamp (out, in); + gst_buffer_copy_metadata (out, in, GST_BUFFER_COPY_TIMESTAMPS); src = (guint32 *) GST_BUFFER_DATA (in); dest = (guint32 *) GST_BUFFER_DATA (out); diff --git a/gst/effectv/gstwarp.c b/gst/effectv/gstwarp.c index 564a03d..088b09d 100644 --- a/gst/effectv/gstwarp.c +++ b/gst/effectv/gstwarp.c @@ -227,7 +227,7 @@ gst_warptv_transform (GstBaseTransform * trans, GstBuffer * in, GstBuffer * out) gint32 *sintable, *ctable; GstFlowReturn ret = GST_FLOW_OK; - gst_buffer_stamp (out, in); + gst_buffer_copy_metadata (out, in, GST_BUFFER_COPY_TIMESTAMPS); xw = (gint) (sin ((warptv->tval + 100) * M_PI / 128) * 30); yw = (gint) (sin ((warptv->tval) * M_PI / 256) * -35); diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c index 3c54b21..3735174 100644 --- a/gst/matroska/matroska-demux.c +++ b/gst/matroska/matroska-demux.c @@ -2416,7 +2416,7 @@ gst_matroska_demux_add_wvpk_header (GstMatroskaTrackContext * stream, GST_WRITE_UINT32_LE (data + 12, wvh.total_samples); GST_WRITE_UINT32_LE (data + 16, wvh.block_index); g_memmove (data + 20, GST_BUFFER_DATA (*buf), block_length); - gst_buffer_stamp (newbuf, *buf); + gst_buffer_copy_metadata (newbuf, *buf, GST_BUFFER_COPY_TIMESTAMPS); gst_buffer_unref (*buf); *buf = newbuf; return TRUE; @@ -2485,7 +2485,7 @@ gst_matroska_demux_check_subtitle_buffer (GstMatroskaDemux * demux, GST_BUFFER_MALLOCDATA (newbuf) = (guint8 *) utf8; GST_BUFFER_DATA (newbuf) = (guint8 *) utf8; GST_BUFFER_SIZE (newbuf) = strlen (utf8); - gst_buffer_stamp (newbuf, buf); + gst_buffer_copy_metadata (newbuf, buf, GST_BUFFER_COPY_TIMESTAMPS); gst_buffer_unref (buf); return newbuf; @@ -2572,7 +2572,7 @@ gst_matroska_decode_buffer (GstMatroskaTrackContext * context, GstBuffer * buf) GST_BUFFER_MALLOCDATA (new_buf) = (guint8 *) new_data; GST_BUFFER_DATA (new_buf) = (guint8 *) new_data; GST_BUFFER_SIZE (new_buf) = new_size; - gst_buffer_stamp (new_buf, buf); + gst_buffer_copy_metadata (new_buf, buf, GST_BUFFER_COPY_TIMESTAMPS); gst_buffer_unref (buf); buf = new_buf; diff --git a/gst/videofilter/gstvideoflip.c b/gst/videofilter/gstvideoflip.c index 043f027..336e053 100644 --- a/gst/videofilter/gstvideoflip.c +++ b/gst/videofilter/gstvideoflip.c @@ -475,7 +475,7 @@ gst_video_flip_transform (GstBaseTransform * trans, GstBuffer * in, videoflip = GST_VIDEO_FLIP (trans); - gst_buffer_stamp (out, in); + gst_buffer_copy_metadata (out, in, GST_BUFFER_COPY_TIMESTAMPS); src = GST_BUFFER_DATA (in); dest = GST_BUFFER_DATA (out); -- 2.7.4