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

video: move some interfaces

Browse source 
Move some interfaces to the video library
This commit is contained in:
Wim Taymans 2011-11-29 19:10:01 +01:00
parent 089c760993
commit 871b306fce
22 changed files with 54 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
docs/libs/gst-plugins-base-libs-sections.txt
View file

@ -565,7 +565,7 @@ KISS_FFT_F64_SIN
<SECTION> <SECTION>
<FILE>gstcolorbalance</FILE> <FILE>gstcolorbalance</FILE>
<INCLUDE>gst/interfaces/color.h</INCLUDE> <INCLUDE>gst/video/colorbalance.h</INCLUDE>
GstColorBalance GstColorBalance
GstColorBalanceInterface GstColorBalanceInterface
GstColorBalanceType GstColorBalanceType
@ -587,7 +587,7 @@ gst_color_balance_type_get_type
<SECTION> <SECTION>
<FILE>gstcolorbalancechannel</FILE> <FILE>gstcolorbalancechannel</FILE>
<INCLUDE>gst/interfaces/colorbalancechannel.h</INCLUDE> <INCLUDE>gst/video/colorbalancechannel.h</INCLUDE>
GstColorBalanceChannel GstColorBalanceChannel
GstColorBalanceChannelClass GstColorBalanceChannelClass
<SUBSECTION Standard> <SUBSECTION Standard>
@ -862,7 +862,7 @@ gst_tuner_norm_get_type
<SECTION> <SECTION>
<FILE>gstvideoorientation</FILE> <FILE>gstvideoorientation</FILE>
<INCLUDE>gst/interfaces/videoorientation.h</INCLUDE> <INCLUDE>gst/video/videoorientation.h</INCLUDE>
GstVideoOrientation GstVideoOrientation
GstVideoOrientationInterface GstVideoOrientationInterface
gst_video_orientation_get_hcenter gst_video_orientation_get_hcenter
@ -883,7 +883,7 @@ gst_video_orientation_get_type
<SECTION> <SECTION>
<FILE>gstvideooverlay</FILE> <FILE>gstvideooverlay</FILE>
<INCLUDE>gst/interfaces/videooverlay.h</INCLUDE> <INCLUDE>gst/video/videooverlay.h</INCLUDE>
GstXOverlay GstXOverlay
GstXOverlayIface GstXOverlayIface
gst_video_overlay_got_window_handle gst_video_overlay_got_window_handle

14
docs/libs/gst-plugins-base-libs.types
View file

@ -22,9 +22,6 @@ gst_audio_base_src_get_type
#include <gst/audio/gstaudioringbuffer.h> #include <gst/audio/gstaudioringbuffer.h>
gst_audio_ring_buffer_get_type gst_audio_ring_buffer_get_type
#include <gst/interfaces/colorbalance.h>
gst_color_balance_get_type
gst_color_balance_channel_get_type
#include <gst/interfaces/mixer.h> #include <gst/interfaces/mixer.h>
gst_mixer_get_type gst_mixer_get_type
gst_mixer_options_get_type gst_mixer_options_get_type
@ -39,10 +36,6 @@ gst_tuner_channel_get_type
gst_tuner_norm_get_type gst_tuner_norm_get_type
#include <gst/interfaces/streamvolume.h> #include <gst/interfaces/streamvolume.h>
gst_stream_volume_get_type gst_stream_volume_get_type
#include <gst/interfaces/videoorientation.h>
gst_video_orientation_get_type
#include <gst/interfaces/videooverlay.h>
gst_video_overlay_get_type
#include <gst/rtp/gstrtpbasedepayload.h> #include <gst/rtp/gstrtpbasedepayload.h>
@ -57,6 +50,13 @@ gst_rtp_base_audio_payload_get_type
gst_video_filter_get_type gst_video_filter_get_type
#include <gst/video/gstvideosink.h> #include <gst/video/gstvideosink.h>
gst_video_sink_get_type gst_video_sink_get_type
#include <gst/video/colorbalance.h>
gst_color_balance_get_type
gst_color_balance_channel_get_type
#include <gst/video/videoorientation.h>
gst_video_orientation_get_type
#include <gst/video/videooverlay.h>
gst_video_overlay_get_type
#include <gst/pbutils/pbutils.h> #include <gst/pbutils/pbutils.h>
gst_discoverer_get_type gst_discoverer_get_type

12
gst-libs/gst/interfaces/Makefile.am
View file

@ -3,8 +3,6 @@ libgstinterfacesincludedir = \
$(includedir)/gstreamer-@GST_MAJORMINOR@/gst/interfaces $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/interfaces
headers_interfaces = \ headers_interfaces = \
colorbalance.h \
colorbalancechannel.h \
mixer.h \ mixer.h \
mixeroptions.h \ mixeroptions.h \
mixertrack.h \ mixertrack.h \
@ -13,9 +11,7 @@ headers_interfaces = \
streamvolume.h \ streamvolume.h \
tuner.h \ tuner.h \
tunernorm.h \ tunernorm.h \
tunerchannel.h \ tunerchannel.h
videoorientation.h \
videooverlay.h
# variables used for enum/marshal generation # variables used for enum/marshal generation
glib_enum_headers = $(headers_interfaces) glib_enum_headers = $(headers_interfaces)
@ -38,8 +34,6 @@ nodist_libgstinterfacesinclude_HEADERS = \
interfaces-enumtypes.h interfaces-enumtypes.h
libgstinterfaces_@GST_MAJORMINOR@_la_SOURCES = \ libgstinterfaces_@GST_MAJORMINOR@_la_SOURCES = \
colorbalance.c \
colorbalancechannel.c \
mixer.c \ mixer.c \
mixeroptions.c \ mixeroptions.c \
mixertrack.c \ mixertrack.c \
@ -48,9 +42,7 @@ libgstinterfaces_@GST_MAJORMINOR@_la_SOURCES = \
streamvolume.c \ streamvolume.c \
tuner.c \ tuner.c \
tunernorm.c \ tunernorm.c \
tunerchannel.c \ tunerchannel.c
videoorientation.c \
videooverlay.c
nodist_libgstinterfaces_@GST_MAJORMINOR@_la_SOURCES = \ nodist_libgstinterfaces_@GST_MAJORMINOR@_la_SOURCES = \
$(built_sources) \ $(built_sources) \

20
gst-libs/gst/video/Makefile.am
View file

@ -1,19 +1,31 @@
# variables used for enum/marshal generation # variables used for enum/marshal generation
glib_enum_headers = video.h glib_enum_headers = video.h colorbalance.h
glib_enum_define = GST_VIDEO glib_enum_define = GST_VIDEO
glib_gen_prefix = gst_video glib_gen_prefix = gst_video
glib_gen_basename = video glib_gen_basename = video
built_sources = video-enumtypes.c built_sources = video-enumtypes.c video-marshal.c
built_headers = video-enumtypes.h built_headers = video-enumtypes.h video-marshal.h
BUILT_SOURCES = $(built_sources) $(built_headers) BUILT_SOURCES = $(built_sources) $(built_headers)
lib_LTLIBRARIES = libgstvideo-@GST_MAJORMINOR@.la lib_LTLIBRARIES = libgstvideo-@GST_MAJORMINOR@.la
CLEANFILES = $(BUILT_SOURCES) CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST = video-marshal.list
libgstvideo_@GST_MAJORMINOR@_la_SOURCES = \ libgstvideo_@GST_MAJORMINOR@_la_SOURCES = \
video.c gstvideosink.c gstvideofilter.c convertframe.c gstvideometa.c gstvideopool.c colorbalance.c \
colorbalancechannel.c \
video.c \
gstvideosink.c \
gstvideofilter.c \
convertframe.c \
gstvideometa.c \
gstvideopool.c \
videoorientation.c \
videooverlay.c
nodist_libgstvideo_@GST_MAJORMINOR@_la_SOURCES = $(BUILT_SOURCES) nodist_libgstvideo_@GST_MAJORMINOR@_la_SOURCES = $(BUILT_SOURCES)
libgstvideo_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/video libgstvideo_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/video

4
gst-libs/gst/interfaces/colorbalance.c → gst-libs/gst/video/colorbalance.c
View file

@ -25,7 +25,7 @@
#endif #endif
#include "colorbalance.h" #include "colorbalance.h"
#include "interfaces-marshal.h" #include "video-marshal.h"
/** /**
* SECTION:gstcolorbalance * SECTION:gstcolorbalance
@ -100,7 +100,7 @@ gst_color_balance_class_init (GstColorBalanceInterface * iface)
GST_TYPE_COLOR_BALANCE, G_SIGNAL_RUN_LAST, GST_TYPE_COLOR_BALANCE, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GstColorBalanceInterface, value_changed), G_STRUCT_OFFSET (GstColorBalanceInterface, value_changed),
NULL, NULL, NULL, NULL,
gst_interfaces_marshal_VOID__OBJECT_INT, gst_video_marshal_VOID__OBJECT_INT,
G_TYPE_NONE, 2, GST_TYPE_COLOR_BALANCE_CHANNEL, G_TYPE_INT); G_TYPE_NONE, 2, GST_TYPE_COLOR_BALANCE_CHANNEL, G_TYPE_INT);
initialized = TRUE; initialized = TRUE;

3
gst-libs/gst/interfaces/colorbalance.h → gst-libs/gst/video/colorbalance.h
View file

@ -23,8 +23,7 @@
#define __GST_COLOR_BALANCE_H__ #define __GST_COLOR_BALANCE_H__
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/interfaces/colorbalancechannel.h> #include <gst/video/colorbalancechannel.h>
#include <gst/interfaces/interfaces-enumtypes.h>
G_BEGIN_DECLS G_BEGIN_DECLS

0
gst-libs/gst/interfaces/colorbalancechannel.c → gst-libs/gst/video/colorbalancechannel.c
View file

0
gst-libs/gst/interfaces/colorbalancechannel.h → gst-libs/gst/video/colorbalancechannel.h
View file

1
gst-libs/gst/video/video-marshal.list Normal file
View file

@ -0,0 +1 @@
VOID:OBJECT,INT

2
gst-libs/gst/interfaces/videoorientation.c → gst-libs/gst/video/videoorientation.c
View file

@ -24,7 +24,7 @@
#endif #endif
#include "videoorientation.h" #include "videoorientation.h"
#include "interfaces-marshal.h" #include "video-marshal.h"
#include <string.h> #include <string.h>

0
gst-libs/gst/interfaces/videoorientation.h → gst-libs/gst/video/videoorientation.h
View file

0
gst-libs/gst/interfaces/videooverlay.c → gst-libs/gst/video/videooverlay.c
View file

0
gst-libs/gst/interfaces/videooverlay.h → gst-libs/gst/video/videooverlay.h
View file

2
sys/ximage/ximagesink.c
View file

@ -105,7 +105,7 @@
/* Our interfaces */ /* Our interfaces */
#include <gst/interfaces/navigation.h> #include <gst/interfaces/navigation.h>
#include <gst/interfaces/videooverlay.h> #include <gst/video/videooverlay.h>
#include <gst/video/gstvideometa.h> #include <gst/video/gstvideometa.h>

4
sys/xvimage/xvimagesink.c
View file

@ -115,9 +115,9 @@
/* Our interfaces */ /* Our interfaces */
#include <gst/interfaces/navigation.h> #include <gst/interfaces/navigation.h>
#include <gst/interfaces/videooverlay.h>
#include <gst/interfaces/colorbalance.h>
#include <gst/interfaces/propertyprobe.h> #include <gst/interfaces/propertyprobe.h>
#include <gst/video/videooverlay.h>
#include <gst/video/colorbalance.h>
/* Helper functions */ /* Helper functions */
#include <gst/video/gstvideometa.h> #include <gst/video/gstvideometa.h>

9
tests/check/libs/gstlibscpp.cc
View file

@ -47,8 +47,6 @@
#include <gst/fft/gstffts16.h> #include <gst/fft/gstffts16.h>
#include <gst/fft/gstffts32.h> #include <gst/fft/gstffts32.h>
#include <gst/interfaces/colorbalancechannel.h>
#include <gst/interfaces/colorbalance.h>
#include <gst/interfaces/interfaces-enumtypes.h> #include <gst/interfaces/interfaces-enumtypes.h>
#include <gst/interfaces/interfaces-marshal.h> #include <gst/interfaces/interfaces-marshal.h>
#include <gst/interfaces/mixer.h> #include <gst/interfaces/mixer.h>
@ -60,8 +58,6 @@
#include <gst/interfaces/tunerchannel.h> #include <gst/interfaces/tunerchannel.h>
#include <gst/interfaces/tuner.h> #include <gst/interfaces/tuner.h>
#include <gst/interfaces/tunernorm.h> #include <gst/interfaces/tunernorm.h>
#include <gst/interfaces/videoorientation.h>
#include <gst/interfaces/videooverlay.h>
#include <gst/pbutils/codec-utils.h> #include <gst/pbutils/codec-utils.h>
#include <gst/pbutils/descriptions.h> #include <gst/pbutils/descriptions.h>
@ -106,7 +102,12 @@
#include <gst/video/gstvideofilter.h> #include <gst/video/gstvideofilter.h>
#include <gst/video/gstvideosink.h> #include <gst/video/gstvideosink.h>
#include <gst/video/video-enumtypes.h> #include <gst/video/video-enumtypes.h>
#include <gst/video/video-marshal.h>
#include <gst/video/video.h> #include <gst/video/video.h>
#include <gst/video/colorbalancechannel.h>
#include <gst/video/colorbalance.h>
#include <gst/video/videoorientation.h>
#include <gst/video/videooverlay.h>
/* we mostly just want to make sure that our library headers don't /* we mostly just want to make sure that our library headers don't
* contain anything a C++ compiler might not like */ * contain anything a C++ compiler might not like */

6
tests/check/libs/libsabi.c
View file

