[gst-cvs] gst-plugins-base: video: don't expose internal gst_adapter_get_buffer() helper function
Tim Mueller
tpm at kemper.freedesktop.org
Sun May 24 16:20:43 PDT 2009
Module: gst-plugins-base
Branch: master
Commit: 5fa9a8f4d0395d312ec272ab2228c59a9ebea098
URL: http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=5fa9a8f4d0395d312ec272ab2228c59a9ebea098
Author: Tim-Philipp Müller <tim.muller at collabora.co.uk>
Date: Sat May 23 00:33:04 2009 +0100
video: don't expose internal gst_adapter_get_buffer() helper function
If it's really needed it should go into GstAdapter in core.
---
gst-libs/gst/video/gstbasevideodecoder.c | 8 ++++++++
gst-libs/gst/video/gstbasevideoparse.c | 8 ++++++++
gst-libs/gst/video/gstbasevideoutils.c | 7 -------
gst-libs/gst/video/gstbasevideoutils.h | 2 --
win32/common/libgstvideo.def | 1 -
5 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/gst-libs/gst/video/gstbasevideodecoder.c b/gst-libs/gst/video/gstbasevideodecoder.c
index acb045a..9aa79ee 100644
--- a/gst-libs/gst/video/gstbasevideodecoder.c
+++ b/gst-libs/gst/video/gstbasevideodecoder.c
@@ -596,6 +596,13 @@ gst_base_video_decoder_reset (GstBaseVideoDecoder * base_video_decoder)
}
}
+static GstBuffer *
+gst_adapter_get_buffer (GstAdapter * adapter)
+{
+ return gst_buffer_ref (GST_BUFFER (adapter->buflist->data));
+
+}
+
static GstFlowReturn
gst_base_video_decoder_chain (GstPad * pad, GstBuffer * buf)
{
@@ -685,6 +692,7 @@ gst_base_video_decoder_chain (GstPad * pad, GstBuffer * buf)
}
}
+ /* FIXME: use gst_adapter_prev_timestamp() here instead? */
buffer = gst_adapter_get_buffer (base_video_decoder->input_adapter);
base_video_decoder->buffer_timestamp = GST_BUFFER_TIMESTAMP (buffer);
diff --git a/gst-libs/gst/video/gstbasevideoparse.c b/gst-libs/gst/video/gstbasevideoparse.c
index c4a3400..66695c7 100644
--- a/gst-libs/gst/video/gstbasevideoparse.c
+++ b/gst-libs/gst/video/gstbasevideoparse.c
@@ -579,6 +579,13 @@ gst_base_video_parse_push_all (GstBaseVideoParse * base_video_parse,
return ret;
}
+static GstBuffer *
+gst_adapter_get_buffer (GstAdapter * adapter)
+{
+ return gst_buffer_ref (GST_BUFFER (adapter->buflist->data));
+
+}
+
static GstFlowReturn
gst_base_video_parse_chain (GstPad * pad, GstBuffer * buf)
{
@@ -631,6 +638,7 @@ gst_base_video_parse_chain (GstPad * pad, GstBuffer * buf)
}
}
+ /* FIXME: use gst_adapter_prev_timestamp() here instead? */
buffer = gst_adapter_get_buffer (base_video_parse->input_adapter);
gst_buffer_unref (buffer);
diff --git a/gst-libs/gst/video/gstbasevideoutils.c b/gst-libs/gst/video/gstbasevideoutils.c
index f503255..3de6038 100644
--- a/gst-libs/gst/video/gstbasevideoutils.c
+++ b/gst-libs/gst/video/gstbasevideoutils.c
@@ -160,10 +160,3 @@ gst_video_state_get_timestamp (const GstVideoState * state, int frame_number)
state->fps_d * GST_SECOND, state->fps_n);
}
}
-
-GstBuffer *
-gst_adapter_get_buffer (GstAdapter * adapter)
-{
- return gst_buffer_ref (GST_BUFFER (adapter->buflist->data));
-
-}
diff --git a/gst-libs/gst/video/gstbasevideoutils.h b/gst-libs/gst/video/gstbasevideoutils.h
index 47c2fd2..b259fc3 100644
--- a/gst-libs/gst/video/gstbasevideoutils.h
+++ b/gst-libs/gst/video/gstbasevideoutils.h
@@ -84,8 +84,6 @@ gboolean gst_base_video_state_from_caps (GstVideoState *state,
GstClockTime gst_video_state_get_timestamp (const GstVideoState *state,
int frame_number);
-GstBuffer *gst_adapter_get_buffer (GstAdapter *adapter);
-
G_END_DECLS
#endif
diff --git a/win32/common/libgstvideo.def b/win32/common/libgstvideo.def
index 08e03e2..3fc1f85 100644
--- a/win32/common/libgstvideo.def
+++ b/win32/common/libgstvideo.def
@@ -1,5 +1,4 @@
EXPORTS
- gst_adapter_get_buffer
gst_base_video_codec_free_frame
gst_base_video_codec_get_type
gst_base_video_codec_new_frame
More information about the Gstreamer-commits
mailing list