mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-28 19:20:35 +00:00
audioaggregator: remove, moved to -base
https://bugzilla.gnome.org/show_bug.cgi?id=791218
This commit is contained in:
Tim-Philipp Müller
parent
c180f8ffed
commit
5b1a968840
6 changed files with 3 additions and 2238 deletions
|
|
@ -1,6 +1,5 @@
|
|||
#include <gst/gst.h>
|
||||
|
||||
#include <gst/audio/gstaudioaggregator.h>
|
||||
#include <gst/video/gstvideoaggregator.h>
|
||||
#include <gst/codecparsers/gsth264parser.h>
|
||||
#include <gst/codecparsers/gstmpegvideoparser.h>
|
||||
|
|
@ -9,9 +8,6 @@
|
|||
#include <gst/player/player.h>
|
||||
#include <gst/webrtc/webrtc.h>
|
||||
|
||||
gst_audio_aggregator_get_type
|
||||
gst_audio_aggregator_pad_get_type
|
||||
|
||||
gst_video_aggregator_get_type
|
||||
gst_video_aggregator_pad_get_type
|
||||
|
||||
|
|
|
|||
|
|
@ -17,10 +17,6 @@ GObject
|
|||
GstControlSource
|
||||
GstElement
|
||||
GstAggregator
|
||||
GstAudioAggregator
|
||||
GstAudioInterleave
|
||||
GstAudioMixer
|
||||
GstLiveAdder
|
||||
GstMXFMux
|
||||
GstVideoAggregator
|
||||
GstCompositor
|
||||
|
|
@ -327,9 +323,6 @@ GObject
|
|||
GstGLContext
|
||||
GstPad
|
||||
GstAggregatorPad
|
||||
GstAudioAggregatorPad
|
||||
GstAudioInterleavePad
|
||||
GstAudioMixerPad
|
||||
GstMXFMuxPad
|
||||
GstVideoAggregatorPad
|
||||
GstCompositorPad
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ lib_LTLIBRARIES = libgstbadaudio-@GST_API_VERSION@.la
|
|||
CLEANFILES =
|
||||
|
||||
libgstbadaudio_@GST_API_VERSION@_la_SOURCES = \
|
||||
gstaudioaggregator.c \
|
||||
gstnonstreamaudiodecoder.c
|
||||
|
||||
nodist_libgstbadaudio_@GST_API_VERSION@_la_SOURCES = $(BUILT_SOURCES)
|
||||
|
|
@ -24,4 +23,4 @@ libgstbadaudio_@GST_API_VERSION@_la_LIBADD = \
|
|||
libgstbadaudio_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
|
||||
|
||||
libgstaudio_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/audio
|
||||
libgstaudio_@GST_API_VERSION@include_HEADERS = gstaudioaggregator.h gstnonstreamaudiodecoder.h
|
||||
libgstaudio_@GST_API_VERSION@include_HEADERS = gstnonstreamaudiodecoder.h
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,228 +0,0 @@
|
|||
/* GStreamer
|
||||
* Copyright (C) 2014 Collabora
|
||||
* Author: Olivier Crete <olivier.crete@collabora.com>
|
||||
*
|
||||
* gstaudioaggregator.h:
|
||||
*
|
||||
* 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., 51 Franklin St, Fifth Floor,
|
||||
* Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#ifndef __GST_AUDIO_AGGREGATOR_H__
|
||||
#define __GST_AUDIO_AGGREGATOR_H__
|
||||
|
||||
#ifndef GST_USE_UNSTABLE_API
|
||||
#warning "The Base library from gst-plugins-bad is unstable API and may change in future."
|
||||
#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
|
||||
#endif
|
||||
|
||||
#include <gst/gst.h>
|
||||
#include <gst/base/gstaggregator.h>
|
||||
#include <gst/audio/audio.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
/*******************************
|
||||
* GstAudioAggregator Structs *
|
||||
*******************************/
|
||||
|
||||
typedef struct _GstAudioAggregator GstAudioAggregator;
|
||||
typedef struct _GstAudioAggregatorPrivate GstAudioAggregatorPrivate;
|
||||
typedef struct _GstAudioAggregatorClass GstAudioAggregatorClass;
|
||||
|
||||
|
||||
/************************
|
||||
* GstAudioAggregatorPad API *
|
||||
***********************/
|
||||
|
||||
#define GST_TYPE_AUDIO_AGGREGATOR_PAD (gst_audio_aggregator_pad_get_type())
|
||||
#define GST_AUDIO_AGGREGATOR_PAD(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AUDIO_AGGREGATOR_PAD, GstAudioAggregatorPad))
|
||||
#define GST_AUDIO_AGGREGATOR_PAD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AUDIO_AGGREGATOR_PAD, GstAudioAggregatorPadClass))
|
||||
#define GST_AUDIO_AGGREGATOR_PAD_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),GST_TYPE_AUDIO_AGGREGATOR_PAD, GstAudioAggregatorPadClass))
|
||||
#define GST_IS_AUDIO_AGGREGATOR_PAD(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AUDIO_AGGREGATOR_PAD))
|
||||
#define GST_IS_AUDIO_AGGREGATOR_PAD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AUDIO_AGGREGATOR_PAD))
|
||||
|
||||
/****************************
|
||||
* GstAudioAggregatorPad Structs *
|
||||
***************************/
|
||||
|
||||
typedef struct _GstAudioAggregatorPad GstAudioAggregatorPad;
|
||||
typedef struct _GstAudioAggregatorPadClass GstAudioAggregatorPadClass;
|
||||
typedef struct _GstAudioAggregatorPadPrivate GstAudioAggregatorPadPrivate;
|
||||
|
||||
/**
|
||||
* GstAudioAggregatorPad:
|
||||
* @parent: The parent #GstAggregatorPad
|
||||
* @info: The audio info for this pad set from the incoming caps
|
||||
*
|
||||
* The default implementation of GstPad used with #GstAudioAggregator
|
||||
*/
|
||||
struct _GstAudioAggregatorPad
|
||||
{
|
||||
GstAggregatorPad parent;
|
||||
|
||||
GstAudioInfo info;
|
||||
|
||||
/*< private >*/
|
||||
GstAudioAggregatorPadPrivate * priv;
|
||||
|
||||
gpointer _gst_reserved[GST_PADDING];
|
||||
};
|
||||
|
||||
/**
|
||||
* GstAudioAggregatorPadClass:
|
||||
*
|
||||
*/
|
||||
struct _GstAudioAggregatorPadClass
|
||||
{
|
||||
GstAggregatorPadClass parent_class;
|
||||
|
||||
/*< private >*/
|
||||
gpointer _gst_reserved[GST_PADDING_LARGE];
|
||||
};
|
||||
|
||||
GST_EXPORT
|
||||
GType gst_audio_aggregator_pad_get_type (void);
|
||||
|
||||
#define GST_TYPE_AUDIO_AGGREGATOR_CONVERT_PAD (gst_audio_aggregator_convert_pad_get_type())
|
||||
#define GST_AUDIO_AGGREGATOR_CONVERT_PAD(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AUDIO_AGGREGATOR_CONVERT_PAD, GstAudioAggregatorConvertPad))
|
||||
#define GST_AUDIO_AGGREGATOR_CONVERT_PAD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AUDIO_AGGREGATOR_CONVERT_PAD, GstAudioAggregatorConvertPadClass))
|
||||
#define GST_AUDIO_AGGREGATOR_CONVERT_PAD_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),GST_TYPE_AUDIO_AGGREGATOR_CONVERT_PAD, GstAudioAggregatorConvertPadClass))
|
||||
#define GST_IS_AUDIO_AGGREGATOR_CONVERT_PAD(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AUDIO_AGGREGATOR_CONVERT_PAD))
|
||||
#define GST_IS_AUDIO_AGGREGATOR_CONVERT_PAD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AUDIO_AGGREGATOR_CONVERT_PAD))
|
||||
|
||||
/****************************
|
||||
* GstAudioAggregatorPad Structs *
|
||||
***************************/
|
||||
|
||||
typedef struct _GstAudioAggregatorConvertPad GstAudioAggregatorConvertPad;
|
||||
typedef struct _GstAudioAggregatorConvertPadClass GstAudioAggregatorConvertPadClass;
|
||||
typedef struct _GstAudioAggregatorConvertPadPrivate GstAudioAggregatorConvertPadPrivate;
|
||||
|
||||
/**
|
||||
* GstAudioAggregatorConvertPad:
|
||||
* @parent: The parent #GstAudioAggregatorPad
|
||||
*
|
||||
* An implementation of GstPad that can be used with #GstAudioAggregator.
|
||||
*
|
||||
* See #GstAudioAggregator for more details.
|
||||
*/
|
||||
struct _GstAudioAggregatorConvertPad
|
||||
{
|
||||
GstAudioAggregatorPad parent;
|
||||
|
||||
/*< private >*/
|
||||
GstAudioAggregatorConvertPadPrivate * priv;
|
||||
|
||||
gpointer _gst_reserved[GST_PADDING];
|
||||
};
|
||||
|
||||
/**
|
||||
* GstAudioAggregatorConvertPadClass:
|
||||
*
|
||||
*/
|
||||
struct _GstAudioAggregatorConvertPadClass
|
||||
{
|
||||
GstAudioAggregatorPadClass parent_class;
|
||||
|
||||
/*< private >*/
|
||||
gpointer _gst_reserved[GST_PADDING];
|
||||
};
|
||||
|
||||
GST_EXPORT
|
||||
GType gst_audio_aggregator_convert_pad_get_type (void);
|
||||
|
||||
/**************************
|
||||
* GstAudioAggregator API *
|
||||
**************************/
|
||||
|
||||
#define GST_TYPE_AUDIO_AGGREGATOR (gst_audio_aggregator_get_type())
|
||||
#define GST_AUDIO_AGGREGATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_AUDIO_AGGREGATOR,GstAudioAggregator))
|
||||
#define GST_AUDIO_AGGREGATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_AUDIO_AGGREGATOR,GstAudioAggregatorClass))
|
||||
#define GST_AUDIO_AGGREGATOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),GST_TYPE_AUDIO_AGGREGATOR,GstAudioAggregatorClass))
|
||||
#define GST_IS_AUDIO_AGGREGATOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AUDIO_AGGREGATOR))
|
||||
#define GST_IS_AUDIO_AGGREGATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AUDIO_AGGREGATOR))
|
||||
|
||||
/**
|
||||
* GstAudioAggregator:
|
||||
* @parent: The parent #GstAggregator
|
||||
* @info: The information parsed from the current caps
|
||||
* @current_caps: The caps set by the subclass
|
||||
*
|
||||
* GstAudioAggregator object
|
||||
*/
|
||||
struct _GstAudioAggregator
|
||||
{
|
||||
GstAggregator parent;
|
||||
|
||||
/* All member are read only for subclasses, must hold OBJECT lock */
|
||||
GstAudioInfo info;
|
||||
|
||||
GstCaps *current_caps;
|
||||
|
||||
/*< private >*/
|
||||
GstAudioAggregatorPrivate *priv;
|
||||
|
||||
gpointer _gst_reserved[GST_PADDING];
|
||||
};
|
||||
|
||||
/**
|
||||
* GstAudioAggregatorClass:
|
||||
* @create_output_buffer: Create a new output buffer contains num_frames frames.
|
||||
* @aggregate_one_buffer: Aggregates one input buffer to the output
|
||||
* buffer. The in_offset and out_offset are in "frames", which is
|
||||
* the size of a sample times the number of channels. Returns TRUE if
|
||||
* any non-silence was added to the buffer
|
||||
* @convert_buffer: Convert a buffer from one format to another. The pad
|
||||
* is either a sinkpad, when converting an input buffer, or the source pad,
|
||||
* when converting the output buffer after a downstream format change is
|
||||
* requested.
|
||||
*/
|
||||
struct _GstAudioAggregatorClass {
|
||||
GstAggregatorClass parent_class;
|
||||
|
||||
GstBuffer * (* create_output_buffer) (GstAudioAggregator * aagg,
|
||||
guint num_frames);
|
||||
gboolean (* aggregate_one_buffer) (GstAudioAggregator * aagg,
|
||||
GstAudioAggregatorPad * pad, GstBuffer * inbuf, guint in_offset,
|
||||
GstBuffer * outbuf, guint out_offset, guint num_frames);
|
||||
GstBuffer * (* convert_buffer) (GstAudioAggregator *aagg,
|
||||
GstPad * pad,
|
||||
GstAudioInfo *in_info,
|
||||
GstAudioInfo *out_info,
|
||||
GstBuffer * buffer);
|
||||
|
||||
/*< private >*/
|
||||
gpointer _gst_reserved[GST_PADDING_LARGE];
|
||||
};
|
||||
|
||||
/*************************
|
||||
* GstAggregator methods *
|
||||
************************/
|
||||
|
||||
GST_EXPORT
|
||||
GType gst_audio_aggregator_get_type(void);
|
||||
|
||||
GST_EXPORT
|
||||
void gst_audio_aggregator_set_sink_caps (GstAudioAggregator * aagg,
|
||||
GstAudioAggregatorPad * pad,
|
||||
GstCaps * caps);
|
||||
|
||||
GST_EXPORT
|
||||
void gst_audio_aggregator_class_perform_conversion (GstAudioAggregatorClass * klass);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __GST_AUDIO_AGGREGATOR_H__ */
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
badaudio_sources = ['gstaudioaggregator.c', 'gstnonstreamaudiodecoder.c']
|
||||
badaudio_headers = ['gstaudioaggregator.h', 'gstnonstreamaudiodecoder.h']
|
||||
badaudio_sources = ['gstnonstreamaudiodecoder.c']
|
||||
badaudio_headers = ['gstnonstreamaudiodecoder.h']
|
||||
install_headers(badaudio_headers, subdir : 'gstreamer-1.0/gst/audio')
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue