mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 15:08:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

controller: port to new controller location and api

Browse source
This commit is contained in:
Stefan Sauer 2011-11-04 18:41:36 +01:00
parent 768e3826ab
commit fb162c8eb4
52 changed files with 41 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ext/annodex/gstcmmldec.h
View file

@ -26,7 +26,6 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/gstformat.h> #include <gst/gstformat.h>
#include <gst/controller/gstcontroller.h>
#include "gstcmmlparser.h" #include "gstcmmlparser.h"

4
gst/alpha/Makefile.am
View file

@ -2,9 +2,9 @@ plugin_LTLIBRARIES = libgstalpha.la libgstalphacolor.la
libgstalpha_la_SOURCES = gstalpha.c libgstalpha_la_SOURCES = gstalpha.c
libgstalpha_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ libgstalpha_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_CONTROLLER_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
libgstalpha_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \ libgstalpha_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
$(GST_CONTROLLER_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM) $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM)
libgstalpha_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstalpha_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstalpha_la_LIBTOOLFLAGS = --tag=disable-static libgstalpha_la_LIBTOOLFLAGS = --tag=disable-static

4
gst/alpha/gstalpha.c
View file

@ -2570,7 +2570,7 @@ gst_alpha_before_transform (GstBaseTransform * btrans, GstBuffer * buf)
GST_BUFFER_TIMESTAMP (buf)); GST_BUFFER_TIMESTAMP (buf));
GST_LOG ("Got stream time of %" GST_TIME_FORMAT, GST_TIME_ARGS (timestamp)); GST_LOG ("Got stream time of %" GST_TIME_FORMAT, GST_TIME_ARGS (timestamp));
if (GST_CLOCK_TIME_IS_VALID (timestamp)) if (GST_CLOCK_TIME_IS_VALID (timestamp))
gst_object_sync_values (G_OBJECT (alpha), timestamp); gst_object_sync_values (GST_OBJECT (alpha), timestamp);
} }
static GstFlowReturn static GstFlowReturn
@ -2624,8 +2624,6 @@ invalid_out:
static gboolean static gboolean
plugin_init (GstPlugin * plugin) plugin_init (GstPlugin * plugin)
{ {
gst_controller_init (NULL, NULL);
return gst_element_register (plugin, "alpha", GST_RANK_NONE, GST_TYPE_ALPHA); return gst_element_register (plugin, "alpha", GST_RANK_NONE, GST_TYPE_ALPHA);
} }

1
gst/alpha/gstalpha.h
View file

@ -26,7 +26,6 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/video/video.h> #include <gst/video/video.h>
#include <gst/video/gstvideofilter.h> #include <gst/video/gstvideofilter.h>
#include <gst/controller/gstcontroller.h>
G_BEGIN_DECLS G_BEGIN_DECLS

2
gst/audiofx/Makefile.am
View file

@ -22,11 +22,9 @@ libgstaudiofx_la_SOURCES = audiofx.c\
# flags used to compile this plugin # flags used to compile this plugin
libgstaudiofx_la_CFLAGS = $(GST_CFLAGS) \ libgstaudiofx_la_CFLAGS = $(GST_CFLAGS) \
$(GST_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \
$(GST_CONTROLLER_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
libgstaudiofx_la_LIBADD = $(GST_LIBS) \ libgstaudiofx_la_LIBADD = $(GST_LIBS) \
$(GST_BASE_LIBS) \ $(GST_BASE_LIBS) \
$(GST_CONTROLLER_LIBS) \
$(GST_PLUGINS_BASE_LIBS) \ $(GST_PLUGINS_BASE_LIBS) \
-lgstaudio-$(GST_MAJORMINOR) \ -lgstaudio-$(GST_MAJORMINOR) \
-lgstfft-$(GST_MAJORMINOR) \ -lgstfft-$(GST_MAJORMINOR) \

3
gst/audiofx/audioamplify.c
View file

@ -43,7 +43,6 @@
#include <gst/base/gstbasetransform.h> #include <gst/base/gstbasetransform.h>
#include <gst/audio/audio.h> #include <gst/audio/audio.h>
#include <gst/audio/gstaudiofilter.h> #include <gst/audio/gstaudiofilter.h>
#include <gst/controller/gstcontroller.h>
#include "audioamplify.h" #include "audioamplify.h"
@ -459,7 +458,7 @@ gst_audio_amplify_transform_ip (GstBaseTransform * base, GstBuffer * buf)
GST_TIME_ARGS (timestamp)); GST_TIME_ARGS (timestamp));
if (GST_CLOCK_TIME_IS_VALID (stream_time)) if (GST_CLOCK_TIME_IS_VALID (stream_time))
gst_object_sync_values (G_OBJECT (filter), stream_time); gst_object_sync_values (GST_OBJECT (filter), stream_time);
if (gst_base_transform_is_passthrough (base) || if (gst_base_transform_is_passthrough (base) ||
G_UNLIKELY (GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_GAP))) G_UNLIKELY (GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_GAP)))

1
gst/audiofx/audiochebband.c
View file

@ -74,7 +74,6 @@
#include <gst/base/gstbasetransform.h> #include <gst/base/gstbasetransform.h>
#include <gst/audio/audio.h> #include <gst/audio/audio.h>
#include <gst/audio/gstaudiofilter.h> #include <gst/audio/gstaudiofilter.h>
#include <gst/controller/gstcontroller.h>
#include <math.h> #include <math.h>

1
gst/audiofx/audiocheblimit.c
View file

@ -70,7 +70,6 @@
#include <gst/base/gstbasetransform.h> #include <gst/base/gstbasetransform.h>
#include <gst/audio/audio.h> #include <gst/audio/audio.h>
#include <gst/audio/gstaudiofilter.h> #include <gst/audio/gstaudiofilter.h>
#include <gst/controller/gstcontroller.h>
#include <math.h> #include <math.h>

3
gst/audiofx/audiodynamic.c
View file

@ -46,7 +46,6 @@
#include <gst/base/gstbasetransform.h> #include <gst/base/gstbasetransform.h>
#include <gst/audio/audio.h> #include <gst/audio/audio.h>
#include <gst/audio/gstaudiofilter.h> #include <gst/audio/gstaudiofilter.h>
#include <gst/controller/gstcontroller.h>
#include "audiodynamic.h" #include "audiodynamic.h"
@ -702,7 +701,7 @@ gst_audio_dynamic_transform_ip (GstBaseTransform * base, GstBuffer * buf)
GST_TIME_ARGS (timestamp)); GST_TIME_ARGS (timestamp));
if (GST_CLOCK_TIME_IS_VALID (stream_time)) if (GST_CLOCK_TIME_IS_VALID (stream_time))
gst_object_sync_values (G_OBJECT (filter), stream_time); gst_object_sync_values (GST_OBJECT (filter), stream_time);
if (gst_base_transform_is_passthrough (base) || if (gst_base_transform_is_passthrough (base) ||
G_UNLIKELY (GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_GAP))) G_UNLIKELY (GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_GAP)))

3
gst/audiofx/audioecho.c
View file

@ -50,7 +50,6 @@
#include <gst/base/gstbasetransform.h> #include <gst/base/gstbasetransform.h>
#include <gst/audio/audio.h> #include <gst/audio/audio.h>
#include <gst/audio/gstaudiofilter.h> #include <gst/audio/gstaudiofilter.h>
#include <gst/controller/gstcontroller.h>
#include "audioecho.h" #include "audioecho.h"
@ -370,7 +369,7 @@ gst_audio_echo_transform_ip (GstBaseTransform * base, GstBuffer * buf)
GST_TIME_ARGS (timestamp)); GST_TIME_ARGS (timestamp));
if (GST_CLOCK_TIME_IS_VALID (stream_time)) if (GST_CLOCK_TIME_IS_VALID (stream_time))
gst_object_sync_values (G_OBJECT (self), stream_time); gst_object_sync_values (GST_OBJECT (self), stream_time);
if (self->buffer == NULL) { if (self->buffer == NULL) {
guint bpf, rate; guint bpf, rate;

1
gst/audiofx/audiofirfilter.c
View file

@ -53,7 +53,6 @@
#include <math.h> #include <math.h>
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/audio/gstaudiofilter.h> #include <gst/audio/gstaudiofilter.h>
#include <gst/controller/gstcontroller.h>
#include "audiofirfilter.h" #include "audiofirfilter.h"

4
gst/audiofx/audiofx.c
View file

@ -23,7 +23,6 @@
#endif #endif
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/controller/gstcontroller.h>
#include "audiopanorama.h" #include "audiopanorama.h"
#include "audioinvert.h" #include "audioinvert.h"
@ -46,9 +45,6 @@
static gboolean static gboolean
plugin_init (GstPlugin * plugin) plugin_init (GstPlugin * plugin)
{ {
/* initialize gst controller library */
gst_controller_init (NULL, NULL);
return (gst_element_register (plugin, "audiopanorama", GST_RANK_NONE, return (gst_element_register (plugin, "audiopanorama", GST_RANK_NONE,
GST_TYPE_AUDIO_PANORAMA) && GST_TYPE_AUDIO_PANORAMA) &&
gst_element_register (plugin, "audioinvert", GST_RANK_NONE, gst_element_register (plugin, "audioinvert", GST_RANK_NONE,

3
gst/audiofx/audiofxbasefirfilter.c
View file

@ -30,7 +30,6 @@
#include <math.h> #include <math.h>
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/audio/gstaudiofilter.h> #include <gst/audio/gstaudiofilter.h>
#include <gst/controller/gstcontroller.h>
#include "audiofxbasefirfilter.h" #include "audiofxbasefirfilter.h"
@ -829,7 +828,7 @@ gst_audio_fx_base_fir_filter_transform (GstBaseTransform * base,
GST_TIME_ARGS (timestamp)); GST_TIME_ARGS (timestamp));
if (GST_CLOCK_TIME_IS_VALID (stream_time)) if (GST_CLOCK_TIME_IS_VALID (stream_time))
gst_object_sync_values (G_OBJECT (self), stream_time); gst_object_sync_values (GST_OBJECT (self), stream_time);
g_return_val_if_fail (self->kernel != NULL, GST_FLOW_ERROR); g_return_val_if_fail (self->kernel != NULL, GST_FLOW_ERROR);
g_return_val_if_fail (channels != 0, GST_FLOW_ERROR); g_return_val_if_fail (channels != 0, GST_FLOW_ERROR);

3
gst/audiofx/audiofxbaseiirfilter.c
View file

@ -26,7 +26,6 @@
#include <gst/base/gstbasetransform.h> #include <gst/base/gstbasetransform.h>
#include <gst/audio/audio.h> #include <gst/audio/audio.h>
#include <gst/audio/gstaudiofilter.h> #include <gst/audio/gstaudiofilter.h>
#include <gst/controller/gstcontroller.h>
#include <math.h> #include <math.h>
@ -364,7 +363,7 @@ gst_audio_fx_base_iir_filter_transform_ip (GstBaseTransform * base,
GST_TIME_ARGS (timestamp)); GST_TIME_ARGS (timestamp));
if (GST_CLOCK_TIME_IS_VALID (stream_time)) if (GST_CLOCK_TIME_IS_VALID (stream_time))
gst_object_sync_values (G_OBJECT (filter), stream_time); gst_object_sync_values (GST_OBJECT (filter), stream_time);
if (gst_base_transform_is_passthrough (base)) if (gst_base_transform_is_passthrough (base))
return GST_FLOW_OK; return GST_FLOW_OK;

1
gst/audiofx/audioiirfilter.c
View file

@ -49,7 +49,6 @@
#include <math.h> #include <math.h>
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/audio/gstaudiofilter.h> #include <gst/audio/gstaudiofilter.h>
#include <gst/controller/gstcontroller.h>
#include "audioiirfilter.h" #include "audioiirfilter.h"

3
gst/audiofx/audioinvert.c
View file

@ -44,7 +44,6 @@
#include <gst/base/gstbasetransform.h> #include <gst/base/gstbasetransform.h>
#include <gst/audio/audio.h> #include <gst/audio/audio.h>
#include <gst/audio/gstaudiofilter.h> #include <gst/audio/gstaudiofilter.h>
#include <gst/controller/gstcontroller.h>
#include "audioinvert.h" #include "audioinvert.h"
@ -239,7 +238,7 @@ gst_audio_invert_transform_ip (GstBaseTransform * base, GstBuffer * buf)
GST_TIME_ARGS (timestamp)); GST_TIME_ARGS (timestamp));
if (GST_CLOCK_TIME_IS_VALID (stream_time)) if (GST_CLOCK_TIME_IS_VALID (stream_time))
gst_object_sync_values (G_OBJECT (filter), stream_time); gst_object_sync_values (GST_OBJECT (filter), stream_time);
if (gst_base_transform_is_passthrough (base) || if (gst_base_transform_is_passthrough (base) ||
G_UNLIKELY (GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_GAP))) G_UNLIKELY (GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_GAP)))

3
gst/audiofx/audiokaraoke.c
View file

@ -42,7 +42,6 @@
#include <gst/base/gstbasetransform.h> #include <gst/base/gstbasetransform.h>
#include <gst/audio/audio.h> #include <gst/audio/audio.h>
#include <gst/audio/gstaudiofilter.h> #include <gst/audio/gstaudiofilter.h>
#include <gst/controller/gstcontroller.h>
#include "audiokaraoke.h" #include "audiokaraoke.h"
@ -341,7 +340,7 @@ gst_audio_karaoke_transform_ip (GstBaseTransform * base, GstBuffer * buf)
GST_TIME_ARGS (timestamp)); GST_TIME_ARGS (timestamp));
if (GST_CLOCK_TIME_IS_VALID (stream_time)) if (GST_CLOCK_TIME_IS_VALID (stream_time))
gst_object_sync_values (G_OBJECT (filter), stream_time); gst_object_sync_values (GST_OBJECT (filter), stream_time);
if (gst_base_transform_is_passthrough (base) || if (gst_base_transform_is_passthrough (base) ||
G_UNLIKELY (GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_GAP))) G_UNLIKELY (GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_GAP)))

3
gst/audiofx/audiopanorama.c
View file

@ -42,7 +42,6 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/base/gstbasetransform.h> #include <gst/base/gstbasetransform.h>
#include <gst/controller/gstcontroller.h>
#include "audiopanorama.h" #include "audiopanorama.h"
@ -630,7 +629,7 @@ gst_audio_panorama_transform (GstBaseTransform * base, GstBuffer * inbuf,
GST_TIME_ARGS (timestamp)); GST_TIME_ARGS (timestamp));
if (GST_CLOCK_TIME_IS_VALID (stream_time)) if (GST_CLOCK_TIME_IS_VALID (stream_time))
gst_object_sync_values (G_OBJECT (filter), stream_time); gst_object_sync_values (GST_OBJECT (filter), stream_time);
indata = gst_buffer_map (inbuf, &insize, NULL, GST_MAP_READ); indata = gst_buffer_map (inbuf, &insize, NULL, GST_MAP_READ);
outdata = gst_buffer_map (outbuf, &outsize, NULL, GST_MAP_WRITE); outdata = gst_buffer_map (outbuf, &outsize, NULL, GST_MAP_WRITE);

1
gst/audiofx/audiowsincband.c
View file

@ -60,7 +60,6 @@
#include <math.h> #include <math.h>
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/audio/gstaudiofilter.h> #include <gst/audio/gstaudiofilter.h>
#include <gst/controller/gstcontroller.h>
#include "audiowsincband.h" #include "audiowsincband.h"

1
gst/audiofx/audiowsinclimit.c
View file

@ -60,7 +60,6 @@
#include <math.h> #include <math.h>
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/audio/gstaudiofilter.h> #include <gst/audio/gstaudiofilter.h>
#include <gst/controller/gstcontroller.h>
#include "audiowsinclimit.h" #include "audiowsinclimit.h"

2
gst/effectv/Makefile.am
View file

@ -6,13 +6,11 @@ libgsteffectv_la_SOURCES = \
gstradioac.c gststreak.c gstripple.c gstradioac.c gststreak.c gstripple.c
libgsteffectv_la_CFLAGS = \ libgsteffectv_la_CFLAGS = \
$(GST_PLUGINS_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_CONTROLLER_CFLAGS) \
$(GST_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \
$(GST_CFLAGS) \ $(GST_CFLAGS) \
-I$(top_srcdir)/gst/videofilter -I$(top_srcdir)/gst/videofilter
libgsteffectv_la_LIBADD = \ libgsteffectv_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ \ $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ \
$(GST_CONTROLLER_LIBS) \
$(GST_BASE_LIBS) \ $(GST_BASE_LIBS) \
$(GST_LIBS) \ $(GST_LIBS) \
$(LIBM) $(LIBM)

4
gst/effectv/gstaging.c
View file

@ -48,8 +48,6 @@
#include "gstaging.h" #include "gstaging.h"
#include "gsteffectv.h" #include "gsteffectv.h"
#include <gst/controller/gstcontroller.h>
static const gint dx[8] = { 1, 1, 0, -1, -1, -1, 0, 1 }; static const gint dx[8] = { 1, 1, 0, -1, -1, -1, 0, 1 };
static const gint dy[8] = { 0, -1, -1, -1, 0, 1, 1, 1 }; static const gint dy[8] = { 0, -1, -1, -1, 0, 1, 1, 1 };
@ -341,7 +339,7 @@ gst_agingtv_transform (GstBaseTransform * trans, GstBuffer * in,
GST_TIME_ARGS (timestamp)); GST_TIME_ARGS (timestamp));
if (GST_CLOCK_TIME_IS_VALID (stream_time)) if (GST_CLOCK_TIME_IS_VALID (stream_time))
gst_object_sync_values (G_OBJECT (agingtv), stream_time); gst_object_sync_values (GST_OBJECT (agingtv), stream_time);
if (!gst_video_frame_map (&in_frame, &agingtv->info, in, GST_MAP_READ)) if (!gst_video_frame_map (&in_frame, &agingtv->info, in, GST_MAP_READ))
goto invalid_in; goto invalid_in;

4
gst/effectv/gstdice.c
View file

@ -53,8 +53,6 @@
#include "gstdice.h" #include "gstdice.h"
#include "gsteffectv.h" #include "gsteffectv.h"
#include <gst/controller/gstcontroller.h>
#define DEFAULT_CUBE_BITS 4 #define DEFAULT_CUBE_BITS 4
#define MAX_CUBE_BITS 5 #define MAX_CUBE_BITS 5
#define MIN_CUBE_BITS 0 #define MIN_CUBE_BITS 0
@ -140,7 +138,7 @@ gst_dicetv_transform (GstBaseTransform * trans, GstBuffer * in, GstBuffer * out)
GST_TIME_ARGS (timestamp)); GST_TIME_ARGS (timestamp));
if (GST_CLOCK_TIME_IS_VALID (stream_time)) if (GST_CLOCK_TIME_IS_VALID (stream_time))
gst_object_sync_values (G_OBJECT (filter), stream_time); gst_object_sync_values (GST_OBJECT (filter), stream_time);
gst_video_frame_map (&in_frame, &filter->info, in, GST_MAP_READ); gst_video_frame_map (&in_frame, &filter->info, in, GST_MAP_READ);
gst_video_frame_map (&out_frame, &filter->info, out, GST_MAP_WRITE); gst_video_frame_map (&out_frame, &filter->info, out, GST_MAP_WRITE);

3
gst/effectv/gstop.c
View file

@ -50,7 +50,6 @@
#include "gsteffectv.h" #include "gsteffectv.h"
#include <gst/video/video.h> #include <gst/video/video.h>
#include <gst/controller/gstcontroller.h>
enum enum
{ {
@ -219,7 +218,7 @@ gst_optv_transform (GstBaseTransform * trans, GstBuffer * in, GstBuffer * out)
GST_TIME_ARGS (timestamp)); GST_TIME_ARGS (timestamp));
if (GST_CLOCK_TIME_IS_VALID (stream_time)) if (GST_CLOCK_TIME_IS_VALID (stream_time))
gst_object_sync_values (G_OBJECT (filter), stream_time); gst_object_sync_values (GST_OBJECT (filter), stream_time);
if (G_UNLIKELY (filter->opmap[0] == NULL)) if (G_UNLIKELY (filter->opmap[0] == NULL))
return GST_FLOW_NOT_NEGOTIATED; return GST_FLOW_NOT_NEGOTIATED;

4
gst/effectv/gstquark.c
View file

@ -48,8 +48,6 @@
#include "gstquark.h" #include "gstquark.h"
#include "gsteffectv.h" #include "gsteffectv.h"
#include <gst/controller/gstcontroller.h>
/* number of frames of time-buffer. It should be as a configurable paramater */ /* number of frames of time-buffer. It should be as a configurable paramater */
/* This number also must be 2^n just for the speed. */ /* This number also must be 2^n just for the speed. */
#define PLANES 16 #define PLANES 16
@ -128,7 +126,7 @@ gst_quarktv_transform (GstBaseTransform * trans, GstBuffer * in,
GST_TIME_ARGS (timestamp)); GST_TIME_ARGS (timestamp));
if (GST_CLOCK_TIME_IS_VALID (timestamp)) if (GST_CLOCK_TIME_IS_VALID (timestamp))
gst_object_sync_values (G_OBJECT (filter), timestamp); gst_object_sync_values (GST_OBJECT (filter), timestamp);
if (G_UNLIKELY (filter->planetable == NULL)) if (G_UNLIKELY (filter->planetable == NULL))
return GST_FLOW_WRONG_STATE; return GST_FLOW_WRONG_STATE;

4
gst/effectv/gstradioac.c
View file

@ -55,8 +55,6 @@
#include "gstradioac.h" #include "gstradioac.h"
#include "gsteffectv.h" #include "gsteffectv.h"
#include <gst/controller/gstcontroller.h>
enum enum
{ {
RADIOAC_NORMAL = 0, RADIOAC_NORMAL = 0,
@ -334,7 +332,7 @@ gst_radioactv_transform (GstBaseTransform * trans, GstBuffer * in,
GST_TIME_ARGS (timestamp)); GST_TIME_ARGS (timestamp));
if (GST_CLOCK_TIME_IS_VALID (stream_time)) if (GST_CLOCK_TIME_IS_VALID (stream_time))
gst_object_sync_values (G_OBJECT (filter), stream_time); gst_object_sync_values (GST_OBJECT (filter), stream_time);
if (!gst_video_frame_map (&in_frame, &filter->info, in, GST_MAP_READ)) if (!gst_video_frame_map (&in_frame, &filter->info, in, GST_MAP_READ))
goto invalid_in; goto invalid_in;

4
gst/effectv/gstrev.c
View file

@ -64,8 +64,6 @@
#include "gstrev.h" #include "gstrev.h"
#include <gst/controller/gstcontroller.h>
#define THE_COLOR 0xffffffff #define THE_COLOR 0xffffffff
enum enum
@ -141,7 +139,7 @@ gst_revtv_transform (GstBaseTransform * trans, GstBuffer * in, GstBuffer * out)
GST_TIME_ARGS (timestamp)); GST_TIME_ARGS (timestamp));
if (GST_CLOCK_TIME_IS_VALID (stream_time)) if (GST_CLOCK_TIME_IS_VALID (stream_time))
gst_object_sync_values (G_OBJECT (filter), stream_time); gst_object_sync_values (GST_OBJECT (filter), stream_time);
if (!gst_video_frame_map (&in_frame, &filter->info, in, GST_MAP_READ)) if (!gst_video_frame_map (&in_frame, &filter->info, in, GST_MAP_READ))
goto invalid_in; goto invalid_in;

4
gst/effectv/gstripple.c
View file

@ -52,8 +52,6 @@
#include "gstripple.h" #include "gstripple.h"
#include "gsteffectv.h" #include "gsteffectv.h"
#include <gst/controller/gstcontroller.h>
#define DEFAULT_MODE 0 #define DEFAULT_MODE 0
enum enum
@ -328,7 +326,7 @@ gst_rippletv_transform (GstBaseTransform * trans, GstBuffer * in,
GST_TIME_ARGS (timestamp)); GST_TIME_ARGS (timestamp));
if (GST_CLOCK_TIME_IS_VALID (stream_time)) if (GST_CLOCK_TIME_IS_VALID (stream_time))
gst_object_sync_values (G_OBJECT (filter), stream_time); gst_object_sync_values (GST_OBJECT (filter), stream_time);
if (!gst_video_frame_map (&in_frame, &filter->info, in, GST_MAP_READ)) if (!gst_video_frame_map (&in_frame, &filter->info, in, GST_MAP_READ))
goto invalid_in; goto invalid_in;

4
gst/effectv/gstvertigo.c
View file

@ -43,8 +43,6 @@
#include "gstvertigo.h" #include "gstvertigo.h"
#include <gst/controller/gstcontroller.h>
#define gst_vertigotv_parent_class parent_class #define gst_vertigotv_parent_class parent_class
G_DEFINE_TYPE (GstVertigoTV, gst_vertigotv, GST_TYPE_VIDEO_FILTER); G_DEFINE_TYPE (GstVertigoTV, gst_vertigotv, GST_TYPE_VIDEO_FILTER);
@ -182,7 +180,7 @@ gst_vertigotv_transform (GstBaseTransform * trans, GstBuffer * in,
GST_TIME_ARGS (timestamp)); GST_TIME_ARGS (timestamp));
if (GST_CLOCK_TIME_IS_VALID (stream_time)) if (GST_CLOCK_TIME_IS_VALID (stream_time))
gst_object_sync_values (G_OBJECT (filter), stream_time); gst_object_sync_values (GST_OBJECT (filter), stream_time);
if (!gst_video_frame_map (&in_frame, &filter->info, in, GST_MAP_READ)) if (!gst_video_frame_map (&in_frame, &filter->info, in, GST_MAP_READ))
goto invalid_in; goto invalid_in;

4
gst/equalizer/Makefile.am
View file

@ -7,9 +7,9 @@ libgstequalizer_la_SOURCES = \
gstiirequalizer10bands.c gstiirequalizer10bands.h gstiirequalizer10bands.c gstiirequalizer10bands.h
libgstequalizer_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \ libgstequalizer_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
$(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS) $(GST_CFLAGS)
libgstequalizer_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ libgstequalizer_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-lgstaudio-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) \ -lgstaudio-$(GST_MAJORMINOR) $(GST_BASE_LIBS) \
$(GST_LIBS) $(LIBM) $(GST_LIBS) $(LIBM)
libgstequalizer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstequalizer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstequalizer_la_LIBTOOLFLAGS = --tag=disable-static libgstequalizer_la_LIBTOOLFLAGS = --tag=disable-static

2
gst/equalizer/gstiirequalizer.c
View file

@ -838,7 +838,7 @@ gst_iir_equalizer_transform_ip (GstBaseTransform * btrans, GstBuffer * buf)
gst_segment_to_stream_time (&btrans->segment, GST_FORMAT_TIME, timestamp); gst_segment_to_stream_time (&btrans->segment, GST_FORMAT_TIME, timestamp);
if (GST_CLOCK_TIME_IS_VALID (timestamp)) if (GST_CLOCK_TIME_IS_VALID (timestamp))
gst_object_sync_values (G_OBJECT (equ), timestamp); gst_object_sync_values (GST_OBJECT (equ), timestamp);
data = gst_buffer_map (buf, &size, NULL, GST_MAP_WRITE); data = gst_buffer_map (buf, &size, NULL, GST_MAP_WRITE);
equ->process (equ, data, size, channels); equ->process (equ, data, size, channels);

1
gst/equalizer/gstiirequalizer.h
View file

@ -23,7 +23,6 @@
#include <gst/audio/gstaudiofilter.h> #include <gst/audio/gstaudiofilter.h>
#include <gst/audio/gstringbuffer.h> #include <gst/audio/gstringbuffer.h>
#include <gst/controller/gstcontroller.h>
typedef struct _GstIirEqualizer GstIirEqualizer; typedef struct _GstIirEqualizer GstIirEqualizer;
typedef struct _GstIirEqualizerClass GstIirEqualizerClass; typedef struct _GstIirEqualizerClass GstIirEqualizerClass;

4
gst/shapewipe/Makefile.am
View file

@ -2,8 +2,8 @@ plugin_LTLIBRARIES = libgstshapewipe.la
libgstshapewipe_la_SOURCES = gstshapewipe.c libgstshapewipe_la_SOURCES = gstshapewipe.c
libgstshapewipe_la_CFLAGS = $(GIO_CFLAGS) $(GST_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) libgstshapewipe_la_CFLAGS = $(GIO_CFLAGS) $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
libgstshapewipe_la_LIBADD = $(GIO_LIBS) $(GST_LIBS) $(GST_CONTROLLER_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ libgstshapewipe_la_LIBADD = $(GIO_LIBS) $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@
libgstshapewipe_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstshapewipe_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstshapewipe_la_LIBTOOLFLAGS = --tag=disable-static libgstshapewipe_la_LIBTOOLFLAGS = --tag=disable-static

5
gst/shapewipe/gstshapewipe.c
View file

@ -45,7 +45,6 @@
#include <string.h> #include <string.h>
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/controller/gstcontroller.h>
#include "gstshapewipe.h" #include "gstshapewipe.h"
@ -821,7 +820,7 @@ gst_shape_wipe_video_sink_chain (GstPad * pad, GstBuffer * buffer)
gst_segment_to_stream_time (&self->segment, GST_FORMAT_TIME, timestamp); gst_segment_to_stream_time (&self->segment, GST_FORMAT_TIME, timestamp);
if (GST_CLOCK_TIME_IS_VALID (timestamp)) if (GST_CLOCK_TIME_IS_VALID (timestamp))
gst_object_sync_values (G_OBJECT (self), timestamp); gst_object_sync_values (GST_OBJECT (self), timestamp);
GST_LOG_OBJECT (self, GST_LOG_OBJECT (self,
"Blending buffer with timestamp %" GST_TIME_FORMAT " at position %f", "Blending buffer with timestamp %" GST_TIME_FORMAT " at position %f",
@ -1085,8 +1084,6 @@ plugin_init (GstPlugin * plugin)
GST_DEBUG_CATEGORY_INIT (gst_shape_wipe_debug, "shapewipe", 0, GST_DEBUG_CATEGORY_INIT (gst_shape_wipe_debug, "shapewipe", 0,
"shapewipe element"); "shapewipe element");
gst_controller_init (NULL, NULL);
if (!gst_element_register (plugin, "shapewipe", GST_RANK_NONE, if (!gst_element_register (plugin, "shapewipe", GST_RANK_NONE,
GST_TYPE_SHAPE_WIPE)) GST_TYPE_SHAPE_WIPE))
return FALSE; return FALSE;

5
gst/smpte/Makefile.am
View file

@ -4,10 +4,9 @@ libgstsmpte_la_SOURCES = gstsmpte.c gstmask.c barboxwipes.c paint.c gstsmptealph
noinst_HEADERS = gstsmpte.h gstmask.h paint.h gstsmptealpha.h noinst_HEADERS = gstsmpte.h gstmask.h paint.h gstsmptealpha.h
libgstsmpte_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(GST_CONTROLLER_CFLAGS) libgstsmpte_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
libgstsmpte_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(LIBM) \ libgstsmpte_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(LIBM) \
-lgstvideo-$(GST_MAJORMINOR) \ -lgstvideo-$(GST_MAJORMINOR)
$(GST_CONTROLLER_LIBS)
libgstsmpte_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstsmpte_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstsmpte_la_LIBTOOLFLAGS = --tag=disable-static libgstsmpte_la_LIBTOOLFLAGS = --tag=disable-static

7
gst/smpte/gstsmptealpha.c
View file

@ -53,8 +53,6 @@
#endif #endif
#include <string.h> #include <string.h>
#include <gst/controller/gstcontroller.h>
#include "gstsmptealpha.h" #include "gstsmptealpha.h"
#include "paint.h" #include "paint.h"
@ -441,7 +439,7 @@ gst_smpte_alpha_before_transform (GstBaseTransform * trans, GstBuffer * buf)
GST_TIME_ARGS (timestamp)); GST_TIME_ARGS (timestamp));
if (GST_CLOCK_TIME_IS_VALID (stream_time)) if (GST_CLOCK_TIME_IS_VALID (stream_time))
gst_object_sync_values (G_OBJECT (smpte), stream_time); gst_object_sync_values (GST_OBJECT (smpte), stream_time);
} }
static GstFlowReturn static GstFlowReturn
@ -745,9 +743,6 @@ gst_smpte_alpha_plugin_init (GstPlugin * plugin)
GST_DEBUG_CATEGORY_INIT (gst_smpte_alpha_debug, "smptealpha", 0, GST_DEBUG_CATEGORY_INIT (gst_smpte_alpha_debug, "smptealpha", 0,
"SMPTE alpha effect"); "SMPTE alpha effect");
/* initialize gst controller library */
gst_controller_init (NULL, NULL);
return gst_element_register (plugin, "smptealpha", GST_RANK_NONE, return gst_element_register (plugin, "smptealpha", GST_RANK_NONE,
GST_TYPE_SMPTE_ALPHA); GST_TYPE_SMPTE_ALPHA);
} }

