Commit a9cf6f23 authored by Tim-Philipp Müller's avatar Tim-Philipp Müller 🐠

video: build GstVideoAggregator which was moved from -bad

parent f11571f3
......@@ -205,6 +205,8 @@
<xi:include href="xml/gstvideo.xml" />
<xi:include href="xml/gstvideometa.xml" />
<xi:include href="xml/gstvideoaffinetransformationmeta.xml" />
<xi:include href="xml/gstvideoaggregator.xml" />
<xi:include href="xml/gstvideoaggregatorpad.xml" />
<xi:include href="xml/gstvideooverlaycomposition.xml" />
<xi:include href="xml/gstvideofilter.xml" />
<xi:include href="xml/gstvideodither.xml" />
......
......@@ -3231,6 +3231,37 @@ GST_VIDEO_AFFINE_TRANSFORMATION_META_API_TYPE
GST_VIDEO_AFFINE_TRANSFORMATION_META_INFO
</SECTION>
<SECTION>
<FILE>gstvideoaggregator</FILE>
<TITLE>GstVideoAggregator</TITLE>
GstVideoAggregator
GstVideoAggregatorClass
<SUBSECTION Standard>
GST_IS_VIDEO_AGGREGATOR
GST_IS_VIDEO_AGGREGATOR_CLASS
GST_TYPE_VIDEO_AGGREGATOR
GST_VIDEO_AGGREGATOR
GST_VIDEO_AGGREGATOR_CLASS
GST_VIDEO_AGGREGATOR_GET_CLASS
gst_video_aggregator_get_type
GstVideoAggregatorPrivate
</SECTION>
<SECTION>
<FILE>gstvideoaggregatorpad</FILE>
<TITLE>GstVideoAggregatorPad</TITLE>
GstVideoAggregatorPad
GstVideoAggregatorPadClass
<SUBSECTION Standard>
GST_IS_VIDEO_AGGREGATOR_PAD
GST_IS_VIDEO_AGGREGATOR_PADCLASS
GST_TYPE_VIDEO_AGGREGATOR_PAD
GST_VIDEO_AGGREGATOR_PAD
GST_VIDEO_AGGREGATOR_PAD_CLASS
GST_VIDEO_AGGREGATOR_PAD_GET_CLASS
gst_video_aggregator_pad_get_type
</SECTION>
<SECTION>
<FILE>gstvideooverlaycomposition</FILE>
<INCLUDE>gst/video/video.h</INCLUDE>
......
......@@ -50,6 +50,8 @@ gst_video_filter_get_type
gst_video_sink_get_type
gst_color_balance_get_type
gst_color_balance_channel_get_type
gst_video_aggregator_get_type
gst_video_aggregator_pad_get_type
gst_video_direction_get_type
gst_video_orientation_get_type
gst_video_overlay_get_type
......
......@@ -36,6 +36,7 @@ libgstvideo_@GST_API_VERSION@_la_SOURCES = \
video-frame.c \
video-scaler.c \
video-tile.c \
gstvideoaggregator.c \
gstvideosink.c \
gstvideofilter.c \
convertframe.c \
......@@ -75,6 +76,7 @@ libgstvideo_@GST_API_VERSION@include_HEADERS = \
video-frame.h \
video-scaler.h \
video-tile.h \
gstvideoaggregator.h \
gstvideosink.h \
gstvideofilter.h \
gstvideometa.h \
......
......@@ -21,15 +21,8 @@
#ifndef __GST_VIDEO_AGGREGATOR_H__
#define __GST_VIDEO_AGGREGATOR_H__
#ifndef GST_USE_UNSTABLE_API
#warning "The Video 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/video/video.h>
#include <gst/base/gstaggregator.h>
#include <gst/video/video-bad-prelude.h>
G_BEGIN_DECLS
......@@ -78,7 +71,6 @@ struct _GstVideoAggregatorPad
/**
* GstVideoAggregatorPadClass:
*
* @update_conversion_info: Called when either the input or output formats
* have changed.
* @prepare_frame: Prepare the frame from the pad buffer and sets it to prepared_frame
......@@ -101,19 +93,19 @@ struct _GstVideoAggregatorPadClass
gpointer _gst_reserved[GST_PADDING_LARGE];
};
GST_VIDEO_BAD_API
GST_VIDEO_API
GType gst_video_aggregator_pad_get_type (void);
GST_VIDEO_BAD_API
GST_VIDEO_API
gboolean gst_video_aggregator_pad_has_current_buffer (GstVideoAggregatorPad *pad);
GST_VIDEO_BAD_API
GST_VIDEO_API
GstBuffer * gst_video_aggregator_pad_get_current_buffer (GstVideoAggregatorPad *pad);
GST_VIDEO_BAD_API
GST_VIDEO_API
GstVideoFrame * gst_video_aggregator_pad_get_prepared_frame (GstVideoAggregatorPad *pad);
GST_VIDEO_BAD_API
GST_VIDEO_API
void gst_video_aggregator_pad_set_needs_alpha (GstVideoAggregatorPad *pad, gboolean needs_alpha);
/********************************
......@@ -162,10 +154,10 @@ struct _GstVideoAggregatorConvertPadClass
gpointer _gst_reserved[GST_PADDING];
};
GST_VIDEO_BAD_API
GST_VIDEO_API
GType gst_video_aggregator_convert_pad_get_type (void);
GST_VIDEO_BAD_API
GST_VIDEO_API
void gst_video_aggregator_convert_pad_update_conversion_info (GstVideoAggregatorConvertPad * pad);
/**********************
......@@ -241,7 +233,7 @@ struct _GstVideoAggregatorClass
gpointer _gst_reserved[GST_PADDING_LARGE];
};
GST_VIDEO_BAD_API
GST_VIDEO_API
GType gst_video_aggregator_get_type (void);
G_END_DECLS
......
......@@ -3,6 +3,7 @@ video_sources = [
'colorbalancechannel.c',
'convertframe.c',
'gstvideoaffinetransformationmeta.c',
'gstvideoaggregator.c',
'gstvideodecoder.c',
'gstvideoencoder.c',
'gstvideofilter.c',
......@@ -38,6 +39,7 @@ video_headers = [
'colorbalance.h',
'colorbalancechannel.h',
'gstvideoaffinetransformationmeta.h',
'gstvideoaggregator.h',
'gstvideodecoder.h',
'gstvideoencoder.h',
'gstvideofilter.h',
......
......@@ -165,6 +165,7 @@ G_END_DECLS
#include <gst/video/colorbalancechannel.h>
#include <gst/video/colorbalance.h>
#include <gst/video/gstvideoaggregator.h>
#include <gst/video/gstvideodecoder.h>
#include <gst/video/gstvideoencoder.h>
#include <gst/video/gstvideofilter.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment