gst: Update to 0.10.32 core/base API

2025-01-02 21:48:55 +00:00 · 2011-01-05 15:04:05 +01:00 · 2011-01-05 15:04:05 +01:00 · 0ef52abad4
commit 0ef52abad4
parent 28fca28378
9 changed files with 450 additions and 29 deletions
--- a/configure.ac
+++ b/configure.ac
@ -174,6 +174,13 @@ then
    IGNORE_GST_0_10_31=""
  fi

+  if test $GST_MINOR_VERSION -lt "32"
+  then
+    IGNORE_GST_0_10_32="gst-0.10.32.ignore"
+  else
+    IGNORE_GST_0_10_32=""
+  fi
+
  dnl plugins base
  if test $GST_PB_MINOR_VERSION -ge "22"
  then
@ -224,6 +231,14 @@ then
  else
    IGNORE_GST_PB_0_10_31=""
  fi
+
+  if test $GST_PB_MINOR_VERSION -lt "32"
+  then
+    IGNORE_GST_PB_0_10_32="gst-pb-0.10.32.ignore"
+  else
+    IGNORE_GST_PB_0_10_32=""
+  fi
+
 else
  IGNORE_GST_0_10_18=""
  IGNORE_GST_0_10_21=""
@ -235,12 +250,14 @@ else
  IGNORE_GST_0_10_29=""
  IGNORE_GST_0_10_30=""
  IGNORE_GST_0_10_31=""
+  IGNORE_GST_0_10_32=""
  IGNORE_GST_PB_0_10_23=""
  IGNORE_GST_PB_0_10_25=""
  IGNORE_GST_PB_0_10_26=""
  IGNORE_GST_PB_0_10_29=""
  IGNORE_GST_PB_0_10_30=""
  IGNORE_GST_PB_0_10_31=""
+  IGNORE_GST_PB_0_10_32=""
  AC_DEFINE_UNQUOTED(HAVE_GST_AUDIO, 1, [We can use the gst-audio library])
  AC_DEFINE_UNQUOTED(HAVE_GST_VIDEO, 1, [We can use the gst-video library])
  AC_DEFINE_UNQUOTED(HAVE_GST_TAG, 1, [We can use the gst-tag library])
@ -255,12 +272,14 @@ AC_SUBST(IGNORE_GST_0_10_26)
 AC_SUBST(IGNORE_GST_0_10_29)
 AC_SUBST(IGNORE_GST_0_10_30)
 AC_SUBST(IGNORE_GST_0_10_31)
+AC_SUBST(IGNORE_GST_0_10_32)
 AC_SUBST(IGNORE_GST_PB_0_10_23)
 AC_SUBST(IGNORE_GST_PB_0_10_25)
 AC_SUBST(IGNORE_GST_PB_0_10_26)
 AC_SUBST(IGNORE_GST_PB_0_10_29)
 AC_SUBST(IGNORE_GST_PB_0_10_30)
 AC_SUBST(IGNORE_GST_PB_0_10_31)
+AC_SUBST(IGNORE_GST_PB_0_10_32)
 AM_CONDITIONAL(HAVE_GST_AUDIO, $HAVE_GST_AUDIO)
 AM_CONDITIONAL(HAVE_GST_VIDEO, $HAVE_GST_VIDEO)
 AM_CONDITIONAL(HAVE_GST_TAG, $HAVE_GST_TAG)
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@ -35,12 +35,14 @@ versioned_overrides = \
 	gst-0.10.29.ignore 	\
 	gst-0.10.30.ignore 	\
 	gst-0.10.31.ignore 	\
+	gst-0.10.32.ignore 	\
 	gst-pb-0.10.23.ignore	\
 	gst-pb-0.10.25.ignore	\
 	gst-pb-0.10.26.ignore	\
 	gst-pb-0.10.29.ignore	\
 	gst-pb-0.10.30.ignore	\
 	gst-pb-0.10.31.ignore	\
+	gst-pb-0.10.32.ignore	\
 	gst-disable-loadsave.ignore

 INCLUDES = $(PYTHON_INCLUDES)