2
gst/videobox/Makefile.am
View file

@ -6,12 +6,10 @@ include $(top_srcdir)/common/orc.mak
libgstvideobox_la_SOURCES = gstvideobox.c libgstvideobox_la_SOURCES = gstvideobox.c
nodist_libgstvideobox_la_SOURCES = $(ORC_NODIST_SOURCES) nodist_libgstvideobox_la_SOURCES = $(ORC_NODIST_SOURCES)
libgstvideobox_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ libgstvideobox_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_CONTROLLER_CFLAGS) \
$(GST_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \
$(GST_CFLAGS) \ $(GST_CFLAGS) \
$(ORC_CFLAGS) $(ORC_CFLAGS)
libgstvideobox_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ libgstvideobox_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
$(GST_CONTROLLER_LIBS) \
$(GST_BASE_LIBS) \ $(GST_BASE_LIBS) \
$(GST_LIBS) \ $(GST_LIBS) \
$(ORC_LIBS) \ $(ORC_LIBS) \

6
gst/videobox/gstvideobox.c
View file

@ -64,8 +64,6 @@
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>
#include <gst/controller/gstcontroller.h>
GST_DEBUG_CATEGORY_STATIC (videobox_debug); GST_DEBUG_CATEGORY_STATIC (videobox_debug);
#define GST_CAT_DEFAULT videobox_debug #define GST_CAT_DEFAULT videobox_debug
@ -3365,7 +3363,7 @@ gst_video_box_before_transform (GstBaseTransform * trans, GstBuffer * in)
GST_TIME_ARGS (timestamp)); GST_TIME_ARGS (timestamp));
if (GST_CLOCK_TIME_IS_VALID (stream_time)) if (GST_CLOCK_TIME_IS_VALID (stream_time))
gst_object_sync_values (G_OBJECT (video_box), stream_time); gst_object_sync_values (GST_OBJECT (video_box), stream_time);
} }
static GstFlowReturn static GstFlowReturn
@ -3389,8 +3387,6 @@ gst_video_box_transform (GstBaseTransform * trans, GstBuffer * in,
static gboolean static gboolean
plugin_init (GstPlugin * plugin) plugin_init (GstPlugin * plugin)
{ {
gst_controller_init (NULL, NULL);
GST_DEBUG_CATEGORY_INIT (videobox_debug, "videobox", 0, GST_DEBUG_CATEGORY_INIT (videobox_debug, "videobox", 0,
"Resizes a video by adding borders or cropping"); "Resizes a video by adding borders or cropping");

3
gst/videofilter/Makefile.am
View file

@ -9,13 +9,12 @@ libgstvideofilter_la_SOURCES = plugin.c \
gstvideoflip.c \ gstvideoflip.c \
gstvideobalance.c \ gstvideobalance.c \
gstgamma.c gstgamma.c
libgstvideofilter_la_CFLAGS = $(GST_CFLAGS) $(GST_CONTROLLER_CFLAGS) \ libgstvideofilter_la_CFLAGS = $(GST_CFLAGS) \
$(GST_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
libgstvideofilter_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ libgstvideofilter_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-lgstvideo-@GST_MAJORMINOR@ \ -lgstvideo-@GST_MAJORMINOR@ \
-lgstinterfaces-@GST_MAJORMINOR@ \ -lgstinterfaces-@GST_MAJORMINOR@ \
$(GST_CONTROLLER_LIBS) \
$(GST_BASE_LIBS) $(GST_LIBS) $(GST_BASE_LIBS) $(GST_LIBS)
libgstvideofilter_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(LIBM) libgstvideofilter_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(LIBM)
libgstvideofilter_la_LIBTOOLFLAGS = --tag=disable-static libgstvideofilter_la_LIBTOOLFLAGS = --tag=disable-static

3
gst/videofilter/gstgamma.c
View file

@ -55,7 +55,6 @@
#include <math.h> #include <math.h>
#include <gst/video/video.h> #include <gst/video/video.h>
#include <gst/controller/gstcontroller.h>
GST_DEBUG_CATEGORY_STATIC (gamma_debug); GST_DEBUG_CATEGORY_STATIC (gamma_debug);
#define GST_CAT_DEFAULT gamma_debug #define GST_CAT_DEFAULT gamma_debug
@ -390,7 +389,7 @@ gst_gamma_before_transform (GstBaseTransform * base, GstBuffer * outbuf)
GST_TIME_ARGS (timestamp)); GST_TIME_ARGS (timestamp));
if (GST_CLOCK_TIME_IS_VALID (stream_time)) if (GST_CLOCK_TIME_IS_VALID (stream_time))
gst_object_sync_values (G_OBJECT (gamma), stream_time); gst_object_sync_values (GST_OBJECT (gamma), stream_time);
} }
static GstFlowReturn static GstFlowReturn