@ -38,14 +38,11 @@
#include <gst/fft/gstffts32.h> #include <gst/fft/gstffts32.h>
#include <gst/fft/gstfftf32.h> #include <gst/fft/gstfftf32.h>
#include <gst/fft/gstfftf64.h> #include <gst/fft/gstfftf64.h>
#include <gst/interfaces/colorbalance.h>
#include <gst/interfaces/mixer.h> #include <gst/interfaces/mixer.h>
#include <gst/interfaces/navigation.h> #include <gst/interfaces/navigation.h>
#include <gst/interfaces/propertyprobe.h> #include <gst/interfaces/propertyprobe.h>
#include <gst/interfaces/streamvolume.h> #include <gst/interfaces/streamvolume.h>
#include <gst/interfaces/tuner.h> #include <gst/interfaces/tuner.h>
#include <gst/interfaces/videoorientation.h>
#include <gst/interfaces/videooverlay.h>
#include <gst/pbutils/pbutils.h> #include <gst/pbutils/pbutils.h>
#include <gst/riff/riff-media.h> #include <gst/riff/riff-media.h>
#include <gst/riff/riff-read.h> #include <gst/riff/riff-read.h>
@ -69,6 +66,9 @@
#include <gst/video/video.h> #include <gst/video/video.h>
#include <gst/video/gstvideofilter.h> #include <gst/video/gstvideofilter.h>
#include <gst/video/gstvideosink.h> #include <gst/video/gstvideosink.h>
#include <gst/video/colorbalance.h>
#include <gst/video/videoorientation.h>
#include <gst/video/videooverlay.h>
/* initial version of the file was generated using: /* initial version of the file was generated using:
* grep -A1 "<STRUCT>" ../../docs/libs/gst-plugins-base-libs-decl.txt | \ * grep -A1 "<STRUCT>" ../../docs/libs/gst-plugins-base-libs-decl.txt | \

6
tests/examples/overlay/Makefile.am
View file

@ -8,7 +8,7 @@ EXAMPLES += gtk-videooverlay
gtk_videooverlay_SOURCES = gtk-videooverlay.c gtk_videooverlay_SOURCES = gtk-videooverlay.c
gtk_videooverlay_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) $(GTK_CFLAGS) gtk_videooverlay_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) $(GTK_CFLAGS)
gtk_videooverlay_LDADD = \ gtk_videooverlay_LDADD = \
$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \ $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \
$(GST_LIBS) $(X_LIBS) $(LIBM) $(GTK_LIBS) $(GST_LIBS) $(X_LIBS) $(LIBM) $(GTK_LIBS)
endif endif
@ -18,7 +18,7 @@ EXAMPLES += qt-videooverlay
qt_videooverlay_SOURCES = qt-videooverlay.cpp qt_videooverlay_SOURCES = qt-videooverlay.cpp
qt_videooverlay_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CXXFLAGS) $(X_CFLAGS) $(QT_CFLAGS) qt_videooverlay_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CXXFLAGS) $(X_CFLAGS) $(QT_CFLAGS)
qt_videooverlay_LDADD = \ qt_videooverlay_LDADD = \
$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \ $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \
$(GST_LIBS) $(X_LIBS) $(LIBM) $(QT_LIBS) $(GST_LIBS) $(X_LIBS) $(LIBM) $(QT_LIBS)
endif endif
@ -28,7 +28,7 @@ EXAMPLES += qtgv-videooverlay
qtgv_videooverlay_SOURCES = qtgv-videooverlay.cpp qtgv-videooverlay.h qtgv_videooverlay_SOURCES = qtgv-videooverlay.cpp qtgv-videooverlay.h
qtgv_videooverlay_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CXXFLAGS) $(X_CFLAGS) $(QT_CFLAGS) qtgv_videooverlay_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CXXFLAGS) $(X_CFLAGS) $(QT_CFLAGS)
qtgv_videooverlay_LDADD = \ qtgv_videooverlay_LDADD = \
$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \ $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \
$(GST_LIBS) $(X_LIBS) $(LIBM) $(QT_LIBS) $(GST_LIBS) $(X_LIBS) $(LIBM) $(QT_LIBS)
# qt moc support, according to http://qtnode.net/wiki/Qt_with_autotools # qt moc support, according to http://qtnode.net/wiki/Qt_with_autotools

2
tests/examples/overlay/qt-videooverlay.cpp
View file

@ -25,7 +25,7 @@
#include <glib.h> #include <glib.h>
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/interfaces/videooverlay.h> #include <gst/video/videooverlay.h>
#include <QApplication> #include <QApplication>
#include <QTimer> #include <QTimer>

2
tests/examples/overlay/qtgv-videooverlay.cpp
View file

@ -28,7 +28,7 @@
#include <QApplication> #include <QApplication>
#include <QTimer> #include <QTimer>
#include <gst/interfaces/videooverlay.h> #include <gst/video/videooverlay.h>
SinkPipeline::SinkPipeline(QGraphicsView *parent) : QObject(parent) SinkPipeline::SinkPipeline(QGraphicsView *parent) : QObject(parent)
{ {

6
tests/icles/Makefile.am
View file

@ -8,7 +8,7 @@ stress_videooverlay_SOURCES = stress-videooverlay.c
stress_videooverlay_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ stress_videooverlay_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS)
stress_videooverlay_LDADD = \ stress_videooverlay_LDADD = \
$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \ $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \
$(GST_LIBS) $(X_LIBS) $(LIBM) $(GST_LIBS) $(X_LIBS) $(LIBM)
if HAVE_GTK_X11 if HAVE_GTK_X11
@ -18,14 +18,14 @@ test_colorkey_SOURCES = test-colorkey.c
test_colorkey_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ test_colorkey_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) $(GTK_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) $(GTK_CFLAGS)
test_colorkey_LDADD = \ test_colorkey_LDADD = \
$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \ $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \
$(GST_LIBS) $(X_LIBS) $(LIBM) $(GTK_LIBS) $(GST_LIBS) $(X_LIBS) $(LIBM) $(GTK_LIBS)
test_videooverlay_SOURCES = test-videooverlay.c test_videooverlay_SOURCES = test-videooverlay.c
test_videooverlay_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ test_videooverlay_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) $(GTK_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) $(GTK_CFLAGS)
test_videooverlay_LDADD = \ test_videooverlay_LDADD = \
$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \ $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \
$(GST_LIBS) $(X_LIBS) $(LIBM) $(GTK_LIBS) $(GST_LIBS) $(X_LIBS) $(LIBM) $(GTK_LIBS)
endif endif

2
tests/icles/stress-videooverlay.c
View file

@ -22,7 +22,7 @@
#endif #endif
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/interfaces/videooverlay.h> #include <gst/video/videooverlay.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>