From: <mn...@ke...> - 2009-12-15 19:00:16
|
Module: gst-plugins-base Branch: master Commit: 60635a9fbcd9007144f1eefd2ad88467802ec130 URL: http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=60635a9fbcd9007144f1eefd2ad88467802ec130 Author: Mark Nauwelaerts <mar...@co...> Date: Tue Dec 15 16:52:44 2009 +0100 audiorate: use separate header file --- gst/audiorate/Makefile.am | 2 + gst/audiorate/gstaudiorate.c | 49 +------------------------- gst/audiorate/gstaudiorate.h | 81 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 48 deletions(-) diff --git a/gst/audiorate/Makefile.am b/gst/audiorate/Makefile.am index 212bd18..10195de 100644 --- a/gst/audiorate/Makefile.am +++ b/gst/audiorate/Makefile.am @@ -1,3 +1,5 @@ +noinst_HEADERS = gstaudiorate.h + plugin_LTLIBRARIES = libgstaudiorate.la libgstaudiorate_la_SOURCES = gstaudiorate.c diff --git a/gst/audiorate/gstaudiorate.c b/gst/audiorate/gstaudiorate.c index d747681..e3b9f6a 100644 --- a/gst/audiorate/gstaudiorate.c +++ b/gst/audiorate/gstaudiorate.c @@ -24,58 +24,11 @@ #include <string.h> #include <stdlib.h> -#include <gst/gst.h> -#include <gst/audio/audio.h> +#include "gstaudiorate.h" #define GST_CAT_DEFAULT audio_rate_debug GST_DEBUG_CATEGORY_STATIC (audio_rate_debug); -#define GST_TYPE_AUDIO_RATE \ - (gst_audio_rate_get_type()) -#define GST_AUDIO_RATE(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AUDIO_RATE,GstAudioRate)) -#define GST_AUDIO_RATE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AUDIO_RATE,GstAudioRate)) -#define GST_IS_AUDIO_RATE(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AUDIO_RATE)) -#define GST_IS_AUDIO_RATE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AUDIO_RATE)) - -typedef struct _GstAudioRate GstAudioRate; -typedef struct _GstAudioRateClass GstAudioRateClass; - -struct _GstAudioRate -{ - GstElement element; - - GstPad *sinkpad, *srcpad; - - /* audio format */ - gint bytes_per_sample; - gint rate; - - /* stats */ - guint64 in, out, add, drop; - gboolean silent; - - /* audio state */ - guint64 next_offset; - guint64 next_ts; - - gboolean discont; - - gboolean new_segment; - /* we accept all formats on the sink */ - GstSegment sink_segment; - /* we output TIME format on the src */ - GstSegment src_segment; -}; - -struct _GstAudioRateClass -{ - GstElementClass parent_class; -}; - /* elementfactory information */ static const GstElementDetails audio_rate_details = GST_ELEMENT_DETAILS ("Audio rate adjuster", diff --git a/gst/audiorate/gstaudiorate.h b/gst/audiorate/gstaudiorate.h new file mode 100644 index 0000000..84e3a9a --- /dev/null +++ b/gst/audiorate/gstaudiorate.h @@ -0,0 +1,81 @@ +/* GStreamer + * Copyright (C) <1999> Erik Walthinsen <om...@cs...> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __GST_AUDIO_RATE_H__ +#define __GST_AUDIO_RATE_H__ + +#include <gst/gst.h> +#include <gst/audio/audio.h> + +G_BEGIN_DECLS + +#define GST_TYPE_AUDIO_RATE \ + (gst_audio_rate_get_type()) +#define GST_AUDIO_RATE(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AUDIO_RATE,GstAudioRate)) +#define GST_AUDIO_RATE_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AUDIO_RATE,GstAudioRate)) +#define GST_IS_AUDIO_RATE(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AUDIO_RATE)) +#define GST_IS_AUDIO_RATE_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AUDIO_RATE)) + +typedef struct _GstAudioRate GstAudioRate; +typedef struct _GstAudioRateClass GstAudioRateClass; + +/** + * GstAudioRate: + * + * Opaque data structure. + */ +struct _GstAudioRate +{ + GstElement element; + + GstPad *sinkpad, *srcpad; + + /* audio format */ + gint bytes_per_sample; + gint rate; + + /* stats */ + guint64 in, out, add, drop; + gboolean silent; + + /* audio state */ + guint64 next_offset; + guint64 next_ts; + + gboolean discont; + + gboolean new_segment; + /* we accept all formats on the sink */ + GstSegment sink_segment; + /* we output TIME format on the src */ + GstSegment src_segment; +}; + +struct _GstAudioRateClass +{ + GstElementClass parent_class; +}; + +G_END_DECLS + +#endif /* __GST_AUDIO_RATE_H__ */ |