3
gst/videofilter/gstvideobalance.c
View file

@ -49,7 +49,6 @@
#include "gstvideobalance.h" #include "gstvideobalance.h"
#include <string.h> #include <string.h>
#include <gst/controller/gstcontroller.h>
#include <gst/interfaces/colorbalance.h> #include <gst/interfaces/colorbalance.h>
GST_DEBUG_CATEGORY_STATIC (videobalance_debug); GST_DEBUG_CATEGORY_STATIC (videobalance_debug);
@ -430,7 +429,7 @@ gst_video_balance_before_transform (GstBaseTransform * base, GstBuffer * buf)
GST_TIME_ARGS (timestamp)); GST_TIME_ARGS (timestamp));
if (GST_CLOCK_TIME_IS_VALID (stream_time)) if (GST_CLOCK_TIME_IS_VALID (stream_time))
gst_object_sync_values (G_OBJECT (balance), stream_time); gst_object_sync_values (GST_OBJECT (balance), stream_time);
} }
static GstFlowReturn static GstFlowReturn

3
gst/videofilter/gstvideoflip.c
View file

@ -48,7 +48,6 @@
#include <string.h> #include <string.h>
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/controller/gstcontroller.h>
#include <gst/video/video.h> #include <gst/video/video.h>
/* GstVideoFlip properties */ /* GstVideoFlip properties */
@ -869,7 +868,7 @@ gst_video_flip_before_transform (GstBaseTransform * trans, GstBuffer * in)
GST_TIME_ARGS (timestamp)); GST_TIME_ARGS (timestamp));
if (GST_CLOCK_TIME_IS_VALID (stream_time)) if (GST_CLOCK_TIME_IS_VALID (stream_time))
gst_object_sync_values (G_OBJECT (videoflip), stream_time); gst_object_sync_values (GST_OBJECT (videoflip), stream_time);
} }
static GstFlowReturn static GstFlowReturn

3
gst/videofilter/plugin.c
View file