--- a/gst/gst-0.10.32.ignore
+++ b/gst/gst-0.10.32.ignore
@ -0,0 +1,7 @@
+%%
+ignore
+  gst_clock_single_shot_id_reinit
+  gst_read_gpollfd
+  gst_value_list_merge
+%%
+
--- a/gst/gst-pb-0.10.32.ignore
+++ b/gst/gst-pb-0.10.32.ignore
@ -0,0 +1,47 @@
+%%
+ignore
+  gst_encoding_profile_get_name
+  gst_encoding_profile_get_description
+  gst_encoding_profile_get_format
+  gst_encoding_profile_get_preset
+  gst_encoding_profile_get_presence
+  gst_encoding_profile_get_restriction
+  gst_encoding_profile_set_name
+  gst_encoding_profile_set_description
+  gst_encoding_profile_set_format
+  gst_encoding_profile_set_preset
+  gst_encoding_profile_set_presence
+  gst_encoding_profile_set_restriction
+  gst_encoding_profile_is_equal
+  gst_encoding_profile_get_output_caps
+  gst_encoding_profile_get_type_nick
+  gst_encoding_container_profile_add_profile
+  gst_encoding_container_profile_contains_profile
+  gst_encoding_container_profile_get_profiles
+  gst_encoding_container_profile_new
+  gst_encoding_audio_profile_new
+  gst_encoding_video_profile_new
+  gst_encoding_video_profile_get_pass
+  gst_encoding_video_profile_set_pass
+  gst_encoding_video_profile_get_variableframerate
+  gst_encoding_video_profile_set_variableframerate
+  gst_encoding_target_new
+  gst_encoding_target_get_name
+  gst_encoding_target_get_category
+  gst_encoding_target_get_description
+  gst_encoding_target_get_profiles
+  gst_encoding_target_add_profile
+  gst_encoding_target_save
+  gst_encoding_target_save_to
+  gst_encoding_target_load
+  gst_encoding_target_load_from
+  gst_discoverer_info_get_seekable
+  gst_video_parse_caps_palette
+%%
+ignore-type
+  GstEncodingProfile
+  GstEncodingContainerProfile
+  GstEncodingAudioProfile
+  GstEncodingVideoProfile
+  GstEncodingTarget
+%%
--- a/gst/gst-types.defs
+++ b/gst/gst-types.defs
@ -440,6 +440,7 @@
    '("badtime" "GST_CLOCK_BADTIME")
    '("error" "GST_CLOCK_ERROR")
    '("unsupported" "GST_CLOCK_UNSUPPORTED")
+    '("done" "GST_CLOCK_DONE")
  )
 )

--- a/gst/gst.defs
+++ b/gst/gst.defs
@ -1162,6 +1162,16 @@
  (return-type "none")
 )

+(define-method single_shot_id_reinit
+  (of-object "GstClock")
+  (c-name "gst_clock_single_shot_id_reinit")
+  (return-type "gboolean")
+  (parameters
+    '("GstClockID" "id")
+    '("GstClockTime" "time")
+  )
+)
+
 (define-virtual change_resolution
  (of-object "GstClock")
  (return-type "GstClockTime")
@ -5645,6 +5655,15 @@
  (return-type "none")
 )

+(define-method get_read_gpollfd
+  (of-object "GstPoll")
+  (c-name "gst_poll_get_read_gpollfd")
+  (return-type "none")
+  (parameters
+    '("GPollFD*" "fd")
+  )
+)
+
 (define-method init
  (of-object "GstPollFD")
  (c-name "gst_poll_fd_init")
@ -8947,6 +8966,16 @@
  )
 )

+(define-function value_list_merge
+  (c-name "gst_value_list_merge")
+  (return-type "none")
+  (parameters
+    '("GValue*" "dest")
+    '("const-GValue*" "value1")
+    '("const-GValue*" "value2")
+  )
+)
+
 (define-function value_list_get_size
  (c-name "gst_value_list_get_size")
  (return-type "guint")
--- a/gst/gstversion.override.in
+++ b/gst/gstversion.override.in
@ -16,4 +16,6 @@ include
@IGNORE_GST_PB_0_10_30@
@IGNORE_GST_0_10_31@
@IGNORE_GST_PB_0_10_31@
+@IGNORE_GST_0_10_32@
+@IGNORE_GST_PB_0_10_32@
 %%
--- a/gst/pbutils.defs
+++ b/gst/pbutils.defs
@ -83,6 +83,41 @@
  (gtype-id "GST_TYPE_DISCOVERER_VIDEO_INFO")
 )

+(define-miniobject EncodingProfile
+  (in-module "Gst")
+  (c-name "GstEncodingProfile")
+  (parent "GstMiniObject")
+  (gtype-id "GST_TYPE_ENCODING_PROFILE")
+)
+
+(define-miniobject EncodingContainerProfile
+  (in-module "Gst")
+  (c-name "GstEncodingContainerProfile")
+  (parent "GstEncodingProfile")
+  (gtype-id "GST_TYPE_ENCODING_CONTAINER_PROFILE")
+)
+
+(define-miniobject EncodingVideoProfile
+  (in-module "Gst")
+  (c-name "GstEncodingVideoProfile")
+  (parent "GstEncodingProfile")
+  (gtype-id "GST_TYPE_ENCODING_VIDEO_PROFILE")
+)
+
+(define-miniobject EncodingAudioProfile
+  (in-module "Gst")
+  (c-name "GstEncodingAudioProfile")
+  (parent "GstEncodingProfile")
+  (gtype-id "GST_TYPE_ENCODING_AUDIO_PROFILE")
+)
+
+(define-miniobject EncodingTarget
+  (in-module "Gst")
+  (c-name "GstEncodingTarget")
+  (parent "GstMiniObject")
+  (gtype-id "GST_TYPE_ENCODING_TARGET")
+)
+
 ;; From codec-utils.h

 (define-function codec_utils_aac_get_sample_rate_from_index
@ -300,13 +335,299 @@
 )


-;; From gstdiscoverer.h
+;; From encoding-profile.h

