diff --git a/gst-libs/gst/pbutils/encoding-profile.h b/gst-libs/gst/pbutils/encoding-profile.h index 49cc2393a4..f227ffcb83 100644 --- a/gst-libs/gst/pbutils/encoding-profile.h +++ b/gst-libs/gst/pbutils/encoding-profile.h @@ -37,11 +37,11 @@ G_BEGIN_DECLS * Since: 0.10.32 */ -#define GST_TYPE_ENCODING_PROFILE \ +#define GST_TYPE_ENCODING_PROFILE \ (gst_encoding_profile_get_type ()) -#define GST_ENCODING_PROFILE(obj) \ +#define GST_ENCODING_PROFILE(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ENCODING_PROFILE, GstEncodingProfile)) -#define GST_IS_ENCODING_PROFILE(obj) \ +#define GST_IS_ENCODING_PROFILE(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ENCODING_PROFILE)) typedef struct _GstEncodingProfile GstEncodingProfile; typedef GObjectClass GstEncodingProfileClass; @@ -56,11 +56,11 @@ GType gst_encoding_profile_get_type (void); * * Since: 0.10.32 */ -#define GST_TYPE_ENCODING_CONTAINER_PROFILE \ +#define GST_TYPE_ENCODING_CONTAINER_PROFILE \ (gst_encoding_container_profile_get_type ()) -#define GST_ENCODING_CONTAINER_PROFILE(obj) \ +#define GST_ENCODING_CONTAINER_PROFILE(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ENCODING_CONTAINER_PROFILE, GstEncodingContainerProfile)) -#define GST_IS_ENCODING_CONTAINER_PROFILE(obj) \ +#define GST_IS_ENCODING_CONTAINER_PROFILE(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ENCODING_CONTAINER_PROFILE)) typedef struct _GstEncodingContainerProfile GstEncodingContainerProfile; typedef GstEncodingProfileClass GstEncodingContainerProfileClass; @@ -75,11 +75,11 @@ GType gst_encoding_container_profile_get_type (void); * * Since: 0.10.32 */ -#define GST_TYPE_ENCODING_VIDEO_PROFILE \ +#define GST_TYPE_ENCODING_VIDEO_PROFILE \ (gst_encoding_video_profile_get_type ()) -#define GST_ENCODING_VIDEO_PROFILE(obj) \ +#define GST_ENCODING_VIDEO_PROFILE(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ENCODING_VIDEO_PROFILE, GstEncodingVideoProfile)) -#define GST_IS_ENCODING_VIDEO_PROFILE(obj) \ +#define GST_IS_ENCODING_VIDEO_PROFILE(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ENCODING_VIDEO_PROFILE)) typedef struct _GstEncodingVideoProfile GstEncodingVideoProfile; typedef GstEncodingProfileClass GstEncodingVideoProfileClass; @@ -94,11 +94,11 @@ GType gst_encoding_video_profile_get_type (void); * * Since: 0.10.32 */ -#define GST_TYPE_ENCODING_AUDIO_PROFILE \ +#define GST_TYPE_ENCODING_AUDIO_PROFILE \ (gst_encoding_audio_profile_get_type ()) -#define GST_ENCODING_AUDIO_PROFILE(obj) \ +#define GST_ENCODING_AUDIO_PROFILE(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ENCODING_AUDIO_PROFILE, GstEncodingAudioProfile)) -#define GST_IS_ENCODING_AUDIO_PROFILE(obj) \ +#define GST_IS_ENCODING_AUDIO_PROFILE(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ENCODING_AUDIO_PROFILE)) typedef struct _GstEncodingAudioProfile GstEncodingAudioProfile; typedef GstEncodingProfileClass GstEncodingAudioProfileClass; @@ -128,61 +128,65 @@ GType gst_encoding_audio_profile_get_type (void); */ #define gst_encoding_profile_ref(profile) (g_object_ref ((GObject*) profile)) -const gchar * gst_encoding_profile_get_name(GstEncodingProfile *profile); -const gchar * gst_encoding_profile_get_description(GstEncodingProfile *profile); -GstCaps * gst_encoding_profile_get_format(GstEncodingProfile *profile); -const gchar * gst_encoding_profile_get_preset(GstEncodingProfile *profile); -guint gst_encoding_profile_get_presence(GstEncodingProfile *profile); -GstCaps * gst_encoding_profile_get_restriction(GstEncodingProfile *profile); +const gchar * gst_encoding_profile_get_name (GstEncodingProfile *profile); +void gst_encoding_profile_set_name (GstEncodingProfile *profile, + const gchar *name); +const gchar * gst_encoding_profile_get_description (GstEncodingProfile *profile); +void gst_encoding_profile_set_description (GstEncodingProfile *profile, + const gchar *description); +GstCaps * gst_encoding_profile_get_format (GstEncodingProfile *profile); +void gst_encoding_profile_set_format (GstEncodingProfile *profile, + GstCaps *format); +const gchar * gst_encoding_profile_get_preset (GstEncodingProfile *profile); +void gst_encoding_profile_set_preset (GstEncodingProfile *profile, + const gchar *preset); +guint gst_encoding_profile_get_presence (GstEncodingProfile *profile); +void gst_encoding_profile_set_presence (GstEncodingProfile *profile, + guint presence); +GstCaps * gst_encoding_profile_get_restriction (GstEncodingProfile *profile); +void gst_encoding_profile_set_restriction (GstEncodingProfile *profile, + GstCaps *restriction); -void gst_encoding_profile_set_name(GstEncodingProfile *profile, const gchar *name); -void gst_encoding_profile_set_description(GstEncodingProfile *profile, const gchar *description); -void gst_encoding_profile_set_format(GstEncodingProfile *profile, GstCaps *format); -void gst_encoding_profile_set_preset(GstEncodingProfile *profile, const gchar *preset); -void gst_encoding_profile_set_restriction(GstEncodingProfile *profile, GstCaps *restriction); -void gst_encoding_profile_set_presence(GstEncodingProfile *profile, guint presence); - -gboolean gst_encoding_profile_is_equal (GstEncodingProfile *a, - GstEncodingProfile *b); -GstCaps * gst_encoding_profile_get_input_caps (GstEncodingProfile *profile); - -const gchar *gst_encoding_profile_get_type_nick (GstEncodingProfile *profile); +gboolean gst_encoding_profile_is_equal (GstEncodingProfile *a, + GstEncodingProfile *b); +GstCaps * gst_encoding_profile_get_input_caps (GstEncodingProfile *profile); +const gchar * gst_encoding_profile_get_type_nick (GstEncodingProfile *profile); GstEncodingProfile * gst_encoding_profile_find (const gchar *targetname, - const gchar *profilename, - const gchar *category); + const gchar *profilename, + const gchar *category); /* GstEncodingContainerProfile API */ -gboolean gst_encoding_container_profile_add_profile (GstEncodingContainerProfile *container, - GstEncodingProfile *profile); -gboolean gst_encoding_container_profile_contains_profile (GstEncodingContainerProfile * container, - GstEncodingProfile *profile); -const GList *gst_encoding_container_profile_get_profiles (GstEncodingContainerProfile *profile); +gboolean gst_encoding_container_profile_add_profile (GstEncodingContainerProfile *container, + GstEncodingProfile *profile); +gboolean gst_encoding_container_profile_contains_profile (GstEncodingContainerProfile * container, + GstEncodingProfile *profile); +const GList * gst_encoding_container_profile_get_profiles (GstEncodingContainerProfile *profile); GstEncodingContainerProfile * gst_encoding_container_profile_new (const gchar *name, - const gchar *description, - GstCaps *format, - const gchar *preset); + const gchar *description, + GstCaps *format, + const gchar *preset); /* Invidual stream encodingprofile API */ GstEncodingVideoProfile * gst_encoding_video_profile_new (GstCaps *format, - const gchar *preset, - GstCaps *restriction, - guint presence); + const gchar *preset, + GstCaps *restriction, + guint presence); GstEncodingAudioProfile * gst_encoding_audio_profile_new (GstCaps *format, - const gchar *preset, - GstCaps *restriction, - guint presence); + const gchar *preset, + GstCaps *restriction, + guint presence); guint gst_encoding_video_profile_get_pass (GstEncodingVideoProfile *prof); gboolean gst_encoding_video_profile_get_variableframerate (GstEncodingVideoProfile *prof); void gst_encoding_video_profile_set_pass (GstEncodingVideoProfile *prof, - guint pass); + guint pass); void gst_encoding_video_profile_set_variableframerate (GstEncodingVideoProfile *prof, - gboolean variableframerate); + gboolean variableframerate); GstEncodingProfile * gst_encoding_profile_from_discoverer (GstDiscovererInfo *info); diff --git a/gst-libs/gst/pbutils/encoding-target.h b/gst-libs/gst/pbutils/encoding-target.h index 4dcf598ecd..b7f9631926 100644 --- a/gst-libs/gst/pbutils/encoding-target.h +++ b/gst-libs/gst/pbutils/encoding-target.h @@ -39,7 +39,7 @@ G_BEGIN_DECLS * The name of the target will usually be the contructor and model of the device, * and that target will contain #GstEncodingProfiles suitable for that device. */ -#define GST_ENCODING_CATEGORY_DEVICE "device" +#define GST_ENCODING_CATEGORY_DEVICE "device" /** * GST_ENCODING_CATEGORY_ONLINE_SERVICE: @@ -50,7 +50,7 @@ G_BEGIN_DECLS * service. */ -#define GST_ENCODING_CATEGORY_ONLINE_SERVICE "online-service" +#define GST_ENCODING_CATEGORY_ONLINE_SERVICE "online-service" /** * GST_ENCODING_CATEGORY_STORAGE_EDITING: @@ -69,7 +69,7 @@ G_BEGIN_DECLS * #GstEncodingTarget category for recording and capture. * Targets within this category are optimized for low latency encoding. */ -#define GST_ENCODING_CATEGORY_CAPTURE "capture" +#define GST_ENCODING_CATEGORY_CAPTURE "capture" /** * GstEncodingTarget: @@ -81,11 +81,11 @@ G_BEGIN_DECLS * * Since: 0.10.32 */ -#define GST_TYPE_ENCODING_TARGET \ +#define GST_TYPE_ENCODING_TARGET \ (gst_encoding_target_get_type ()) -#define GST_ENCODING_TARGET(obj) \ +#define GST_ENCODING_TARGET(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ENCODING_TARGET, GstEncodingTarget)) -#define GST_IS_ENCODING_TARGET(obj) \ +#define GST_IS_ENCODING_TARGET(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ENCODING_TARGET)) typedef struct _GstEncodingTarget GstEncodingTarget; @@ -115,33 +115,35 @@ GType gst_encoding_target_get_type (void); #define gst_encoding_target_ref(target) \ (g_object_ref ((GObject*) target)) -GstEncodingTarget * -gst_encoding_target_new (const gchar *name, const gchar *category, - const gchar *description, const GList *profiles); -const gchar *gst_encoding_target_get_name (GstEncodingTarget *target); -const gchar *gst_encoding_target_get_category (GstEncodingTarget *target); -const gchar *gst_encoding_target_get_description (GstEncodingTarget *target); -const GList *gst_encoding_target_get_profiles (GstEncodingTarget *target); -GstEncodingProfile *gst_encoding_target_get_profile (GstEncodingTarget *target, - const gchar *name); +GstEncodingTarget * gst_encoding_target_new (const gchar *name, + const gchar *category, + const gchar *description, + const GList *profiles); -gboolean -gst_encoding_target_add_profile (GstEncodingTarget *target, GstEncodingProfile *profile); +const gchar * gst_encoding_target_get_name (GstEncodingTarget *target); +const gchar * gst_encoding_target_get_category (GstEncodingTarget *target); +const gchar * gst_encoding_target_get_description (GstEncodingTarget *target); +const GList * gst_encoding_target_get_profiles (GstEncodingTarget *target); +GstEncodingProfile * gst_encoding_target_get_profile (GstEncodingTarget *target, + const gchar *name); -gboolean gst_encoding_target_save (GstEncodingTarget *target, - GError **error); -gboolean gst_encoding_target_save_to_file (GstEncodingTarget *target, - const gchar *filepath, - GError **error); -GstEncodingTarget *gst_encoding_target_load (const gchar *name, - const gchar *category, - GError **error); -GstEncodingTarget *gst_encoding_target_load_from_file (const gchar *filepath, - GError **error); +gboolean gst_encoding_target_add_profile (GstEncodingTarget *target, + GstEncodingProfile *profile); -GList *gst_encoding_list_available_categories (void); -GList *gst_encoding_list_all_targets (const gchar * categoryname); +gboolean gst_encoding_target_save (GstEncodingTarget *target, + GError **error); +gboolean gst_encoding_target_save_to_file (GstEncodingTarget *target, + const gchar *filepath, + GError **error); +GstEncodingTarget * gst_encoding_target_load (const gchar *name, + const gchar *category, + GError **error); +GstEncodingTarget * gst_encoding_target_load_from_file (const gchar *filepath, + GError **error); + +GList * gst_encoding_list_available_categories (void); +GList * gst_encoding_list_all_targets (const gchar * categoryname); G_END_DECLS -#endif /* __GST_PROFILE_REGISTRY_H__ */ +#endif /* __GST_PROFILE_REGISTRY_H__ */ diff --git a/gst-libs/gst/pbutils/pbutils-private.h b/gst-libs/gst/pbutils/pbutils-private.h index 8ac614791f..7efa6abe35 100644 --- a/gst-libs/gst/pbutils/pbutils-private.h +++ b/gst-libs/gst/pbutils/pbutils-private.h @@ -27,12 +27,16 @@ struct _GstDiscovererStreamInfo { GstCaps *caps; GstTagList *tags; GstStructure *misc; + + gpointer _gst_reserved[GST_PADDING]; }; struct _GstDiscovererContainerInfo { GstDiscovererStreamInfo parent; GList *streams; + + gpointer _gst_reserved[GST_PADDING]; }; struct _GstDiscovererAudioInfo { @@ -46,6 +50,8 @@ struct _GstDiscovererAudioInfo { guint max_bitrate; gchar *language; + + gpointer _gst_reserved[GST_PADDING]; }; struct _GstDiscovererVideoInfo { @@ -64,12 +70,16 @@ struct _GstDiscovererVideoInfo { guint max_bitrate; gboolean is_image; + + gpointer _gst_reserved[GST_PADDING]; }; struct _GstDiscovererSubtitleInfo { GstDiscovererStreamInfo parent; gchar *language; + + gpointer _gst_reserved[GST_PADDING]; }; struct _GstDiscovererInfo { @@ -87,6 +97,8 @@ struct _GstDiscovererInfo { GstStructure *misc; GstTagList *tags; gboolean seekable; + + gpointer _gst_reserved[GST_PADDING]; }; /* missing-plugins.c */