@ -22,7 +22,6 @@
#endif #endif
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/controller/gstcontroller.h>
#include "gstgamma.h" #include "gstgamma.h"
#include "gstvideoflip.h" #include "gstvideoflip.h"
@ -31,8 +30,6 @@
static gboolean static gboolean
plugin_init (GstPlugin * plugin) plugin_init (GstPlugin * plugin)
{ {
gst_controller_init (NULL, NULL);
return (gst_element_register (plugin, "gamma", GST_RANK_NONE, GST_TYPE_GAMMA) return (gst_element_register (plugin, "gamma", GST_RANK_NONE, GST_TYPE_GAMMA)
&& gst_element_register (plugin, "videobalance", GST_RANK_NONE, && gst_element_register (plugin, "videobalance", GST_RANK_NONE,
GST_TYPE_VIDEO_BALANCE) GST_TYPE_VIDEO_BALANCE)

4
gst/videomixer/Makefile.am
View file

@ -10,10 +10,10 @@ libgstvideomixer_la_SOURCES = \
nodist_libgstvideomixer_la_SOURCES = $(ORC_NODIST_SOURCES) nodist_libgstvideomixer_la_SOURCES = $(ORC_NODIST_SOURCES)
libgstvideomixer_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ libgstvideomixer_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS) $(ORC_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(ORC_CFLAGS)
libgstvideomixer_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ libgstvideomixer_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-lgstvideo-@GST_MAJORMINOR@ \ -lgstvideo-@GST_MAJORMINOR@ \
$(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) $(GST_LIBS) $(ORC_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS)
libgstvideomixer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstvideomixer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstvideomixer_la_LIBTOOLFLAGS = --tag=disable-static libgstvideomixer_la_LIBTOOLFLAGS = --tag=disable-static

3
gst/videomixer/videomixer.c
View file

@ -76,7 +76,6 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/base/gstcollectpads.h> #include <gst/base/gstcollectpads.h>
#include <gst/controller/gstcontroller.h>
#include <gst/video/video.h> #include <gst/video/video.h>
#ifdef HAVE_STDLIB_H #ifdef HAVE_STDLIB_H
@ -1444,7 +1443,7 @@ gst_videomixer_blend_buffers (GstVideoMixer * mix, GstBuffer * outbuf)
/* sync object properties on stream time */ /* sync object properties on stream time */
if (GST_CLOCK_TIME_IS_VALID (stream_time)) if (GST_CLOCK_TIME_IS_VALID (stream_time))
gst_object_sync_values (G_OBJECT (pad), stream_time); gst_object_sync_values (GST_OBJECT (pad), stream_time);
blend (GST_BUFFER_DATA (mixcol->buffer), blend (GST_BUFFER_DATA (mixcol->buffer),
pad->xpos, pad->ypos, pad->in_width, pad->in_height, pad->alpha, pad->xpos, pad->ypos, pad->in_width, pad->in_height, pad->alpha,

4
gst/videomixer/videomixer2.c
View file

@ -91,8 +91,6 @@
#include "videomixer2.h" #include "videomixer2.h"
#include "videomixer2pad.h" #include "videomixer2pad.h"
#include <gst/controller/gstcontroller.h>
#ifdef DISABLE_ORC #ifdef DISABLE_ORC
#define orc_memset memset #define orc_memset memset
#else #else
@ -869,7 +867,7 @@ gst_videomixer2_blend_buffers (GstVideoMixer2 * mix,
/* sync object properties on stream time */ /* sync object properties on stream time */
if (GST_CLOCK_TIME_IS_VALID (stream_time)) if (GST_CLOCK_TIME_IS_VALID (stream_time))
gst_object_sync_values (G_OBJECT (pad), stream_time); gst_object_sync_values (GST_OBJECT (pad), stream_time);
composite (GST_BUFFER_DATA (mixcol->buffer), composite (GST_BUFFER_DATA (mixcol->buffer),
pad->xpos, pad->ypos, pad->width, pad->height, pad->alpha, pad->xpos, pad->ypos, pad->width, pad->height, pad->alpha,

2
sys/v4l2/Makefile.am
View file

@ -22,7 +22,6 @@ libgstvideo4linux2_la_SOURCES += gstv4l2sink.c
libgstvideo4linux2_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ libgstvideo4linux2_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \
$(GST_CONTROLLER_CFLAGS) \
$(GST_CFLAGS) \ $(GST_CFLAGS) \
$(X_CFLAGS) \ $(X_CFLAGS) \
$(LIBV4L2_CFLAGS) \ $(LIBV4L2_CFLAGS) \
@ -33,7 +32,6 @@ libgstvideo4linux2_la_LIBTOOLFLAGS = --tag=disable-static
libgstvideo4linux2_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ libgstvideo4linux2_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
$(GST_BASE_LIBS) \ $(GST_BASE_LIBS) \
$(GST_CONTROLLER_LIBS) \
$(GST_PLUGINS_BASE_LIBS) \ $(GST_PLUGINS_BASE_LIBS) \
-lgstvideo-$(GST_MAJORMINOR) \ -lgstvideo-$(GST_MAJORMINOR) \
-lgstinterfaces-$(GST_MAJORMINOR) \ -lgstinterfaces-$(GST_MAJORMINOR) \

4
sys/v4l2/gstv4l2.c
View file

@ -28,7 +28,6 @@
#include "gst/gst-i18n-plugin.h" #include "gst/gst-i18n-plugin.h"
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/controller/gstcontroller.h>
#include "gstv4l2object.h" #include "gstv4l2object.h"
#include "gstv4l2src.h" #include "gstv4l2src.h"
@ -48,9 +47,6 @@ plugin_init (GstPlugin * plugin)
GST_DEBUG_CATEGORY_INIT (v4l2_debug, "v4l2", 0, "V4L2 API calls"); GST_DEBUG_CATEGORY_INIT (v4l2_debug, "v4l2", 0, "V4L2 API calls");
GST_DEBUG_CATEGORY_GET (GST_CAT_PERFORMANCE, "GST_PERFORMANCE"); GST_DEBUG_CATEGORY_GET (GST_CAT_PERFORMANCE, "GST_PERFORMANCE");
/* initialize gst controller library */
gst_controller_init (NULL, NULL);
if (!gst_element_register (plugin, "v4l2src", GST_RANK_PRIMARY, if (!gst_element_register (plugin, "v4l2src", GST_RANK_PRIMARY,
GST_TYPE_V4L2SRC) || GST_TYPE_V4L2SRC) ||
!gst_element_register (plugin, "v4l2sink", GST_RANK_NONE, !gst_element_register (plugin, "v4l2sink", GST_RANK_NONE,

1
sys/v4l2/gstv4l2object.h
View file

@ -49,7 +49,6 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/base/gstpushsrc.h> #include <gst/base/gstpushsrc.h>
#include <gst/controller/gstcontroller.h>
#include <gst/video/video.h> #include <gst/video/video.h>
#include <gst/interfaces/propertyprobe.h> #include <gst/interfaces/propertyprobe.h>

4
sys/v4l2/gstv4l2src.c
View file

@ -659,7 +659,7 @@ gst_v4l2src_start (GstBaseSrc * src)
/* activate settings for first frame */ /* activate settings for first frame */
v4l2src->ctrl_time = 0; v4l2src->ctrl_time = 0;
gst_object_sync_values (G_OBJECT (src), v4l2src->ctrl_time); gst_object_sync_values (GST_OBJECT (src), v4l2src->ctrl_time);
return TRUE; return TRUE;
} }
@ -797,7 +797,7 @@ gst_v4l2src_fill (GstPushSrc * src, GstBuffer * buf)
*/ */
v4l2src->ctrl_time = timestamp; v4l2src->ctrl_time = timestamp;
} }
gst_object_sync_values (G_OBJECT (src), v4l2src->ctrl_time); gst_object_sync_values (GST_OBJECT (src), v4l2src->ctrl_time);
GST_INFO_OBJECT (src, "sync to %" GST_TIME_FORMAT, GST_INFO_OBJECT (src, "sync to %" GST_TIME_FORMAT,
GST_TIME_ARGS (v4l2src->ctrl_time)); GST_TIME_ARGS (v4l2src->ctrl_time));

4
tests/examples/shapewipe/shapewipe-example.c
View file

@ -18,7 +18,6 @@
*/ */
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/controller/gstcontroller.h>
#include <gst/controller/gstlfocontrolsource.h> #include <gst/controller/gstlfocontrolsource.h>
#include <stdlib.h> #include <stdlib.h>
@ -78,7 +77,6 @@ main (gint argc, gchar ** argv)
} }
gst_init (&argc, &argv); gst_init (&argc, &argv);
gst_controller_init (&argc, &argv);
if (argc > 2) { if (argc > 2) {
border = atof (argv[2]); border = atof (argv[2]);
@ -99,7 +97,7 @@ main (gint argc, gchar ** argv)
shapewipe = gst_bin_get_by_name (GST_BIN (pipeline), "shape"); shapewipe = gst_bin_get_by_name (GST_BIN (pipeline), "shape");
if (!(ctrl = gst_controller_new (G_OBJECT (shapewipe), "position", NULL))) { if (!(ctrl = gst_controller_new (GST_OBJECT (shapewipe), "position", NULL))) {
g_print ("can't control shapewipe element\n"); g_print ("can't control shapewipe element\n");
return -3; return -3;
} }

4
tests/examples/v4l2/camctrl.c
View file

@ -31,7 +31,6 @@
*/ */
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/controller/gstcontroller.h>
#include <gst/controller/gstinterpolationcontrolsource.h> #include <gst/controller/gstinterpolationcontrolsource.h>
static void static void
@ -130,7 +129,6 @@ main (gint argc, gchar ** argv)
/* init gstreamer */ /* init gstreamer */
gst_init (&argc, &argv); gst_init (&argc, &argv);
gst_controller_init (&argc, &argv);
/* create a new bin to hold the elements */ /* create a new bin to hold the elements */
bin = gst_pipeline_new ("camera"); bin = gst_pipeline_new ("camera");
@ -172,7 +170,7 @@ main (gint argc, gchar ** argv)
} }
/* get the controller */ /* get the controller */
if (!(ctrl = gst_controller_new (G_OBJECT (src), "brightness", "contrast", if (!(ctrl = gst_controller_new (GST_OBJECT (src), "brightness", "contrast",
"saturation", NULL))) { "saturation", NULL))) {
GST_WARNING ("can't control source element"); GST_WARNING ("can't control source element");
return -1; return -1;