-(define-function gst_discoverer_stream_info_get_type
-  (c-name "gst_discoverer_stream_info_get_type")
-  (return-type "GType")
+(define-method get_name
+  (of-object "GstEncodingProfile")
+  (c-name "gst_encoding_profile_get_name")
+  (return-type "const-gchar*")
 )

+(define-method get_description
+  (of-object "GstEncodingProfile")
+  (c-name "gst_encoding_profile_get_description")
+  (return-type "const-gchar*")
+)
+
+(define-method get_format
+  (of-object "GstEncodingProfile")
+  (c-name "gst_encoding_profile_get_format")
+  (return-type "const-GstCaps*")
+)
+
+(define-method get_preset
+  (of-object "GstEncodingProfile")
+  (c-name "gst_encoding_profile_get_preset")
+  (return-type "const-gchar*")
+)
+
+(define-method get_presence
+  (of-object "GstEncodingProfile")
+  (c-name "gst_encoding_profile_get_presence")
+  (return-type "guint")
+)
+
+(define-method get_restriction
+  (of-object "GstEncodingProfile")
+  (c-name "gst_encoding_profile_get_restriction")
+  (return-type "const-GstCaps*")
+)
+
+(define-method set_name
+  (of-object "GstEncodingProfile")
+  (c-name "gst_encoding_profile_set_name")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "name")
+  )
+)
+
+(define-method set_description
+  (of-object "GstEncodingProfile")
+  (c-name "gst_encoding_profile_set_description")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "description")
+  )
+)
+
+(define-method set_format
+  (of-object "GstEncodingProfile")
+  (c-name "gst_encoding_profile_set_format")
+  (return-type "none")
+  (parameters
+    '("GstCaps*" "format")
+  )
+)
+
+(define-method set_preset
+  (of-object "GstEncodingProfile")
+  (c-name "gst_encoding_profile_set_preset")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "preset")
+  )
+)
+
+(define-method set_restriction
+  (of-object "GstEncodingProfile")
+  (c-name "gst_encoding_profile_set_restriction")
+  (return-type "none")
+  (parameters
+    '("GstCaps*" "restriction")
+  )
+)
+
+(define-method set_presence
+  (of-object "GstEncodingProfile")
+  (c-name "gst_encoding_profile_set_presence")
+  (return-type "none")
+  (parameters
+    '("guint" "presence")
+  )
+)
+
+(define-method is_equal
+  (of-object "GstEncodingProfile")
+  (c-name "gst_encoding_profile_is_equal")
+  (return-type "gboolean")
+  (parameters
+    '("GstEncodingProfile*" "b")
+  )
+)
+
+(define-method get_output_caps
+  (of-object "GstEncodingProfile")
+  (c-name "gst_encoding_profile_get_output_caps")
+  (return-type "GstCaps*")
+)
+
+(define-method get_type_nick
+  (of-object "GstEncodingProfile")
+  (c-name "gst_encoding_profile_get_type_nick")
+  (return-type "const-gchar*")
+)
+
+(define-method add_profile
+  (of-object "GstEncodingContainerProfile")
+  (c-name "gst_encoding_container_profile_add_profile")
+  (return-type "gboolean")
+  (parameters
+    '("GstEncodingProfile*" "profile")
+  )
+)
+
+(define-method contains_profile
+  (of-object "GstEncodingContainerProfile")
+  (c-name "gst_encoding_container_profile_contains_profile")
+  (return-type "gboolean")
+  (parameters
+    '("GstEncodingProfile*" "profile")
+  )
+)
+
+(define-method get_profiles
+  (of-object "GstEncodingContainerProfile")
+  (c-name "gst_encoding_container_profile_get_profiles")
+  (return-type "const-GList*")
+)
+
+(define-function gst_encoding_container_profile_new
+  (c-name "gst_encoding_container_profile_new")
+  (is-constructor-of "GstEncodingContainerProfile")
+  (return-type "GstEncodingContainerProfile*")
+  (parameters
+    '("const-gchar*" "name")
+    '("const-gchar*" "description")
+    '("GstCaps*" "format")
+    '("const-gchar*" "preset")
+  )
+)
+
+(define-function gst_encoding_video_profile_new
+  (c-name "gst_encoding_video_profile_new")
+  (is-constructor-of "GstEncodingVideoProfile")
+  (return-type "GstEncodingVideoProfile*")
+  (parameters
+    '("GstCaps*" "format")
+    '("const-gchar*" "preset")
+    '("GstCaps*" "restriction")
+    '("guint" "presence")
+  )
+)
+
+(define-function gst_encoding_audio_profile_new
+  (c-name "gst_encoding_audio_profile_new")
+  (is-constructor-of "GstEncodingAudioProfile")
+  (return-type "GstEncodingAudioProfile*")
+  (parameters
+    '("GstCaps*" "format")
+    '("const-gchar*" "preset")
+    '("GstCaps*" "restriction")
+    '("guint" "presence")
+  )
+)
+
+(define-method get_pass
+  (of-object "GstEncodingVideoProfile")
+  (c-name "gst_encoding_video_profile_get_pass")
+  (return-type "guint")
+)
+
+(define-method get_variableframerate
+  (of-object "GstEncodingVideoProfile")
+  (c-name "gst_encoding_video_profile_get_variableframerate")
+  (return-type "gboolean")
+)
+
+(define-method set_pass
+  (of-object "GstEncodingVideoProfile")
+  (c-name "gst_encoding_video_profile_set_pass")
+  (return-type "none")
+  (parameters
+    '("guint" "pass")
+  )
+)
+
+(define-method set_variableframerate
+  (of-object "GstEncodingVideoProfile")
+  (c-name "gst_encoding_video_profile_set_variableframerate")
+  (return-type "none")
+  (parameters
+    '("gboolean" "variableframerate")
+  )
+)
+
+
+
+;; From encoding-target.h
+
+(define-function gst_encoding_target_new
+  (c-name "gst_encoding_target_new")
+  (is-constructor-of "GstEncodingTarget")
+  (return-type "GstEncodingTarget*")
+  (parameters
+    '("const-gchar*" "name")
+    '("const-gchar*" "category")
+    '("const-gchar*" "description")
+    '("const-GList*" "profiles")
+  )
+)
+
+(define-method get_name
+  (of-object "GstEncodingTarget")
+  (c-name "gst_encoding_target_get_name")
+  (return-type "const-gchar*")
+)
+
+(define-method get_category
+  (of-object "GstEncodingTarget")
+  (c-name "gst_encoding_target_get_category")
+  (return-type "const-gchar*")
+)
+
+(define-method get_description
+  (of-object "GstEncodingTarget")
+  (c-name "gst_encoding_target_get_description")
+  (return-type "const-gchar*")
+)
+
+(define-method get_profiles
+  (of-object "GstEncodingTarget")
+  (c-name "gst_encoding_target_get_profiles")
+  (return-type "const-GList*")
+)
+
+(define-method add_profile
+  (of-object "GstEncodingTarget")
+  (c-name "gst_encoding_target_add_profile")
+  (return-type "gboolean")
+  (parameters
+    '("GstEncodingProfile*" "profile")
+  )
+)
+
+(define-method save
+  (of-object "GstEncodingTarget")
+  (c-name "gst_encoding_target_save")
+  (return-type "gboolean")
+  (parameters
+    '("GError**" "error")
+  )
+)
+
+(define-method save_to
+  (of-object "GstEncodingTarget")
+  (c-name "gst_encoding_target_save_to")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "path")
+    '("GError**" "error")
+  )
+)
+
+(define-function gst_encoding_target_load
+  (c-name "gst_encoding_target_load")
+  (return-type "GstEncodingTarget*")
+  (parameters
+    '("const-gchar*" "name")
+    '("GError**" "error")
+  )
+)
+
+(define-function gst_encoding_target_load_from
+  (c-name "gst_encoding_target_load_from")
+  (return-type "GstEncodingTarget*")
+  (parameters
+    '("const-gchar*" "path")
+    '("GError**" "error")
+  )
+)
+
+
+
+;; From gstdiscoverer.h
+
 (define-method get_previous
  (of-object "GstDiscovererStreamInfo")
  (c-name "gst_discoverer_stream_info_get_previous")
@ -343,22 +664,12 @@
  (return-type "const-gchar*")
 )

-(define-function gst_discoverer_container_info_get_type
-  (c-name "gst_discoverer_container_info_get_type")
-  (return-type "GType")
-)
-
 (define-method get_streams
  (of-object "GstDiscovererContainerInfo")
  (c-name "gst_discoverer_container_info_get_streams")
  (return-type "GList*")
 )

-(define-function gst_discoverer_audio_info_get_type
-  (c-name "gst_discoverer_audio_info_get_type")
-  (return-type "GType")
-)
-
 (define-function gst_discoverer_audio_info_get_channels
  (c-name "gst_discoverer_audio_info_get_channels")
  (return-type "guint")
@ -399,11 +710,6 @@
  )
 )

-(define-function gst_discoverer_video_info_get_type
-  (c-name "gst_discoverer_video_info_get_type")
-  (return-type "GType")
-)
-
 (define-function gst_discoverer_video_info_get_width
  (c-name "gst_discoverer_video_info_get_width")
  (return-type "guint")
@ -492,11 +798,6 @@
  )
 )

-(define-function gst_discoverer_info_get_type
-  (c-name "gst_discoverer_info_get_type")
-  (return-type "GType")
-)
-
 (define-method copy
  (of-object "GstDiscovererInfo")
  (c-name "gst_discoverer_info_copy")
@ -533,6 +834,12 @@
  (return-type "GstClockTime")
 )

+(define-method get_seekable
+  (of-object "GstDiscovererInfo")
+  (c-name "gst_discoverer_info_get_seekable")
+  (return-type "gboolean")
+)
+
 (define-method get_misc
  (of-object "GstDiscovererInfo")
  (c-name "gst_discoverer_info_get_misc")
@ -580,11 +887,6 @@
  )
 )

-(define-function gst_discoverer_get_type
-  (c-name "gst_discoverer_get_type")
-  (return-type "GType")
-)
-
 (define-function gst_discoverer_new
  (c-name "gst_discoverer_new")
  (is-constructor-of "GstDiscoverer")
--- a/gst/video.defs
+++ b/gst/video.defs
@ -57,6 +57,10 @@
    '("bgr15" "GST_VIDEO_FORMAT_BGR15")
    '("uyvp" "GST_VIDEO_FORMAT_UYVP")
    '("a420" "GST_VIDEO_FORMAT_A420")
+    '("rgb8-paletted" "GST_VIDEO_FORMAT_RGB8_PALETTED")
+    '("yuv9" "GST_VIDEO_FORMAT_YUV9")
+    '("yvu9" "GST_VIDEO_FORMAT_YVU9")
+    '("iyu1" "GST_VIDEO_FORMAT_IYU1")
  )
 )

@ -173,6 +177,14 @@
  )
 )

+(define-function video_parse_caps_palette
+  (c-name "gst_video_parse_caps_palette")
+  (return-type "GstBuffer*")
+  (parameters
+    '("GstCaps*" "caps")
+  )
+)
+
 (define-method new_caps
  (of-object "GstVideoFormat")
  (c-name "gst_video_format_new_caps")