diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2016-01-04 10:11:20 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2016-01-04 10:21:21 +0200 |
| commit | ecb3636579632212f180b478a00bfd9d8f0ce0a9 (patch) | |
| tree | d0dbec9a5e187045594c2bd6a43f1353fbdfea9b | |
| parent | 14b945de5a98fe3d3ab306651ad3ecb494a1743d (diff) | |
player: Build against GstPlayer version from gst-plugins-bad everywhere
The old version with everything included and buildable against GStreamer 1.6
can still be found in the gst-player-0.1 branch and will be continued to be
updated for a while.
59 files changed, 21 insertions, 13049 deletions
diff --git a/Makefile.am b/Makefile.am index 8e88802..ea77ddc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,13 +1,7 @@ -ACLOCAL_AMFLAGS = -I m4 - -if HAVE_CHECK -tests_dir = tests -endif - if HAVE_GTK gtk_dir = gtk endif -SUBDIRS = lib gst-play $(gtk_dir) $(tests_dir) docs pkgconfig -DIST_SUBDIRS = android gst-play gtk ios lib tests docs pkgconfig +SUBDIRS = gst-play $(gtk_dir) +DIST_SUBDIRS = android gst-play gtk ios diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 77af905..65e2044 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -3,17 +3,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := gstplayer -LOCAL_SRC_FILES := \ - player.c \ - ../../lib/gst/player/gstplayer.c \ - ../../lib/gst/player/gstplayer-signal-dispatcher.c \ - ../../lib/gst/player/gstplayer-video-renderer.c \ - ../../lib/gst/player/gstplayer-media-info.c \ - ../../lib/gst/player/gstplayer-g-main-context-signal-dispatcher.c \ - ../../lib/gst/player/gstplayer-video-overlay-video-renderer.c \ - ../../lib/gst/player/gstplayer-visualization.c - -LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../lib +LOCAL_SRC_FILES := player.c + LOCAL_SHARED_LIBRARIES := gstreamer_android LOCAL_LDLIBS := -llog -landroid include $(BUILD_SHARED_LIBRARY) @@ -43,6 +34,6 @@ GSTREAMER_NDK_BUILD_PATH := $(GSTREAMER_ROOT)/share/gst-android/ndk-build/ include $(GSTREAMER_NDK_BUILD_PATH)/plugins.mk GSTREAMER_PLUGINS := $(GSTREAMER_PLUGINS_CORE) $(GSTREAMER_PLUGINS_PLAYBACK) $(GSTREAMER_PLUGINS_CODECS) $(GSTREAMER_PLUGINS_NET) $(GSTREAMER_PLUGINS_SYS) $(GSTREAMER_PLUGINS_CODECS_RESTRICTED) $(GSTREAMER_CODECS_GPL) $(GSTREAMER_PLUGINS_ENCODING) $(GSTREAMER_PLUGINS_VIS) $(GSTREAMER_PLUGINS_EFFECTS) $(GSTREAMER_PLUGINS_NET_RESTRICTED) -GSTREAMER_EXTRA_DEPS := gstreamer-video-1.0 glib-2.0 +GSTREAMER_EXTRA_DEPS := gstreamer-player-1.0 gstreamer-video-1.0 glib-2.0 include $(GSTREAMER_NDK_BUILD_PATH)/gstreamer-1.0.mk diff --git a/android/jni/player.c b/android/jni/player.c index ee53708..ed72e86 100644 --- a/android/jni/player.c +++ b/android/jni/player.c @@ -25,7 +25,7 @@ #include <android/native_window.h> #include <android/native_window_jni.h> -#include "gst/player/player.h" +#include <gst/player/player.h> GST_DEBUG_CATEGORY_STATIC (debug_category); #define GST_CAT_DEFAULT debug_category @@ -13,4 +13,4 @@ mkdir -p m4 autoreconf -v --install || exit 1 cd $ORIGDIR || exit $? -$srcdir/configure --enable-maintainer-mode --enable-more-warnings --enable-warnings-as-errors --enable-gtk-doc "$@" +$srcdir/configure --enable-maintainer-mode --enable-more-warnings --enable-warnings-as-errors "$@" diff --git a/check.mk b/check.mk deleted file mode 100644 index 03dfbf2..0000000 --- a/check.mk +++ /dev/null @@ -1,60 +0,0 @@ -%.check: % - ./$* - -if HAVE_GDB -%.gdb: % - $(LIBTOOL) --mode=execute \ - $(GDB) $* -endif - -SUPPRESSIONS = $(top_srcdir)/gst.supp - -if HAVE_VALGRIND - -%.valgrind: % - $(LIBTOOL) --mode=execute \ - $(VALGRIND) -q \ - $(foreach s,$(SUPPRESSIONS),--suppressions=$(s)) \ - --tool=memcheck \ - --leak-check=full \ - --track-origins=yes \ - --leak-resolution=high \ - ./$* 2>&1 | tee valgrind.log - @if $(EGREP) '==[0-9]+==' valgrind.log > /dev/null 2>&1; then \ - rm valgrind.log; \ - exit 1; \ - fi - @rm valgrind.log - -%.valgrind.gen-suppressions: % - $(LIBTOOL) --mode=execute \ - $(VALGRIND) -q \ - $(foreach s,$(SUPPRESSIONS),--suppressions=$(s)) \ - --tool=memcheck \ - --leak-check=full \ - --track-origins=yes \ - --gen-suppressions=all \ - --leak-resolution=high \ - ./$* 2>&1 | tee valgrind.log - @if $(EGREP) '==[0-9]+==' valgrind.log > /dev/null 2>&1; then \ - rm valgrind.log; \ - exit 1; \ - fi - @rm valgrind.log - -check-valgrind: $(TESTS) - @failed=0; \ - for test in $(TESTS); do \ - $(MAKE) $$test.valgrind; \ - if test "$$?" -ne 0; then \ - echo "Valgrind error for test $$test"; \ - failed=`expr $$failed + 1`; \ - whicht="$$whicht $$test"; \ - fi; \ - done; \ - if test "$$failed" -ne 0; then \ - echo "$$failed tests had leaks or errors under valgrind:"; \ - echo "$$whicht"; \ - false; \ - fi -endif diff --git a/configure.ac b/configure.ac index 3f82573..30e2db3 100644 --- a/configure.ac +++ b/configure.ac @@ -34,26 +34,10 @@ AC_C_BIGENDIAN AC_CHECK_LIBM AC_SUBST(LIBM) -# set libtool versioning -# +1 : 0 : +1 == new interface that does not break old one. -# +1 : 0 : 0 == changed/removed an interface. Breaks old apps. -# ? : +1 : ? == internal changes that doesn't break anything. -# CURRENT : REVISION : AGE -LT_CURRENT=0 -LT_REVISION=0 -LT_AGE=0 - -GST_PLAYER_API_VERSION=0.0 -AC_SUBST(GST_PLAYER_API_VERSION) - -AC_SUBST(LT_CURRENT) -AC_SUBST(LT_REVISION) -AC_SUBST(LT_AGE) - PKG_PROG_PKG_CONFIG PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.38.0 gobject-2.0 >= 2.38.0]) -PKG_CHECK_MODULES(GSTREAMER, [gstreamer-1.0 >= 1.6 gstreamer-video-1.0 >= 1.6 gstreamer-tag-1.0 >= 1.6 gstreamer-pbutils-1.0 >= 1.6]) +PKG_CHECK_MODULES(GSTREAMER, [gstreamer-1.0 >= 1.7.1 gstreamer-tag-1.0 gstreamer-player-1.0]) GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`" AC_SUBST(GLIB_PREFIX) @@ -69,33 +53,6 @@ AM_CONDITIONAL(HAVE_GMODULE, test "x$have_gmodules" != "xno") PKG_CHECK_MODULES(GTK_X11, [gtk+-x11-3.0 x11], [have_gtk_x11="yes"], [have_gtk_x11="no"]) AM_CONDITIONAL(HAVE_GTK_X11, test "x$have_gtk_x11" != "xno") -GOBJECT_INTROSPECTION_CHECK([1.31.1]) -GTK_DOC_CHECK([1.16], [--flavour no-tmpl]) - -PKG_CHECK_MODULES(CHECK, check, have_check="yes", have_check="no") -AC_SUBST(CHECK_CFLAGS) -AC_SUBST(CHECK_LIBS) -AM_CONDITIONAL(HAVE_CHECK, test "x$have_check" != "xno") - -AC_PATH_PROG(VALGRIND, valgrind, no) - -have_valgrind_3_4_0=no -if test "x$VALGRIND" != "xno"; then - valgrind_version=0 - valgrind_version="`$VALGRIND --version | head -n 1 | sed 's/^[[^0-9]]*//' | sed 's/[[^0-9]]*$//' | cut -d' ' -f1`" - AC_MSG_CHECKING([for valgrind version $valgrind_version >= 3.4.0]) - if perl -we "exit ((v$valgrind_version ge v3.4.0) ? 0 : 1)"; then - have_valgrind_3_4_0=yes - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi -fi -AM_CONDITIONAL(HAVE_VALGRIND, test "x$VALGRIND" != "xno" -a "x$have_valgrind_3_4_0" = "xyes") - -AC_PATH_PROG(GDB, gdb, no) -AM_CONDITIONAL(HAVE_GDB, test ! "x$GDB" = "xno") - WARNING_CFLAGS="-Wall" AC_ARG_ENABLE(more-warnings, @@ -142,19 +99,10 @@ AC_SUBST(WARNING_CFLAGS) AC_CONFIG_FILES([ Makefile - lib/Makefile - lib/gst/Makefile - lib/gst/player/Makefile gst-play/Makefile gtk/Makefile android/Makefile ios/Makefile - tests/Makefile - docs/Makefile - docs/lib/Makefile - pkgconfig/Makefile - pkgconfig/gstreamer-player.pc - pkgconfig/gstreamer-player-uninstalled.pc ]) AC_OUTPUT diff --git a/docs/Makefile.am b/docs/Makefile.am deleted file mode 100644 index c885a30..0000000 --- a/docs/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -if ENABLE_GTK_DOC -DOCS_SUBDIRS = lib -endif - -SUBDIRS = $(DOCS_SUBDIRS) -DIST_SUBDIRS = lib - diff --git a/docs/lib/Makefile.am b/docs/lib/Makefile.am deleted file mode 100644 index 45e1795..0000000 --- a/docs/lib/Makefile.am +++ /dev/null @@ -1,89 +0,0 @@ -# This is a blank Makefile.am for using gtk-doc. -# Copy this to your project's API docs directory and modify the variables to -# suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples -# of using the various options. - -# The name of the module, e.g. 'glib'. -DOC_MODULE=gst-player - -# Uncomment for versioned docs and specify the version of the module, e.g. '2'. -#DOC_MODULE_VERSION=2 - -# The top-level XML file. -DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml - -# Directories containing the source code. -# gtk-doc will search all .c and .h files beneath these paths -# for inline comments documenting functions and macros. -# e.g. DOC_SOURCE_DIR=$(top_srcdir)/gtk $(top_srcdir)/gdk -DOC_SOURCE_DIR=$(top_srcdir)/lib - -# Extra options to pass to gtkdoc-scangobj. Normally not needed. -SCANGOBJ_OPTIONS= - -# Extra options to supply to gtkdoc-scan. -# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" -SCAN_OPTIONS=--rebuild-types - -# Extra options to supply to gtkdoc-mkdb -# e.g. MKDB_OPTIONS=--xml-mode --output-format=xml -MKDB_OPTIONS=--xml-mode --output-format=xml - -# Extra options to supply to gtkdoc-mkhtml -MKHTML_OPTIONS= - -# Extra options to supply to gtkdoc-fixref. Normally not needed. -# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html -FIXXREF_OPTIONS=--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html \ - --extra-dir=$(GST_PREFIX)/share/gtk-doc/html - -# Used for dependencies. The docs will be rebuilt if any of these change. -# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h -# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c -HFILE_GLOB=$(top_srcdir)/lib/gst/player/*.h -CFILE_GLOB=$(top_srcdir)/lib/gst/player/*.c - -# Extra header to include when scanning, which are not under DOC_SOURCE_DIR -# e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h -EXTRA_HFILES= - -# Header files or dirs to ignore when scanning. Use base file/dir names -# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h private_code -IGNORE_HFILES= \ - gstplayer-signal-dispatcher-private.h \ - gstplayer-video-renderer-private.h \ - gstplayer-media-info-private.h - -# Images to copy into HTML directory. -# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png -HTML_IMAGES= - -# Extra files that are included by $(DOC_MAIN_SGML_FILE). -# e.g. content_files=running.xml building.xml changes-2.0.xml -content_files= - -# Files where gtk-doc abbrevations (#GtkWidget) are expanded -# e.g. expand_content_files=running.xml -expand_content_files= - -# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library. -# Only needed if you are using gtkdoc-scangobj to dynamically query widget -# signals and properties. -# e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) -# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) -GTKDOC_CFLAGS=-I$(top_srcdir)/lib -I$(top_builddir)/lib $(GSTREAMER_CFLAGS) $(GLIB_CFLAGS) -GTKDOC_LIBS=$(top_builddir)/lib/gst/player/.libs/libgstplayer-@GST_PLAYER_API_VERSION@.la $(GSTREAMER_LIBS) $(GLIB_LIBS) - -# This includes the standard gtk-doc make rules, copied by gtkdocize. -include $(top_srcdir)/gtk-doc.make - -# Comment this out if you want 'make check' to test you doc status -# and run some sanity checks -if ENABLE_GTK_DOC -TESTS_ENVIRONMENT = \ - DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \ - SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir) -TESTS = $(GTKDOC_CHECK) -endif - --include $(top_srcdir)/git.mk diff --git a/docs/lib/gst-player-docs.xml b/docs/lib/gst-player-docs.xml deleted file mode 100644 index 88e3c33..0000000 --- a/docs/lib/gst-player-docs.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" - "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> - -<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude"> - <bookinfo> - <title>GStreamer Player Reference Manual</title> - <releaseinfo> - for GStreamer Player API 0.0.1 - </releaseinfo> - </bookinfo> - - <chapter> - <xi:include href="xml/gstplayer.xml"/> - <xi:include href="xml/gstplayer-mediainfo.xml"/> - <xi:include href="xml/gstplayer-gmaincontextsignaldispatcher.xml"/> - <xi:include href="xml/gstplayer-videooverlayvideorenderer.xml"/> - <xi:include href="xml/gstplayer-visualization.xml"/> - </chapter> - - <chapter id="player-hierarchy"> - <title>Object Hierarchy</title> - <xi:include href="xml/tree_index.sgml"/> - </chapter> - - <index id="api-index-full"> - <title>API Index</title> - <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include> - </index> - - <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include> -</book> diff --git a/docs/lib/gst-player-sections.txt b/docs/lib/gst-player-sections.txt deleted file mode 100644 index 247c34b..0000000 --- a/docs/lib/gst-player-sections.txt +++ /dev/null @@ -1,239 +0,0 @@ -<SECTION> -<FILE>gstplayer</FILE> -GstPlayer - -gst_player_new - -gst_player_play -gst_player_pause -gst_player_stop - -gst_player_seek - -gst_player_set_uri -gst_player_get_uri - -gst_player_get_duration -gst_player_get_position - -gst_player_set_volume -gst_player_set_mute -gst_player_get_volume -gst_player_get_mute - -gst_player_get_pipeline - -gst_player_set_position_update_interval -gst_player_get_position_update_interval - -GstPlayerState -gst_player_state_get_name - -GST_PLAYER_ERROR -GstPlayerError -gst_player_error_get_name - -gst_player_get_media_info -gst_player_get_audio_streams -gst_player_get_video_streams -gst_player_get_subtitle_streams - -gst_player_set_audio_track -gst_player_set_video_track -gst_player_set_subtitle_track - -gst_player_get_current_audio_track -gst_player_get_current_video_track -gst_player_get_current_subtitle_track - -gst_player_set_audio_track_enabled -gst_player_set_video_track_enabled -gst_player_set_subtitle_track_enabled - -gst_player_set_subtitle_uri -gst_player_get_subtitle_uri - -gst_player_set_visualization -gst_player_set_visualization_enabled -gst_player_get_current_visualization - -GstPlayerColorBalanceType -gst_player_color_balance_type_get_name - -gst_player_has_color_balance -gst_player_set_color_balance -gst_player_get_color_balance - -gst_player_get_rate -gst_player_set_rate - -GstPlayerSignalDispatcher -GstPlayerSignalDispatcherInterface - -GstPlayerVideoRenderer -GstPlayerVideoRendererInterface - -<SUBSECTION Standard> -GST_IS_PLAYER -GST_IS_PLAYER_CLASS -GST_PLAYER -GST_PLAYER_CAST -GST_PLAYER_CLASS -GST_PLAYER_GET_CLASS -GST_TYPE_PLAYER -GstPlayerClass -gst_player_get_type - -gst_player_visualization_get_type - -GST_TYPE_PLAYER_ERROR -gst_player_error_quark -gst_player_error_get_type - -GST_TYPE_PLAYER_STATE -gst_player_state_get_type - -GST_TYPE_PLAYER_COLOR_BALANCE_TYPE -gst_player_color_balance_type_get_type - -GST_TYPE_PLAYER_SIGNAL_DISPATCHER -GST_PLAYER_SIGNAL_DISPATCHER -GST_IS_PLAYER_SIGNAL_DISPATCHER -GST_PLAYER_SIGNAL_DISPATCHER_GET_INTERFACE -gst_player_signal_dispatcher_get_type - -GST_TYPE_PLAYER_VIDEO_RENDERER -GST_IS_PLAYER_VIDEO_RENDERER -GST_PLAYER_VIDEO_RENDERER -GST_PLAYER_VIDEO_RENDERER_GET_INTERFACE -gst_player_video_renderer_get_type -</SECTION> - -<SECTION> -<FILE>gstplayer-gmaincontextsignaldispatcher</FILE> -gst_player_g_main_context_signal_dispatcher_new - -<SUBSECTION Standard> -GST_PLAYER_G_MAIN_CONTEXT_SIGNAL_DISPATCHER -GST_PLAYER_G_MAIN_CONTEXT_SIGNAL_DISPATCHER_CAST -GST_PLAYER_G_MAIN_CONTEXT_SIGNAL_DISPATCHER_CLASS -GST_PLAYER_G_MAIN_CONTEXT_SIGNAL_DISPATCHER_GET_CLASS -GST_IS_PLAYER_G_MAIN_CONTEXT_SIGNAL_DISPATCHER -GST_IS_PLAYER_G_MAIN_CONTEXT_SIGNAL_DISPATCHER_CLASS -GST_TYPE_PLAYER_G_MAIN_CONTEXT_SIGNAL_DISPATCHER - -gst_player_g_main_context_signal_dispatcher_get_type -</SECTION> - -<SECTION> -<FILE>gstplayer-videooverlayvideorenderer</FILE> -GstPlayerVideoOverlayVideoRenderer - -gst_player_video_overlay_video_renderer_new -gst_player_video_overlay_video_renderer_get_window_handle -gst_player_video_overlay_video_renderer_set_window_handle - -<SUBSECTION Standard> -GST_PLAYER_VIDEO_OVERLAY_VIDEO_RENDERER -GST_PLAYER_VIDEO_OVERLAY_VIDEO_RENDERER_CAST -GST_PLAYER_VIDEO_OVERLAY_VIDEO_RENDERER_CLASS -GST_PLAYER_VIDEO_OVERLAY_VIDEO_RENDERER_GET_CLASS -GST_IS_PLAYER_VIDEO_OVERLAY_VIDEO_RENDERER -GST_IS_PLAYER_VIDEO_OVERLAY_VIDEO_RENDERER_CLASS -GST_TYPE_PLAYER_VIDEO_OVERLAY_VIDEO_RENDERER - -gst_player_video_overlay_video_renderer_get_type - -</SECTION> - -<SECTION> -<FILE>gstplayer-visualization</FILE> -GstPlayerVisualization -gst_player_visualizations_get -gst_player_visualizations_free -gst_player_visualization_copy -gst_player_visualization_free - -<SUBSECTION Standard> -gst_player_visualization_get_type -</SECTION> - -<SECTION> -<FILE>gstplayer-mediainfo</FILE> -GstPlayerMediaInfo - -GstPlayerStreamInfo -GstPlayerAudioInfo -GstPlayerVideoInfo -GstPlayerSubtitleInfo - -gst_player_media_info_get_uri -gst_player_media_info_get_duration -gst_player_media_info_get_title -gst_player_media_info_get_container_format -gst_player_media_info_is_seekable -gst_player_media_info_get_image_sample -gst_player_media_info_get_tags -gst_player_media_info_get_stream_list - -gst_player_stream_info_get_index -gst_player_stream_info_get_caps -gst_player_stream_info_get_tags -gst_player_stream_info_get_codec -gst_player_stream_info_get_stream_type - -gst_player_audio_info_get_bitrate -gst_player_audio_info_get_channels -gst_player_audio_info_get_language -gst_player_audio_info_get_max_bitrate -gst_player_audio_info_get_sample_rate - -gst_player_video_info_get_bitrate -gst_player_video_info_get_height -gst_player_video_info_get_width -gst_player_video_info_get_framerate -gst_player_video_info_get_max_bitrate -gst_player_video_info_get_pixel_aspect_ratio - -gst_player_subtitle_info_get_language -<SUBSECTION Standard> -GST_PLAYER_MEDIA_INFO -GST_IS_PLAYER_MEDIA_INFO -GST_PLAYER_MEDIA_INFO_CLASS -GST_IS_PLAYER_MEDIA_INFO_CLASS -GST_TYPE_PLAYER_MEDIA_INFO -GstPlayerMediaInfoClass -gst_player_media_info_get_type - -GST_PLAYER_STREAM_INFO -GST_IS_PLAYER_STREAM_INFO -GST_PLAYER_STREAM_INFO_CLASS -GST_IS_PLAYER_STREAM_INFO_CLASS -GST_TYPE_PLAYER_STREAM_INFO -GstPlayerStreamInfoClass -gst_player_stream_info_get_type - -GST_PLAYER_AUDIO_INFO -GST_IS_PLAYER_AUDIO_INFO -GST_PLAYER_AUDIO_INFO_CLASS -GST_IS_PLAYER_AUDIO_INFO_CLASS -GST_TYPE_PLAYER_AUDIO_INFO -GstPlayerAudioInfoClass -gst_player_audio_info_get_type - -GST_PLAYER_VIDEO_INFO -GST_IS_PLAYER_VIDEO_INFO -GST_PLAYER_VIDEO_INFO_CLASS -GST_IS_PLAYER_VIDEO_INFO_CLASS -GST_TYPE_PLAYER_VIDEO_INFO -GstPlayerVideoInfoClass -gst_player_video_info_get_type - -GST_IS_PLAYER_SUBTITLE_INFO -GST_PLAYER_SUBTITLE_INFO -GST_PLAYER_SUBTITLE_INFO_CLASS -GST_IS_PLAYER_SUBTITLE_INFO_CLASS -GST_TYPE_PLAYER_SUBTITLE_INFO -GstPlayerSubtitleInfoClass -gst_player_subtitle_info_get_type -</SECTION> diff --git a/docs/lib/gst-player.types b/docs/lib/gst-player.types deleted file mode 100644 index 578bba1..0000000 --- a/docs/lib/gst-player.types +++ /dev/null @@ -1,14 +0,0 @@ -gst_player_audio_info_get_type -gst_player_color_balance_type_get_type -gst_player_error_get_type -gst_player_g_main_context_signal_dispatcher_get_type -gst_player_get_type -gst_player_media_info_get_type -gst_player_signal_dispatcher_get_type -gst_player_state_get_type -gst_player_stream_info_get_type -gst_player_subtitle_info_get_type -gst_player_video_info_get_type -gst_player_video_overlay_video_renderer_get_type -gst_player_video_renderer_get_type -gst_player_visualization_get_type diff --git a/gst-play/Makefile.am b/gst-play/Makefile.am index 534e0df..184e8c1 100644 --- a/gst-play/Makefile.am +++ b/gst-play/Makefile.am @@ -2,9 +2,8 @@ bin_PROGRAMS = gst-play gst_play_SOURCES = gst-play.c gst-play-kb.c gst-play-kb.h -LDADD = $(top_builddir)/lib/gst/player/.libs/libgstplayer-@GST_PLAYER_API_VERSION@.la \ - $(GSTREAMER_LIBS) $(GLIB_LIBS) $(LIBM) +LDADD = $(GSTREAMER_LIBS) $(GLIB_LIBS) $(LIBM) -AM_CFLAGS = -I$(top_srcdir)/lib -I$(top_builddir)/lib $(GSTREAMER_CFLAGS) $(GLIB_CFLAGS) $(WARNING_CFLAGS) +AM_CFLAGS = $(GSTREAMER_CFLAGS) $(GLIB_CFLAGS) $(WARNING_CFLAGS) noinst_HEADERS = gst-play-kb.h diff --git a/gst.supp b/gst.supp deleted file mode 100644 index 4ff7d3f..0000000 --- a/gst.supp +++ /dev/null @@ -1,3976 +0,0 @@ -### this file contains suppressions for valgrind when running -### the gstreamer unit tests -### it might be useful for wider use as well - -### syscall suppressions - -{ - <clone on Wim's Debian> - Memcheck:Param - clone(parent_tidptr) - fun:clone - fun:clone -} - -{ - <clone on Wim's Debian> - Memcheck:Param - clone(child_tidptr) - fun:clone - fun:clone -} - -{ - <clone on Wim's Debian> - Memcheck:Param - clone(tlsinfo) - fun:clone - fun:clone -} - -### glibc suppressions - -{ - <conditional jump on wim's debian 2/2/06> - Memcheck:Cond - obj:/lib/ld-2.*.so - fun:dl_open_worker - obj:/lib/ld-2.*.so - fun:_dl_open - fun:dlopen_doit - obj:/lib/ld-2.*.so - fun:_dlerror_run - fun:dlopen - fun:g_module_open - fun:gst_plugin_load_file -} - -{ - <Conditional jump> - Memcheck:Cond - fun:strlen - fun:fillin_rpath - fun:_dl_init_paths - fun:dl_main - fun:_dl_sysdep_start - fun:_dl_start - obj:/lib64/ld-2.*.so - obj:* - obj:* -} - -{ - <Conditional jump> - Memcheck:Cond - fun:_dl_relocate_object - fun:dl_main - fun:_dl_sysdep_start - fun:_dl_start -} - -{ - <insert a suppression name here> - Memcheck:Cond - fun:* - fun:dl_open_worker - fun:_dl_catch_error - fun:_dl_open - fun:dlopen_doit - fun:_dl_catch_error - fun:_dlerror_run - fun:dlopen@@GLIBC_2.2.5 -} - -# glibc does not deallocate thread-local storage - -{ - <tls> - Memcheck:Leak - fun:calloc - fun:_dl_allocate_tls - fun:pthread_create@@* -} - -{ - <tls> - Memcheck:Leak - fun:calloc - fun:allocate_dtv - fun:_dl_allocate_tls -} - -# I get an extra stack entry on x86/dapper -{ - <tls> - Memcheck:Leak - fun:calloc - obj:/lib/ld-2.3.*.so - fun:_dl_allocate_tls - fun:pthread_create@@* -} - - -{ - <pthread strstr> - Memcheck:Cond - fun:strstr - fun:__pthread_initialize_minimal - obj:/lib/libpthread-*.so - obj:/lib/libpthread-*.so - fun:call_init - fun:_dl_init - obj:/lib/ld-*.so -} - -# a thread-related free problem in glibc from Edgard -{ - __libc_freeres_rw_acess - Memcheck:Addr4 - obj:* - obj:* - obj:* - obj:* - obj:* - fun:__libc_freeres -} - -{ - <a conditional jump on wim's debian> - Memcheck:Cond - obj:/lib/ld-2.3.*.so - obj:/lib/ld-2.3.*.so - obj:/lib/ld-2.3.*.so - obj:/lib/ld-2.3.*.so - obj:/lib/ld-2.3.*.so -} - -# g_module_open-related problems -{ - <started showing up on fc4-quick> - Memcheck:Addr2 - fun:memcpy - fun:_dl_map_object_deps - fun:dl_open_worker - fun:_dl_catch_error - fun:_dl_open - fun:dlopen_doit - fun:_dl_catch_error - fun:_dlerror_run - fun:dlopen@@GLIBC_2.1 - fun:g_module_open - fun:gst_plugin_load_file - fun:gst_registry_scan_path_level - fun:gst_registry_scan_path_level - fun:gst_registry_scan_path_level - fun:init_post - fun:g_option_context_parse - fun:gst_init_check - fun:gst_init - fun:gst_check_init - fun:main -} - -{ - <started showing up on fc4-quick> - Memcheck:Addr4 - fun:memcpy - fun:_dl_map_object_deps - fun:dl_open_worker - fun:_dl_catch_error - fun:_dl_open - fun:dlopen_doit - fun:_dl_catch_error - fun:_dlerror_run - fun:dlopen@@GLIBC_2.1 - fun:g_module_open - fun:gst_plugin_load_file - fun:gst_registry_scan_path_level - fun:gst_registry_scan_path_level - fun:gst_registry_scan_path_level - fun:init_post - fun:g_option_context_parse - fun:gst_init_check - fun:gst_init - fun:gst_check_init - fun:main -} - -{ - <g_module_open on wim's debian> - Memcheck:Cond - obj:/lib/ld-2.3.*.so - obj:/lib/ld-2.3.*.so - obj:/lib/ld-2.3.*.so - fun:do_sym - fun:_dl_sym - fun:dlsym_doit - obj:/lib/ld-2.3.*.so - fun:_dlerror_run - fun:dlsym - fun:g_module_symbol - fun:g_module_open - fun:gst_plugin_load_file -} - -{ - <g_module_open on wim's debian> - Memcheck:Cond - obj:/lib/ld-2.3.*.so - obj:/lib/ld-2.3.*.so - obj:/lib/ld-2.3.*.so - fun:dl_open_worker - obj:/lib/ld-2.3.*.so - fun:_dl_open - fun:dlopen_doit - obj:/lib/ld-2.3.*.so - fun:_dlerror_run - fun:dlopen@@GLIBC_2.1 - fun:g_module_open - fun:gst_plugin_load_file -} -{ - <g_module_open on wim's debian> - Memcheck:Cond - obj:/lib/ld-2.3.*.so - fun:dl_open_worker - obj:/lib/ld-2.3.*.so - fun:_dl_open - fun:dlopen_doit - obj:/lib/ld-2.3.*.so - fun:_dlerror_run - fun:dlopen@@GLIBC_2.1 - fun:g_module_open - fun:gst_plugin_load_file - fun:gst_plugin_load_by_name - fun:gst_plugin_feature_load -} - -{ - <leak on wim's debian in g_module_open> - Memcheck:Leak - fun:malloc - obj:/lib/ld-2.3.*.so - fun:dl_open_worker - obj:/lib/ld-2.3.*.so - fun:_dl_open - fun:dlopen_doit - obj:/lib/ld-2.3.*.so - fun:_dlerror_run - fun:dlopen@@GLIBC_2.1 - fun:g_module_open - fun:gst_plugin_load_file - fun:gst_plugin_load_by_name -} - -{ - <invalid read on wim's debian> - Memcheck:Addr4 - obj:/lib/ld-2.3.*.so - obj:/lib/ld-2.3.*.so - obj:/lib/ld-2.3.*.so - obj:/lib/ld-2.3.*.so - obj:/lib/ld-2.3.*.so - obj:/lib/ld-2.3.*.so - obj:/lib/ld-2.3.*.so - fun:dl_open_worker - obj:/lib/ld-2.3.*.so - fun:_dl_open - fun:dlopen_doit - obj:/lib/ld-2.3.*.so -} - -{ - <invalid read on wim's debian> - Memcheck:Addr4 - obj:/lib/ld-2.3.*.so - obj:/lib/ld-2.3.*.so - obj:/lib/ld-2.3.*.so - obj:/lib/ld-2.3.*.so - obj:/lib/ld-2.3.*.so - obj:/lib/ld-2.3.*.so - fun:dl_open_worker - obj:/lib/ld-2.3.*.so - fun:_dl_open - fun:dlopen_doit - obj:/lib/ld-2.3.*.so - fun:_dlerror_run -} - -{ - <invalid read on wim's debian - 2006-02-02> - Memcheck:Addr4 - obj:/lib/ld-2.3.*.so - obj:/lib/ld-2.3.*.so - obj:/lib/ld-2.3.*.so - fun:dl_open_worker - obj:/lib/ld-2.3.*.so - fun:_dl_open - fun:dlopen_doit - obj:/lib/ld-2.3.*.so - fun:_dlerror_run - fun:dlopen@@GLIBC_2.1 - fun:g_module_open -} - -{ - <invalid read on wim's debian - 2006-02-02> - Memcheck:Addr4 - obj:/lib/ld-2.3.*.so - obj:/lib/ld-2.3.*.so - fun:dl_open_worker - obj:/lib/ld-2.3.*.so - fun:_dl_open - fun:dlopen_doit - obj:/lib/ld-2.3.*.so - fun:_dlerror_run - fun:dlopen@@GLIBC_2.1 - fun:g_module_open -} - -{ - <invalid read on wim's debian - 2006-02-02> - Memcheck:Addr4 - obj:/lib/ld-2.3.*.so - obj:/lib/ld-2.3.*.so - obj:/lib/ld-2.3.*.so - fun:do_sym - fun:_dl_sym - fun:dlsym_doit - obj:/lib/ld-2.3.*.so - fun:_dlerror_run - fun:dlsym - fun:g_module_symbol - fun:g_module_open -} - -{ - <futex on Andy's 64-bit ubuntu> - Memcheck:Param - futex(uaddr2) - fun:pthread_once - obj:/lib/libc-2.3.*.so - obj:/lib/libc-2.3.*.so - fun:mbsnrtowcs - fun:vfprintf - fun:vsprintf - fun:sprintf - obj:/lib/libc-2.3.*.so - fun:tmpfile - fun:setup_pipe - fun:setup_messaging_with_key - fun:setup_messaging -} - -{ - <suppression for glibc 2.7 on debian> - Memcheck:Addr4 - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - fun:dlopen - fun:g_module_open -} - -{ - <suppression for glibc 2.7 on debian> - Memcheck:Addr4 - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libc-2.7.so - fun:_dl_sym - obj:/lib/i686/cmov/libdl-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - fun:dlsym - fun:g_module_symbol - fun:g_module_open -} - -{ - <suppression for glibc 2.7 on debian> - Memcheck:Addr4 - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - fun:dlopen - fun:g_module_open -} - -{ - <suppression for glibc 2.7 on debian> - Memcheck:Addr4 - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - fun:dlopen - fun:g_module_open -} - -{ - <suppression for glibc 2.7 on debian> - Memcheck:Addr4 - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - fun:dlopen - fun:g_module_open -} - -{ - <suppression for glibc 2.7 on debian> - Memcheck:Addr4 - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libc-2.7.so - obj:/lib/ld-2.7.so - fun:__libc_dlopen_mode -} - -{ - <suppression for glibc 2.7 on debian> - Memcheck:Addr4 - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libc-2.7.so - obj:/lib/ld-2.7.so - fun:__libc_dlopen_mode -} - -{ - <suppression for glibc 2.7 on debian> - Memcheck:Addr4 - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libc-2.7.so - obj:/lib/ld-2.7.so - fun:__libc_dlopen_mode - obj:/lib/i686/cmov/libc-2.7.so - obj:/lib/i686/cmov/libc-2.7.so - obj:/lib/i686/cmov/libc-2.7.so - obj:/lib/i686/cmov/libc-2.7.so - obj:/lib/i686/cmov/libc-2.7.so - fun:iconv_open -} - -{ - <suppression for glibc 2.7 on debian> - Memcheck:Addr4 - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libc-2.7.so - obj:/lib/ld-2.7.so - fun:__libc_dlopen_mode - obj:/lib/i686/cmov/libc-2.7.so - obj:/lib/i686/cmov/libc-2.7.so - obj:/lib/i686/cmov/libc-2.7.so - obj:/lib/i686/cmov/libc-2.7.so - obj:/lib/i686/cmov/libc-2.7.so - fun:iconv_open -} - -{ - <suppression for glibc 2.7 on Ubunty Hardy 64-bit> - Memcheck:Addr8 - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/libc-2.7.so - obj:/lib/ld-2.7.so - fun:__libc_dlopen_mode - obj:/lib/libc-2.7.so - obj:/lib/libc-2.7.so - obj:/lib/libc-2.7.so - obj:/lib/libc-2.7.so - obj:/lib/libc-2.7.so - fun:iconv_open -} - -{ - <suppression for glibc 2.7 on Ubunty Hardy 64-bit> - Memcheck:Addr8 - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/libc-2.7.so - obj:/lib/ld-2.7.so - fun:__libc_dlopen_mode - obj:/lib/libc-2.7.so - obj:/lib/libc-2.7.so - obj:/lib/libc-2.7.so - obj:/lib/libc-2.7.so - obj:/lib/libc-2.7.so - fun:iconv_open -} - -{ - <suppression for glibc 2.7 on debian> - Memcheck:Addr4 - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - fun:dlopen -} - -{ - <suppression for glibc 2.7 on debian> - Memcheck:Addr4 - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - fun:dlopen -} - -{ - <suppression for glibc 2.7 on Ubunty Hardy 64-bit> - Memcheck:Addr8 - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/libc-2.7.so - obj:/lib/ld-2.7.so - fun:__libc_dlopen_mode -} - -{ - <suppression for glibc 2.7 on debian> - Memcheck:Cond - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - fun:dlopen -} - -{ - <suppression for glibc 2.7 on debian> - Memcheck:Cond - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - fun:dlopen -} - -{ - <suppression for glibc 2.7 on debian> - Memcheck:Addr4 - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - fun:dlopen -} - -{ - <suppression for glibc 2.7 on debian> - Memcheck:Addr4 - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - fun:dlopen -} - -{ - <suppression for glibc 2.7 on debian> - Memcheck:Cond - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - fun:dlopen -} - -{ - <suppression for glibc 2.7 on debian> - Memcheck:Cond - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - fun:dlopen -} - -{ - <suppression for glibc 2.7 on debian> - Memcheck:Addr4 - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - fun:dlopen -} - -{ - <suppression for glibc 2.7 on debian> - Memcheck:Addr4 - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - fun:dlopen -} - -{ - <suppression for glibc 2.7 on debian> - Memcheck:Cond - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - fun:dlopen -} - -{ - <suppression for glibc 2.7 on debian> - Memcheck:Cond - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - fun:dlopen -} - -{ - <suppression for glibc 2.7 on debian> - Memcheck:Addr4 - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/i686/cmov/libdl-2.7.so - fun:dlopen -} - -# suppression for a glibc bug: -# http://valgrind.org/docs/manual/faq.html#faq.exit_errors> -{ - <Workaround for a glibc bug> - Memcheck:Free - fun:free - obj:*libc-*.so - fun:__libc_freeres - fun:* - fun:_Exit -} - -# same as above, just so it works for tpm on gutsy/x86-64 -{ - <workaround glibc bug on gutsy x86-64> - Memcheck:Free - fun:free - fun:free_mem - fun:__libc_freeres -} - -# valgrind doesn't allow me to specify a suppression for Addr1, Addr2, Addr4 -# as Addr*, so 3 copies for that; and then 2 of each for that pesky memcpy -{ - <Invalid read of size 1, 2, 4 on thomas's FC4> - Memcheck:Addr1 - fun:_dl_signal_error - fun:_dl_map_object_deps - fun:dl_open_worker - fun:_dl_catch_error - fun:_dl_open - fun:dlopen_doit - fun:_dl_catch_error - fun:_dlerror_run - fun:dlopen@@GLIBC_2.1 - fun:g_module_open -} - -{ - <Invalid read of size 1, 2, 4 on thomas's FC4> - Memcheck:Addr2 - fun:_dl_signal_error - fun:_dl_map_object_deps - fun:dl_open_worker - fun:_dl_catch_error - fun:_dl_open - fun:dlopen_doit - fun:_dl_catch_error - fun:_dlerror_run - fun:dlopen@@GLIBC_2.1 - fun:g_module_open -} -{ - <Invalid read of size 1, 2, 4 on thomas's FC4> - Memcheck:Addr4 - fun:_dl_signal_error - fun:_dl_map_object_deps - fun:dl_open_worker - fun:_dl_catch_error - fun:_dl_open - fun:dlopen_doit - fun:_dl_catch_error - fun:_dlerror_run - fun:dlopen@@GLIBC_2.1 - fun:g_module_open -} - -{ - <Invalid read of size 1, 2, 4 on thomas's FC4> - Memcheck:Addr1 - fun:memcpy - fun:_dl_signal_error - fun:_dl_map_object_deps - fun:dl_open_worker - fun:_dl_catch_error - fun:_dl_open - fun:dlopen_doit - fun:_dl_catch_error - fun:_dlerror_run - fun:dlopen@@GLIBC_2.1 - fun:g_module_open -} - -{ - <Invalid read of size 1, 2, 4 on thomas's FC4> - Memcheck:Addr2 - fun:memcpy - fun:_dl_signal_error - fun:_dl_map_object_deps - fun:dl_open_worker - fun:_dl_catch_error - fun:_dl_open - fun:dlopen_doit - fun:_dl_catch_error - fun:_dlerror_run - fun:dlopen@@GLIBC_2.1 - fun:g_module_open -} -{ - <Invalid read of size 1, 2, 4 on thomas's FC4> - Memcheck:Addr4 - fun:memcpy - fun:_dl_signal_error - fun:_dl_map_object_deps - fun:dl_open_worker - fun:_dl_catch_error - fun:_dl_open - fun:dlopen_doit - fun:_dl_catch_error - fun:_dlerror_run - fun:dlopen@@GLIBC_2.1 - fun:g_module_open -} - -{ - <Addr8 on Andy's AMD64 ubuntu in dl_open> - Memcheck:Addr8 - obj:/lib/ld-2.3.*.so - obj:/lib/ld-2.3.*.so - obj:/lib/ld-2.3.*.so - obj:/lib/ld-2.3.*.so - obj:/lib/ld-2.3.*.so - obj:/lib/ld-2.3.*.so - obj:/lib/ld-2.3.*.so - obj:/lib/libc-2.3.*.so - obj:/lib/ld-2.3.*.so - fun:_dl_open - obj:/lib/libdl-2.3.*.so - obj:/lib/ld-2.3.*.so -} - -{ - <Conditional jump on Andy's AMD64 ubuntu> - Memcheck:Cond - obj:/lib/ld-2.3.*.so - obj:/lib/libc-2.3.*.so - obj:/lib/ld-2.3.*.so - fun:_dl_open - obj:/lib/libdl-2.3.*.so - obj:/lib/ld-2.3.*.so - obj:/lib/libdl-2.3.*.so - fun:dlopen - fun:g_module_open - fun:gst_plugin_load_file - fun:gst_plugin_load_by_name - fun:gst_plugin_feature_load -} - -{ - <Mike's x86 dapper> - Memcheck:Addr4 - obj:/lib/ld-2.3.6.so - obj:/lib/ld-2.3.6.so - obj:/lib/tls/i686/cmov/libc-2.3.6.so - obj:/lib/ld-2.3.6.so - fun:_dl_open - obj:/lib/tls/i686/cmov/libdl-2.3.6.so - obj:/lib/ld-2.3.6.so - obj:/lib/tls/i686/cmov/libdl-2.3.6.so - fun:dlopen -} - -{ - <Mike's x86 dapper> - Memcheck:Cond - obj:/lib/ld-2.3.6.so - obj:/lib/tls/i686/cmov/libc-2.3.6.so - obj:/lib/ld-2.3.6.so - fun:_dl_open - obj:/lib/tls/i686/cmov/libdl-2.3.6.so - obj:/lib/ld-2.3.6.so - obj:/lib/tls/i686/cmov/libdl-2.3.6.so - fun:dlopen -} - -{ - <Another dapper one> - Memcheck:Cond - obj:/lib/ld-2.3.6.so - obj:/lib/ld-2.3.6.so - obj:/lib/ld-2.3.6.so - obj:/lib/tls/i686/cmov/libc-2.3.6.so - obj:/lib/ld-2.3.6.so - fun:_dl_open - obj:/lib/tls/i686/cmov/libdl-2.3.6.so - obj:/lib/ld-2.3.6.so - obj:/lib/tls/i686/cmov/libdl-2.3.6.so - fun:dlopen -} - -### glib suppressions -{ - <g_parse_debug_string> - Memcheck:Cond - fun:g_parse_debug_string - obj:/usr/lib*/libglib-2.0.so.* - fun:g_slice_alloc - fun:g_slice_alloc0 -} - -{ - <g_type_init leaks> - Memcheck:Leak - fun:*alloc - ... - fun:g_type_init* - fun:init_pre* -} - -{ - <g_type_register_fundamental leaks> - Memcheck:Leak - fun:*alloc - ... - fun:g_type_register_fundamental -} - -{ - <glib 2.21 static type data> - Memcheck:Leak - fun:malloc - fun:realloc - fun:g_realloc - fun:type_node_any_new_W -} - -{ - <glib 2.21 static type data> - Memcheck:Leak - fun:realloc - fun:g_realloc - fun:type_node_any_new_W -} - -{ - <glib 2.21 static type data> - Memcheck:Leak - fun:calloc - fun:g_malloc0 - fun:g_type_class_ref -} - -{ - <glib 2.21 static type data> - Memcheck:Leak - fun:malloc - fun:realloc - fun:g_realloc - fun:type_add_flags_W -} - -{ - <glib 2.21 static type data> - Memcheck:Leak - fun:calloc - fun:g_malloc0 - fun:type_add_flags_W -} - -#pthread memleaks - -{ - Thread creation leak - Memcheck:Leak - fun:calloc - fun:allocate_dtv - fun:_dl_allocate* - fun:_dl_allocate* - fun:__pthread_initialize_minimal -} - -{ - Thread management leak - Memcheck:Leak - fun:calloc - fun:allocate_dtv - fun:_dl_allocate* - fun:_dl_allocate* - fun:__pthread_* -} - -{ - Thread management leak 2 - Memcheck:Leak - fun:memalign - fun:_dl_allocate* - fun:_dl_allocate* - fun:__pthread_* -} - -{ - pthread_create Syscall param write(buf) points to uninitialised byte(s) - Memcheck:Param - write(buf) - fun:pthread_create@@GLIBC_2.2.5 - fun:g_thread_create* - -} - -# nss_parse_* memleak (used by g_option_context_parse) -{ - nss_parse_* memleak - Memcheck:Leak - fun:malloc - fun:nss_parse_service_list - fun:__nss_database_lookup -} - -# liboil suppressions -{ - <liboil cpu_fault_check_try> - Memcheck:Value8 - obj:/usr/lib/liboil-0.3.so.0.1.0 - obj:/usr/lib/liboil-0.3.so.0.1.0 - obj:/usr/lib/liboil-0.3.so.0.1.0 - fun:oil_cpu_fault_check_try - fun:oil_test_check_impl - fun:oil_class_optimize - fun:oil_optimize_all - fun:oil_init -} - -{ - <annoying read error inside dlopen stuff on Ubuntu Dapper x86_64> - Memcheck:Addr8 - obj:/lib/ld-2.3.6.so -} - -{ - <Ubuntu Dapper x86_64> - Memcheck:Param - futex(uaddr2) - fun:pthread_once - obj:/lib/libc-2.3.6.so - obj:/lib/libc-2.3.6.so - fun:setlocale - fun:init_pre - fun:g_option_context_parse - fun:gst_init_check - fun:gst_init - fun:gst_check_init - fun:main -} - -{ - <Ubuntu Dapper x86_64 dlopen stuff again> - Memcheck:Cond - obj:/lib/ld-2.3.6.so - obj:/lib/ld-2.3.6.so - fun:_dl_open - obj:/lib/libdl-2.3.6.so - obj:/lib/ld-2.3.6.so - obj:/lib/libdl-2.3.6.so - fun:dlopen - fun:g_module_open - fun:gst_plugin_load_file -} -# this exists in a bunch of different variations, hence the short tail/trace -{ - <dlopen invalid read of size 4 suppression on tpm's Ubuntu edgy/x86> - Memcheck:Addr4 - obj:/lib/ld-2.4.so - obj:/lib/ld-2.4.so -} -{ - <and the same for 64bit systems> - Memcheck:Addr8 - obj:/lib/ld-2.4.so - obj:/lib/ld-2.4.so -} - -# More edgy suppressions (Mike) -{ - <dlopen Condition jump suppressions for Ubuntu Edgy/x86> - Memcheck:Cond - obj:/lib/ld-2.4.so - obj:/lib/ld-2.4.so - obj:/lib/ld-2.4.so - obj:/lib/ld-2.4.so - fun:dlopen_doit - obj:/lib/ld-2.4.so - fun:_dlerror_run - fun:dlopen@@GLIBC_2.1 -} - -{ - <dlopen Condition jump suppressions for Ubuntu Edgy/x86> - Memcheck:Cond - obj:/lib/ld-2.4.so - obj:/lib/ld-2.4.so - obj:/lib/ld-2.4.so - obj:/lib/ld-2.4.so - obj:/lib/ld-2.4.so - obj:/lib/ld-2.4.so - fun:dlopen_doit - obj:/lib/ld-2.4.so - fun:_dlerror_run - fun:dlopen@@GLIBC_2.1 -} - -{ - <dlopen Condition jump suppressions for Ubuntu Edgy/x86> - Memcheck:Cond - obj:/lib/ld-2.4.so - obj:/lib/ld-2.4.so - obj:/lib/ld-2.4.so - fun:do_sym - fun:_dl_sym -} - -# This one's overly general, but there's zero other information in the stack -# trace - just these five lines! -{ - <dlopen Condition jump suppressions for Ubuntu Edgy/x86> - Memcheck:Cond - obj:/lib/ld-2.4.so - obj:/lib/ld-2.4.so - obj:/lib/ld-2.4.so - obj:/lib/ld-2.4.so - obj:/lib/ld-2.4.so -} - -{ - <tls leaks on Edgy/x86> - Memcheck:Leak - fun:calloc - obj:/lib/ld-2.4.so - fun:_dl_allocate_tls - fun:pthread_create@@GLIBC_2.1 -} - -# TLS leaks for feisty/x86 -{ - <tls leaks on Feisty/x86> - Memcheck:Leak - fun:calloc - fun:allocate_dtv - fun:_dl_allocate_tls - fun:pthread_create@@GLIBC_2.1 -} - -{ - <libcdio 0.76 leak> - Memcheck:Leak - fun:calloc - obj:/usr/lib/libcdio.so.6.0.1 - fun:cdio_open_am_linux - obj:/usr/lib/libcdio.so.6.0.1 - fun:cdio_open_am -} - -{ - <Addr8 on Jan's AMD64 ubuntu Feisty in dl_open> - Memcheck:Addr8 - obj:/lib/ld-2.5.so -} - -{ - <First of many Alsa errors> - Memcheck:Cond - fun:snd_pcm_direct_shm_create_or_connect - fun:snd_pcm_dsnoop_open - fun:_snd_pcm_dsnoop_open - obj:/*lib/libasound.so.2.0.0 - obj:/*lib/libasound.so.2.0.0 - fun:snd_pcm_open_slave - fun:_snd_pcm_plug_open - obj:/*lib/libasound.so.2.0.0 - fun:snd_pcm_open_slave - fun:_snd_pcm_asym_open - obj:/*lib/libasound.so.2.0.0 - obj:/*lib/libasound.so.2.0.0 -} - -{ - <alsa error> - Memcheck:Cond - fun:snd*_pcm_hw_param_set_near -} - -{ - <alsa error> - Memcheck:Cond - ... - fun:snd*_pcm_hw_param_set_near -} - -{ - <alsa error> - Memcheck:Cond - obj:/*lib/libasound.so.2.0.0 - obj:/*lib/libasound.so.2.0.0 - fun:snd_pcm_close - obj:/*lib/libasound.so.2.0.0 -} -{ - <alsa error> - Memcheck:Cond - fun:snd_pcm_direct_shm_create_or_connect - fun:snd_pcm_dmix_open - fun:_snd_pcm_dmix_open - obj:/*lib/libasound.so.2.0.0 - obj:/*lib/libasound.so.2.0.0 - fun:snd_pcm_open_slave - fun:_snd_pcm_softvol_open - obj:/*lib/libasound.so.2.0.0 - fun:snd_pcm_open_slave - fun:_snd_pcm_plug_open - obj:/*lib/libasound.so.2.0.0 - fun:snd_pcm_open_slave - fun:_snd_pcm_asym_open - obj:/*lib/libasound.so.2.0.0 - obj:/*lib/libasound.so.2.0.0 -} -{ - <alsa error> - Memcheck:Leak - fun:malloc - fun:strdup - fun:snd_dlobj_cache_add - obj:/*lib/libasound.so.2.0.0 - fun:snd_pcm_open_slave - fun:snd_pcm_dsnoop_open - fun:_snd_pcm_dsnoop_open - obj:/*lib/libasound.so.2.0.0 - obj:/*lib/libasound.so.2.0.0 - fun:snd_pcm_open_slave - fun:_snd_pcm_plug_open - obj:/*lib/libasound.so.2.0.0 - fun:snd_pcm_open_slave - fun:_snd_pcm_asym_open - obj:/*lib/libasound.so.2.0.0 - obj:/*lib/libasound.so.2.0.0 -} -# Catch about 15 variations on inserting info into an ALSA -# internal cache -{ - <alsa error> - Memcheck:Leak - fun:malloc - ... - fun:snd*_dlobj_cache_add - obj:/*lib*/libasound.so.2.0.0 -} - -{ - <alsa leak in loading configuration> - Memcheck:Leak - fun:*alloc - ... - fun:snd_pcm_open_conf -} - -{ - <alsa leak snd_config_hook_load> - Memcheck:Leak - fun:*alloc - obj:/*lib*/libasound.so.2.0.0 - ... - fun:snd_config_hook_load -} - -{ - <alsa leak snd_config_update_r> - Memcheck:Leak - fun:*alloc - obj:/*lib*/libasound.so.2.0.0 - ... - fun:snd_config_update_r - fun:snd_config_update -} -{ - <alsa leak snd_config_update_r> - Memcheck:Leak - fun:*alloc - fun:strdup - ... - fun:snd_config_update_r - fun:snd_config_update -} -{ - <alsa leak snd_config_searcha_hooks> - Memcheck:Leak - fun:*alloc - fun:_dl_close_worker - ... - fun:snd_config_searcha_hooks -} - -{ - <nss lookup within ALSA> - Memcheck:Leak - fun:malloc - obj:/lib/libc*.so - fun:__nss_database_lookup - obj:* - obj:* - fun:getgrnam_r - fun:getgrnam - fun:snd_pcm_direct_parse_open_conf -} - -{ - <libxcb leak on Ubuntu Feisty> - Memcheck:Leak - fun:calloc - fun:_XCBInitDisplayLock - fun:XOpenDisplay -} - -# GConf internal initialisations related to getting the default client. -{ - <Orbit something or other> - Memcheck:Leak - fun:calloc - fun:g_malloc0 - fun:ORBit_alloc_tcval - obj:/usr/lib/libORBit-2.so.* - fun:ORBit_demarshal_IOR - fun:ORBit_demarshal_object - fun:CORBA_ORB_string_to_object - obj:/usr/lib/libgconf-2.so.* - fun:gconf_get_current_lock_holder - fun:gconf_activate_server - obj:/usr/lib/libgconf-2.so.* - obj:/usr/lib/libgconf-2.so.* - fun:gconf_engine_get_default -} -{ - <gconf internal leak> - Memcheck:Leak - fun:calloc - fun:g_malloc0 - fun:ORBit_alloc_tcval - obj:* - fun:PortableServer_POA_servant_to_reference - fun:* - fun:* - fun:* - fun:gconf_engine_get_default -} -{ - <gconf internal leak> - Memcheck:Leak - fun:calloc - fun:g_malloc0 - fun:ORBit_alloc_tcval - obj:/usr/lib/libORBit-2.so.* - fun:ORBit_demarshal_IOR - fun:ORBit_demarshal_object - fun:CORBA_ORB_string_to_object - obj:/usr/lib/libgconf-2.so.* - fun:gconf_get_current_lock_holder - fun:gconf_activate_server - obj:/usr/lib/libgconf-2.so.* - obj:/usr/lib/libgconf-2.so.* - fun:gconf_engine_get_default -} -{ - <gconf internal initialisation> - Memcheck:Leak - fun:calloc - fun:g_malloc0 - fun:ORBit_alloc* - fun:* - fun:ORBit_demarshal_IOR - fun:ORBit_demarshal_object - fun:ORBit_demarshal_value - fun:* - fun:ORBit_small_invoke_stub - fun:ConfigServer_get_default_database - fun:* - fun:gconf_engine_get_default -} -{ - <gconf internal init> - Memcheck:Leak - fun:calloc - fun:g_malloc0 - fun:ORBit_alloc* - fun:* - fun:IOP_generate_profiles - fun:ORBit_marshal_object - fun:ORBit_marshal_value - fun:* - fun:ORBit_small_invoke_stub - fun:ConfigServer_add_client - fun:* - fun:* - fun:gconf_engine_get_default -} -{ - <gconf internal init> - Memcheck:Leak - fun:calloc - fun:g_malloc0 - fun:ORBit_alloc_by_tc - fun:* - fun:PortableServer_POA_servant_to_reference - fun:* - fun:* - fun:* - fun:gconf_engine_get_default -} -{ - <gconf internal init> - Memcheck:Leak - fun:calloc - fun:g_malloc0 - fun:ORBit_alloc_by_tc - obj:/usr/lib/libORBit-2.so.* - fun:ORBit_demarshal_IOR - fun:ORBit_demarshal_object - fun:CORBA_ORB_string_to_object - obj:/usr/lib/libgconf-2.so.* - fun:gconf_get_current_lock_holder - fun:gconf_activate_server - obj:/usr/lib/libgconf-2.so.* - obj:/usr/lib/libgconf-2.so.* - fun:gconf_engine_get_default -} - -{ - <insert a suppression name here> - Memcheck:Leak - fun:calloc - fun:g_malloc0 - fun:ORBit_alloc* - fun:* - fun:ORBit_demarshal_IOR - fun:ORBit_demarshal_object - fun:* - fun:* - fun:gconf_activate_server -} - -# Some libORBit/bonobo initialisation stuff -{ - <bonobo init> - Memcheck:Leak - fun:malloc - fun:g_malloc - fun:ORBit_alloc_string - fun:CORBA_string_dup - fun:Bonobo_ActivationEnvValue_set - fun:bonobo_activation_init_activation_env - fun:bonobo_activation_orb_init - fun:bonobo_activation_init -} -{ - <bonobo init> - Memcheck:Leak - fun:calloc - fun:g_malloc0 - fun:ORBit_alloc* - fun:ORBit_small_alloc* - obj:/usr/lib/libORBit-2.so* - fun:PortableServer_POA_servant_to_reference - obj:/usr/lib/libbonobo-2.so* -} -{ - <bonobo init> - Memcheck:Leak - fun:calloc - fun:g_malloc0 - fun:ORBit_alloc_tcval - fun:ORBit_small_allocbuf - fun:ORBit_adaptor_setup - obj:/usr/lib/libORBit-2.so* - fun:ORBit_POA_setup_root - fun:ORBit_init_internals - fun:CORBA_ORB_init -} -{ - <bonobo init - more recent variant of above> - Memcheck:Leak - fun:calloc - fun:g_malloc0 - fun:ORBit_alloc_tcval - fun:ORBit_adaptor_setup - fun:* - fun:ORBit_POA_setup_root - fun:ORBit_init_internals - fun:CORBA_ORB_init -} -{ - <bonobo init> - Memcheck:Leak - fun:calloc - fun:g_malloc0 - fun:ORBit_alloc* - fun:ORBit_small_allocbuf - fun:bonobo_activation_init_activation_env - fun:bonobo_activation_orb_init - fun:bonobo_activation_init -} - -# More GConf stuff from the FC5 buildbot, mostly variations on the -# above stack traces -{ - <incompletely initialised ORBit buffer> - Memcheck:Param - writev(vector[...]) - fun:writev - obj:/usr/lib/libORBit-2.so* - fun:link_connection_writev - fun:giop_send_buffer_write - obj:/usr/lib/libORBit-2.so* - fun:ORBit_small_invoke_stub - fun:ORBit_small_invoke_stub_n - fun:ORBit_c_stub_invoke - fun:ConfigServer_ping - fun:gconf_activate_server - obj:/usr/lib/libgconf-2.so* - obj:/usr/lib/libgconf-2.so* - fun:gconf_engine_get_default -} -{ - <gconf init> - Memcheck:Leak - fun:calloc - fun:g_malloc0 - fun:ORBit_alloc* - fun:ORBit_small_alloc* - obj:/usr/lib/libORBit-2.so* - fun:PortableServer_POA_servant_to_reference - obj:/usr/lib/libgconf-2.so* - obj:/usr/lib/libgconf-2.so* - obj:/usr/lib/libgconf-2.so* - fun:gconf_engine_get_default -} -{ - <gconf init> - Memcheck:Leak - fun:calloc - fun:g_malloc0 - fun:ORBit_alloc* - fun:ORBit_small_alloc - obj:/usr/lib/libORBit-2.so* - fun:ORBit_demarshal_IOR - fun:ORBit_demarshal_object - fun:CORBA_ORB_string_to_object - obj:/usr/lib/libgconf-2.so* - fun:gconf_get_current_lock_holder - fun:gconf_activate_server - obj:/usr/lib/libgconf-2.so* - obj:/usr/lib/libgconf-2.so* - fun:gconf_engine_get_default -} -{ - <gconf init> - Memcheck:Leak - fun:calloc - fun:g_malloc0 - fun:ORBit_alloc* - fun:ORBit_small_alloc* - obj:/usr/lib/libORBit-2.so* - fun:ORBit_demarshal_IOR - fun:ORBit_demarshal_object - fun:CORBA_ORB_string_to_object - obj:/usr/lib/libgconf-2.so* - fun:gconf_get_current_lock_holder - fun:gconf_activate_server - obj:/usr/lib/libgconf-2.so* - obj:/usr/lib/libgconf-2.so* - fun:gconf_engine_get_default -} -{ - <bonobo init> - Memcheck:Leak - fun:calloc - fun:g_malloc0 - fun:ORBit_alloc* - fun:ORBit_small_alloc* - obj:/usr/lib/libORBit-2.so* - fun:ORBit_demarshal_IOR - fun:ORBit_demarshal_object - fun:ORBit_demarshal_value - obj:/usr/lib/libORBit-2.so* - fun:ORBit_small_invoke_stub - fun:ORBit_small_invoke_stub_n - fun:ORBit_c_stub_invoke - fun:ConfigServer_get_default_database - obj:/usr/lib/libgconf-2.so* - fun:gconf_engine_get_default -} -{ - <gconf init> - Memcheck:Leak - fun:calloc - fun:g_malloc0 - fun:ORBit_alloc* - fun:ORBit_small_alloc* - obj:/usr/lib/libORBit-2.so* - fun:ORBit_OAObject_object_to_objkey - fun:IOP_generate_profiles - fun:ORBit_marshal_object - fun:ORBit_marshal_value - obj:/usr/lib/libORBit-2.so* - fun:ORBit_small_invoke_stub - fun:ORBit_small_invoke_stub_n - fun:ORBit_c_stub_invoke - fun:ConfigServer_add_client - obj:/usr/lib/libgconf-2.so* - obj:/usr/lib/libgconf-2.so* - fun:gconf_engine_get_default -} -{ - <GLib caching the home dir> - Memcheck:Leak - fun:malloc - obj:*libc-*.so - fun:__nss_database_lookup - obj:* - obj:* - fun:getpwnam_r - obj:/usr/lib*/libglib-2.0.so.* - fun:g_get_home_dir -} -{ - <GLib caching the user name> - Memcheck:Leak - fun:malloc - obj:*libc-*.so - fun:__nss_database_lookup - obj:* - obj:* - fun:getpwnam_r - obj:/usr/lib*/libglib-2.0.so.* - fun:g_get_user_name -} -{ - <GLib caching the tmp dir> - Memcheck:Leak - fun:malloc - obj:*libc-*.so - fun:__nss_database_lookup - obj:* - obj:* - fun:getpwnam_r - obj:/usr/lib*/libglib-2.0.so.* - fun:g_get_tmp_dir -} - -{ - <GLib caching the host name> - Memcheck:Leak - fun:malloc - obj:*libc-*.so - fun:__nss_database_lookup - obj:* - obj:* - fun:getpwnam_r - obj:/usr/lib*/libglib-2.0.so.0.* - fun:g_get_host_name -} - - -## Some Fontconfig errors. -{ - <First time load of a font - feisty x86_64> - Memcheck:Leak - fun:malloc - fun:FcPatternObjectInsertElt - fun:FcPatternObjectAddWithBinding - fun:FcPatternAppend - fun:FcEndElement - obj:/usr/lib/libexpat.so.* - obj:/usr/lib/libexpat.so.* - obj:/usr/lib/libexpat.so.* - obj:/usr/lib/libexpat.so.* - fun:XML_ParseBuffer - fun:FcConfigParseAndLoad - fun:FcConfigParseAndLoad - fun:FcParseInclude - fun:FcEndElement - obj:/usr/lib/libexpat.so.* - obj:/usr/lib/libexpat.so.* - obj:/usr/lib/libexpat.so.* - obj:/usr/lib/libexpat.so.* - fun:XML_ParseBuffer - fun:FcConfigParseAndLoad -} -{ - <First time load of a font - generic> - Memcheck:Leak - fun:*alloc - ... - fun:FcInitLoadConfig -} - -# Issues with ubuntu Hardy, same crack as for previous ubuntus -{ - <tls leak generic ubuntu hardy x86> - Memcheck:Leak - fun:calloc - obj:* - fun:_dl_allocate_tls - fun:pthread_create@@* - obj:/usr/lib/libgthread* - fun:g_thread_* -} - -# I've made this version generic, so that it covers future modifications -# of library names -{ - <tls leak generic> - Memcheck:Leak - fun:calloc - obj:* - fun:_dl_allocate_tls - fun:pthread_create@@* - fun:g_thread_* -} - -# series of invalid read of size 4 in g_module_open for ubuntu -# hardy x86/32bit -{ - <invalid read of size 4 within <g_module_open> - Memcheck:Addr4 - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/tls/i686/cmov/libdl-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/tls/i686/cmov/libdl-2.7.so - fun:dlopen - fun:g_module_open - fun:gst_plugin_load_* -} - -{ - <invalid read of size 4 within <g_module_open> - Memcheck:Addr4 - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/tls/i686/cmov/libdl-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/tls/i686/cmov/libdl-2.7.so - fun:dlopen - fun:g_module_open - fun:gst_plugin_load_* -} - -{ - <invalid read of size 4 within <g_module_open> - Memcheck:Addr4 - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/tls/i686/cmov/libdl-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/tls/i686/cmov/libdl-2.7.so - fun:dlopen - fun:g_module_open - fun:gst_plugin_load_* -} - -{ - <invalid read of size 4 within <g_module_open> - Memcheck:Addr4 - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/tls/i686/cmov/libdl-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/tls/i686/cmov/libdl-2.7.so - fun:dlopen - fun:g_module_open - fun:gst_plugin_load_* -} - -{ - <invalid read of size 4 within <g_module_open> - Memcheck:Addr4 - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/tls/i686/cmov/libdl-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/tls/i686/cmov/libdl-2.7.so - fun:dlopen - fun:g_module_open - fun:gst_plugin_load* -} - -{ - <invalid read of size 4 within <g_module_open> - Memcheck:Addr4 - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/tls/i686/cmov/libc-2.7.so - fun:_dl_sym - obj:/lib/tls/i686/cmov/libdl-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/tls/i686/cmov/libdl-2.7.so - fun:dlsym - fun:g_module_symbol - fun:g_module_open - fun:gst_plugin_load_* -} - -# series of invalid read of size 8 in g_module_open for ubuntu -# hardy x86/64bit -{ - <invalid read of size 8 within <g_module_open> - Memcheck:Addr8 - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/libdl-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/libdl-2.7.so - fun:dlopen - fun:g_module_open -} - -{ - <invalid read of size 8 within <g_module_open> - Memcheck:Addr8 - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/libdl-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/libdl-2.7.so - fun:dlopen - fun:g_module_open -} - -{ - <invalid read of size 8 within <g_module_open> - Memcheck:Addr8 - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/libdl-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/libdl-2.7.so - fun:dlopen - fun:g_module_open -} - -{ - <invalid read of size 8 within <g_module_open> - Memcheck:Addr8 - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/libdl-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/libdl-2.7.so - fun:dlopen - fun:g_module_open -} - -{ - <invalid read of size 8 within <g_module_open> - Memcheck:Addr8 - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/libdl-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/libdl-2.7.so - fun:dlopen - fun:g_module_open -} - -{ - <invalid read of size 8 within <g_module_open> - Memcheck:Addr8 - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/libdl-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/libdl-2.7.so - fun:dlopen - fun:g_module_open -} - -{ - <invalid read of size 8 within <g_module_open> - Memcheck:Addr8 - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/libc-2.7.so - obj:/lib/libdl-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/libdl-2.7.so - fun:dlsym - fun:g_module_symbol - fun:g_module_open -} - -{ - <GLib caching> - Memcheck:Addr4 - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/tls/i686/cmov/libc-2.7.so - obj:/lib/ld-2.7.so - fun:__libc_dlopen_mode - fun:__nss_lookup_function - obj:/lib/tls/i686/cmov/libc-2.7.so - fun:__nss_passwd_lookup - fun:getpwnam_r -} - -{ - <GLib caching> - Memcheck:Addr4 - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/tls/i686/cmov/libc-2.7.so - obj:/lib/ld-2.7.so - fun:__libc_dlopen_mode - fun:__nss_lookup_function - obj:/lib/tls/i686/cmov/libc-2.7.so - fun:__nss_passwd_lookup - fun:getpwnam_r -} - -{ - <GLib caching> - Memcheck:Addr4 - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/tls/i686/cmov/libc-2.7.so - obj:/lib/ld-2.7.so - fun:__libc_dlopen_mode - fun:__nss_lookup_function - obj:/lib/tls/i686/cmov/libnss_compat-2.7.so - fun:_nss_compat_getpwnam_r - fun:getpwnam_r -} - -{ - <GLib caching> - Memcheck:Addr4 - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/tls/i686/cmov/libc-2.7.so - obj:/lib/ld-2.7.so - fun:__libc_dlopen_mode - fun:__nss_lookup_function - obj:/lib/tls/i686/cmov/libnss_compat-2.7.so - fun:_nss_compat_getpwnam_r - fun:getpwnam_r -} - -{ - <GLib caching> - Memcheck:Addr8 - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/ld-2.7.so - obj:/lib/libc-2.7.so - obj:/lib/ld-2.7.so - fun:__libc_dlopen_mode - fun:__nss_lookup_function - obj:/lib/libc-2.7.so - fun:getpwnam_r -} - -## Leaks in ALSA (variations of leak from snd_config_load1) - -{ - <Alsa leak> - Memcheck:Leak - fun:calloc - fun:_snd_config_make - fun:_snd_config_make_add - fun:* - fun:* - fun:* - fun:* - fun:snd_config_load1 -} - -{ - <Alsa leak> - Memcheck:Leak - fun:calloc - fun:_snd_config_make - fun:_snd_config_make_add - fun:* - fun:* - fun:snd_config_load1 -} -{ - <Alsa leak> - Memcheck:Leak - fun:calloc - fun:_snd_config_make - fun:_snd_config_make_add - fun:* - fun:* - fun:* - fun:snd_config_load1 -} -{ - <Alsa leak> - Memcheck:Leak - fun:calloc - fun:_snd_config_make - fun:_snd_config_make_add - fun:* - fun:* - fun:* - fun:* - fun:* - fun:snd_config_load1 -} - -{ - <Alsa leak> - Memcheck:Leak - fun:calloc - fun:_snd_config_make - fun:_snd_config_make_add - fun:* - fun:* - fun:* - fun:* - fun:* - fun:* - fun:snd_config_load1 -} - -{ - <Alsa leak> - Memcheck:Leak - fun:calloc - fun:_snd_config_make - fun:_snd_config_make_add - fun:* - fun:* - fun:* - fun:* - fun:* - fun:* - fun:* - fun:snd_config_load1 -} -{ - <Alsa leak> - Memcheck:Leak - fun:calloc - fun:_snd_config_make - fun:_snd_config_make_add - fun:* - fun:* - fun:* - fun:* - fun:* - fun:* - fun:* - fun:* - fun:snd_config_load1 -} - -{ - <Alsa leak> - Memcheck:Leak - fun:malloc - fun:snd1_dlobj_cache_add - fun:snd_ctl_open_noupdate -} - -{ - <Alsa leak> - Memcheck:Leak - fun:malloc - fun:* - fun:snd1_dlobj_cache_add - fun:snd_ctl_open_noupdate -} - -{ - <Alsa leak> - Memcheck:Leak - fun:*alloc - fun:* - fun:* - fun:* - fun:snd_config_load1 -} - -{ - <Alsa leak> - Memcheck:Leak - fun:*alloc - fun:* - fun:* - fun:* - fun:* - fun:snd_config_load1 -} - -{ - <Alsa leak> - Memcheck:Leak - fun:*alloc - fun:* - fun:* - fun:* - fun:* - fun:* - fun:snd_config_load1 -} - -{ - <Alsa leak> - Memcheck:Leak - fun:*alloc - fun:* - fun:* - fun:* - fun:* - fun:* - fun:* - fun:snd_config_load1 -} - -{ - <Alsa leak> - Memcheck:Leak - fun:*alloc - fun:* - fun:* - fun:* - fun:* - fun:* - fun:* - fun:* - fun:snd_config_load1 -} - -{ - <Alsa leak> - Memcheck:Leak - fun:*alloc - fun:* - fun:* - fun:* - fun:* - fun:* - fun:* - fun:* - fun:* - fun:snd_config_load1 -} - -{ - <Alsa leak> - Memcheck:Leak - fun:*alloc - fun:* - fun:* - fun:* - fun:* - fun:* - fun:* - fun:* - fun:* - fun:* - fun:snd_config_load1 -} - -{ - <Alsa leak> - Memcheck:Leak - fun:*alloc - fun:* - fun:* - fun:* - fun:* - fun:* - fun:* - fun:* - fun:* - fun:* - fun:* - fun:snd_config_load1 -} - - -# The following are leaks of caps that need to be created dynamically -# in the type registration of the plugin (used for pad templates). - -{ - <Leak in ogmparsers> - Memcheck:Leak - fun:malloc - fun:g_malloc - fun:g_slice_alloc - fun:gst_caps_new_empty - fun:gst_caps_new_simple - fun:* - fun:g_type_class_ref - fun:gst_element_register -} - -{ - <Leak in ogmparsers> - Memcheck:Leak - fun:malloc - fun:g_malloc - fun:g_slice_alloc - fun:gst_caps_new_empty - fun:* - fun:* - fun:g_type_class_ref - fun:gst_element_register - fun:gst_ogm_parse_plugin_init - fun:plugin_init -} - -{ - <Leak in videotestsrc> - Memcheck:Leak - fun:malloc - fun:g_malloc - fun:g_slice_alloc - fun:gst_caps_new_empty - fun:gst_caps_copy - fun:gst_video_test_src_base_init - fun:g_type_class_ref - fun:gst_element_register -} - -{ - <Leak in videotestsrc> - Memcheck:Leak - fun:malloc - fun:g_malloc - fun:g_slice_alloc - fun:gst_caps_new_empty - fun:gst_caps_copy - fun:gst_video_test_src_getcaps - fun:gst_video_test_src_base_init - fun:g_type_class_ref - fun:gst_element_register -} - -{ - <Leak in ffmpegcolorspace> - Memcheck:Leak - fun:malloc - fun:g_malloc - fun:g_slice_alloc - fun:gst_caps_new_empty - fun:gst_ffmpegcsp_codectype_to_caps - fun:gst_ffmpegcolorspace_register - fun:plugin_init -} - -{ - <Leak in ffmpegocolorspace> - Memcheck:Leak - fun:malloc - fun:g_malloc - fun:g_slice_alloc - fun:gst_caps_new_empty - fun:gst_caps_copy - fun:gst_ffmpegcolorspace_register - fun:plugin_init -} - -{ - <Leak in gstffmpegdemux> - Memcheck:Leak - fun:malloc - fun:g_malloc - fun:g_slice_alloc - fun:gst_caps_new_empty - fun:gst_caps_new_any - fun:gst_ffmpegdemux_register - fun:plugin_init -} - -{ - <Leak in GstAudioFilter subclasses> - Memcheck:Leak - fun:malloc - fun:g_malloc - fun:g_slice_alloc - fun:gst_caps_new_empty - fun:gst_caps_copy - fun:gst_audio_filter_class_add_pad_templates -} - -{ - <Leak in GstAudioFilter subclasses, variant> - Memcheck:Leak - fun:realloc - fun:g_realloc - fun:g_ptr_array_maybe_expand - fun:g_ptr_array_add - fun:gst_caps_append - fun:gst_audio_filter_class_add_pad_templates -} - -{ - <Leak in GstAudioFilter subclasses, variant> - Memcheck:Leak - fun:malloc - fun:realloc - fun:g_realloc - fun:g_ptr_array_maybe_expand - fun:g_ptr_array_add - fun:gst_caps_append - fun:gst_audio_filter_class_add_pad_templates -} - -{ - <Leak in GstAudioFilter subclasses, variant> - Memcheck:Leak - fun:malloc - fun:realloc - fun:g_realloc - fun:g_ptr_array_maybe_expand - fun:g_ptr_array_add - fun:gst_caps_copy - fun:gst_audio_filter_class_add_pad_templates -} - -{ - <Leak in GstAudioFilter subclasses, variant2> - Memcheck:Leak - fun:malloc - fun:g_malloc - fun:g_slice_alloc - fun:g_ptr_array_sized_new - fun:gst_caps_new_empty - fun:gst_caps_copy - fun:gst_audio_filter_class_add_pad_templates -} -{ - <Leak in GstAudioFilter subclasses, variant3> - Memcheck:Leak - fun:malloc - fun:realloc - fun:g_realloc - fun:g_array_maybe_expand - fun:g_array_sized_new - fun:* - fun:* - fun:* - fun:gst_value_init_and_copy - fun:gst_structure_copy - fun:gst_caps_copy - fun:gst_audio_filter_class_add_pad_templates -} -{ - <Leak in GstAudioFilter subclasses, variant4> - Memcheck:Leak - fun:malloc - fun:realloc - fun:g_realloc - fun:g_array_maybe_expand - fun:g_array_sized_new - fun:* - fun:gst_structure_copy - fun:gst_caps_copy - fun:gst_audio_filter_class_add_pad_templates -} -{ - <Leak in GstAudioFilter subclasses, variant5> - Memcheck:Leak - fun:malloc - fun:g_malloc - fun:g_slice_alloc - fun:g_array_sized_new - fun:* - fun:gst_structure_copy - fun:gst_caps_copy - fun:gst_audio_filter_class_add_pad_templates -} - -{ - <Leak in riff-media> - Memcheck:Leak - fun:malloc - fun:g_malloc - fun:g_slice_alloc - fun:gst_caps_new_empty - fun:gst_riff_create_*_template_caps -} -{ - <Leak in riff-media> - Memcheck:Leak - fun:malloc - fun:realloc - fun:g_realloc - fun:* - fun:* - fun:* - fun:gst_structure_copy - fun:gst_caps_copy - fun:gst_caps_append - fun:gst_riff_create_*_template_caps -} -{ - <Leak in riff-media> - Memcheck:Leak - fun:malloc - fun:g_malloc - fun:g_slice_alloc - fun:g_array_sized_new - fun:* - fun:gst_structure_copy - fun:gst_caps_copy - fun:gst_caps_append - fun:gst_riff_create_*_template_caps -} - -## Leaks in pango (bilboed: gentoo unstable amd64) - -{ - <Pango leak - generic> - Memcheck:Leak - fun:*alloc - ... - fun:pango_layout_get_pixel_extents -} -{ - <insert a suppression name here> - Memcheck:Leak - fun:calloc - fun:g_malloc0 - fun:pango_language_from_string - fun:pango_language_get_default - fun:pango_context_init - fun:g_type_create_instance - fun:g_object_constructor - fun:g_object_newv - fun:g_object_new_valist - fun:g_object_new - fun:pango_font_map_create_context -} - -{ - <PangoLanguage can never be freed> - Memcheck:Leak - fun:calloc - fun:g_malloc0 - fun:pango_language_from_string -} - - -## Leak of everything allocated by gst-libav plugin init -{ - <insert_a_suppression_name_here> - Memcheck:Leak - fun:*alloc - ... - fun:gst_ffmpeg_cfg_init -} - -## Leak of GIO module through gnomevfs - -{ - <gio leak> - Memcheck:Leak - fun:malloc - fun:g_malloc - fun:* - fun:* - fun:g_type_create_instance - fun:* - fun:* - fun:* - fun:* - fun:g_io_module_new - fun:g_io_modules_load_all_in_directory - fun:* - fun:get_default_vfs -} - -## Conditional jump in getaddrinfo (bilboed, gentoo ~amd64, Dec 13 2008) -{ - <Leak of addrinfo in esd> - Memcheck:Cond - fun:gaih_inet - fun:getaddrinfo -} - -## Dynamic pad templates in mxfmux -{ - <Dynamic pad templates in mxfmux> - Memcheck:Leak - fun:malloc - fun:g_malloc - fun:g_slice_alloc - fun:gst_caps_new_empty - fun:gst_caps_from_string - fun:mxf_*_init - fun:plugin_init -} - -## We don't know if ffmpeg frees this or not and better pass a copy for safety -{ - <insert a suppression name here> - Memcheck:Leak - fun:malloc - fun:g_malloc - fun:g_strdup - fun:gst_ffmpeg_cfg_fill_context - fun:gst_ffmpegenc_setcaps - fun:gst_pad_set_caps -} - -## Leak/overreads with glibc-2.10 - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:do_sym - fun:dlsym_doit - fun:_dl_catch_error - fun:_dlerror_run - fun:dlsym -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:do_sym - fun:dlsym_doit - fun:_dl_catch_error - fun:_dlerror_run - fun:dlsym -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:dl_open_worker - fun:_dl_catch_error - fun:_dl_open - fun:dlopen_doit - fun:_dl_catch_error - fun:_dlerror_run - fun:dlopen* -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:_dl_relocate_object - fun:dl_open_worker - fun:_dl_catch_error - fun:_dl_open - fun:dlopen_doit - fun:_dl_catch_error - fun:_dlerror_run - fun:dlopen* -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:_dl_check_map_versions - fun:dl_open_worker - fun:_dl_catch_error - fun:_dl_open - fun:dlopen_doit - fun:_dl_catch_error - fun:_dlerror_run - fun:dlopen* -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:dl_open_worker - fun:_dl_catch_error - fun:_dl_open - fun:dlopen_doit - fun:_dl_catch_error - fun:_dlerror_run - fun:dlopen* -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:_dl_relocate_object - fun:dl_open_worker - fun:_dl_catch_error - fun:_dl_open - fun:dlopen_doit - fun:_dl_catch_error - fun:_dlerror_run - fun:dlopen* -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:_dl_check_map_versions - fun:dl_open_worker - fun:_dl_catch_error - fun:_dl_open - fun:dlopen_doit - fun:_dl_catch_error - fun:_dlerror_run - fun:dlopen* -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:_dl_map_object* - fun:dl_open_worker - fun:_dl_catch_error - fun:_dl_open - fun:dlopen_doit - fun:_dl_catch_error - fun:_dlerror_run - fun:dlopen* -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:_dl_map_object* - fun:dl_open_worker - fun:_dl_catch_error - fun:_dl_open - fun:dlopen_doit - fun:_dl_catch_error - fun:_dlerror_run - fun:dlopen* -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:_dl_check_caller - fun:dl_open_worker - fun:_dl_catch_error - fun:_dl_open - fun:dlopen_doit - fun:_dl_catch_error - fun:_dlerror_run - fun:dlopen* -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:_dl_check_caller - fun:dl_open_worker - fun:_dl_catch_error - fun:_dl_open - fun:dlopen_doit - fun:_dl_catch_error - fun:_dlerror_run - fun:dlopen* -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - obj:/lib*/libc-2.10.*.so - obj:/lib*/libc-2.10.*.so - fun:_vgnU_freeres -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - obj:/lib*/libc-2.10.*.so - obj:/lib*/libc-2.10.*.so - fun:_vgnU_freeres -} -{ - <glibc-2.10 mysterious invalid free on exit> - Memcheck:Free - fun:free - obj:/lib*/libc-2.10.*.so - obj:/lib*/libc-2.10.*.so - fun:_vgnU_freeres -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:_dl_fini - fun:__run_exit_handlers - fun:exit -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:_dl_fini - fun:__run_exit_handlers - fun:exit -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:_dl_sort_fini - fun:_dl_fini - fun:__run_exit_handlers - fun:exit -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:_dl_sort_fini - fun:_dl_fini - fun:__run_exit_handlers - fun:exit -} - -# glibc-2.10 dl overreads -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:_dl_fixup - fun:_dl_runtime_resolve -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:_dl_fixup - fun:_dl_runtime_resolve -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:_dl_lookup_symbol_x - fun:_dl_fixup - fun:_dl_runtime_resolve -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:_dl_lookup_symbol_x - fun:_dl_fixup - fun:_dl_runtime_resolve -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:call_init - fun:_dl_init -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:_dl_init -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:do_lookup_x - fun:_dl_lookup_symbol_x - fun:_dl_relocate_object - fun:dl_main -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:do_lookup_x - fun:_dl_lookup_symbol_x - fun:_dl_relocate_object - fun:dl_main -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:_dl_lookup_symbol_x - fun:_dl_relocate_object - fun:dl_main -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:_dl_relocate_object - fun:dl_main -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:dl_main - fun:_dl_sysdep_start - fun:_dl_start -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:dl_main - fun:_dl_sysdep_start - fun:_dl_start -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:* - fun:do_lookup_x - fun:_dl_lookup_symbol_x - fun:_dl_relocate_object - fun:dl_main -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:* - fun:do_lookup_x - fun:_dl_lookup_symbol_x - fun:_dl_relocate_object - fun:dl_main -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:_dl_check_map_versions - fun:_dl_check_all_versions - fun:version_check_doit - fun:_dl_receive_error - fun:dl_main -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:_dl_check_map_versions - fun:_dl_check_all_versions - fun:version_check_doit - fun:_dl_receive_error - fun:dl_main -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:_dl_check_all_versions - fun:version_check_doit - fun:_dl_receive_error - fun:dl_main -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:_dl_check_all_versions - fun:version_check_doit - fun:_dl_receive_error - fun:dl_main -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:* - fun:_dl_check_map_versions - fun:_dl_check_all_versions - fun:version_check_doit - fun:_dl_receive_error - fun:dl_main -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:* - fun:_dl_check_map_versions - fun:_dl_check_all_versions - fun:version_check_doit - fun:_dl_receive_error - fun:dl_main -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:init_tls - fun:dl_main -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:init_tls - fun:dl_main -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:_dl_map_object_deps - fun:dl_main -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:_dl_map_object_deps - fun:dl_main -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:_dl_protect_relro - fun:_dl_relocate_object - fun:dl_main -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:* - fun:do_lookup_x - fun:_dl_lookup_symbol_x - fun:_dl_relocate_object - fun:dl_main -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:_dl_setup_hash - fun:_dl_map_object_from_fd - fun:_dl_map_object -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:* - fun:_dl_new_object - fun:_dl_map_object_from_fd - fun:_dl_map_object -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:* - fun:_dl_new_object - fun:_dl_map_object_from_fd - fun:_dl_map_object -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:openaux - fun:_dl_catch_error - fun:_dl_map_object_deps - fun:dl_main -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:* - fun:_dl_map_object -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:* - fun:_dl_map_object -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:_dl_map_object - fun:openaux - fun:_dl_catch_error - fun:_dl_map_object_deps - fun:dl_main -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:_dl_map_object - fun:openaux - fun:_dl_catch_error - fun:_dl_map_object_deps - fun:dl_main -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:* - fun:_dl_map_object - fun:openaux - fun:_dl_catch_error - fun:_dl_map_object_deps - fun:dl_main -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:* - fun:open_path - fun:_dl_map_object - fun:openaux - fun:_dl_catch_error - fun:_dl_map_object_deps - fun:dl_main -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:* - fun:open_path - fun:_dl_map_object - fun:openaux - fun:_dl_catch_error - fun:_dl_map_object_deps - fun:dl_main -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:_dl_map_object_from_fd - fun:_dl_map_object -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:_dl_map_object_from_fd - fun:_dl_map_object -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:* - fun:_dl_new_object - fun:_dl_map_object_from_fd - fun:_dl_map_object -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:_dl_new_object - fun:_dl_map_object_from_fd - fun:_dl_map_object -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:_dl_new_object - fun:_dl_map_object_from_fd - fun:_dl_map_object -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:* - fun:_dl_name_match_p - fun:_dl_map_object -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:* - fun:* - fun:_dl_map_object -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:* - fun:_dl_name_match_p - fun:_dl_check_map_versions - fun:_dl_check_all_versions -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:* - fun:* - fun:do_lookup_x - fun:_dl_lookup_symbol_x -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:do_lookup_x - fun:_dl_lookup_symbol_x -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:do_lookup_x - fun:_dl_lookup_symbol_x -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:* - fun:do_lookup_x - fun:_dl_lookup_symbol_x -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:* - fun:do_lookup_x - fun:_dl_lookup_symbol_x -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:_dl_name_match_p - fun:_dl_map_object - fun:dl_open_worker -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:_dl_name_match_p - fun:_dl_map_object - fun:dl_open_worker -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:* - fun:_dl_name_match_p - fun:_dl_map_object - fun:dl_open_worker -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:* - fun:_dl_name_match_p - fun:_dl_map_object - fun:dl_open_worker -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:_dl_lookup_symbol_x - fun:_dl_relocate_object -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:_dl_lookup_symbol_x - fun:_dl_relocate_object -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:* - fun:* - fun:_dl_check_map_versions -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:* - fun:_dl_check_map_versions -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:* - fun:* - fun:_dl_check_map_versions -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:* - fun:_dl_check_map_versions -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:openaux -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:_dl_name_match_p - fun:_dl_map_object -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:_dl_close_worker - fun:_dl_close - fun:_dl_catch_error - fun:dlerror_run -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:_dl_close_worker - fun:_dl_close - fun:_dl_catch_error - fun:dlerror_run -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:* - fun:_dl_close_worker - fun:_dl_close - fun:_dl_catch_error - fun:dlerror_run -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:* - fun:_dl_close_worker - fun:_dl_close - fun:_dl_catch_error - fun:dlerror_run -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:fillin_rpath - fun:_dl_init_paths - fun:dl_main -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:fillin_rpath - fun:_dl_init_paths - fun:dl_main -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:* - fun:fillin_rpath - fun:_dl_init_paths - fun:dl_main -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:* - fun:fillin_rpath - fun:_dl_init_paths - fun:dl_main -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:_dl_map_object - fun:map_doit - fun:_dl_catch_error - fun:do_preload - fun:dl_main -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:_dl_map_object - fun:map_doit - fun:_dl_catch_error - fun:do_preload - fun:dl_main -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Param - open(filename) - fun:open - fun:open_verify - fun:_dl_map_object - fun:map_doit - fun:_dl_catch_error - fun:do_preload - fun:dl_main -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Param - stat(file_name) - fun:_xstat - fun:open_path - fun:_dl_map_object - fun:openaux - fun:_dl_catch_error - fun:_dl_map_object_deps - fun:dl_main -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:_dl_catch_error - fun:_dl_map_object_deps - fun:dl_open_worker -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:* - fun:_dl_map_object_deps - fun:dl_main -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:* - fun:_dl_map_object_deps - fun:dl_main -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:* - fun:* - fun:_dl_map_object_deps - fun:dl_main -} - -# glibc-2.10 tls issues -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:* - fun:init_tls - fun:dl_main -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:* - fun:init_tls - fun:dl_main -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:* - fun:* - fun:init_tls - fun:dl_main -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:* - fun:* - fun:init_tls - fun:dl_main -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:_dl_allocate_tls_init - fun:dl_main -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:_dl_allocate_tls_init - fun:dl_main -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:* - fun:_dl_allocate_tls_init - fun:dl_main -} -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Value8 - fun:* - fun:_dl_allocate_tls_init - fun:dl_main -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Cond - fun:__tls* - obj:* - obj:* - fun:_vgnU_freeres -} - -{ - <glibc-2.10 overreads/conditionals> - Memcheck:Param - arch_prctl(arg2) - fun:init_tls -} -# GLib caching tmp/home directories (glibc-2.10 variants) -{ - <glibc-2.10 GLIB leaks> - Memcheck:Cond - fun:* - fun:dl_open_worker - fun:* - fun:* - fun:* - fun:_dl_catch_error - fun:dlerror_run - fun:* - fun:__nss_lookup_function - fun:__nss_lookup - fun:getpwnam* -} -{ - <glibc-2.10 GLIB leaks> - Memcheck:Value8 - fun:* - fun:dl_open_worker - fun:* - fun:* - fun:* - fun:_dl_catch_error - fun:dlerror_run - fun:* - fun:__nss_lookup_function - fun:__nss_lookup - fun:getpwnam* -} -{ - <glibc-2.10 GLIB leaks> - Memcheck:Cond - fun:dl_open_worker - fun:* - fun:* - fun:do_dlopen - fun:* - fun:dlerror_run - fun:* - fun:__nss_lookup_function - fun:__nss_lookup - fun:getpwnam* -} -{ - <glibc-2.10 GLIB leaks> - Memcheck:Value8 - fun:dl_open_worker - fun:* - fun:* - fun:do_dlopen - fun:* - fun:dlerror_run - fun:* - fun:__nss_lookup_function - fun:__nss_lookup - fun:getpwnam* -} - -{ - <glibc-2.10 GLIB leaks> - Memcheck:Value8 - fun:_dl_add_to_slotinfo - fun:dl_main -} -{ - <glibc-2.10 GLIB leaks> - Memcheck:Param - open(filename) - fun:open - fun:open_verify - fun:open_path - fun:_dl_map_object -} - - - -# GModule issues with glibc-2.10 -{ - <glibc-2.10 GLIB leaks> - Memcheck:Value8 - fun:* - fun:* - fun:dlsym - fun:g_module_symbol -} -{ - <glibc-2.10 GLIB leaks> - Memcheck:Value8 - fun:g_module_* - fun:gst_plugin* -} -{ - <glibc-2.10 GLIB leaks> - Memcheck:Value8 - fun:* - fun:g_module_* - fun:gst_plugin* -} - -{ - <glibc-2.10 GLIB leaks> - Memcheck:Value8 - fun:* - fun:* - fun:dlopen* - fun:g_module_open -} -{ - <glibc-2.10 GLIB leaks> - Memcheck:Value8 - fun:* - fun:* - fun:* - fun:* - fun:* - fun:* - fun:* - fun:dlsym - fun:g_module_symbol -} - -{ - <glibc-2.10 GLIB leaks> - Memcheck:Value8 - fun:* - fun:* - fun:* - fun:* - fun:* - fun:dlopen* - fun:g_module_open -} - -# Leak in GSlice -{ - <insert a suppression name here> - Memcheck:Value8 - fun:g_parse_debug_string - fun:slice_config_init - fun:g_slice_init_nomessage - fun:_g_slice_thread_init_nomessage - fun:g_thread_init_glib -} - -# 2.10 pthread issues -{ - <insert a suppression name here> - Memcheck:Value8 - fun:__pthread_initialize_minimal -} - -# glibc 2.11 conditional -{ - <glibc-2.11 conditional> - Memcheck:Cond - fun:_dl_relocate_object - fun:dl_main - fun:_dl_sysdep_start - fun:_dl_start - obj:/lib64/ld-2.11.so -} - -# glibc 2.11 Leak - -{ - <insert_a_suppression_name_here> - Memcheck:Leak - fun:*alloc - fun:dl_open_worker - fun:_dl_catch_error - fun:_dl_open - fun:dlopen_doit - fun:_dl_catch_error - fun:_dlerror_run - fun:dlopen@@GLIBC_2.2.5 -} - -{ - <insert_a_suppression_name_here> - Memcheck:Leak - fun:*alloc - fun:_dl_* - fun:dl_open_worker - fun:_dl_catch_error - fun:_dl_open - fun:dlopen_doit - fun:_dl_catch_error - fun:_dlerror_run - fun:dlopen@@GLIBC_2.2.5 -} - -{ - <insert_a_suppression_name_here> - Memcheck:Leak - fun:*alloc - fun:_dl_* - fun:_dl_* - fun:_dl_* - fun:dl_open_worker - fun:_dl_catch_error - fun:_dl_open - fun:dlopen_doit - fun:_dl_catch_error - fun:_dlerror_run - fun:dlopen@@GLIBC_2.2.5 -} - -{ - <insert_a_suppression_name_here> - Memcheck:Leak - fun:*alloc - fun:* - fun:_dl_* - fun:openaux - fun:_dl_catch_error - fun:_dl_map_object_deps - fun:dl_open_worker - fun:_dl_catch_error - fun:_dl_open - fun:dlopen_doit - fun:_dl_catch_error - fun:_dlerror_run - fun:dlopen@@GLIBC_2.2.5 -} - -{ - <insert_a_suppression_name_here> - Memcheck:Leak - fun:*alloc - fun:* - fun:_dl_map_object - fun:dl_open_worker - fun:_dl_catch_error - fun:_dl_open - fun:dlopen_doit - fun:_dl_catch_error - fun:_dlerror_run - fun:dlopen@@GLIBC_2.2.5 -} - -{ - <insert_a_suppression_name_here> - Memcheck:Leak - fun:*alloc - fun:_dl_new_object - fun:_dl_map_object_from_fd - fun:_dl_map_object - fun:openaux - fun:_dl_catch_error - fun:_dl_map_object_deps - fun:dl_open_worker - fun:_dl_catch_error - fun:_dl_open - fun:dlopen_doit - fun:_dl_catch_error - fun:_dlerror_run - fun:dlopen@@GLIBC_2.2.5 -} - -{ - <insert_a_suppression_name_here> - Memcheck:Leak - fun:*alloc - fun:* - fun:_dl_* - fun:_dl_* - fun:_dl_* - fun:dl_open_worker - fun:_dl_catch_error - fun:_dl_open - fun:dlopen_doit - fun:_dl_catch_error - fun:_dlerror_run - fun:dlopen@@GLIBC_2.2.5 -} - -# glib type leaks -{ - <insert_a_suppression_name_here> - Memcheck:Leak - fun:*alloc - ... - fun:g_type_register_static -} - -# new registry system -# all of this will only be created once when loading registry. - -{ - <insert_a_suppression_name_here> - Memcheck:Leak - fun:*alloc - ... - fun:_priv_gst_registry_chunks_load_plugin -} - -# system-wide tags -# these tags are registered once - -{ - <insert_a_suppression_name_here> - Memcheck:Leak - fun:*alloc - fun:* - fun:* - fun:gst_tag_register - fun:_gst_tag_initialize -} - -# system-wide type classes that we keep referenced - -{ - <g_type_class_ref leaks> - Memcheck:Leak - fun:*alloc - ... - fun:g_type_class_ref -} - -# leaking cached queries which are only initialized once -{ - <insert_a_suppression_name_here> - Memcheck:Leak - fun:*alloc - ... - fun:_gst_query_initialize - fun:init_post -} - -# macosx (leopard) library loader leak -{ - <insert_a_suppression_name_here> - Memcheck:Leak - fun:_Znwm - fun:_ZNSs4_Rep9_S_createEmmRKSaIcE - fun:_ZNSs12_S_constructIPKcEEPcT_S3_RKSaIcESt20forward_iterator_tag - fun:_ZNSsC2EPKcRKSaIcE - fun:_Z41__static_initialization_and_destruction_0ii - fun:_ZN16ImageLoaderMachO18doModInitFunctionsERKN11ImageLoader11LinkContextE -} - -# GObject type registration -{ - <insert_a_suppression_name_here> - Memcheck:Leak - fun:*alloc - ... - fun:_g_atomic_array_copy -} - -{ - <getdelim one-time inits called from libselinux> - Memcheck:Leak - fun:*alloc - fun:getdelim - obj:*libselinux* -} - -{ - <weird one when re-reading registry> - Memcheck:Leak - fun:*alloc - ... - obj:*/sed -} - -{ - <weird one when re-reading registry> - Memcheck:Addr8 - ... - obj:*/sed -} - -# GLib 2.23 interface vtable -{ - <insert_a_suppression_name_here> - Memcheck:Leak - fun:*alloc - ... - fun:g_type_add_interface_static -} - -{ - <leak in dash on debian sid> - Memcheck:Leak - fun:*alloc - obj:*/dash -} - -# libtool/gentoo fake leak -# it actually runs bash and valgrind complains -{ - <insert_a_suppression_name_here> - Memcheck:Leak - fun:*alloc - obj:/bin/bash -} - -{ - <ignore possbly-lost leaks in the plugin scanner which doesn't clean up properly> - Memcheck:Leak - fun:*alloc - ... - fun:_gst_plugin_loader_client_run - fun:main -} - -{ - <warning with libc 2.13-2 as in Debian/unstable on amd64> - Memcheck:Cond - fun:*strcasecmp* - ... - fun:__dcigettext -} - -{ - <warning with libc 2.13-2 as in Debian/unstable on amd64> - Memcheck:Value8 - fun:*strcasecmp* - ... - fun:__dcigettext -} - -{ - <GstSystemClock is a singleton and does not leak> - Memcheck:Leak - fun:malloc - ... - fun:gst_poll_new - fun:gst_poll_new_timer - fun:gst_system_clock_init -} - -{ - <glib types are singletons> - Memcheck:Leak - fun:calloc - ... - fun:gobject_init_ctor -} - -{ - <quark table is leaked on purpose if it grows too big> - Memcheck:Leak - fun:malloc - ... - fun:g_quark_from*_string -} - -{ - <check failing to initialize memory> - Memcheck:Param - timer_create(evp) - fun:timer_create@@GLIBC_2.3.3 - fun:srunner_run -} - diff --git a/gtk-doc.make b/gtk-doc.make deleted file mode 100644 index 823abb0..0000000 --- a/gtk-doc.make +++ /dev/null @@ -1,319 +0,0 @@ -# -*- mode: makefile -*- - -#################################### -# Everything below here is generic # -#################################### - -if GTK_DOC_USE_LIBTOOL -GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -GTKDOC_RUN = $(LIBTOOL) --mode=execute -else -GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -GTKDOC_RUN = -endif - -# We set GPATH here; this gives us semantics for GNU make -# which are more like other make's VPATH, when it comes to -# whether a source that is a target of one rule is then -# searched for in VPATH/GPATH. -# -GPATH = $(srcdir) - -TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) - -SETUP_FILES = \ - $(content_files) \ - $(expand_content_files) \ - $(DOC_MAIN_SGML_FILE) \ - $(DOC_MODULE)-sections.txt \ - $(DOC_MODULE)-overrides.txt - -EXTRA_DIST = \ - $(HTML_IMAGES) \ - $(SETUP_FILES) - -DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ - html-build.stamp pdf-build.stamp \ - tmpl.stamp sgml.stamp html.stamp pdf.stamp - -SCANOBJ_FILES = \ - $(DOC_MODULE).args \ - $(DOC_MODULE).hierarchy \ - $(DOC_MODULE).interfaces \ - $(DOC_MODULE).prerequisites \ - $(DOC_MODULE).signals - -REPORT_FILES = \ - $(DOC_MODULE)-undocumented.txt \ - $(DOC_MODULE)-undeclared.txt \ - $(DOC_MODULE)-unused.txt - -gtkdoc-check.test: Makefile - $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \ - echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \ - chmod +x $@ - -CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test - -if GTK_DOC_BUILD_HTML -HTML_BUILD_STAMP=html-build.stamp -else -HTML_BUILD_STAMP= -endif -if GTK_DOC_BUILD_PDF -PDF_BUILD_STAMP=pdf-build.stamp -else -PDF_BUILD_STAMP= -endif - -all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) -.PHONY: all-gtk-doc - -if ENABLE_GTK_DOC -all-local: all-gtk-doc -endif - -docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) - -$(REPORT_FILES): sgml-build.stamp - -#### setup #### - -GTK_DOC_V_SETUP=$(GTK_DOC_V_SETUP_$(V)) -GTK_DOC_V_SETUP_=$(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY)) -GTK_DOC_V_SETUP_0=@echo " DOC Preparing build"; - -setup-build.stamp: - -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \ - if test "x$$files" != "x" ; then \ - for file in $$files ; do \ - destdir=`dirname $(abs_builddir)/$$file` ;\ - test -d "$$destdir" || mkdir -p "$$destdir"; \ - test -f $(abs_srcdir)/$$file && \ - cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ - done; \ - fi; \ - test -d $(abs_srcdir)/tmpl && \ - { cp -pR $(abs_srcdir)/tmpl $(abs_builddir)/; \ - chmod -R u+w $(abs_builddir)/tmpl; } \ - fi - $(AM_V_at)touch setup-build.stamp - -#### scan #### - -GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_$(V)) -GTK_DOC_V_SCAN_=$(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY)) -GTK_DOC_V_SCAN_0=@echo " DOC Scanning header files"; - -GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_$(V)) -GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) -GTK_DOC_V_INTROSPECT_0=@echo " DOC Introspecting gobjects"; - -scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) - $(GTK_DOC_V_SCAN)_source_dir='' ; \ - for i in $(DOC_SOURCE_DIR) ; do \ - _source_dir="$${_source_dir} --source-dir=$$i" ; \ - done ; \ - gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) - $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ - scanobj_options=""; \ - gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$$?" = "0"; then \ - if test "x$(V)" = "x1"; then \ - scanobj_options="--verbose"; \ - fi; \ - fi; \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ - gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ - else \ - for i in $(SCANOBJ_FILES) ; do \ - test -f $$i || touch $$i ; \ - done \ - fi - $(AM_V_at)touch scan-build.stamp - -$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp - @true - -#### templates #### - -GTK_DOC_V_TMPL=$(GTK_DOC_V_TMPL_$(V)) -GTK_DOC_V_TMPL_=$(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY)) -GTK_DOC_V_TMPL_0=@echo " DOC Rebuilding template files"; - -tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) - $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - if test -w $(abs_srcdir) ; then \ - cp -pR $(abs_builddir)/tmpl $(abs_srcdir)/; \ - fi \ - fi - $(AM_V_at)touch tmpl-build.stamp - -tmpl.stamp: tmpl-build.stamp - @true - -$(srcdir)/tmpl/*.sgml: - @true - -#### xml #### - -GTK_DOC_V_XML=$(GTK_DOC_V_XML_$(V)) -GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) -GTK_DOC_V_XML_0=@echo " DOC Building XML"; - -sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - -$(GTK_DOC_V_XML)chmod -R u+w $(srcdir) && _source_dir='' ; \ - for i in $(DOC_SOURCE_DIR) ; do \ - _source_dir="$${_source_dir} --source-dir=$$i" ; \ - done ; \ - gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) - $(AM_V_at)touch sgml-build.stamp - -sgml.stamp: sgml-build.stamp - @true - -#### html #### - -GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_$(V)) -GTK_DOC_V_HTML_=$(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY)) -GTK_DOC_V_HTML_0=@echo " DOC Building HTML"; - -GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_$(V)) -GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) -GTK_DOC_V_XREF_0=@echo " DOC Fixing cross-references"; - -html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) - $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ - mkhtml_options=""; \ - gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$$?" = "0"; then \ - if test "x$(V)" = "x1"; then \ - mkhtml_options="$$mkhtml_options --verbose"; \ - fi; \ - fi; \ - gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ - if test "$$?" = "0"; then \ - mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ - fi; \ - cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) - -@test "x$(HTML_IMAGES)" = "x" || \ - for file in $(HTML_IMAGES) ; do \ - if test -f $(abs_srcdir)/$$file ; then \ - cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ - fi; \ - if test -f $(abs_builddir)/$$file ; then \ - cp $(abs_builddir)/$$file $(abs_builddir)/html; \ - fi; \ - done; - $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - $(AM_V_at)touch html-build.stamp - -#### pdf #### - -GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_$(V)) -GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) -GTK_DOC_V_PDF_0=@echo " DOC Building PDF"; - -pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) - $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ - mkpdf_options=""; \ - gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$$?" = "0"; then \ - if test "x$(V)" = "x1"; then \ - mkpdf_options="$$mkpdf_options --verbose"; \ - fi; \ - fi; \ - if test "x$(HTML_IMAGES)" != "x"; then \ - for img in $(HTML_IMAGES); do \ - part=`dirname $$img`; \ - echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \ - if test $$? != 0; then \ - mkpdf_options="$$mkpdf_options --imgdir=$$part"; \ - fi; \ - done; \ - fi; \ - gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) - $(AM_V_at)touch pdf-build.stamp - -############## - -clean-local: - @rm -f *~ *.bak - @rm -rf .libs - @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \ - rm -f $(DOC_MODULE).types; \ - fi - @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \ - rm -f $(DOC_MODULE)-sections.txt; \ - fi - -distclean-local: - @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ - $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt - @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - rm -f $(SETUP_FILES) $(DOC_MODULE).types; \ - rm -rf tmpl; \ - fi - -maintainer-clean-local: - @rm -rf xml html - -install-data-local: - @installfiles=`echo $(builddir)/html/*`; \ - if test "$$installfiles" = '$(builddir)/html/*'; \ - then echo 1>&2 'Nothing to install' ; \ - else \ - if test -n "$(DOC_MODULE_VERSION)"; then \ - installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ - else \ - installdir="$(DESTDIR)$(TARGET_DIR)"; \ - fi; \ - $(mkinstalldirs) $${installdir} ; \ - for i in $$installfiles; do \ - echo ' $(INSTALL_DATA) '$$i ; \ - $(INSTALL_DATA) $$i $${installdir}; \ - done; \ - if test -n "$(DOC_MODULE_VERSION)"; then \ - mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ - $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ - fi; \ - $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ - fi - -uninstall-local: - @if test -n "$(DOC_MODULE_VERSION)"; then \ - installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ - else \ - installdir="$(DESTDIR)$(TARGET_DIR)"; \ - fi; \ - rm -rf $${installdir} - -# -# Require gtk-doc when making dist -# -if HAVE_GTK_DOC -dist-check-gtkdoc: docs -else -dist-check-gtkdoc: - @echo "*** gtk-doc is needed to run 'make dist'. ***" - @echo "*** gtk-doc was not found when 'configure' ran. ***" - @echo "*** please install gtk-doc and rerun 'configure'. ***" - @false -endif - -dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local - @mkdir $(distdir)/tmpl - @mkdir $(distdir)/html - @-cp ./tmpl/*.sgml $(distdir)/tmpl - @cp ./html/* $(distdir)/html - @-cp ./$(DOC_MODULE).pdf $(distdir)/ - @-cp ./$(DOC_MODULE).types $(distdir)/ - @-cp ./$(DOC_MODULE)-sections.txt $(distdir)/ - @cd $(distdir) && rm -f $(DISTCLEANFILES) - @$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html - -.PHONY : dist-hook-local docs diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 97ce95d..45623e5 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -28,9 +28,8 @@ BUILT_SOURCES: gtk-play-resources.c gtk-play-resources.h gtk_play_SOURCES = gtk-play.c gtk-play-resources.c gtk-video-renderer.c -LDADD = $(top_builddir)/lib/gst/player/.libs/libgstplayer-@GST_PLAYER_API_VERSION@.la \ - $(GSTREAMER_LIBS) $(GTK_LIBS) $(GTK_X11_LIBS) $(GLIB_LIBS) $(LIBM) $(GMODULE_LIBS) +LDADD = $(GSTREAMER_LIBS) $(GTK_LIBS) $(GTK_X11_LIBS) $(GLIB_LIBS) $(LIBM) $(GMODULE_LIBS) -AM_CFLAGS = -I$(top_srcdir)/lib -I$(top_builddir)/lib $(GSTREAMER_CFLAGS) $(GTK_CFLAGS) $(GTK_X11_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(WARNING_CFLAGS) +AM_CFLAGS = $(GSTREAMER_CFLAGS) $(GTK_CFLAGS) $(GTK_X11_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(WARNING_CFLAGS) noinst_HEADERS = gtk-play-resources.h gtk-video-renderer.h diff --git a/gtk/gtk-play.c b/gtk/gtk-play.c index 51d0bf0..c91693b 100644 --- a/gtk/gtk-play.c +++ b/gtk/gtk-play.c @@ -24,7 +24,6 @@ #include <gst/gst.h> #include <gst/tag/tag.h> -#include <gst/video/videooverlay.h> #include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk/gdk.h> diff --git a/ios/GstPlay.xcodeproj/project.pbxproj b/ios/GstPlay.xcodeproj/project.pbxproj index 9a3e45c..6d9ff1f 100644 --- a/ios/GstPlay.xcodeproj/project.pbxproj +++ b/ios/GstPlay.xcodeproj/project.pbxproj @@ -23,8 +23,6 @@ AD2B885C198D65470070367B /* MainStoryboard_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AD2B885A198D65470070367B /* MainStoryboard_iPad.storyboard */; }; AD2B8861198D65780070367B /* LibraryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AD2B885E198D65780070367B /* LibraryViewController.m */; }; AD2B8862198D65780070367B /* VideoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AD2B8860198D65780070367B /* VideoViewController.m */; }; - AD2B886C198D69ED0070367B /* gstplayer.c in Sources */ = {isa = PBXBuildFile; fileRef = AD2B886A198D69ED0070367B /* gstplayer.c */; }; - E95DEC9B1B8332F100CC3512 /* gstplayer-media-info.c in Sources */ = {isa = PBXBuildFile; fileRef = E95DEC981B8332F100CC3512 /* gstplayer-media-info.c */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -53,12 +51,6 @@ AD2B885E198D65780070367B /* LibraryViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LibraryViewController.m; sourceTree = "<group>"; }; AD2B885F198D65780070367B /* VideoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoViewController.h; sourceTree = "<group>"; }; AD2B8860198D65780070367B /* VideoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VideoViewController.m; sourceTree = "<group>"; }; - AD2B886A198D69ED0070367B /* gstplayer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gstplayer.c; sourceTree = "<group>"; }; - AD2B886B198D69ED0070367B /* gstplayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gstplayer.h; sourceTree = "<group>"; }; - E95DEC971B8332F100CC3512 /* gstplayer-media-info-private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gstplayer-media-info-private.h"; sourceTree = "<group>"; }; - E95DEC981B8332F100CC3512 /* gstplayer-media-info.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "gstplayer-media-info.c"; sourceTree = "<group>"; }; - E95DEC991B8332F100CC3512 /* gstplayer-media-info.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gstplayer-media-info.h"; sourceTree = "<group>"; }; - E95DEC9A1B8332F100CC3512 /* player.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = player.h; sourceTree = "<group>"; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -79,7 +71,6 @@ AD2B8812198D631B0070367B = { isa = PBXGroup; children = ( - AD2B8868198D69ED0070367B /* gst */, AD2B8826198D631B0070367B /* GstPlay */, AD2B881D198D631B0070367B /* Frameworks */, AD2B881C198D631B0070367B /* Products */, @@ -140,28 +131,6 @@ name = "Supporting Files"; sourceTree = "<group>"; }; - AD2B8868198D69ED0070367B /* gst */ = { - isa = PBXGroup; - children = ( - AD2B8869198D69ED0070367B /* player */, - ); - name = gst; - path = ../lib/gst; - sourceTree = "<group>"; - }; - AD2B8869198D69ED0070367B /* player */ = { - isa = PBXGroup; - children = ( - E95DEC971B8332F100CC3512 /* gstplayer-media-info-private.h */, - E95DEC981B8332F100CC3512 /* gstplayer-media-info.c */, - E95DEC991B8332F100CC3512 /* gstplayer-media-info.h */, - E95DEC9A1B8332F100CC3512 /* player.h */, - AD2B886A198D69ED0070367B /* gstplayer.c */, - AD2B886B198D69ED0070367B /* gstplayer.h */, - ); - path = player; - sourceTree = "<group>"; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -229,14 +198,12 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - E95DEC9B1B8332F100CC3512 /* gstplayer-media-info.c in Sources */, AD2B8861198D65780070367B /* LibraryViewController.m in Sources */, AD2B8831198D631B0070367B /* AppDelegate.m in Sources */, AD2B8862198D65780070367B /* VideoViewController.m in Sources */, AD2B8858198D637A0070367B /* EaglUIVIew.m in Sources */, AD2B882D198D631B0070367B /* main.m in Sources */, AD2B8837198D631B0070367B /* gst_ios_init.m in Sources */, - AD2B886C198D69ED0070367B /* gstplayer.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/ios/GstPlay/VideoViewController.m b/ios/GstPlay/VideoViewController.m index 19c3799..079fcde 100644 --- a/ios/GstPlay/VideoViewController.m +++ b/ios/GstPlay/VideoViewController.m @@ -1,5 +1,5 @@ #import "VideoViewController.h" -#import <gst/player/gstplayer.h> +#import <gst/player/player.h> #import <UIKit/UIKit.h> @interface VideoViewController () { diff --git a/lib/Makefile.am b/lib/Makefile.am deleted file mode 100644 index 062cb55..0000000 --- a/lib/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = gst diff --git a/lib/gst/Makefile.am b/lib/gst/Makefile.am deleted file mode 100644 index bbe2c30..0000000 --- a/lib/gst/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = player diff --git a/lib/gst/player/Makefile.am b/lib/gst/player/Makefile.am deleted file mode 100644 index ca5841f..0000000 --- a/lib/gst/player/Makefile.am +++ /dev/null @@ -1,98 +0,0 @@ -lib_LTLIBRARIES = libgstplayer-@GST_PLAYER_API_VERSION@.la - -libgstplayer_@GST_PLAYER_API_VERSION@_la_SOURCES = \ - gstplayer.c \ - gstplayer-signal-dispatcher.c \ - gstplayer-video-renderer.c \ - gstplayer-media-info.c \ - gstplayer-g-main-context-signal-dispatcher.c \ - gstplayer-video-overlay-video-renderer.c \ - gstplayer-visualization.c - -libgstplayer_@GST_PLAYER_API_VERSION@_la_CFLAGS = \ - -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib \ - $(GSTREAMER_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(WARNING_CFLAGS) - -libgstplayer_@GST_PLAYER_API_VERSION@_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -export-symbols-regex '^gst_.*$$' \ - -no-undefined - -libgstplayer_@GST_PLAYER_API_VERSION@_la_LIBADD = \ - $(LIBM) \ - $(GSTREAMER_LIBS) \ - $(GLIB_LIBS) - -libgstplayerdir = $(includedir)/gst-player-@GST_PLAYER_API_VERSION@/gst/player - -noinst_HEADERS = \ - gstplayer-signal-dispatcher-private.h \ - gstplayer-video-renderer-private.h \ - gstplayer-media-info-private.h - -libgstplayer_HEADERS = \ - player.h \ - gstplayer.h \ - gstplayer-signal-dispatcher.h \ - gstplayer-video-renderer.h \ - gstplayer-media-info.h \ - gstplayer-g-main-context-signal-dispatcher.h \ - gstplayer-video-overlay-video-renderer.h \ - gstplayer-visualization.h - -CLEANFILES = - -if HAVE_INTROSPECTION -BUILT_GIRSOURCES = GstPlayer-@GST_PLAYER_API_VERSION@.gir - -gir_headers=$(patsubst %,$(srcdir)/%, $(libgstplayer_HEADERS)) -gir_sources=$(patsubst %,$(srcdir)/%, $(libgstplayer_@GST_PLAYER_API_VERSION@_la_SOURCES)) - -GstPlayer-@GST_PLAYER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstplayer-@GST_PLAYER_API_VERSION@.la - $(AM_V_GEN)$(INTROSPECTION_SCANNER) -v --namespace GstPlayer \ - --nsversion=@GST_PLAYER_API_VERSION@ \ - --warn-all \ - --strip-prefix=Gst \ - -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib \ - --c-include "gst/player/player.h" \ - --add-include-path=$(top_builddir)/lib \ - --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-1.0` \ - --library-path=$(top_builddir)/lib \ - --library=libgstplayer-@GST_PLAYER_API_VERSION@.la \ - --include=GObject-2.0 \ - --include=Gst-1.0 \ - --libtool="${LIBTOOL}" \ - --pkg gobject-2.0 \ - --pkg gstreamer-1.0 \ - --pkg gstreamer-audio-1.0 \ - --pkg gstreamer-video-1.0 \ - --pkg gstreamer-tag-1.0 \ - --pkg gstreamer-pbutils-1.0 \ - --pkg-export gstreamer-player-@GST_PLAYER_API_VERSION@ \ - --add-init-section="gst_init(NULL,NULL);" \ - --output $@ \ - $(gir_headers) \ - $(gir_sources) - -# INTROSPECTION_GIRDIR/INTROSPECTION_TYPELIBDIR aren't the right place to -# install anything - we need to install inside our prefix. -girdir = $(datadir)/gir-1.0 -gir_DATA = $(BUILT_GIRSOURCES) - -typelibsdir = $(libdir)/girepository-1.0/ - -typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) - -%.typelib: %.gir $(INTROSPECTION_COMPILER) - $(AM_V_GEN)$(INTROSPECTION_COMPILER) \ - --includedir=$(srcdir)/lib \ - --includedir=$(builddir)/lib \ - --includedir=`$(PKG_CONFIG) --variable=girdir gstreamer-1.0` \ - $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) - -CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) -endif diff --git a/lib/gst/player/gstplayer-g-main-context-signal-dispatcher.c b/lib/gst/player/gstplayer-g-main-context-signal-dispatcher.c deleted file mode 100644 index c1f57d0..0000000 --- a/lib/gst/player/gstplayer-g-main-context-signal-dispatcher.c +++ /dev/null @@ -1,212 +0,0 @@ -/* GStreamer - * - * Copyright (C) 2014-2015 Sebastian Dröge <sebastian@centricular.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -/** - * SECTION:gstplayer-gmaincontextsignaldispatcher - * @short_description: Player GLib MainContext dispatcher - * - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "gstplayer-g-main-context-signal-dispatcher.h" - -struct _GstPlayerGMainContextSignalDispatcher -{ - GObject parent; - GMainContext *application_context; -}; - -struct _GstPlayerGMainContextSignalDispatcherClass -{ - GObjectClass parent_class; -}; - -static void - gst_player_g_main_context_signal_dispatcher_interface_init - (GstPlayerSignalDispatcherInterface * iface); - -enum -{ - G_MAIN_CONTEXT_SIGNAL_DISPATCHER_PROP_0, - G_MAIN_CONTEXT_SIGNAL_DISPATCHER_PROP_APPLICATION_CONTEXT, - G_MAIN_CONTEXT_SIGNAL_DISPATCHER_PROP_LAST -}; - -G_DEFINE_TYPE_WITH_CODE (GstPlayerGMainContextSignalDispatcher, - gst_player_g_main_context_signal_dispatcher, G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE (GST_TYPE_PLAYER_SIGNAL_DISPATCHER, - gst_player_g_main_context_signal_dispatcher_interface_init)); - -static GParamSpec - * g_main_context_signal_dispatcher_param_specs - [G_MAIN_CONTEXT_SIGNAL_DISPATCHER_PROP_LAST] = { NULL, }; - -static void -gst_player_g_main_context_signal_dispatcher_finalize (GObject * object) -{ - GstPlayerGMainContextSignalDispatcher *self = - GST_PLAYER_G_MAIN_CONTEXT_SIGNAL_DISPATCHER (object); - - if (self->application_context) - g_main_context_unref (self->application_context); - - G_OBJECT_CLASS - (gst_player_g_main_context_signal_dispatcher_parent_class)->finalize - (object); -} - -static void -gst_player_g_main_context_signal_dispatcher_set_property (GObject * object, - guint prop_id, const GValue * value, GParamSpec * pspec) -{ - GstPlayerGMainContextSignalDispatcher *self = - GST_PLAYER_G_MAIN_CONTEXT_SIGNAL_DISPATCHER (object); - - switch (prop_id) { - case G_MAIN_CONTEXT_SIGNAL_DISPATCHER_PROP_APPLICATION_CONTEXT: - self->application_context = g_value_dup_boxed (value); - if (!self->application_context) - self->application_context = g_main_context_ref_thread_default (); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -gst_player_g_main_context_signal_dispatcher_get_property (GObject * object, - guint prop_id, GValue * value, GParamSpec * pspec) -{ - GstPlayerGMainContextSignalDispatcher *self = - GST_PLAYER_G_MAIN_CONTEXT_SIGNAL_DISPATCHER (object); - - switch (prop_id) { - case G_MAIN_CONTEXT_SIGNAL_DISPATCHER_PROP_APPLICATION_CONTEXT: - g_value_set_boxed (value, self->application_context); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void - gst_player_g_main_context_signal_dispatcher_class_init - (GstPlayerGMainContextSignalDispatcherClass * klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - - gobject_class->finalize = - gst_player_g_main_context_signal_dispatcher_finalize; - gobject_class->set_property = - gst_player_g_main_context_signal_dispatcher_set_property; - gobject_class->get_property = - gst_player_g_main_context_signal_dispatcher_get_property; - - g_main_context_signal_dispatcher_param_specs - [G_MAIN_CONTEXT_SIGNAL_DISPATCHER_PROP_APPLICATION_CONTEXT] = - g_param_spec_boxed ("application-context", "Application Context", - "Application GMainContext to dispatch signals to", G_TYPE_MAIN_CONTEXT, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS); - - g_object_class_install_properties (gobject_class, - G_MAIN_CONTEXT_SIGNAL_DISPATCHER_PROP_LAST, - g_main_context_signal_dispatcher_param_specs); -} - -static void - gst_player_g_main_context_signal_dispatcher_init - (G_GNUC_UNUSED GstPlayerGMainContextSignalDispatcher * self) -{ -} - -typedef struct -{ - void (*emitter) (gpointer data); - gpointer data; - GDestroyNotify destroy; -} GMainContextSignalDispatcherData; - -static gboolean -g_main_context_signal_dispatcher_dispatch_gsourcefunc (gpointer user_data) -{ - GMainContextSignalDispatcherData *data = user_data; - - data->emitter (data->data); - - return G_SOURCE_REMOVE; -} - -static void -g_main_context_signal_dispatcher_dispatch_destroy (gpointer user_data) -{ - GMainContextSignalDispatcherData *data = user_data; - - if (data->destroy) - data->destroy (data->data); - g_free (data); -} - -static void -gst_player_g_main_context_signal_dispatcher_dispatch (GstPlayerSignalDispatcher - * iface, G_GNUC_UNUSED GstPlayer * player, void (*emitter) (gpointer data), - gpointer data, GDestroyNotify destroy) -{ - GstPlayerGMainContextSignalDispatcher *self = - GST_PLAYER_G_MAIN_CONTEXT_SIGNAL_DISPATCHER (iface); - GMainContextSignalDispatcherData *gsourcefunc_data = - g_new (GMainContextSignalDispatcherData, 1); - - gsourcefunc_data->emitter = emitter; - gsourcefunc_data->data = data; - gsourcefunc_data->destroy = destroy; - - g_main_context_invoke_full (self->application_context, - G_PRIORITY_DEFAULT, g_main_context_signal_dispatcher_dispatch_gsourcefunc, - gsourcefunc_data, g_main_context_signal_dispatcher_dispatch_destroy); -} - -static void - gst_player_g_main_context_signal_dispatcher_interface_init - (GstPlayerSignalDispatcherInterface * iface) -{ - iface->dispatch = gst_player_g_main_context_signal_dispatcher_dispatch; -} - -/** - * gst_player_g_main_context_signal_dispatcher_new: - * @application_context: (allow-none): GMainContext to use or %NULL - * - * Creates a new GstPlayerSignalDispatcher that uses @application_context, - * or the thread default one if %NULL is used. See gst_player_new_full(). - * - * Returns: (transfer full): the new GstPlayerSignalDispatcher - */ -GstPlayerSignalDispatcher * -gst_player_g_main_context_signal_dispatcher_new (GMainContext * - application_context) -{ - return g_object_new (GST_TYPE_PLAYER_G_MAIN_CONTEXT_SIGNAL_DISPATCHER, - "application-context", application_context, NULL); -} diff --git a/lib/gst/player/gstplayer-g-main-context-signal-dispatcher.h b/lib/gst/player/gstplayer-g-main-context-signal-dispatcher.h deleted file mode 100644 index 431032b..0000000 --- a/lib/gst/player/gstplayer-g-main-context-signal-dispatcher.h +++ /dev/null @@ -1,48 +0,0 @@ -/* GStreamer - * - * Copyright (C) 2014-2015 Sebastian Dröge <sebastian@centricular.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#ifndef __GST_PLAYER_G_MAIN_CONTEXT_SIGNAL_DISPATCHER_H__ -#define __GST_PLAYER_G_MAIN_CONTEXT_SIGNAL_DISPATCHER_H__ - -#include <gst/player/gstplayer-types.h> -#include <gst/player/gstplayer-signal-dispatcher.h> - -G_BEGIN_DECLS - -typedef struct _GstPlayerGMainContextSignalDispatcher - GstPlayerGMainContextSignalDispatcher; -typedef struct _GstPlayerGMainContextSignalDispatcherClass - GstPlayerGMainContextSignalDispatcherClass; - -#define GST_TYPE_PLAYER_G_MAIN_CONTEXT_SIGNAL_DISPATCHER (gst_player_g_main_context_signal_dispatcher_get_type ()) -#define GST_IS_PLAYER_G_MAIN_CONTEXT_SIGNAL_DISPATCHER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_PLAYER_G_MAIN_CONTEXT_SIGNAL_DISPATCHER)) -#define GST_IS_PLAYER_G_MAIN_CONTEXT_SIGNAL_DISPATCHER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_PLAYER_G_MAIN_CONTEXT_SIGNAL_DISPATCHER)) -#define GST_PLAYER_G_MAIN_CONTEXT_SIGNAL_DISPATCHER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_PLAYER_G_MAIN_CONTEXT_SIGNAL_DISPATCHER, GstPlayerGMainContextSignalDispatcherClass)) -#define GST_PLAYER_G_MAIN_CONTEXT_SIGNAL_DISPATCHER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PLAYER_G_MAIN_CONTEXT_SIGNAL_DISPATCHER, GstPlayerGMainContextSignalDispatcher)) -#define GST_PLAYER_G_MAIN_CONTEXT_SIGNAL_DISPATCHER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_PLAYER_G_MAIN_CONTEXT_SIGNAL_DISPATCHER, GstPlayerGMainContextSignalDispatcherClass)) -#define GST_PLAYER_G_MAIN_CONTEXT_SIGNAL_DISPATCHER_CAST(obj) ((GstPlayerGMainContextSignalDispatcher*)(obj)) - -GType gst_player_g_main_context_signal_dispatcher_get_type (void); - -GstPlayerSignalDispatcher * gst_player_g_main_context_signal_dispatcher_new (GMainContext * application_context); - -G_END_DECLS - -#endif /* __GST_PLAYER_G_MAIN_CONTEXT_SIGNAL_DISPATCHER_H__ */ diff --git a/lib/gst/player/gstplayer-media-info-private.h b/lib/gst/player/gstplayer-media-info-private.h deleted file mode 100644 index b8757be..0000000 --- a/lib/gst/player/gstplayer-media-info-private.h +++ /dev/null @@ -1,125 +0,0 @@ -/* GStreamer - * - * Copyright (C) 2015 Brijesh Singh <brijesh.ksingh@gmail.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#include "gstplayer-media-info.h" - -#ifndef __GST_PLAYER_MEDIA_INFO_PRIVATE_H__ -#define __GST_PLAYER_MEDIA_INFO_PRIVATE_H__ - -struct _GstPlayerStreamInfo -{ - GObject parent; - - gchar *codec; - - GstCaps *caps; - gint stream_index; - GstTagList *tags; -}; - -struct _GstPlayerStreamInfoClass -{ - GObjectClass parent_class; -}; - -struct _GstPlayerSubtitleInfo -{ - GstPlayerStreamInfo parent; - - gchar *language; -}; - -struct _GstPlayerSubtitleInfoClass -{ - GstPlayerStreamInfoClass parent_class; -}; - -struct _GstPlayerAudioInfo -{ - GstPlayerStreamInfo parent; - - gint channels; - gint sample_rate; - - guint bitrate; - guint max_bitrate; - - gchar *language; -}; - -struct _GstPlayerAudioInfoClass -{ - GstPlayerStreamInfoClass parent_class; -}; - -struct _GstPlayerVideoInfo -{ - GstPlayerStreamInfo parent; - - gint width; - gint height; - gint framerate_num; - gint framerate_denom; - gint par_num; - gint par_denom; - - guint bitrate; - guint max_bitrate; -}; - -struct _GstPlayerVideoInfoClass -{ - GstPlayerStreamInfoClass parent_class; -}; - -struct _GstPlayerMediaInfo -{ - GObject parent; - - gchar *uri; - gchar *title; - gchar *container; - gboolean seekable; - GstTagList *tags; - GstSample *image_sample; - - GList *stream_list; - GList *audio_stream_list; - GList *video_stream_list; - GList *subtitle_stream_list; - - GstClockTime duration; -}; - -struct _GstPlayerMediaInfoClass -{ - GObjectClass parent_class; -}; - -G_GNUC_INTERNAL GstPlayerMediaInfo* gst_player_media_info_new - (const gchar *uri); -G_GNUC_INTERNAL GstPlayerMediaInfo* gst_player_media_info_copy - (GstPlayerMediaInfo *ref); -G_GNUC_INTERNAL GstPlayerStreamInfo* gst_player_stream_info_new - (gint stream_index, GType type); -G_GNUC_INTERNAL GstPlayerStreamInfo* gst_player_stream_info_copy - (GstPlayerStreamInfo *ref); - -#endif /* __GST_PLAYER_MEDIA_INFO_PRIVATE_H__ */ diff --git a/lib/gst/player/gstplayer-media-info.c b/lib/gst/player/gstplayer-media-info.c deleted file mode 100644 index a42b611..0000000 --- a/lib/gst/player/gstplayer-media-info.c +++ /dev/null @@ -1,775 +0,0 @@ -/* GStreamer - * - * Copyright (C) 2015 Brijesh Singh <brijesh.ksingh@gmail.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -/** - * SECTION:gstplayer-mediainfo - * @short_description: Player Media Information - * - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "gstplayer-media-info.h" -#include "gstplayer-media-info-private.h" - -/* Per-stream information */ -G_DEFINE_ABSTRACT_TYPE (GstPlayerStreamInfo, gst_player_stream_info, - G_TYPE_OBJECT); - -static void -gst_player_stream_info_init (GstPlayerStreamInfo * sinfo) -{ - sinfo->stream_index = -1; -} - -static void -gst_player_stream_info_finalize (GObject * object) -{ - GstPlayerStreamInfo *sinfo = GST_PLAYER_STREAM_INFO (object); - - g_free (sinfo->codec); - - if (sinfo->caps) - gst_caps_unref (sinfo->caps); - - if (sinfo->tags) - gst_tag_list_unref (sinfo->tags); - - G_OBJECT_CLASS (gst_player_stream_info_parent_class)->finalize (object); -} - -static void -gst_player_stream_info_class_init (GstPlayerStreamInfoClass * klass) -{ - GObjectClass *gobject_class = (GObjectClass *) klass; - - gobject_class->finalize = gst_player_stream_info_finalize; -} - -/** - * gst_player_stream_info_get_index: - * @info: a #GstPlayerStreamInfo - * - * Function to get stream index from #GstPlayerStreamInfo instance. - * - * Returns: the stream index of this stream. - */ -gint -gst_player_stream_info_get_index (const GstPlayerStreamInfo * info) -{ - g_return_val_if_fail (GST_IS_PLAYER_STREAM_INFO (info), -1); - - return info->stream_index; -} - -/** - * gst_player_stream_info_get_stream_type: - * @info: a #GstPlayerStreamInfo - * - * Function to return human readable name for the stream type - * of the given @info (ex: "audio", "video", "subtitle") - * - * Returns: a human readable name - */ -const gchar * -gst_player_stream_info_get_stream_type (const GstPlayerStreamInfo * info) -{ - g_return_val_if_fail (GST_IS_PLAYER_STREAM_INFO (info), NULL); - - if (GST_IS_PLAYER_VIDEO_INFO (info)) - return "video"; - else if (GST_IS_PLAYER_AUDIO_INFO (info)) - return "audio"; - else - return "subtitle"; -} - -/** - * gst_player_stream_info_get_tags: - * @info: a #GstPlayerStreamInfo - * - * Returns: (transfer none): the tags contained in this stream. - */ -GstTagList * -gst_player_stream_info_get_tags (const GstPlayerStreamInfo * info) -{ - g_return_val_if_fail (GST_IS_PLAYER_STREAM_INFO (info), NULL); - - return info->tags; -} - -/** - * gst_player_stream_info_get_codec: - * @info: a #GstPlayerStreamInfo - * - * A string describing codec used in #GstPlayerStreamInfo. - * - * Returns: codec string or NULL on unknown. - */ -const gchar * -gst_player_stream_info_get_codec (const GstPlayerStreamInfo * info) -{ - g_return_val_if_fail (GST_IS_PLAYER_STREAM_INFO (info), NULL); - - return info->codec; -} - -/** - * gst_player_stream_info_get_caps: - * @info: a #GstPlayerStreamInfo - * - * Returns: (transfer none): the #GstCaps of the stream. - */ -GstCaps * -gst_player_stream_info_get_caps (const GstPlayerStreamInfo * info) -{ - g_return_val_if_fail (GST_IS_PLAYER_STREAM_INFO (info), NULL); - - return info->caps; -} - -/* Video information */ -G_DEFINE_TYPE (GstPlayerVideoInfo, gst_player_video_info, - GST_TYPE_PLAYER_STREAM_INFO); - -static void -gst_player_video_info_init (GstPlayerVideoInfo * info) -{ - info->width = -1; - info->height = -1; - info->framerate_num = 0; - info->framerate_denom = 1; - info->par_num = 1; - info->par_denom = 1; -} - -static void -gst_player_video_info_class_init (G_GNUC_UNUSED GstPlayerVideoInfoClass * klass) -{ - /* nothing to do here */ -} - -/** - * gst_player_video_info_get_width: - * @info: a #GstPlayerVideoInfo - * - * Returns: the width of video in #GstPlayerVideoInfo. - */ -gint -gst_player_video_info_get_width (const GstPlayerVideoInfo * info) -{ - g_return_val_if_fail (GST_IS_PLAYER_VIDEO_INFO (info), -1); - - return info->width; -} - -/** - * gst_player_video_info_get_height: - * @info: a #GstPlayerVideoInfo - * - * Returns: the height of video in #GstPlayerVideoInfo. - */ -gint -gst_player_video_info_get_height (const GstPlayerVideoInfo * info) -{ - g_return_val_if_fail (GST_IS_PLAYER_VIDEO_INFO (info), -1); - - return info->height; -} - -/** - * gst_player_video_info_get_framerate_num: - * @info: a #GstPlayerVideoInfo - * - */ -void -gst_player_video_info_get_framerate (const GstPlayerVideoInfo * info, - gint * fps_n, gint * fps_d) -{ - g_return_if_fail (GST_IS_PLAYER_VIDEO_INFO (info)); - - *fps_n = info->framerate_num; - *fps_d = info->framerate_denom; -} - -/** - * gst_player_video_info_get_pixel_aspect_ratio: - * @info: a #GstPlayerVideoInfo - * @par_n: (out): numerator - * @par_d: (out): denominator - * - * Returns the pixel aspect ratio in @par_n and @par_d - * - */ -void -gst_player_video_info_get_pixel_aspect_ratio (const GstPlayerVideoInfo * info, - guint * par_n, guint * par_d) -{ - g_return_if_fail (GST_IS_PLAYER_VIDEO_INFO (info)); - - *par_n = info->par_num; - *par_d = info->par_denom; -} - -/** - * gst_player_video_info_get_bitrate: - * @info: a #GstPlayerVideoInfo - * - * Returns: the current bitrate of video in #GstPlayerVideoInfo. - */ -gint -gst_player_video_info_get_bitrate (const GstPlayerVideoInfo * info) -{ - g_return_val_if_fail (GST_IS_PLAYER_VIDEO_INFO (info), -1); - - return info->bitrate; -} - -/** - * gst_player_video_info_get_max_bitrate: - * @info: a #GstPlayerVideoInfo - * - * Returns: the maximum bitrate of video in #GstPlayerVideoInfo. - */ -gint -gst_player_video_info_get_max_bitrate (const GstPlayerVideoInfo * info) -{ - g_return_val_if_fail (GST_IS_PLAYER_VIDEO_INFO (info), -1); - - return info->max_bitrate; -} - -/* Audio information */ -G_DEFINE_TYPE (GstPlayerAudioInfo, gst_player_audio_info, - GST_TYPE_PLAYER_STREAM_INFO); - -static void -gst_player_audio_info_init (GstPlayerAudioInfo * info) -{ - info->channels = 0; - info->sample_rate = 0; - info->bitrate = -1; - info->max_bitrate = -1; -} - -static void -gst_player_audio_info_finalize (GObject * object) -{ - GstPlayerAudioInfo *info = GST_PLAYER_AUDIO_INFO (object); - - g_free (info->language); - - G_OBJECT_CLASS (gst_player_audio_info_parent_class)->finalize (object); -} - -static void -gst_player_audio_info_class_init (GstPlayerAudioInfoClass * klass) -{ - GObjectClass *gobject_class = (GObjectClass *) klass; - - gobject_class->finalize = gst_player_audio_info_finalize; -} - -/** - * gst_player_audio_info_get_language: - * @info: a #GstPlayerAudioInfo - * - * Returns: the language of the stream, or NULL if unknown. - */ -const gchar * -gst_player_audio_info_get_language (const GstPlayerAudioInfo * info) -{ - g_return_val_if_fail (GST_IS_PLAYER_AUDIO_INFO (info), NULL); - - return info->language; -} - -/** - * gst_player_audio_info_get_channels: - * @info: a #GstPlayerAudioInfo - * - * Returns: the number of audio channels in #GstPlayerAudioInfo. - */ -gint -gst_player_audio_info_get_channels (const GstPlayerAudioInfo * info) -{ - g_return_val_if_fail (GST_IS_PLAYER_AUDIO_INFO (info), 0); - - return info->channels; -} - -/** - * gst_player_audio_info_get_sample_rate: - * @info: a #GstPlayerAudioInfo - * - * Returns: the audio sample rate in #GstPlayerAudioInfo. - */ -gint -gst_player_audio_info_get_sample_rate (const GstPlayerAudioInfo * info) -{ - g_return_val_if_fail (GST_IS_PLAYER_AUDIO_INFO (info), 0); - - return info->sample_rate; -} - -/** - * gst_player_audio_info_get_bitrate: - * @info: a #GstPlayerAudioInfo - * - * Returns: the audio bitrate in #GstPlayerAudioInfo. - */ -gint -gst_player_audio_info_get_bitrate (const GstPlayerAudioInfo * info) -{ - g_return_val_if_fail (GST_IS_PLAYER_AUDIO_INFO (info), -1); - - return info->bitrate; -} - -/** - * gst_player_audio_info_get_max_bitrate: - * @info: a #GstPlayerAudioInfo - * - * Returns: the audio maximum bitrate in #GstPlayerAudioInfo. - */ -gint -gst_player_audio_info_get_max_bitrate (const GstPlayerAudioInfo * info) -{ - g_return_val_if_fail (GST_IS_PLAYER_AUDIO_INFO (info), -1); - - return info->max_bitrate; -} - -/* Subtitle information */ -G_DEFINE_TYPE (GstPlayerSubtitleInfo, gst_player_subtitle_info, - GST_TYPE_PLAYER_STREAM_INFO); - -static void -gst_player_subtitle_info_init (G_GNUC_UNUSED GstPlayerSubtitleInfo * info) -{ - /* nothing to do */ -} - -static void -gst_player_subtitle_info_finalize (GObject * object) -{ - GstPlayerSubtitleInfo *info = GST_PLAYER_SUBTITLE_INFO (object); - - g_free (info->language); - - G_OBJECT_CLASS (gst_player_subtitle_info_parent_class)->finalize (object); -} - -static void -gst_player_subtitle_info_class_init (GstPlayerSubtitleInfoClass * klass) -{ - GObjectClass *gobject_class = (GObjectClass *) klass; - - gobject_class->finalize = gst_player_subtitle_info_finalize; -} - -/** - * gst_player_subtitle_info_get_language: - * @info: a #GstPlayerSubtitleInfo - * - * Returns: the language of the stream, or NULL if unknown. - */ -const gchar * -gst_player_subtitle_info_get_language (const GstPlayerSubtitleInfo * info) -{ - g_return_val_if_fail (GST_IS_PLAYER_SUBTITLE_INFO (info), NULL); - - return info->language; -} - -/* Global media information */ -G_DEFINE_TYPE (GstPlayerMediaInfo, gst_player_media_info, G_TYPE_OBJECT); - -static void -gst_player_media_info_init (GstPlayerMediaInfo * info) -{ - info->duration = -1; - info->seekable = FALSE; -} - -static void -gst_player_media_info_finalize (GObject * object) -{ - GstPlayerMediaInfo *info = GST_PLAYER_MEDIA_INFO (object); - - g_free (info->uri); - - if (info->tags) - gst_tag_list_unref (info->tags); - - g_free (info->title); - - g_free (info->container); - - if (info->image_sample) - gst_sample_unref (info->image_sample); - - if (info->audio_stream_list) - g_list_free (info->audio_stream_list); - - if (info->video_stream_list) - g_list_free (info->video_stream_list); - - if (info->subtitle_stream_list) - g_list_free (info->subtitle_stream_list); - - if (info->stream_list) - g_list_free_full (info->stream_list, g_object_unref); - - G_OBJECT_CLASS (gst_player_media_info_parent_class)->finalize (object); -} - -static void -gst_player_media_info_class_init (GstPlayerMediaInfoClass * klass) -{ - GObjectClass *oclass = (GObjectClass *) klass; - - oclass->finalize = gst_player_media_info_finalize; -} - -static GstPlayerVideoInfo * -gst_player_video_info_new (void) -{ - return g_object_new (GST_TYPE_PLAYER_VIDEO_INFO, NULL); -} - -static GstPlayerAudioInfo * -gst_player_audio_info_new (void) -{ - return g_object_new (GST_TYPE_PLAYER_AUDIO_INFO, NULL); -} - -static GstPlayerSubtitleInfo * -gst_player_subtitle_info_new (void) -{ - return g_object_new (GST_TYPE_PLAYER_SUBTITLE_INFO, NULL); -} - -static GstPlayerStreamInfo * -gst_player_video_info_copy (GstPlayerVideoInfo * ref) -{ - GstPlayerVideoInfo *ret; - - ret = gst_player_video_info_new (); - - ret->width = ref->width; - ret->height = ref->height; - ret->framerate_num = ref->framerate_num; - ret->framerate_denom = ref->framerate_denom; - ret->par_num = ref->par_num; - ret->par_denom = ref->par_denom; - ret->bitrate = ref->bitrate; - ret->max_bitrate = ref->max_bitrate; - - return (GstPlayerStreamInfo *) ret; -} - -static GstPlayerStreamInfo * -gst_player_audio_info_copy (GstPlayerAudioInfo * ref) -{ - GstPlayerAudioInfo *ret; - - ret = gst_player_audio_info_new (); - - ret->sample_rate = ref->sample_rate; - ret->channels = ref->channels; - ret->bitrate = ref->bitrate; - ret->max_bitrate = ref->max_bitrate; - - if (ref->language) - ret->language = g_strdup (ref->language); - - return (GstPlayerStreamInfo *) ret; -} - -static GstPlayerStreamInfo * -gst_player_subtitle_info_copy (GstPlayerSubtitleInfo * ref) -{ - GstPlayerSubtitleInfo *ret; - - ret = gst_player_subtitle_info_new (); - if (ref->language) - ret->language = g_strdup (ref->language); - - return (GstPlayerStreamInfo *) ret; -} - -GstPlayerStreamInfo * -gst_player_stream_info_copy (GstPlayerStreamInfo * ref) -{ - GstPlayerStreamInfo *info = NULL; - - if (!ref) - return NULL; - - if (GST_IS_PLAYER_VIDEO_INFO (ref)) - info = gst_player_video_info_copy ((GstPlayerVideoInfo *) ref); - else if (GST_IS_PLAYER_AUDIO_INFO (ref)) - info = gst_player_audio_info_copy ((GstPlayerAudioInfo *) ref); - else - info = gst_player_subtitle_info_copy ((GstPlayerSubtitleInfo *) ref); - - info->stream_index = ref->stream_index; - if (ref->tags) - info->tags = gst_tag_list_ref (ref->tags); - if (ref->caps) - info->caps = gst_caps_copy (ref->caps); - if (ref->codec) - info->codec = g_strdup (ref->codec); - - return info; -} - -GstPlayerMediaInfo * -gst_player_media_info_copy (GstPlayerMediaInfo * ref) -{ - GList *l; - GstPlayerMediaInfo *info; - - if (!ref) - return NULL; - - info = gst_player_media_info_new (ref->uri); - info->duration = ref->duration; - info->seekable = ref->seekable; - if (ref->tags) - info->tags = gst_tag_list_ref (ref->tags); - if (ref->title) - info->title = g_strdup (ref->title); - if (ref->container) - info->container = g_strdup (ref->container); - if (ref->image_sample) - info->image_sample = gst_sample_ref (ref->image_sample); - - for (l = ref->stream_list; l != NULL; l = l->next) { - GstPlayerStreamInfo *s; - - s = gst_player_stream_info_copy ((GstPlayerStreamInfo *) l->data); - info->stream_list = g_list_append (info->stream_list, s); - - if (GST_IS_PLAYER_AUDIO_INFO (s)) - info->audio_stream_list = g_list_append (info->audio_stream_list, s); - else if (GST_IS_PLAYER_VIDEO_INFO (s)) - info->video_stream_list = g_list_append (info->video_stream_list, s); - else - info->subtitle_stream_list = - g_list_append (info->subtitle_stream_list, s); - } - - return info; -} - -GstPlayerStreamInfo * -gst_player_stream_info_new (gint stream_index, GType type) -{ - GstPlayerStreamInfo *info = NULL; - - if (type == GST_TYPE_PLAYER_AUDIO_INFO) - info = (GstPlayerStreamInfo *) gst_player_audio_info_new (); - else if (type == GST_TYPE_PLAYER_VIDEO_INFO) - info = (GstPlayerStreamInfo *) gst_player_video_info_new (); - else - info = (GstPlayerStreamInfo *) gst_player_subtitle_info_new (); - - info->stream_index = stream_index; - - return info; -} - -GstPlayerMediaInfo * -gst_player_media_info_new (const gchar * uri) -{ - GstPlayerMediaInfo *info; - - g_return_val_if_fail (uri != NULL, NULL); - - info = g_object_new (GST_TYPE_PLAYER_MEDIA_INFO, NULL); - info->uri = g_strdup (uri); - - return info; -} - -/** - * gst_player_media_info_get_uri: - * @info: a #GstPlayerMediaInfo - * - * Returns: the URI associated with #GstPlayerMediaInfo. - */ -const gchar * -gst_player_media_info_get_uri (const GstPlayerMediaInfo * info) -{ - g_return_val_if_fail (GST_IS_PLAYER_MEDIA_INFO (info), NULL); - - return info->uri; -} - -/** - * gst_player_media_info_is_seekable: - * @info: a #GstPlayerMediaInfo - * - * Returns: %TRUE if the media is seekable. - */ -gboolean -gst_player_media_info_is_seekable (const GstPlayerMediaInfo * info) -{ - g_return_val_if_fail (GST_IS_PLAYER_MEDIA_INFO (info), FALSE); - - return info->seekable; -} - -/** - * gst_player_media_info_get_stream_list: - * @info: a #GstPlayerMediaInfo - * - * Returns: (transfer none) (element-type GstPlayerStreamInfo): A #GList of - * matching #GstPlayerStreamInfo. - */ -GList * -gst_player_media_info_get_stream_list (const GstPlayerMediaInfo * info) -{ - g_return_val_if_fail (GST_IS_PLAYER_MEDIA_INFO (info), NULL); - - return info->stream_list; -} - -/** - * gst_player_get_video_streams: - * @info: a #GstPlayerMediaInfo - * - * Returns: (transfer none) (element-type GstPlayerVideoInfo): A #GList of - * matching #GstPlayerVideoInfo. - */ -GList * -gst_player_get_video_streams (const GstPlayerMediaInfo * info) -{ - g_return_val_if_fail (GST_IS_PLAYER_MEDIA_INFO (info), NULL); - - return info->video_stream_list; -} - -/** - * gst_player_get_subtitle_streams: - * @info: a #GstPlayerMediaInfo - * - * Returns: (transfer none) (element-type GstPlayerSubtitleInfo): A #GList of - * matching #GstPlayerSubtitleInfo. - */ -GList * -gst_player_get_subtitle_streams (const GstPlayerMediaInfo * info) -{ - g_return_val_if_fail (GST_IS_PLAYER_MEDIA_INFO (info), NULL); - - return info->subtitle_stream_list; -} - -/** - * gst_player_get_audio_streams: - * @info: a #GstPlayerMediaInfo - * - * Returns: (transfer none) (element-type GstPlayerAudioInfo): A #GList of - * matching #GstPlayerAudioInfo. - */ -GList * -gst_player_get_audio_streams (const GstPlayerMediaInfo * info) -{ - g_return_val_if_fail (GST_IS_PLAYER_MEDIA_INFO (info), NULL); - - return info->audio_stream_list; -} - -/** - * gst_player_media_info_get_duration: - * @info: a #GstPlayerMediaInfo - * - * Returns: duration of the media. - */ -GstClockTime -gst_player_media_info_get_duration (const GstPlayerMediaInfo * info) -{ - g_return_val_if_fail (GST_IS_PLAYER_MEDIA_INFO (info), -1); - - return info->duration; -} - -/** - * gst_player_media_info_get_tags: - * @info: a #GstPlayerMediaInfo - * - * Returns: (transfer none): the tags contained in media info. - */ -GstTagList * -gst_player_media_info_get_tags (const GstPlayerMediaInfo * info) -{ - g_return_val_if_fail (GST_IS_PLAYER_MEDIA_INFO (info), NULL); - - return info->tags; -} - -/** - * gst_player_media_info_get_title: - * @info: a #GstPlayerMediaInfo - * - * Returns: the media title. - */ -const gchar * -gst_player_media_info_get_title (const GstPlayerMediaInfo * info) -{ - g_return_val_if_fail (GST_IS_PLAYER_MEDIA_INFO (info), NULL); - - return info->title; -} - -/** - * gst_player_media_info_get_container_format: - * @info: a #GstPlayerMediaInfo - * - * Returns: the container format. - */ -const gchar * -gst_player_media_info_get_container_format (const GstPlayerMediaInfo * info) -{ - g_return_val_if_fail (GST_IS_PLAYER_MEDIA_INFO (info), NULL); - - return info->container; -} - -/** - * gst_player_media_info_get_image_sample: - * @info: a #GstPlayerMediaInfo - * - * Function to get the image (or preview-image) stored in taglist. - * Application can use gst_sample_*_() API's to get caps, buffer etc. - * - * Returns: (transfer none): GstSample or NULL. - */ -GstSample * -gst_player_media_info_get_image_sample (const GstPlayerMediaInfo * info) -{ - g_return_val_if_fail (GST_IS_PLAYER_MEDIA_INFO (info), NULL); - - return info->image_sample; -} diff --git a/lib/gst/player/gstplayer-media-info.h b/lib/gst/player/gstplayer-media-info.h deleted file mode 100644 index a458b75..0000000 --- a/lib/gst/player/gstplayer-media-info.h +++ /dev/null @@ -1,192 +0,0 @@ -/* GStreamer - * - * Copyright (C) 2015 Brijesh Singh <brijesh.ksingh@gmail.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#ifndef __GST_PLAYER_MEDIA_INFO_H__ -#define __GST_PLAYER_MEDIA_INFO_H__ - -#include <gst/gst.h> - -G_BEGIN_DECLS - -#define GST_TYPE_PLAYER_STREAM_INFO \ - (gst_player_stream_info_get_type ()) -#define GST_PLAYER_STREAM_INFO(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_PLAYER_STREAM_INFO,GstPlayerStreamInfo)) -#define GST_PLAYER_STREAM_INFO_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_PLAYER_STREAM_INFO,GstPlayerStreamInfo)) -#define GST_IS_PLAYER_STREAM_INFO(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_PLAYER_STREAM_INFO)) -#define GST_IS_PLAYER_STREAM_INFO_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_PLAYER_STREAM_INFO)) - -/** - * GstPlayerStreamInfo: - * - * Base structure for information concering a media stream. Depending on - * the stream type, one can find more media-specific information in - * #GstPlayerVideoInfo, #GstPlayerAudioInfo, #GstPlayerSubtitleInfo. - */ -typedef struct _GstPlayerStreamInfo GstPlayerStreamInfo; -typedef struct _GstPlayerStreamInfoClass GstPlayerStreamInfoClass; -GType gst_player_stream_info_get_type (void); - -gint gst_player_stream_info_get_index - (const GstPlayerStreamInfo *info); -const gchar* gst_player_stream_info_get_stream_type - (const GstPlayerStreamInfo *info); -GstTagList* gst_player_stream_info_get_tags - (const GstPlayerStreamInfo *info); -GstCaps* gst_player_stream_info_get_caps - (const GstPlayerStreamInfo *info); -const gchar* gst_player_stream_info_get_codec - (const GstPlayerStreamInfo *info); - -#define GST_TYPE_PLAYER_VIDEO_INFO \ - (gst_player_video_info_get_type ()) -#define GST_PLAYER_VIDEO_INFO(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_PLAYER_VIDEO_INFO, GstPlayerVideoInfo)) -#define GST_PLAYER_VIDEO_INFO_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((obj),GST_TYPE_PLAYER_VIDEO_INFO, GstPlayerVideoInfoClass)) -#define GST_IS_PLAYER_VIDEO_INFO(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_PLAYER_VIDEO_INFO)) -#define GST_IS_PLAYER_VIDEO_INFO_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((obj),GST_TYPE_PLAYER_VIDEO_INFO)) - -/** - * GstPlayerVideoInfo: - * - * #GstPlayerStreamInfo specific to video streams. - */ -typedef struct _GstPlayerVideoInfo GstPlayerVideoInfo; -typedef struct _GstPlayerVideoInfoClass GstPlayerVideoInfoClass; -GType gst_player_video_info_get_type (void); - -gint gst_player_video_info_get_bitrate - (const GstPlayerVideoInfo* info); -gint gst_player_video_info_get_max_bitrate - (const GstPlayerVideoInfo* info); -gint gst_player_video_info_get_width - (const GstPlayerVideoInfo* info); -gint gst_player_video_info_get_height - (const GstPlayerVideoInfo* info); -void gst_player_video_info_get_framerate - (const GstPlayerVideoInfo* info, gint *fps_n, gint *fps_d); -void gst_player_video_info_get_pixel_aspect_ratio - (const GstPlayerVideoInfo* info, guint *par_n, guint *par_d); - -#define GST_TYPE_PLAYER_AUDIO_INFO \ - (gst_player_audio_info_get_type ()) -#define GST_PLAYER_AUDIO_INFO(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_PLAYER_AUDIO_INFO, GstPlayerAudioInfo)) -#define GST_PLAYER_AUDIO_INFO_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_PLAYER_AUDIO_INFO, GstPlayerAudioInfoClass)) -#define GST_IS_PLAYER_AUDIO_INFO(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_PLAYER_AUDIO_INFO)) -#define GST_IS_PLAYER_AUDIO_INFO_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_PLAYER_AUDIO_INFO)) - -/** - * GstPlayerAudioInfo: - * - * #GstPlayerStreamInfo specific to audio streams. - */ -typedef struct _GstPlayerAudioInfo GstPlayerAudioInfo; -typedef struct _GstPlayerAudioInfoClass GstPlayerAudioInfoClass; -GType gst_player_audio_info_get_type (void); - -gint gst_player_audio_info_get_channels - (const GstPlayerAudioInfo* info); -gint gst_player_audio_info_get_sample_rate - (const GstPlayerAudioInfo* info); -gint gst_player_audio_info_get_bitrate - (const GstPlayerAudioInfo* info); -gint gst_player_audio_info_get_max_bitrate - (const GstPlayerAudioInfo* info); -const gchar* gst_player_audio_info_get_language - (const GstPlayerAudioInfo* info); - -#define GST_TYPE_PLAYER_SUBTITLE_INFO \ - (gst_player_subtitle_info_get_type ()) -#define GST_PLAYER_SUBTITLE_INFO(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_PLAYER_SUBTITLE_INFO, GstPlayerSubtitleInfo)) -#define GST_PLAYER_SUBTITLE_INFO_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_PLAYER_SUBTITLE_INFO,GstPlayerSubtitleInfoClass)) -#define GST_IS_PLAYER_SUBTITLE_INFO(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_PLAYER_SUBTITLE_INFO)) -#define GST_IS_PLAYER_SUBTITLE_INFO_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_PLAYER_SUBTITLE_INFO)) - -/** - * GstPlayerSubtitleInfo: - * - * #GstPlayerStreamInfo specific to subtitle streams. - */ -typedef struct _GstPlayerSubtitleInfo GstPlayerSubtitleInfo; -typedef struct _GstPlayerSubtitleInfoClass GstPlayerSubtitleInfoClass; -GType gst_player_subtitle_info_get_type (void); - -const gchar* gst_player_subtitle_info_get_language - (const GstPlayerSubtitleInfo* info); - -#define GST_TYPE_PLAYER_MEDIA_INFO \ - (gst_player_media_info_get_type()) -#define GST_PLAYER_MEDIA_INFO(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_PLAYER_MEDIA_INFO,GstPlayerMediaInfo)) -#define GST_PLAYER_MEDIA_INFO_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_PLAYER_MEDIA_INFO,GstPlayerMediaInfoClass)) -#define GST_IS_PLAYER_MEDIA_INFO(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_PLAYER_MEDIA_INFO)) -#define GST_IS_PLAYER_MEDIA_INFO_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_PLAYER_MEDIA_INFO)) - -/** - * GstPlayerMediaInfo: - * - * Structure containing the media information of a URI. - */ -typedef struct _GstPlayerMediaInfo GstPlayerMediaInfo; -typedef struct _GstPlayerMediaInfoClass GstPlayerMediaInfoClass; -GType gst_player_media_info_get_type (void); - -const gchar* gst_player_media_info_get_uri - (const GstPlayerMediaInfo *info); -gboolean gst_player_media_info_is_seekable - (const GstPlayerMediaInfo *info); -GstClockTime gst_player_media_info_get_duration - (const GstPlayerMediaInfo *info); -GList* gst_player_media_info_get_stream_list - (const GstPlayerMediaInfo *info); -GList* gst_player_get_video_streams - (const GstPlayerMediaInfo *info); -GList* gst_player_get_audio_streams - (const GstPlayerMediaInfo *info); -GList* gst_player_get_subtitle_streams - (const GstPlayerMediaInfo *info); -GstTagList* gst_player_media_info_get_tags - (const GstPlayerMediaInfo *info); -const gchar* gst_player_media_info_get_title - (const GstPlayerMediaInfo *info); -const gchar* gst_player_media_info_get_container_format - (const GstPlayerMediaInfo *info); -GstSample* gst_player_media_info_get_image_sample - (const GstPlayerMediaInfo *info); -G_END_DECLS - -#endif /* __GST_PLAYER_MEDIA_INFO_H */ diff --git a/lib/gst/player/gstplayer-signal-dispatcher-private.h b/lib/gst/player/gstplayer-signal-dispatcher-private.h deleted file mode 100644 index 7399161..0000000 --- a/lib/gst/player/gstplayer-signal-dispatcher-private.h +++ /dev/null @@ -1,34 +0,0 @@ -/* GStreamer - * - * Copyright (C) 2014-2015 Sebastian Dröge <sebastian@centricular.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#ifndef __GST_PLAYER_SIGNAL_DISPATCHER_PRIVATE_H__ -#define __GST_PLAYER_SIGNAL_DISPATCHER_PRIVATE_H__ - -#include <gst/player/gstplayer-signal-dispatcher.h> - -G_BEGIN_DECLS - -G_GNUC_INTERNAL void gst_player_signal_dispatcher_dispatch (GstPlayerSignalDispatcher * self, - GstPlayer * player, GstPlayerSignalDispatcherFunc emitter, gpointer data, - GDestroyNotify destroy); - -G_END_DECLS - -#endif /* __GST_PLAYER_SIGNAL_DISPATCHER_PRIVATE_H__ */ diff --git a/lib/gst/player/gstplayer-signal-dispatcher.c b/lib/gst/player/gstplayer-signal-dispatcher.c deleted file mode 100644 index 33e7b73..0000000 --- a/lib/gst/player/gstplayer-signal-dispatcher.c +++ /dev/null @@ -1,57 +0,0 @@ -/* GStreamer - * - * Copyright (C) 2014-2015 Sebastian Dröge <sebastian@centricular.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "gstplayer-signal-dispatcher.h" -#include "gstplayer-signal-dispatcher-private.h" - -G_DEFINE_INTERFACE (GstPlayerSignalDispatcher, gst_player_signal_dispatcher, - G_TYPE_OBJECT); - -static void -gst_player_signal_dispatcher_default_init (G_GNUC_UNUSED - GstPlayerSignalDispatcherInterface * iface) -{ - -} - -void -gst_player_signal_dispatcher_dispatch (GstPlayerSignalDispatcher * self, - GstPlayer * player, GstPlayerSignalDispatcherFunc emitter, gpointer data, - GDestroyNotify destroy) -{ - GstPlayerSignalDispatcherInterface *iface; - - if (!self) { - emitter (data); - if (destroy) - destroy (data); - return; - } - - g_return_if_fail (GST_IS_PLAYER_SIGNAL_DISPATCHER (self)); - iface = GST_PLAYER_SIGNAL_DISPATCHER_GET_INTERFACE (self); - g_return_if_fail (iface->dispatch != NULL); - - iface->dispatch (self, player, emitter, data, destroy); -} diff --git a/lib/gst/player/gstplayer-signal-dispatcher.h b/lib/gst/player/gstplayer-signal-dispatcher.h deleted file mode 100644 index 76338b2..0000000 --- a/lib/gst/player/gstplayer-signal-dispatcher.h +++ /dev/null @@ -1,53 +0,0 @@ -/* GStreamer - * - * Copyright (C) 2014-2015 Sebastian Dröge <sebastian@centricular.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#ifndef __GST_PLAYER_SIGNAL_DISPATCHER_H__ -#define __GST_PLAYER_SIGNAL_DISPATCHER_H__ - -#include <gst/gst.h> -#include <gst/player/gstplayer-types.h> - -G_BEGIN_DECLS - -typedef struct _GstPlayerSignalDispatcher GstPlayerSignalDispatcher; -typedef struct _GstPlayerSignalDispatcherInterface GstPlayerSignalDispatcherInterface; - -#define GST_TYPE_PLAYER_SIGNAL_DISPATCHER (gst_player_signal_dispatcher_get_type ()) -#define GST_PLAYER_SIGNAL_DISPATCHER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PLAYER_SIGNAL_DISPATCHER, GstPlayerSignalDispatcher)) -#define GST_IS_PLAYER_SIGNAL_DISPATCHER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_PLAYER_SIGNAL_DISPATCHER)) -#define GST_PLAYER_SIGNAL_DISPATCHER_GET_INTERFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_PLAYER_SIGNAL_DISPATCHER, GstPlayerSignalDispatcherInterface)) - -typedef void (*GstPlayerSignalDispatcherFunc) (gpointer data); - -struct _GstPlayerSignalDispatcherInterface { - GTypeInterface parent_iface; - - void (*dispatch) (GstPlayerSignalDispatcher * self, - GstPlayer * player, - GstPlayerSignalDispatcherFunc emitter, - gpointer data, - GDestroyNotify destroy); -}; - -GType gst_player_signal_dispatcher_get_type (void); - -G_END_DECLS - -#endif /* __GST_PLAYER_SIGNAL_DISPATCHER_H__ */ diff --git a/lib/gst/player/gstplayer-types.h b/lib/gst/player/gstplayer-types.h deleted file mode 100644 index f6627e6..0000000 --- a/lib/gst/player/gstplayer-types.h +++ /dev/null @@ -1,35 +0,0 @@ -/* GStreamer - * - * Copyright (C) 2015 Sebastian Dröge <sebastian@centricular.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#ifndef __GST_PLAYER_TYPES_H__ -#define __GST_PLAYER_TYPES_H__ - -#include <gst/gst.h> - -G_BEGIN_DECLS - -typedef struct _GstPlayer GstPlayer; -typedef struct _GstPlayerClass GstPlayerClass; - -G_END_DECLS - -#endif /* __GST_PLAYER_TYPES_H__ */ - - diff --git a/lib/gst/player/gstplayer-video-overlay-video-renderer.c b/lib/gst/player/gstplayer-video-overlay-video-renderer.c deleted file mode 100644 index ab8894f..0000000 --- a/lib/gst/player/gstplayer-video-overlay-video-renderer.c +++ /dev/null @@ -1,224 +0,0 @@ -/* GStreamer - * - * Copyright (C) 2014-2015 Sebastian Dröge <sebastian@centricular.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -/** - * SECTION:gstplayer-videooverlayvideorenderer - * @short_description: Player Video Overlay Video Renderer - * - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "gstplayer-video-overlay-video-renderer.h" -#include "gstplayer.h" - -#include <gst/video/video.h> - -struct _GstPlayerVideoOverlayVideoRenderer -{ - GObject parent; - - GstVideoOverlay *video_overlay; - gpointer window_handle; -}; - -struct _GstPlayerVideoOverlayVideoRendererClass -{ - GObjectClass parent_class; -}; - -static void - gst_player_video_overlay_video_renderer_interface_init - (GstPlayerVideoRendererInterface * iface); - -enum -{ - VIDEO_OVERLAY_VIDEO_RENDERER_PROP_0, - VIDEO_OVERLAY_VIDEO_RENDERER_PROP_WINDOW_HANDLE, - VIDEO_OVERLAY_VIDEO_RENDERER_PROP_LAST -}; - -G_DEFINE_TYPE_WITH_CODE (GstPlayerVideoOverlayVideoRenderer, - gst_player_video_overlay_video_renderer, G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE (GST_TYPE_PLAYER_VIDEO_RENDERER, - gst_player_video_overlay_video_renderer_interface_init)); - -static GParamSpec - * video_overlay_video_renderer_param_specs - [VIDEO_OVERLAY_VIDEO_RENDERER_PROP_LAST] = { NULL, }; - -static void -gst_player_video_overlay_video_renderer_set_property (GObject * object, - guint prop_id, const GValue * value, GParamSpec * pspec) -{ - GstPlayerVideoOverlayVideoRenderer *self = - GST_PLAYER_VIDEO_OVERLAY_VIDEO_RENDERER (object); - - switch (prop_id) { - case VIDEO_OVERLAY_VIDEO_RENDERER_PROP_WINDOW_HANDLE: - self->window_handle = g_value_get_pointer (value); - if (self->video_overlay) - gst_video_overlay_set_window_handle (self->video_overlay, - (guintptr) self->window_handle); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -gst_player_video_overlay_video_renderer_get_property (GObject * object, - guint prop_id, GValue * value, GParamSpec * pspec) -{ - GstPlayerVideoOverlayVideoRenderer *self = - GST_PLAYER_VIDEO_OVERLAY_VIDEO_RENDERER (object); - - switch (prop_id) { - case VIDEO_OVERLAY_VIDEO_RENDERER_PROP_WINDOW_HANDLE: - g_value_set_pointer (value, self->window_handle); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -gst_player_video_overlay_video_renderer_finalize (GObject * object) -{ - GstPlayerVideoOverlayVideoRenderer *self = - GST_PLAYER_VIDEO_OVERLAY_VIDEO_RENDERER (object); - - if (self->video_overlay) - gst_object_unref (self->video_overlay); - - G_OBJECT_CLASS - (gst_player_video_overlay_video_renderer_parent_class)->finalize (object); -} - -static void - gst_player_video_overlay_video_renderer_class_init - (GstPlayerVideoOverlayVideoRendererClass * klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - - gobject_class->set_property = - gst_player_video_overlay_video_renderer_set_property; - gobject_class->get_property = - gst_player_video_overlay_video_renderer_get_property; - gobject_class->finalize = gst_player_video_overlay_video_renderer_finalize; - - video_overlay_video_renderer_param_specs - [VIDEO_OVERLAY_VIDEO_RENDERER_PROP_WINDOW_HANDLE] = - g_param_spec_pointer ("window-handle", "Window Handle", - "Window handle to embed the video into", - G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS); - - g_object_class_install_properties (gobject_class, - VIDEO_OVERLAY_VIDEO_RENDERER_PROP_LAST, - video_overlay_video_renderer_param_specs); -} - -static void - gst_player_video_overlay_video_renderer_init - (G_GNUC_UNUSED GstPlayerVideoOverlayVideoRenderer * self) -{ -} - -static GstElement *gst_player_video_overlay_video_renderer_create_video_sink - (GstPlayerVideoRenderer * iface, GstPlayer * player) -{ - GstElement *video_overlay; - GstPlayerVideoOverlayVideoRenderer *self = - GST_PLAYER_VIDEO_OVERLAY_VIDEO_RENDERER (iface); - - if (self->video_overlay) - gst_object_unref (self->video_overlay); - - video_overlay = gst_player_get_pipeline (player); - g_return_val_if_fail (GST_IS_VIDEO_OVERLAY (video_overlay), NULL); - - self->video_overlay = GST_VIDEO_OVERLAY (video_overlay); - - gst_video_overlay_set_window_handle (self->video_overlay, - (guintptr) self->window_handle); - - return NULL; -} - -static void - gst_player_video_overlay_video_renderer_interface_init - (GstPlayerVideoRendererInterface * iface) -{ - iface->create_video_sink = - gst_player_video_overlay_video_renderer_create_video_sink; -} - -/** - * gst_player_video_overlay_video_renderer_new: - * @window_handle: (allow-none): Window handle to use or %NULL - * - * Returns: (transfer full): - */ -GstPlayerVideoRenderer * -gst_player_video_overlay_video_renderer_new (gpointer window_handle) -{ - return g_object_new (GST_TYPE_PLAYER_VIDEO_OVERLAY_VIDEO_RENDERER, - "window-handle", window_handle, NULL); -} - -/** - * gst_player_video_overlay_video_renderer_set_window_handle: - * @self: #GstPlayerVideoRenderer instance - * @window_handle: handle referencing to the platform specific window - * - * Sets the platform specific window handle into which the video - * should be rendered - **/ -void gst_player_video_overlay_video_renderer_set_window_handle - (GstPlayerVideoOverlayVideoRenderer * self, gpointer window_handle) -{ - g_return_if_fail (GST_IS_PLAYER_VIDEO_OVERLAY_VIDEO_RENDERER (self)); - - g_object_set (self, "window-handle", window_handle, NULL); -} - -/** - * gst_player_video_overlay_video_renderer_get_window_handle: - * @self: #GstPlayerVideoRenderer instance - * - * Returns: (transfer none): The currently set, platform specific window - * handle - */ -gpointer - gst_player_video_overlay_video_renderer_get_window_handle - (GstPlayerVideoOverlayVideoRenderer * self) { - gpointer window_handle; - - g_return_val_if_fail (GST_IS_PLAYER_VIDEO_OVERLAY_VIDEO_RENDERER (self), - NULL); - - g_object_get (self, "window-handle", &window_handle, NULL); - - return window_handle; -} diff --git a/lib/gst/player/gstplayer-video-overlay-video-renderer.h b/lib/gst/player/gstplayer-video-overlay-video-renderer.h deleted file mode 100644 index 72a420b..0000000 --- a/lib/gst/player/gstplayer-video-overlay-video-renderer.h +++ /dev/null @@ -1,49 +0,0 @@ -/* GStreamer - * - * Copyright (C) 2014-2015 Sebastian Dröge <sebastian@centricular.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#ifndef __GST_PLAYER_VIDEO_OVERLAY_VIDEO_RENDERER_H__ -#define __GST_PLAYER_VIDEO_OVERLAY_VIDEO_RENDERER_H__ - -#include <gst/player/gstplayer-types.h> -#include <gst/player/gstplayer-video-renderer.h> - -G_BEGIN_DECLS - -typedef struct _GstPlayerVideoOverlayVideoRenderer - GstPlayerVideoOverlayVideoRenderer; -typedef struct _GstPlayerVideoOverlayVideoRendererClass - GstPlayerVideoOverlayVideoRendererClass; - -#define GST_TYPE_PLAYER_VIDEO_OVERLAY_VIDEO_RENDERER (gst_player_video_overlay_video_renderer_get_type ()) -#define GST_IS_PLAYER_VIDEO_OVERLAY_VIDEO_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_PLAYER_VIDEO_OVERLAY_VIDEO_RENDERER)) -#define GST_IS_PLAYER_VIDEO_OVERLAY_VIDEO_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_PLAYER_VIDEO_OVERLAY_VIDEO_RENDERER)) -#define GST_PLAYER_VIDEO_OVERLAY_VIDEO_RENDERER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_PLAYER_VIDEO_OVERLAY_VIDEO_RENDERER, GstPlayerVideoOverlayVideoRendererClass)) -#define GST_PLAYER_VIDEO_OVERLAY_VIDEO_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PLAYER_VIDEO_OVERLAY_VIDEO_RENDERER, GstPlayerVideoOverlayVideoRenderer)) -#define GST_PLAYER_VIDEO_OVERLAY_VIDEO_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_PLAYER_VIDEO_OVERLAY_VIDEO_RENDERER, GstPlayerVideoOverlayVideoRendererClass)) -#define GST_PLAYER_VIDEO_OVERLAY_VIDEO_RENDERER_CAST(obj) ((GstPlayerVideoOverlayVideoRenderer*)(obj)) - -GType gst_player_video_overlay_video_renderer_get_type (void); -GstPlayerVideoRenderer * gst_player_video_overlay_video_renderer_new (gpointer window_handle); -void gst_player_video_overlay_video_renderer_set_window_handle (GstPlayerVideoOverlayVideoRenderer * self, gpointer window_handle); -gpointer gst_player_video_overlay_video_renderer_get_window_handle (GstPlayerVideoOverlayVideoRenderer * self); - -G_END_DECLS - -#endif /* __GST_PLAYER_VIDEO_OVERLAY_VIDEO_RENDERER_H__ */ diff --git a/lib/gst/player/gstplayer-video-renderer-private.h b/lib/gst/player/gstplayer-video-renderer-private.h deleted file mode 100644 index 6ecab15..0000000 --- a/lib/gst/player/gstplayer-video-renderer-private.h +++ /dev/null @@ -1,33 +0,0 @@ -/* GStreamer - * - * Copyright (C) 2014-2015 Sebastian Dröge <sebastian@centricular.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#ifndef __GST_PLAYER_VIDEO_RENDERER_PRIVATE_H__ -#define __GST_PLAYER_VIDEO_RENDERER_PRIVATE_H__ - -#include <gst/player/gstplayer-video-renderer.h> - -G_BEGIN_DECLS - -G_GNUC_INTERNAL GstElement * gst_player_video_renderer_create_video_sink (GstPlayerVideoRenderer * - self, GstPlayer * player); - -G_END_DECLS - -#endif /* __GST_PLAYER_VIDEO_RENDERER_PRIVATE_H__ */ diff --git a/lib/gst/player/gstplayer-video-renderer.c b/lib/gst/player/gstplayer-video-renderer.c deleted file mode 100644 index 6faf6a8..0000000 --- a/lib/gst/player/gstplayer-video-renderer.c +++ /dev/null @@ -1,49 +0,0 @@ -/* GStreamer - * - * Copyright (C) 2014-2015 Sebastian Dröge <sebastian@centricular.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "gstplayer-video-renderer.h" -#include "gstplayer-video-renderer-private.h" - -G_DEFINE_INTERFACE (GstPlayerVideoRenderer, gst_player_video_renderer, - G_TYPE_OBJECT); - -static void -gst_player_video_renderer_default_init (G_GNUC_UNUSED - GstPlayerVideoRendererInterface * iface) -{ - -} - -GstElement * -gst_player_video_renderer_create_video_sink (GstPlayerVideoRenderer * self, - GstPlayer * player) -{ - GstPlayerVideoRendererInterface *iface; - - g_return_val_if_fail (GST_IS_PLAYER_VIDEO_RENDERER (self), NULL); - iface = GST_PLAYER_VIDEO_RENDERER_GET_INTERFACE (self); - g_return_val_if_fail (iface->create_video_sink != NULL, NULL); - - return iface->create_video_sink (self, player); -} diff --git a/lib/gst/player/gstplayer-video-renderer.h b/lib/gst/player/gstplayer-video-renderer.h deleted file mode 100644 index b9df5c9..0000000 --- a/lib/gst/player/gstplayer-video-renderer.h +++ /dev/null @@ -1,47 +0,0 @@ -/* GStreamer - * - * Copyright (C) 2014-2015 Sebastian Dröge <sebastian@centricular.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#ifndef __GST_PLAYER_VIDEO_RENDERER_H__ -#define __GST_PLAYER_VIDEO_RENDERER_H__ - -#include <gst/gst.h> -#include <gst/player/gstplayer-types.h> - -G_BEGIN_DECLS - -typedef struct _GstPlayerVideoRenderer GstPlayerVideoRenderer; -typedef struct _GstPlayerVideoRendererInterface GstPlayerVideoRendererInterface; - -#define GST_TYPE_PLAYER_VIDEO_RENDERER (gst_player_video_renderer_get_type ()) -#define GST_PLAYER_VIDEO_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PLAYER_VIDEO_RENDERER, GstPlayerVideoRenderer)) -#define GST_IS_PLAYER_VIDEO_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_PLAYER_VIDEO_RENDERER)) -#define GST_PLAYER_VIDEO_RENDERER_GET_INTERFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_PLAYER_VIDEO_RENDERER, GstPlayerVideoRendererInterface)) - -struct _GstPlayerVideoRendererInterface { - GTypeInterface parent_iface; - - GstElement * (*create_video_sink) (GstPlayerVideoRenderer * self, GstPlayer * player); -}; - -GType gst_player_video_renderer_get_type (void); - -G_END_DECLS - -#endif /* __GST_PLAYER_VIDEO_RENDERER_H__ */ diff --git a/lib/gst/player/gstplayer-visualization.c b/lib/gst/player/gstplayer-visualization.c deleted file mode 100644 index 79976a7..0000000 --- a/lib/gst/player/gstplayer-visualization.c +++ /dev/null @@ -1,178 +0,0 @@ -/* GStreamer - * - * Copyright (C) 2014-2015 Sebastian Dröge <sebastian@centricular.com> - * Copyright (C) 2015 Brijesh Singh <brijesh.ksingh@gmail.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -/** - * SECTION:gstplayer-visualization - * @short_description: Player Visualization - * - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "gstplayer-visualization.h" - -#include <string.h> - -static GMutex vis_lock; -static GQueue vis_list = G_QUEUE_INIT; -static guint32 vis_cookie; - -G_DEFINE_BOXED_TYPE (GstPlayerVisualization, gst_player_visualization, - (GBoxedCopyFunc) gst_player_visualization_copy, - (GBoxedFreeFunc) gst_player_visualization_free); - -/** - * gst_player_visualization_free: - * @vis: #GstPlayerVisualization instance - * - * Frees a #GstPlayerVisualization. - */ -void -gst_player_visualization_free (GstPlayerVisualization * vis) -{ - g_return_if_fail (vis != NULL); - - g_free (vis->name); - g_free (vis->description); - g_free (vis); -} - -/** - * gst_player_visualization_copy: - * @vis: #GstPlayerVisualization instance - * - * Makes a copy of the #GstPlayerVisualization. The result must be - * freed using gst_player_visualization_free(). - * - * Returns: (transfer full): an allocated copy of @vis. - */ -GstPlayerVisualization * -gst_player_visualization_copy (const GstPlayerVisualization * vis) -{ - GstPlayerVisualization *ret; - - g_return_val_if_fail (vis != NULL, NULL); - - ret = g_new0 (GstPlayerVisualization, 1); - ret->name = vis->name ? g_strdup (vis->name) : NULL; - ret->description = vis->description ? g_strdup (vis->description) : NULL; - - return ret; -} - -/** - * gst_player_visualizations_free: - * @viss: a %NULL terminated array of #GstPlayerVisualization to free - * - * Frees a %NULL terminated array of #GstPlayerVisualization. - */ -void -gst_player_visualizations_free (GstPlayerVisualization ** viss) -{ - GstPlayerVisualization **p; - - g_return_if_fail (viss != NULL); - - p = viss; - while (*p) { - g_free ((*p)->name); - g_free ((*p)->description); - g_free (*p); - p++; - } - g_free (viss); -} - -static void -gst_player_update_visualization_list (void) -{ - GList *features; - GList *l; - guint32 cookie; - GstPlayerVisualization *vis; - - g_mutex_lock (&vis_lock); - - /* check if we need to update the list */ - cookie = gst_registry_get_feature_list_cookie (gst_registry_get ()); - if (vis_cookie == cookie) { - g_mutex_unlock (&vis_lock); - return; - } - - /* if update is needed then first free the existing list */ - while ((vis = g_queue_pop_head (&vis_list))) - gst_player_visualization_free (vis); - - features = gst_registry_get_feature_list (gst_registry_get (), - GST_TYPE_ELEMENT_FACTORY); - - for (l = features; l; l = l->next) { - GstPluginFeature *feature = l->data; - const gchar *klass; - - klass = gst_element_factory_get_metadata (GST_ELEMENT_FACTORY (feature), - GST_ELEMENT_METADATA_KLASS); - - if (strstr (klass, "Visualization")) { - vis = g_new0 (GstPlayerVisualization, 1); - - vis->name = g_strdup (gst_plugin_feature_get_name (feature)); - vis->description = - g_strdup (gst_element_factory_get_metadata (GST_ELEMENT_FACTORY - (feature), GST_ELEMENT_METADATA_DESCRIPTION)); - g_queue_push_tail (&vis_list, vis); - } - } - gst_plugin_feature_list_free (features); - - vis_cookie = cookie; - - g_mutex_unlock (&vis_lock); -} - -/** - * gst_player_visualizations_get: - * - * Returns: (transfer full) (array zero-terminated=1) (element-type GstPlayerVisualization): - * a %NULL terminated array containing all available - * visualizations. Use gst_player_visualizations_free() after - * usage. - */ -GstPlayerVisualization ** -gst_player_visualizations_get (void) -{ - gint i = 0; - GList *l; - GstPlayerVisualization **ret; - - gst_player_update_visualization_list (); - - g_mutex_lock (&vis_lock); - ret = g_new0 (GstPlayerVisualization *, g_queue_get_length (&vis_list) + 1); - for (l = vis_list.head; l; l = l->next) - ret[i++] = gst_player_visualization_copy (l->data); - g_mutex_unlock (&vis_lock); - - return ret; -} diff --git a/lib/gst/player/gstplayer-visualization.h b/lib/gst/player/gstplayer-visualization.h deleted file mode 100644 index 7382773..0000000 --- a/lib/gst/player/gstplayer-visualization.h +++ /dev/null @@ -1,52 +0,0 @@ -/* GStreamer - * - * Copyright (C) 2014-2015 Sebastian Dröge <sebastian@centricular.com> - * Copyright (C) 2015 Brijesh Singh <brijesh.ksingh@gmail.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#ifndef __GST_PLAYER_VISUALIZATION_H__ -#define __GST_PLAYER_VISUALIZATION_H__ - -#include <gst/gst.h> - -G_BEGIN_DECLS - -typedef struct _GstPlayerVisualization GstPlayerVisualization; -/** - * GstPlayerVisualization: - * @name: name of the visualization. - * @description: description of the visualization. - * - * A #GstPlayerVisualization descriptor. - */ -struct _GstPlayerVisualization { - gchar *name; - gchar *description; -}; - -GType gst_player_visualization_get_type (void); - -GstPlayerVisualization * gst_player_visualization_copy (const GstPlayerVisualization *vis); -void gst_player_visualization_free (GstPlayerVisualization *vis); - -GstPlayerVisualization ** gst_player_visualizations_get (void); -void gst_player_visualizations_free (GstPlayerVisualization **viss); - -G_END_DECLS - -#endif /* __GST_PLAYER_VISUALIZATION_H__ */ diff --git a/lib/gst/player/gstplayer.c b/lib/gst/player/gstplayer.c deleted file mode 100644 index 78f36d5..0000000 --- a/lib/gst/player/gstplayer.c +++ /dev/null @@ -1,3790 +0,0 @@ -/* GStreamer - * - * Copyright (C) 2014-2015 Sebastian Dröge <sebastian@centricular.com> - * Copyright (C) 2015 Brijesh Singh <brijesh.ksingh@gmail.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -/** - * SECTION:gstplayer - * @short_description: Player - * - */ - -/* TODO: - * - * - Equalizer - * - Gapless playback - * - Frame stepping - * - Subtitle font, connection speed - * - Deinterlacing - * - Buffering control (-> progressive downloading) - * - Playlist/queue object - * - Custom video sink (e.g. embed in GL scene) - * - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "gstplayer.h" -#include "gstplayer-signal-dispatcher-private.h" -#include "gstplayer-video-renderer-private.h" -#include "gstplayer-media-info-private.h" - -#include <gst/gst.h> -#include <gst/video/video.h> -#include <gst/video/colorbalance.h> -#include <gst/tag/tag.h> -#include <gst/pbutils/descriptions.h> - -#include <string.h> - -GST_DEBUG_CATEGORY_STATIC (gst_player_debug); -#define GST_CAT_DEFAULT gst_player_debug - -#define DEFAULT_URI NULL -#define DEFAULT_POSITION GST_CLOCK_TIME_NONE -#define DEFAULT_DURATION GST_CLOCK_TIME_NONE -#define DEFAULT_VOLUME 1.0 -#define DEFAULT_MUTE FALSE -#define DEFAULT_RATE 1.0 -#define DEFAULT_POSITION_UPDATE_INTERVAL_MS 100 - -GQuark -gst_player_error_quark (void) -{ - static GQuark quark; - - if (!quark) - quark = g_quark_from_static_string ("gst-player-error-quark"); - - return quark; -} - -enum -{ - PROP_0, - PROP_VIDEO_RENDERER, - PROP_SIGNAL_DISPATCHER, - PROP_URI, - PROP_SUBURI, - PROP_POSITION, - PROP_DURATION, - PROP_MEDIA_INFO, - PROP_CURRENT_AUDIO_TRACK, - PROP_CURRENT_VIDEO_TRACK, - PROP_CURRENT_SUBTITLE_TRACK, - PROP_VOLUME, - PROP_MUTE, - PROP_RATE, - PROP_PIPELINE, - PROP_POSITION_UPDATE_INTERVAL, - PROP_LAST -}; - -enum -{ - SIGNAL_POSITION_UPDATED, - SIGNAL_DURATION_CHANGED, - SIGNAL_STATE_CHANGED, - SIGNAL_BUFFERING, - SIGNAL_END_OF_STREAM, - SIGNAL_ERROR, - SIGNAL_WARNING, - SIGNAL_VIDEO_DIMENSIONS_CHANGED, - SIGNAL_MEDIA_INFO_UPDATED, - SIGNAL_VOLUME_CHANGED, - SIGNAL_MUTE_CHANGED, - SIGNAL_SEEK_DONE, - SIGNAL_LAST -}; - -enum -{ - GST_PLAY_FLAG_VIDEO = (1 << 0), - GST_PLAY_FLAG_AUDIO = (1 << 1), - GST_PLAY_FLAG_SUBTITLE = (1 << 2), - GST_PLAY_FLAG_VIS = (1 << 3) -}; - -struct _GstPlayer -{ - GstObject parent; - - GstPlayerVideoRenderer *video_renderer; - GstPlayerSignalDispatcher *signal_dispatcher; - - gchar *uri; - gchar *suburi; - - GThread *thread; - GMutex lock; - GCond cond; - GMainContext *context; - GMainLoop *loop; - - GstElement *playbin; - GstBus *bus; - GstState target_state, current_state; - gboolean is_live, is_eos; - GSource *tick_source, *ready_timeout_source; - - gdouble rate; - guint position_update_interval_ms; - - GstPlayerState app_state; - gint buffering; - - GstTagList *global_tags; - GstPlayerMediaInfo *media_info; - - GstElement *current_vis_element; - - /* Protected by lock */ - gboolean seek_pending; /* Only set from main context */ - GstClockTime last_seek_time; /* Only set from main context */ - GSource *seek_source; - GstClockTime seek_position; -}; - -struct _GstPlayerClass -{ - GstObjectClass parent_class; -}; - -#define parent_class gst_player_parent_class -G_DEFINE_TYPE (GstPlayer, gst_player, GST_TYPE_OBJECT); - -static guint signals[SIGNAL_LAST] = { 0, }; -static GParamSpec *param_specs[PROP_LAST] = { NULL, }; - -static void gst_player_dispose (GObject * object); -static void gst_player_finalize (GObject * object); -static void gst_player_set_property (GObject * object, guint prop_id, - const GValue * value, GParamSpec * pspec); -static void gst_player_get_property (GObject * object, guint prop_id, - GValue * value, GParamSpec * pspec); -static void gst_player_constructed (GObject * object); - -static gpointer gst_player_main (gpointer data); - -static void gst_player_seek_internal_locked (GstPlayer * self); -static gboolean gst_player_stop_internal (gpointer user_data); -static gboolean gst_player_pause_internal (gpointer user_data); -static gboolean gst_player_play_internal (gpointer user_data); -static gboolean gst_player_set_rate_internal (gpointer user_data); -static gboolean gst_player_set_position_update_interval_internal (gpointer - user_data); -static void change_state (GstPlayer * self, GstPlayerState state); - -static GstPlayerMediaInfo *gst_player_media_info_create (GstPlayer * self); - -static void gst_player_streams_info_create (GstPlayer * self, - GstPlayerMediaInfo * media_info, const gchar * prop, GType type); -static void gst_player_stream_info_update (GstPlayer * self, - GstPlayerStreamInfo * s); -static void gst_player_stream_info_update_tags_and_caps (GstPlayer * self, - GstPlayerStreamInfo * s); -static GstPlayerStreamInfo *gst_player_stream_info_find (GstPlayerMediaInfo * - media_info, GType type, gint stream_index); -static GstPlayerStreamInfo *gst_player_stream_info_get_current (GstPlayer * - self, const gchar * prop, GType type); - -static void gst_player_video_info_update (GstPlayer * self, - GstPlayerStreamInfo * stream_info); -static void gst_player_audio_info_update (GstPlayer * self, - GstPlayerStreamInfo * stream_info); -static void gst_player_subtitle_info_update (GstPlayer * self, - GstPlayerStreamInfo * stream_info); - -static void emit_media_info_updated_signal (GstPlayer * self); - -static void *get_title (GstTagList * tags); -static void *get_container_format (GstTagList * tags); -static void *get_from_tags (GstPlayer * self, GstPlayerMediaInfo * media_info, - void *(*func) (GstTagList *)); -static void *get_cover_sample (GstTagList * tags); - -static void -gst_player_init (GstPlayer * self) -{ - GST_TRACE_OBJECT (self, "Initializing"); - - self = gst_player_get_instance_private (self); - - g_mutex_init (&self->lock); - g_cond_init (&self->cond); - - self->context = g_main_context_new (); - self->loop = g_main_loop_new (self->context, FALSE); - - self->position_update_interval_ms = DEFAULT_POSITION_UPDATE_INTERVAL_MS; - self->seek_pending = FALSE; - self->seek_position = GST_CLOCK_TIME_NONE; - self->last_seek_time = GST_CLOCK_TIME_NONE; - - GST_TRACE_OBJECT (self, "Initialized"); -} - -static void -gst_player_class_init (GstPlayerClass * klass) -{ - GObjectClass *gobject_class = (GObjectClass *) klass; - - gobject_class->set_property = gst_player_set_property; - gobject_class->get_property = gst_player_get_property; - gobject_class->dispose = gst_player_dispose; - gobject_class->finalize = gst_player_finalize; - gobject_class->constructed = gst_player_constructed; - - param_specs[PROP_VIDEO_RENDERER] = - g_param_spec_object ("video-renderer", - "Video Renderer", "Video renderer to use for rendering videos", - GST_TYPE_PLAYER_VIDEO_RENDERER, - G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS); - - param_specs[PROP_SIGNAL_DISPATCHER] = - g_param_spec_object ("signal-dispatcher", - "Signal Dispatcher", "Dispatcher for the signals to e.g. event loops", - GST_TYPE_PLAYER_SIGNAL_DISPATCHER, - G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS); - - param_specs[PROP_URI] = g_param_spec_string ("uri", "URI", "Current URI", - DEFAULT_URI, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); - - param_specs[PROP_SUBURI] = g_param_spec_string ("suburi", "Subtitle URI", - "Current Subtitle URI", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); - - param_specs[PROP_POSITION] = - g_param_spec_uint64 ("position", "Position", "Current Position", - 0, G_MAXUINT64, DEFAULT_POSITION, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); - - param_specs[PROP_MEDIA_INFO] = - g_param_spec_object ("media-info", "Media Info", - "Current media information", GST_TYPE_PLAYER_MEDIA_INFO, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); - - param_specs[PROP_CURRENT_AUDIO_TRACK] = - g_param_spec_object ("current-audio-track", "Current Audio Track", - "Current audio track information", GST_TYPE_PLAYER_AUDIO_INFO, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); - - param_specs[PROP_CURRENT_VIDEO_TRACK] = - g_param_spec_object ("current-video-track", "Current Video Track", - "Current video track information", GST_TYPE_PLAYER_VIDEO_INFO, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); - - param_specs[PROP_CURRENT_SUBTITLE_TRACK] = - g_param_spec_object ("current-subtitle-track", "Current Subtitle Track", - "Current audio subtitle information", GST_TYPE_PLAYER_SUBTITLE_INFO, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); - - param_specs[PROP_DURATION] = - g_param_spec_uint64 ("duration", "Duration", "Duration", - 0, G_MAXUINT64, DEFAULT_DURATION, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); - - param_specs[PROP_VOLUME] = - g_param_spec_double ("volume", "Volume", "Volume", - 0, 10.0, DEFAULT_VOLUME, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); - - param_specs[PROP_MUTE] = - g_param_spec_boolean ("mute", "Mute", "Mute", - DEFAULT_MUTE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); - - param_specs[PROP_PIPELINE] = - g_param_spec_object ("pipeline", "Pipeline", - "GStreamer pipeline that is used", - GST_TYPE_ELEMENT, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); - - param_specs[PROP_RATE] = - g_param_spec_double ("rate", "rate", "Playback rate", - -64.0, 64.0, DEFAULT_RATE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); - - param_specs[PROP_POSITION_UPDATE_INTERVAL] = - g_param_spec_uint ("position-update-interval", "Position update interval", - "Interval in milliseconds between two position-updated signals." - "Pass 0 to stop updating the position.", - 0, 10000, DEFAULT_POSITION_UPDATE_INTERVAL_MS, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); - - g_object_class_install_properties (gobject_class, PROP_LAST, param_specs); - - signals[SIGNAL_POSITION_UPDATED] = - g_signal_new ("position-updated", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS, 0, NULL, - NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_CLOCK_TIME); - - signals[SIGNAL_DURATION_CHANGED] = - g_signal_new ("duration-changed", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS, 0, NULL, - NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_CLOCK_TIME); - - signals[SIGNAL_STATE_CHANGED] = - g_signal_new ("state-changed", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS, 0, NULL, - NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_PLAYER_STATE); - - signals[SIGNAL_BUFFERING] = - g_signal_new ("buffering", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS, 0, NULL, - NULL, NULL, G_TYPE_NONE, 1, G_TYPE_INT); - - signals[SIGNAL_END_OF_STREAM] = - g_signal_new ("end-of-stream", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS, 0, NULL, - NULL, NULL, G_TYPE_NONE, 0, G_TYPE_INVALID); - - signals[SIGNAL_ERROR] = - g_signal_new ("error", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS, 0, NULL, - NULL, NULL, G_TYPE_NONE, 1, G_TYPE_ERROR); - - signals[SIGNAL_VIDEO_DIMENSIONS_CHANGED] = - g_signal_new ("video-dimensions-changed", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS, 0, NULL, - NULL, NULL, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); - - signals[SIGNAL_MEDIA_INFO_UPDATED] = - g_signal_new ("media-info-updated", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS, 0, NULL, - NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_PLAYER_MEDIA_INFO); - - signals[SIGNAL_VOLUME_CHANGED] = - g_signal_new ("volume-changed", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS, 0, NULL, - NULL, NULL, G_TYPE_NONE, 0, G_TYPE_INVALID); - - signals[SIGNAL_MUTE_CHANGED] = - g_signal_new ("mute-changed", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS, 0, NULL, - NULL, NULL, G_TYPE_NONE, 0, G_TYPE_INVALID); - - signals[SIGNAL_WARNING] = - g_signal_new ("warning", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS, 0, NULL, - NULL, NULL, G_TYPE_NONE, 1, G_TYPE_ERROR); - - signals[SIGNAL_SEEK_DONE] = - g_signal_new ("seek-done", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS, 0, NULL, - NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_CLOCK_TIME); -} - -static void -gst_player_dispose (GObject * object) -{ - GstPlayer *self = GST_PLAYER (object); - - GST_TRACE_OBJECT (self, "Stopping main thread"); - - if (self->loop) { - g_main_loop_quit (self->loop); - - g_thread_join (self->thread); - self->thread = NULL; - - g_main_loop_unref (self->loop); - self->loop = NULL; - - g_main_context_unref (self->context); - self->context = NULL; - } - - G_OBJECT_CLASS (parent_class)->dispose (object); -} - -static void -gst_player_finalize (GObject * object) -{ - GstPlayer *self = GST_PLAYER (object); - - GST_TRACE_OBJECT (self, "Finalizing"); - - g_free (self->uri); - g_free (self->suburi); - if (self->global_tags) - gst_tag_list_unref (self->global_tags); - if (self->video_renderer) - g_object_unref (self->video_renderer); - if (self->signal_dispatcher) - g_object_unref (self->signal_dispatcher); - if (self->current_vis_element) - gst_object_unref (self->current_vis_element); - g_mutex_clear (&self->lock); - g_cond_clear (&self->cond); - - G_OBJECT_CLASS (parent_class)->finalize (object); -} - -static void -gst_player_constructed (GObject * object) -{ - GstPlayer *self = GST_PLAYER (object); - - GST_TRACE_OBJECT (self, "Constructed"); - - g_mutex_lock (&self->lock); - self->thread = g_thread_new ("GstPlayer", gst_player_main, self); - while (!self->loop || !g_main_loop_is_running (self->loop)) - g_cond_wait (&self->cond, &self->lock); - g_mutex_unlock (&self->lock); - - G_OBJECT_CLASS (parent_class)->constructed (object); -} - -static gboolean -gst_player_set_uri_internal (gpointer user_data) -{ - GstPlayer *self = user_data; - - gst_player_stop_internal (self); - - g_mutex_lock (&self->lock); - - GST_DEBUG_OBJECT (self, "Changing URI to '%s'", GST_STR_NULL (self->uri)); - - g_object_set (self->playbin, "uri", self->uri, NULL); - - /* if have suburi from previous playback then free it */ - if (self->suburi) { - g_free (self->suburi); - self->suburi = NULL; - g_object_set (self->playbin, "suburi", NULL, NULL); - } - - g_mutex_unlock (&self->lock); - - return G_SOURCE_REMOVE; -} - -static gboolean -gst_player_set_suburi_internal (gpointer user_data) -{ - GstPlayer *self = user_data; - GstClockTime position; - GstState target_state; - - /* save the state and position */ - target_state = self->target_state; - position = gst_player_get_position (self); - - gst_player_stop_internal (self); - g_mutex_lock (&self->lock); - - GST_DEBUG_OBJECT (self, "Changing SUBURI to '%s'", - GST_STR_NULL (self->suburi)); - - g_object_set (self->playbin, "suburi", self->suburi, NULL); - g_object_set (self->playbin, "uri", self->uri, NULL); - - g_mutex_unlock (&self->lock); - - /* restore state and position */ - if (position != GST_CLOCK_TIME_NONE) - gst_player_seek (self, position); - if (target_state == GST_STATE_PAUSED) - gst_player_pause_internal (self); - else if (target_state == GST_STATE_PLAYING) - gst_player_play_internal (self); - - return G_SOURCE_REMOVE; -} - -static void -gst_player_set_property (GObject * object, guint prop_id, - const GValue * value, GParamSpec * pspec) -{ - GstPlayer *self = GST_PLAYER (object); - - switch (prop_id) { - case PROP_VIDEO_RENDERER: - self->video_renderer = g_value_dup_object (value); - break; - case PROP_SIGNAL_DISPATCHER: - self->signal_dispatcher = g_value_dup_object (value); - break; - case PROP_URI:{ - g_mutex_lock (&self->lock); - g_free (self->uri); - - self->uri = g_value_dup_string (value); - GST_DEBUG_OBJECT (self, "Set uri=%s", self->uri); - g_mutex_unlock (&self->lock); - - g_main_context_invoke_full (self->context, G_PRIORITY_DEFAULT, - gst_player_set_uri_internal, self, NULL); - break; - } - case PROP_SUBURI:{ - g_mutex_lock (&self->lock); - g_free (self->suburi); - - self->suburi = g_value_dup_string (value); - GST_DEBUG_OBJECT (self, "Set suburi=%s", self->suburi); - g_mutex_unlock (&self->lock); - - g_main_context_invoke_full (self->context, G_PRIORITY_DEFAULT, - gst_player_set_suburi_internal, self, NULL); - break; - } - case PROP_VOLUME: - GST_DEBUG_OBJECT (self, "Set volume=%lf", g_value_get_double (value)); - g_object_set_property (G_OBJECT (self->playbin), "volume", value); - break; - case PROP_RATE: - g_mutex_lock (&self->lock); - self->rate = g_value_get_double (value); - GST_DEBUG_OBJECT (self, "Set rate=%lf", g_value_get_double (value)); - g_mutex_unlock (&self->lock); - - gst_player_set_rate_internal (self); - break; - case PROP_MUTE: - GST_DEBUG_OBJECT (self, "Set mute=%d", g_value_get_boolean (value)); - g_object_set_property (G_OBJECT (self->playbin), "mute", value); - break; - case PROP_POSITION_UPDATE_INTERVAL: - g_mutex_lock (&self->lock); - self->position_update_interval_ms = g_value_get_uint (value); - GST_DEBUG_OBJECT (self, "Set position update interval=%u ms", - g_value_get_uint (value)); - g_mutex_unlock (&self->lock); - - gst_player_set_position_update_interval_internal (self); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -gst_player_get_property (GObject * object, guint prop_id, - GValue * value, GParamSpec * pspec) -{ - GstPlayer *self = GST_PLAYER (object); - - switch (prop_id) { - case PROP_URI: - g_mutex_lock (&self->lock); - g_value_set_string (value, self->uri); - g_mutex_unlock (&self->lock); - break; - case PROP_SUBURI: - g_mutex_lock (&self->lock); - g_value_set_string (value, self->suburi); - g_mutex_unlock (&self->lock); - GST_DEBUG_OBJECT (self, "Returning has-suburi=%d", - g_value_get_boolean (value)); - break; - case PROP_POSITION:{ - gint64 position = 0; - - gst_element_query_position (self->playbin, GST_FORMAT_TIME, &position); - g_value_set_uint64 (value, position); - GST_TRACE_OBJECT (self, "Returning position=%" GST_TIME_FORMAT, - GST_TIME_ARGS (g_value_get_uint64 (value))); - break; - } - case PROP_DURATION:{ - gint64 duration = 0; - - gst_element_query_duration (self->playbin, GST_FORMAT_TIME, &duration); - g_value_set_uint64 (value, duration); - GST_TRACE_OBJECT (self, "Returning duration=%" GST_TIME_FORMAT, - GST_TIME_ARGS (g_value_get_uint64 (value))); - break; - } - case PROP_MEDIA_INFO:{ - GstPlayerMediaInfo *media_info = gst_player_get_media_info (self); - g_value_set_object (value, media_info); - g_object_unref (media_info); - break; - } - case PROP_CURRENT_AUDIO_TRACK:{ - GstPlayerAudioInfo *audio_info = - gst_player_get_current_audio_track (self); - g_value_set_object (value, audio_info); - g_object_unref (audio_info); - break; - } - case PROP_CURRENT_VIDEO_TRACK:{ - GstPlayerVideoInfo *video_info = - gst_player_get_current_video_track (self); - g_value_set_object (value, video_info); - g_object_unref (video_info); - break; - } - case PROP_CURRENT_SUBTITLE_TRACK:{ - GstPlayerSubtitleInfo *subtitle_info = - gst_player_get_current_subtitle_track (self); - g_value_set_object (value, subtitle_info); - g_object_unref (subtitle_info); - break; - } - case PROP_VOLUME: - g_object_get_property (G_OBJECT (self->playbin), "volume", value); - GST_TRACE_OBJECT (self, "Returning volume=%lf", - g_value_get_double (value)); - break; - case PROP_RATE: - g_mutex_lock (&self->lock); - g_value_set_double (value, gst_player_get_rate (self)); - g_mutex_unlock (&self->lock); - break; - case PROP_MUTE: - g_object_get_property (G_OBJECT (self->playbin), "mute", value); - GST_TRACE_OBJECT (self, "Returning mute=%d", g_value_get_boolean (value)); - break; - case PROP_PIPELINE: - g_value_set_object (value, self->playbin); - break; - case PROP_POSITION_UPDATE_INTERVAL: - g_mutex_lock (&self->lock); - g_value_set_uint (value, gst_player_get_position_update_interval (self)); - g_mutex_unlock (&self->lock); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static gboolean -main_loop_running_cb (gpointer user_data) -{ - GstPlayer *self = GST_PLAYER (user_data); - - GST_TRACE_OBJECT (self, "Main loop running now"); - - g_mutex_lock (&self->lock); - g_cond_signal (&self->cond); - g_mutex_unlock (&self->lock); - - return G_SOURCE_REMOVE; -} - -typedef struct -{ - GstPlayer *player; - GstPlayerState state; -} StateChangedSignalData; - -static void -state_changed_dispatch (gpointer user_data) -{ - StateChangedSignalData *data = user_data; - - g_signal_emit (data->player, signals[SIGNAL_STATE_CHANGED], 0, data->state); -} - -static void -state_changed_signal_data_free (StateChangedSignalData * data) -{ - g_object_unref (data->player); - g_free (data); -} - -static void -change_state (GstPlayer * self, GstPlayerState state) -{ - if (state == self->app_state) - return; - - GST_DEBUG_OBJECT (self, "Changing app state from %s to %s", - gst_player_state_get_name (self->app_state), - gst_player_state_get_name (state)); - self->app_state = state; - - if (g_signal_handler_find (self, G_SIGNAL_MATCH_ID, - signals[SIGNAL_STATE_CHANGED], 0, NULL, NULL, NULL) != 0) { - StateChangedSignalData *data = g_new (StateChangedSignalData, 1); - - data->player = g_object_ref (self); - data->state = state; - gst_player_signal_dispatcher_dispatch (self->signal_dispatcher, self, - state_changed_dispatch, data, - (GDestroyNotify) state_changed_signal_data_free); - } -} - -typedef struct -{ - GstPlayer *player; - GstClockTime position; -} PositionUpdatedSignalData; - -static void -position_updated_dispatch (gpointer user_data) -{ - PositionUpdatedSignalData *data = user_data; - - if (data->player->target_state >= GST_STATE_PAUSED) { - g_signal_emit (data->player, signals[SIGNAL_POSITION_UPDATED], 0, - data->position); - g_object_notify_by_pspec (G_OBJECT (data->player), - param_specs[PROP_POSITION]); - } -} - -static void -position_updated_signal_data_free (PositionUpdatedSignalData * data) -{ - g_object_unref (data->player); - g_free (data); -} - -static gboolean -tick_cb (gpointer user_data) -{ - GstPlayer *self = GST_PLAYER (user_data); - gint64 position; - - if (self->target_state >= GST_STATE_PAUSED - && gst_element_query_position (self->playbin, GST_FORMAT_TIME, - &position)) { - GST_LOG_OBJECT (self, "Position %" GST_TIME_FORMAT, - GST_TIME_ARGS (position)); - - if (g_signal_handler_find (self, G_SIGNAL_MATCH_ID, - signals[SIGNAL_POSITION_UPDATED], 0, NULL, NULL, NULL) != 0) { - PositionUpdatedSignalData *data = g_new (PositionUpdatedSignalData, 1); - - data->player = g_object_ref (self); - data->position = position; - gst_player_signal_dispatcher_dispatch (self->signal_dispatcher, self, - position_updated_dispatch, data, - (GDestroyNotify) position_updated_signal_data_free); - } - } - - return G_SOURCE_CONTINUE; -} - -static void -add_tick_source (GstPlayer * self) -{ - if (self->tick_source) - return; - - if (!self->position_update_interval_ms) - return; - - self->tick_source = g_timeout_source_new (self->position_update_interval_ms); - g_source_set_callback (self->tick_source, (GSourceFunc) tick_cb, self, NULL); - g_source_attach (self->tick_source, self->context); -} - -static void -remove_tick_source (GstPlayer * self) -{ - if (!self->tick_source) - return; - - g_source_destroy (self->tick_source); - g_source_unref (self->tick_source); - self->tick_source = NULL; -} - -static gboolean -ready_timeout_cb (gpointer user_data) -{ - GstPlayer *self = user_data; - - if (self->target_state <= GST_STATE_READY) { - GST_DEBUG_OBJECT (self, "Setting pipeline to NULL state"); - self->target_state = GST_STATE_NULL; - self->current_state = GST_STATE_NULL; - gst_element_set_state (self->playbin, GST_STATE_NULL); - } - - return G_SOURCE_REMOVE; -} - -static void -add_ready_timeout_source (GstPlayer * self) -{ - if (self->ready_timeout_source) - return; - - self->ready_timeout_source = g_timeout_source_new_seconds (60); - g_source_set_callback (self->ready_timeout_source, - (GSourceFunc) ready_timeout_cb, self, NULL); - g_source_attach (self->ready_timeout_source, self->context); -} - -static void -remove_ready_timeout_source (GstPlayer * self) -{ - if (!self->ready_timeout_source) - return; - - g_source_destroy (self->ready_timeout_source); - g_source_unref (self->ready_timeout_source); - self->ready_timeout_source = NULL; -} - -typedef struct -{ - GstPlayer *player; - GError *err; -} ErrorSignalData; - -static void -error_dispatch (gpointer user_data) -{ - ErrorSignalData *data = user_data; - - g_signal_emit (data->player, signals[SIGNAL_ERROR], 0, data->err); -} - -static void -free_error_signal_data (ErrorSignalData * data) -{ - g_object_unref (data->player); - g_clear_error (&data->err); - g_free (data); -} - -static void -emit_error (GstPlayer * self, GError * err) -{ - GST_ERROR_OBJECT (self, "Error: %s (%s, %d)", err->message, - g_quark_to_string (err->domain), err->code); - - if (g_signal_handler_find (self, G_SIGNAL_MATCH_ID, - signals[SIGNAL_ERROR], 0, NULL, NULL, NULL) != 0) { - ErrorSignalData *data = g_new (ErrorSignalData, 1); - - data->player = g_object_ref (self); - data->err = g_error_copy (err); - gst_player_signal_dispatcher_dispatch (self->signal_dispatcher, self, - error_dispatch, data, (GDestroyNotify) free_error_signal_data); - } - - g_error_free (err); - - remove_tick_source (self); - remove_ready_timeout_source (self); - - self->target_state = GST_STATE_NULL; - self->current_state = GST_STATE_NULL; - self->is_live = FALSE; - self->is_eos = FALSE; - gst_element_set_state (self->playbin, GST_STATE_NULL); - change_state (self, GST_PLAYER_STATE_STOPPED); - self->buffering = 100; - - g_mutex_lock (&self->lock); - if (self->media_info) { - g_object_unref (self->media_info); - self->media_info = NULL; - } - - if (self->global_tags) { - gst_tag_list_unref (self->global_tags); - self->global_tags = NULL; - } - - self->seek_pending = FALSE; - if (self->seek_source) { - g_source_destroy (self->seek_source); - g_source_unref (self->seek_source); - self->seek_source = NULL; - } - self->seek_position = GST_CLOCK_TIME_NONE; - self->last_seek_time = GST_CLOCK_TIME_NONE; - g_mutex_unlock (&self->lock); -} - -static void -dump_dot_file (GstPlayer * self, const gchar * name) -{ - gchar *full_name; - - full_name = g_strdup_printf ("gst-player.%p.%s", self, name); - - GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS (GST_BIN (self->playbin), - GST_DEBUG_GRAPH_SHOW_ALL, full_name); - - g_free (full_name); -} - -typedef struct -{ - GstPlayer *player; - GError *err; -} WarningSignalData; - -static void -warning_dispatch (gpointer user_data) -{ - WarningSignalData *data = user_data; - - g_signal_emit (data->player, signals[SIGNAL_WARNING], 0, data->err); -} - -static void -free_warning_signal_data (WarningSignalData * data) -{ - g_object_unref (data->player); - g_clear_error (&data->err); - g_free (data); -} - -static void -emit_warning (GstPlayer * self, GError * err) -{ - GST_ERROR_OBJECT (self, "Warning: %s (%s, %d)", err->message, - g_quark_to_string (err->domain), err->code); - - if (g_signal_handler_find (self, G_SIGNAL_MATCH_ID, - signals[SIGNAL_WARNING], 0, NULL, NULL, NULL) != 0) { - WarningSignalData *data = g_new (WarningSignalData, 1); - - data->player = g_object_ref (self); - data->err = g_error_copy (err); - gst_player_signal_dispatcher_dispatch (self->signal_dispatcher, self, - warning_dispatch, data, (GDestroyNotify) free_warning_signal_data); - } - - g_error_free (err); -} - -static void -error_cb (G_GNUC_UNUSED GstBus * bus, GstMessage * msg, gpointer user_data) -{ - GstPlayer *self = GST_PLAYER (user_data); - GError *err, *player_err; - gchar *name, *debug, *message, *full_message; - - dump_dot_file (self, "error"); - - gst_message_parse_error (msg, &err, &debug); - - name = gst_object_get_path_string (msg->src); - message = gst_error_get_message (err->domain, err->code); - - if (debug) - full_message = - g_strdup_printf ("Error from element %s: %s\n%s\n%s", name, message, - err->message, debug); - else - full_message = - g_strdup_printf ("Error from element %s: %s\n%s", name, message, - err->message); - - GST_ERROR_OBJECT (self, "ERROR: from element %s: %s\n", name, err->message); - if (debug != NULL) - GST_ERROR_OBJECT (self, "Additional debug info:\n%s\n", debug); - - player_err = - g_error_new_literal (GST_PLAYER_ERROR, GST_PLAYER_ERROR_FAILED, - full_message); - emit_error (self, player_err); - - g_clear_error (&err); - g_free (debug); - g_free (name); - g_free (full_message); - g_free (message); -} - -static void -warning_cb (G_GNUC_UNUSED GstBus * bus, GstMessage * msg, gpointer user_data) -{ - GstPlayer *self = GST_PLAYER (user_data); - GError *err, *player_err; - gchar *name, *debug, *message, *full_message; - - dump_dot_file (self, "warning"); - - gst_message_parse_warning (msg, &err, &debug); - - name = gst_object_get_path_string (msg->src); - message = gst_error_get_message (err->domain, err->code); - - if (debug) - full_message = - g_strdup_printf ("Warning from element %s: %s\n%s\n%s", name, message, - err->message, debug); - else - full_message = - g_strdup_printf ("Warning from element %s: %s\n%s", name, message, - err->message); - - GST_WARNING_OBJECT (self, "WARNING: from element %s: %s\n", name, - err->message); - if (debug != NULL) - GST_WARNING_OBJECT (self, "Additional debug info:\n%s\n", debug); - - player_err = - g_error_new_literal (GST_PLAYER_ERROR, GST_PLAYER_ERROR_FAILED, - full_message); - emit_warning (self, player_err); - - g_clear_error (&err); - g_free (debug); - g_free (name); - g_free (full_message); - g_free (message); -} - -static void -eos_dispatch (gpointer user_data) -{ - g_signal_emit (user_data, signals[SIGNAL_END_OF_STREAM], 0); -} - -static void -eos_cb (G_GNUC_UNUSED GstBus * bus, G_GNUC_UNUSED GstMessage * msg, - gpointer user_data) -{ - GstPlayer *self = GST_PLAYER (user_data); - - GST_DEBUG_OBJECT (self, "End of stream"); - - tick_cb (self); - remove_tick_source (self); - - if (g_signal_handler_find (self, G_SIGNAL_MATCH_ID, - signals[SIGNAL_END_OF_STREAM], 0, NULL, NULL, NULL) != 0) { - gst_player_signal_dispatcher_dispatch (self->signal_dispatcher, self, - eos_dispatch, g_object_ref (self), (GDestroyNotify) g_object_unref); - } - change_state (self, GST_PLAYER_STATE_STOPPED); - self->buffering = 100; - self->is_eos = TRUE; -} - -typedef struct -{ - GstPlayer *player; - gint percent; -} BufferingSignalData; - -static void -buffering_dispatch (gpointer user_data) -{ - BufferingSignalData *data = user_data; - - if (data->player->target_state >= GST_STATE_PAUSED) { - g_signal_emit (data->player, signals[SIGNAL_BUFFERING], 0, data->percent); - } -} - -static void -buffering_signal_data_free (BufferingSignalData * data) -{ - g_object_unref (data->player); - g_free (data); -} - -static void -buffering_cb (G_GNUC_UNUSED GstBus * bus, GstMessage * msg, gpointer user_data) -{ - GstPlayer *self = GST_PLAYER (user_data); - gint percent; - - if (self->target_state < GST_STATE_PAUSED) - return; - if (self->is_live) - return; - - gst_message_parse_buffering (msg, &percent); - GST_LOG_OBJECT (self, "Buffering %d%%", percent); - - if (percent < 100 && self->target_state >= GST_STATE_PAUSED) { - GstStateChangeReturn state_ret; - - GST_DEBUG_OBJECT (self, "Waiting for buffering to finish"); - state_ret = gst_element_set_state (self->playbin, GST_STATE_PAUSED); - - if (state_ret == GST_STATE_CHANGE_FAILURE) { - emit_error (self, g_error_new (GST_PLAYER_ERROR, GST_PLAYER_ERROR_FAILED, - "Failed to handle buffering")); - return; - } - - change_state (self, GST_PLAYER_STATE_BUFFERING); - } - - if (self->buffering != percent) { - if (g_signal_handler_find (self, G_SIGNAL_MATCH_ID, - signals[SIGNAL_BUFFERING], 0, NULL, NULL, NULL) != 0) { - BufferingSignalData *data = g_new (BufferingSignalData, 1); - - data->player = g_object_ref (self); - data->percent = percent; - gst_player_signal_dispatcher_dispatch (self->signal_dispatcher, self, - buffering_dispatch, data, - (GDestroyNotify) buffering_signal_data_free); - } - - self->buffering = percent; - } - - - g_mutex_lock (&self->lock); - if (percent == 100 && (self->seek_position != GST_CLOCK_TIME_NONE || - self->seek_pending)) { - g_mutex_unlock (&self->lock); - - GST_DEBUG_OBJECT (self, "Buffering finished - seek pending"); - } else if (percent == 100 && self->target_state >= GST_STATE_PLAYING - && self->current_state >= GST_STATE_PAUSED) { - GstStateChangeReturn state_ret; - - g_mutex_unlock (&self->lock); - - GST_DEBUG_OBJECT (self, "Buffering finished - going to PLAYING"); - state_ret = gst_element_set_state (self->playbin, GST_STATE_PLAYING); - /* Application state change is happening when the state change happened */ - if (state_ret == GST_STATE_CHANGE_FAILURE) - emit_error (self, g_error_new (GST_PLAYER_ERROR, GST_PLAYER_ERROR_FAILED, - "Failed to handle buffering")); - } else if (percent == 100 && self->target_state >= GST_STATE_PAUSED) { - g_mutex_unlock (&self->lock); - - GST_DEBUG_OBJECT (self, "Buffering finished - staying PAUSED"); - change_state (self, GST_PLAYER_STATE_PAUSED); - } else { - g_mutex_unlock (&self->lock); - } -} - -static void -clock_lost_cb (G_GNUC_UNUSED GstBus * bus, G_GNUC_UNUSED GstMessage * msg, - gpointer user_data) -{ - GstPlayer *self = GST_PLAYER (user_data); - GstStateChangeReturn state_ret; - - GST_DEBUG_OBJECT (self, "Clock lost"); - if (self->target_state >= GST_STATE_PLAYING) { - state_ret = gst_element_set_state (self->playbin, GST_STATE_PAUSED); - if (state_ret != GST_STATE_CHANGE_FAILURE) - state_ret = gst_element_set_state (self->playbin, GST_STATE_PLAYING); - - if (state_ret == GST_STATE_CHANGE_FAILURE) - emit_error (self, g_error_new (GST_PLAYER_ERROR, GST_PLAYER_ERROR_FAILED, - "Failed to handle clock loss")); - } -} - -typedef struct -{ - GstPlayer *player; - gint width, height; -} VideoDimensionsChangedSignalData; - -static void -video_dimensions_changed_dispatch (gpointer user_data) -{ - VideoDimensionsChangedSignalData *data = user_data; - - if (data->player->target_state >= GST_STATE_PAUSED) { - g_signal_emit (data->player, signals[SIGNAL_VIDEO_DIMENSIONS_CHANGED], 0, - data->width, data->height); - } -} - -static void -video_dimensions_changed_signal_data_free (VideoDimensionsChangedSignalData * - data) -{ - g_object_unref (data->player); - g_free (data); -} - -static void -check_video_dimensions_changed (GstPlayer * self) -{ - GstElement *video_sink; - GstPad *video_sink_pad; - GstCaps *caps; - GstVideoInfo info; - gint width = 0, height = 0; - - g_object_get (self->playbin, "video-sink", &video_sink, NULL); - if (!video_sink) - goto out; - - video_sink_pad = gst_element_get_static_pad (video_sink, "sink"); - if (!video_sink_pad) { - gst_object_unref (video_sink); - goto out; - } - - caps = gst_pad_get_current_caps (video_sink_pad); - - if (caps) { - if (gst_video_info_from_caps (&info, caps)) { - info.width = info.width * info.par_n / info.par_d; - - GST_DEBUG_OBJECT (self, "Video dimensions changed: %dx%d", info.width, - info.height); - width = info.width; - height = info.height; - } - - gst_caps_unref (caps); - } - gst_object_unref (video_sink_pad); - gst_object_unref (video_sink); - -out: - if (g_signal_handler_find (self, G_SIGNAL_MATCH_ID, - signals[SIGNAL_VIDEO_DIMENSIONS_CHANGED], 0, NULL, NULL, NULL) != 0) { - VideoDimensionsChangedSignalData *data = - g_new (VideoDimensionsChangedSignalData, 1); - - data->player = g_object_ref (self); - data->width = width; - data->height = height; - gst_player_signal_dispatcher_dispatch (self->signal_dispatcher, self, - video_dimensions_changed_dispatch, data, - (GDestroyNotify) video_dimensions_changed_signal_data_free); - } -} - -static void -notify_caps_cb (G_GNUC_UNUSED GObject * object, - G_GNUC_UNUSED GParamSpec * pspec, gpointer user_data) -{ - GstPlayer *self = GST_PLAYER (user_data); - - check_video_dimensions_changed (self); -} - -typedef struct -{ - GstPlayer *player; - GstClockTime duration; -} DurationChangedSignalData; - -static void -duration_changed_dispatch (gpointer user_data) -{ - DurationChangedSignalData *data = user_data; - - if (data->player->target_state >= GST_STATE_PAUSED) { - g_signal_emit (data->player, signals[SIGNAL_DURATION_CHANGED], 0, - data->duration); - g_object_notify_by_pspec (G_OBJECT (data->player), - param_specs[PROP_DURATION]); - } -} - -static void -duration_changed_signal_data_free (DurationChangedSignalData * data) -{ - g_object_unref (data->player); - g_free (data); -} - -static void -emit_duration_changed (GstPlayer * self, GstClockTime duration) -{ - GST_DEBUG_OBJECT (self, "Duration changed %" GST_TIME_FORMAT, - GST_TIME_ARGS (duration)); - - if (g_signal_handler_find (self, G_SIGNAL_MATCH_ID, - signals[SIGNAL_DURATION_CHANGED], 0, NULL, NULL, NULL) != 0) { - DurationChangedSignalData *data = g_new (DurationChangedSignalData, 1); - - data->player = g_object_ref (self); - data->duration = duration; - gst_player_signal_dispatcher_dispatch (self->signal_dispatcher, self, - duration_changed_dispatch, data, - (GDestroyNotify) duration_changed_signal_data_free); - } -} - -typedef struct -{ - GstPlayer *player; - GstClockTime position; -} SeekDoneSignalData; - -static void -seek_done_dispatch (gpointer user_data) -{ - SeekDoneSignalData *data = user_data; - - g_signal_emit (data->player, signals[SIGNAL_SEEK_DONE], 0, data->position); -} - -static void -seek_done_signal_data_free (SeekDoneSignalData * data) -{ - g_object_unref (data->player); - g_free (data); -} - -static void -emit_seek_done (GstPlayer * self) -{ - if (g_signal_handler_find (self, G_SIGNAL_MATCH_ID, - signals[SIGNAL_SEEK_DONE], 0, NULL, NULL, NULL) != 0) { - SeekDoneSignalData *data = g_new (SeekDoneSignalData, 1); - - data->player = g_object_ref (self); - data->position = gst_player_get_position (self); - gst_player_signal_dispatcher_dispatch (self->signal_dispatcher, self, - seek_done_dispatch, data, (GDestroyNotify) seek_done_signal_data_free); - } -} - -static void -state_changed_cb (G_GNUC_UNUSED GstBus * bus, GstMessage * msg, - gpointer user_data) -{ - GstPlayer *self = GST_PLAYER (user_data); - GstState old_state, new_state, pending_state; - - gst_message_parse_state_changed (msg, &old_state, &new_state, &pending_state); - - if (GST_MESSAGE_SRC (msg) == GST_OBJECT (self->playbin)) { - gchar *transition_name; - - GST_DEBUG_OBJECT (self, "Changed state old: %s new: %s pending: %s", - gst_element_state_get_name (old_state), - gst_element_state_get_name (new_state), - gst_element_state_get_name (pending_state)); - - transition_name = g_strdup_printf ("%s_%s", - gst_element_state_get_name (old_state), - gst_element_state_get_name (new_state)); - dump_dot_file (self, transition_name); - g_free (transition_name); - - self->current_state = new_state; - - if (old_state == GST_STATE_READY && new_state == GST_STATE_PAUSED - && pending_state == GST_STATE_VOID_PENDING) { - GstElement *video_sink; - GstPad *video_sink_pad; - gint64 duration = -1; - - GST_DEBUG_OBJECT (self, "Initial PAUSED - pre-rolled"); - - g_mutex_lock (&self->lock); - if (self->media_info) - g_object_unref (self->media_info); - self->media_info = gst_player_media_info_create (self); - g_mutex_unlock (&self->lock); - emit_media_info_updated_signal (self); - - g_object_get (self->playbin, "video-sink", &video_sink, NULL); - - if (video_sink) { - video_sink_pad = gst_element_get_static_pad (video_sink, "sink"); - - if (video_sink_pad) { - g_signal_connect (video_sink_pad, "notify::caps", - (GCallback) notify_caps_cb, self); - gst_object_unref (video_sink_pad); - } - gst_object_unref (video_sink); - } - - check_video_dimensions_changed (self); - gst_element_query_duration (self->playbin, GST_FORMAT_TIME, &duration); - emit_duration_changed (self, duration); - } - - if (new_state == GST_STATE_PAUSED - && pending_state == GST_STATE_VOID_PENDING) { - remove_tick_source (self); - - g_mutex_lock (&self->lock); - if (self->seek_pending) { - self->seek_pending = FALSE; - - if (!self->media_info->seekable) { - GST_DEBUG_OBJECT (self, "Media is not seekable"); - if (self->seek_source) { - g_source_destroy (self->seek_source); - g_source_unref (self->seek_source); - self->seek_source = NULL; - } - self->seek_position = GST_CLOCK_TIME_NONE; - self->last_seek_time = GST_CLOCK_TIME_NONE; - } else if (self->seek_source) { - GST_DEBUG_OBJECT (self, "Seek finished but new seek is pending"); - gst_player_seek_internal_locked (self); - } else { - GST_DEBUG_OBJECT (self, "Seek finished"); - emit_seek_done (self); - } - } - - if (self->seek_position != GST_CLOCK_TIME_NONE) { - GST_DEBUG_OBJECT (self, "Seeking now that we reached PAUSED state"); - gst_player_seek_internal_locked (self); - g_mutex_unlock (&self->lock); - } else if (!self->seek_pending) { - g_mutex_unlock (&self->lock); - - tick_cb (self); - - if (self->target_state >= GST_STATE_PLAYING && self->buffering == 100) { - GstStateChangeReturn state_ret; - - state_ret = gst_element_set_state (self->playbin, GST_STATE_PLAYING); - if (state_ret == GST_STATE_CHANGE_FAILURE) - emit_error (self, g_error_new (GST_PLAYER_ERROR, - GST_PLAYER_ERROR_FAILED, "Failed to play")); - } else if (self->buffering == 100) { - change_state (self, GST_PLAYER_STATE_PAUSED); - } - } else { - g_mutex_unlock (&self->lock); - } - } else if (new_state == GST_STATE_PLAYING - && pending_state == GST_STATE_VOID_PENDING) { - - /* If no seek is currently pending, add the tick source. This can happen - * if we seeked already but the state-change message was still queued up */ - if (!self->seek_pending) { - add_tick_source (self); - change_state (self, GST_PLAYER_STATE_PLAYING); - } - } else if (new_state == GST_STATE_READY && old_state > GST_STATE_READY) { - change_state (self, GST_PLAYER_STATE_STOPPED); - } else { - /* Otherwise we neither reached PLAYING nor PAUSED, so must - * wait for something to happen... i.e. are BUFFERING now */ - change_state (self, GST_PLAYER_STATE_BUFFERING); - } - } -} - -static void -duration_changed_cb (G_GNUC_UNUSED GstBus * bus, G_GNUC_UNUSED GstMessage * msg, - gpointer user_data) -{ - GstPlayer *self = GST_PLAYER (user_data); - gint64 duration; - - if (gst_element_query_duration (self->playbin, GST_FORMAT_TIME, &duration)) { - emit_duration_changed (self, duration); - } -} - -static void -latency_cb (G_GNUC_UNUSED GstBus * bus, G_GNUC_UNUSED GstMessage * msg, - gpointer user_data) -{ - GstPlayer *self = GST_PLAYER (user_data); - - GST_DEBUG_OBJECT (self, "Latency changed"); - - gst_bin_recalculate_latency (GST_BIN (self->playbin)); -} - -static void -request_state_cb (G_GNUC_UNUSED GstBus * bus, GstMessage * msg, - gpointer user_data) -{ - GstPlayer *self = GST_PLAYER (user_data); - GstState state; - GstStateChangeReturn state_ret; - - gst_message_parse_request_state (msg, &state); - - GST_DEBUG_OBJECT (self, "State %s requested", - gst_element_state_get_name (state)); - - self->target_state = state; - state_ret = gst_element_set_state (self->playbin, state); - if (state_ret == GST_STATE_CHANGE_FAILURE) - emit_error (self, g_error_new (GST_PLAYER_ERROR, GST_PLAYER_ERROR_FAILED, - "Failed to change to requested state %s", - gst_element_state_get_name (state))); -} - -static void -media_info_update (GstPlayer * self, GstPlayerMediaInfo * info) -{ - g_free (info->title); - info->title = get_from_tags (self, info, get_title); - - g_free (info->container); - info->container = get_from_tags (self, info, get_container_format); - - if (info->image_sample) - gst_sample_unref (info->image_sample); - info->image_sample = get_from_tags (self, info, get_cover_sample); - - GST_DEBUG_OBJECT (self, "title: %s, container: %s " - "image_sample: %p", info->title, info->container, info->image_sample); -} - -static void -tags_cb (G_GNUC_UNUSED GstBus * bus, GstMessage * msg, gpointer user_data) -{ - GstPlayer *self = GST_PLAYER (user_data); - GstTagList *tags = NULL; - - gst_message_parse_tag (msg, &tags); - - /* - * NOTE: Inorder to get global tag you must apply the following patches in - * your gstreamer build. - * - * http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=9119fbd774093e3ae762c8652acd80d54b2c3b45 - * http://cgit.freedesktop.org/gstreamer/gstreamer/commit/?id=18b058100940bdcaed86fa412e3582a02871f995 - */ - GST_DEBUG_OBJECT (self, "recieved %s tags", - gst_tag_list_get_scope (tags) == - GST_TAG_SCOPE_GLOBAL ? "global" : "stream"); - - if (gst_tag_list_get_scope (tags) == GST_TAG_SCOPE_GLOBAL) { - g_mutex_lock (&self->lock); - if (self->media_info) { - if (self->media_info->tags) - gst_tag_list_unref (self->media_info->tags); - self->media_info->tags = gst_tag_list_ref (tags); - media_info_update (self, self->media_info); - g_mutex_unlock (&self->lock); - emit_media_info_updated_signal (self); - } else { - if (self->global_tags) - gst_tag_list_unref (self->global_tags); - self->global_tags = gst_tag_list_ref (tags); - g_mutex_unlock (&self->lock); - } - } - - gst_tag_list_unref (tags); -} - -static void -element_cb (G_GNUC_UNUSED GstBus * bus, GstMessage * msg, gpointer user_data) -{ - GstPlayer *self = GST_PLAYER (user_data); - const GstStructure *s; - - s = gst_message_get_structure (msg); - if (gst_structure_has_name (s, "redirect")) { - const gchar *new_location; - - new_location = gst_structure_get_string (s, "new-location"); - if (!new_location) { - const GValue *locations_list, *location_val; - guint i, size; - - locations_list = gst_structure_get_value (s, "locations"); - size = gst_value_list_get_size (locations_list); - for (i = 0; i < size; ++i) { - const GstStructure *location_s; - - location_val = gst_value_list_get_value (locations_list, i); - if (!GST_VALUE_HOLDS_STRUCTURE (location_val)) - continue; - - location_s = (const GstStructure *) g_value_get_boxed (location_val); - if (!gst_structure_has_name (location_s, "redirect")) - continue; - - new_location = gst_structure_get_string (location_s, "new-location"); - if (new_location) - break; - } - } - - if (new_location) { - GstState target_state; - - GST_DEBUG_OBJECT (self, "Redirect to '%s'", new_location); - - /* Remember target state and restore after setting the URI */ - target_state = self->target_state; - - g_mutex_lock (&self->lock); - g_free (self->uri); - - self->uri = g_strdup (new_location); - g_mutex_unlock (&self->lock); - - gst_player_set_uri_internal (self); - - if (target_state == GST_STATE_PAUSED) - gst_player_pause_internal (self); - else if (target_state == GST_STATE_PLAYING) - gst_player_play_internal (self); - } - } -} - -static void -player_set_flag (GstPlayer * self, gint pos) -{ - gint flags; - - g_object_get (self->playbin, "flags", &flags, NULL); - flags |= pos; - g_object_set (self->playbin, "flags", flags, NULL); - - GST_DEBUG_OBJECT (self, "setting flags=%#x", flags); -} - -static void -player_clear_flag (GstPlayer * self, gint pos) -{ - gint flags; - - g_object_get (self->playbin, "flags", &flags, NULL); - flags &= ~pos; - g_object_set (self->playbin, "flags", flags, NULL); - - GST_DEBUG_OBJECT (self, "setting flags=%#x", flags); -} - -typedef struct -{ - GstPlayer *player; - GstPlayerMediaInfo *info; -} MediaInfoUpdatedSignalData; - -static void -media_info_updated_dispatch (gpointer user_data) -{ - MediaInfoUpdatedSignalData *data = user_data; - - if (data->player->target_state >= GST_STATE_PAUSED) { - g_signal_emit (data->player, signals[SIGNAL_MEDIA_INFO_UPDATED], 0, - data->info); - } -} - -static void -free_media_info_updated_signal_data (MediaInfoUpdatedSignalData * data) -{ - g_object_unref (data->player); - g_object_unref (data->info); - g_free (data); -} - -/* - * emit_media_info_updated_signal: - * - * create a new copy of self->media_info object and emits the newly created - * copy to user application. The newly created media_info will be unref'ed - * as part of signal finalize method. - */ -static void -emit_media_info_updated_signal (GstPlayer * self) -{ - MediaInfoUpdatedSignalData *data = g_new (MediaInfoUpdatedSignalData, 1); - data->player = g_object_ref (self); - g_mutex_lock (&self->lock); - data->info = gst_player_media_info_copy (self->media_info); - g_mutex_unlock (&self->lock); - - gst_player_signal_dispatcher_dispatch (self->signal_dispatcher, self, - media_info_updated_dispatch, data, - (GDestroyNotify) free_media_info_updated_signal_data); -} - -static GstCaps * -get_caps (GstPlayer * self, gint stream_index, GType type) -{ - GstPad *pad = NULL; - GstCaps *caps = NULL; - - if (type == GST_TYPE_PLAYER_VIDEO_INFO) - g_signal_emit_by_name (G_OBJECT (self->playbin), - "get-video-pad", stream_index, &pad); - else if (type == GST_TYPE_PLAYER_AUDIO_INFO) - g_signal_emit_by_name (G_OBJECT (self->playbin), - "get-audio-pad", stream_index, &pad); - else - g_signal_emit_by_name (G_OBJECT (self->playbin), - "get-text-pad", stream_index, &pad); - - if (pad) { - caps = gst_pad_get_current_caps (pad); - gst_object_unref (pad); - } - - return caps; -} - -static void -gst_player_subtitle_info_update (GstPlayer * self, - GstPlayerStreamInfo * stream_info) -{ - GstPlayerSubtitleInfo *info = (GstPlayerSubtitleInfo *) stream_info; - - if (stream_info->tags) { - - /* free the old language info */ - g_free (info->language); - info->language = NULL; - - /* First try to get the language full name from tag, if name is not - * available then try language code. If we find the language code - * then use gstreamer api to translate code to full name. - */ - gst_tag_list_get_string (stream_info->tags, GST_TAG_LANGUAGE_NAME, - &info->language); - if (!info->language) { - gchar *lang_code = NULL; - - gst_tag_list_get_string (stream_info->tags, GST_TAG_LANGUAGE_CODE, - &lang_code); - if (lang_code) { - info->language = g_strdup (gst_tag_get_language_name (lang_code)); - g_free (lang_code); - } - } - - /* If we are still failed to find language name then check if external - * subtitle is loaded and compare the stream index between current sub - * stream index with our stream index and if matches then declare it as - * external subtitle and use the filename. - */ - if (!info->language) { - gint text_index = -1; - gchar *suburi = NULL; - - g_object_get (G_OBJECT (self->playbin), "current-suburi", &suburi, NULL); - if (suburi) { - g_object_get (G_OBJECT (self->playbin), "current-text", &text_index, - NULL); - if (text_index == gst_player_stream_info_get_index (stream_info)) - info->language = g_path_get_basename (suburi); - g_free (suburi); - } - } - - } else { - g_free (info->language); - info->language = NULL; - } - - GST_DEBUG_OBJECT (self, "language=%s", info->language); -} - -static void -gst_player_video_info_update (GstPlayer * self, - GstPlayerStreamInfo * stream_info) -{ - GstPlayerVideoInfo *info = (GstPlayerVideoInfo *) stream_info; - - if (stream_info->caps) { - GstStructure *s; - - s = gst_caps_get_structure (stream_info->caps, 0); - if (s) { - gint width, height; - gint fps_n, fps_d; - gint par_n, par_d; - - if (gst_structure_get_int (s, "width", &width)) - info->width = width; - else - info->width = -1; - - if (gst_structure_get_int (s, "height", &height)) - info->height = height; - else - info->height = -1; - - if (gst_structure_get_fraction (s, "framerate", &fps_n, &fps_d)) { - info->framerate_num = fps_n; - info->framerate_denom = fps_d; - } else { - info->framerate_num = 0; - info->framerate_denom = 1; - } - - - if (gst_structure_get_fraction (s, "pixel-aspect-ratio", &par_n, &par_d)) { - info->par_num = par_n; - info->par_denom = par_d; - } else { - info->par_num = 1; - info->par_denom = 1; - } - } - } else { - info->width = info->height = -1; - info->par_num = info->par_denom = 1; - info->framerate_num = 0; - info->framerate_denom = 1; - } - - if (stream_info->tags) { - guint bitrate, max_bitrate; - - if (gst_tag_list_get_uint (stream_info->tags, GST_TAG_BITRATE, &bitrate)) - info->bitrate = bitrate; - else - info->bitrate = -1; - - if (gst_tag_list_get_uint (stream_info->tags, GST_TAG_MAXIMUM_BITRATE, - &max_bitrate) || gst_tag_list_get_uint (stream_info->tags, - GST_TAG_NOMINAL_BITRATE, &max_bitrate)) - info->max_bitrate = max_bitrate; - else - info->max_bitrate = -1; - } else { - info->bitrate = info->max_bitrate = -1; - } - - GST_DEBUG_OBJECT (self, "width=%d height=%d fps=%.2f par=%d:%d " - "bitrate=%d max_bitrate=%d", info->width, info->height, - (gdouble) info->framerate_num / info->framerate_denom, - info->par_num, info->par_denom, info->bitrate, info->max_bitrate); -} - -static void -gst_player_audio_info_update (GstPlayer * self, - GstPlayerStreamInfo * stream_info) -{ - GstPlayerAudioInfo *info = (GstPlayerAudioInfo *) stream_info; - - if (stream_info->caps) { - GstStructure *s; - - s = gst_caps_get_structure (stream_info->caps, 0); - if (s) { - gint rate, channels; - - if (gst_structure_get_int (s, "rate", &rate)) - info->sample_rate = rate; - else - info->sample_rate = -1; - - if (gst_structure_get_int (s, "channels", &channels)) - info->channels = channels; - else - info->channels = 0; - } - } else { - info->sample_rate = -1; - info->channels = 0; - } - - if (stream_info->tags) { - guint bitrate, max_bitrate; - - if (gst_tag_list_get_uint (stream_info->tags, GST_TAG_BITRATE, &bitrate)) - info->bitrate = bitrate; - else - info->bitrate = -1; - - if (gst_tag_list_get_uint (stream_info->tags, GST_TAG_MAXIMUM_BITRATE, - &max_bitrate) || gst_tag_list_get_uint (stream_info->tags, - GST_TAG_NOMINAL_BITRATE, &max_bitrate)) - info->max_bitrate = max_bitrate; - else - info->max_bitrate = -1; - - /* if we have old language the free it */ - g_free (info->language); - info->language = NULL; - - /* First try to get the language full name from tag, if name is not - * available then try language code. If we find the language code - * then use gstreamer api to translate code to full name. - */ - gst_tag_list_get_string (stream_info->tags, GST_TAG_LANGUAGE_NAME, - &info->language); - if (!info->language) { - gchar *lang_code = NULL; - - gst_tag_list_get_string (stream_info->tags, GST_TAG_LANGUAGE_CODE, - &lang_code); - if (lang_code) { - info->language = g_strdup (gst_tag_get_language_name (lang_code)); - g_free (lang_code); - } - } - } else { - g_free (info->language); - info->language = NULL; - info->max_bitrate = info->bitrate = -1; - } - - GST_DEBUG_OBJECT (self, "language=%s rate=%d channels=%d bitrate=%d " - "max_bitrate=%d", info->language, info->sample_rate, info->channels, - info->bitrate, info->bitrate); -} - -static GstPlayerStreamInfo * -gst_player_stream_info_find (GstPlayerMediaInfo * media_info, - GType type, gint stream_index) -{ - GList *list, *l; - GstPlayerStreamInfo *info = NULL; - - if (!media_info) - return NULL; - - list = gst_player_media_info_get_stream_list (media_info); - for (l = list; l != NULL; l = l->next) { - info = (GstPlayerStreamInfo *) l->data; - if ((G_OBJECT_TYPE (info) == type) && (info->stream_index == stream_index)) { - return info; - } - } - - return NULL; -} - -static gboolean -is_track_enabled (GstPlayer * self, gint pos) -{ - gint flags; - - g_object_get (G_OBJECT (self->playbin), "flags", &flags, NULL); - - if ((flags & pos)) - return TRUE; - - return FALSE; -} - -static GstPlayerStreamInfo * -gst_player_stream_info_get_current (GstPlayer * self, const gchar * prop, - GType type) -{ - gint current; - GstPlayerStreamInfo *info; - - if (!self->media_info) - return NULL; - - g_object_get (G_OBJECT (self->playbin), prop, ¤t, NULL); - g_mutex_lock (&self->lock); - info = gst_player_stream_info_find (self->media_info, type, current); - if (info) - info = gst_player_stream_info_copy (info); - g_mutex_unlock (&self->lock); - - return info; -} - -static void -gst_player_stream_info_update (GstPlayer * self, GstPlayerStreamInfo * s) -{ - if (GST_IS_PLAYER_VIDEO_INFO (s)) - gst_player_video_info_update (self, s); - else if (GST_IS_PLAYER_AUDIO_INFO (s)) - gst_player_audio_info_update (self, s); - else - gst_player_subtitle_info_update (self, s); -} - -static gchar * -stream_info_get_codec (GstPlayerStreamInfo * s) -{ - const gchar *type; - GstTagList *tags; - gchar *codec = NULL; - - if (GST_IS_PLAYER_VIDEO_INFO (s)) - type = GST_TAG_VIDEO_CODEC; - else if (GST_IS_PLAYER_AUDIO_INFO (s)) - type = GST_TAG_AUDIO_CODEC; - else - type = GST_TAG_SUBTITLE_CODEC; - - tags = gst_player_stream_info_get_tags (s); - if (tags) { - gst_tag_list_get_string (tags, type, &codec); - if (!codec) - gst_tag_list_get_string (tags, GST_TAG_CODEC, &codec); - } - - if (!codec) { - GstCaps *caps; - caps = gst_player_stream_info_get_caps (s); - if (caps) { - codec = gst_pb_utils_get_codec_description (caps); - } - } - - return codec; -} - -static void -gst_player_stream_info_update_tags_and_caps (GstPlayer * self, - GstPlayerStreamInfo * s) -{ - GstTagList *tags; - gint stream_index; - - stream_index = gst_player_stream_info_get_index (s); - - if (GST_IS_PLAYER_VIDEO_INFO (s)) - g_signal_emit_by_name (self->playbin, "get-video-tags", - stream_index, &tags); - else if (GST_IS_PLAYER_AUDIO_INFO (s)) - g_signal_emit_by_name (self->playbin, "get-audio-tags", - stream_index, &tags); - else - g_signal_emit_by_name (self->playbin, "get-text-tags", stream_index, &tags); - - if (s->tags) - gst_tag_list_unref (s->tags); - s->tags = tags; - - if (s->caps) - gst_caps_unref (s->caps); - s->caps = get_caps (self, stream_index, G_OBJECT_TYPE (s)); - - g_free (s->codec); - s->codec = stream_info_get_codec (s); - - GST_DEBUG_OBJECT (self, "%s index: %d tags: %p caps: %p", - gst_player_stream_info_get_stream_type (s), stream_index, - s->tags, s->caps); - - gst_player_stream_info_update (self, s); -} - -static void -gst_player_streams_info_create (GstPlayer * self, - GstPlayerMediaInfo * media_info, const gchar * prop, GType type) -{ - gint i; - gint total = -1; - GstPlayerStreamInfo *s; - - if (!media_info) - return; - - g_object_get (G_OBJECT (self->playbin), prop, &total, NULL); - - GST_DEBUG_OBJECT (self, "%s: %d", prop, total); - - for (i = 0; i < total; i++) { - /* check if stream already exist in the list */ - s = gst_player_stream_info_find (media_info, type, i); - - if (!s) { - /* create a new stream info instance */ - s = gst_player_stream_info_new (i, type); - - /* add the object in stream list */ - media_info->stream_list = g_list_append (media_info->stream_list, s); - - /* based on type, add the object in its corresponding stream_ list */ - if (GST_IS_PLAYER_AUDIO_INFO (s)) - media_info->audio_stream_list = g_list_append - (media_info->audio_stream_list, s); - else if (GST_IS_PLAYER_VIDEO_INFO (s)) - media_info->video_stream_list = g_list_append - (media_info->video_stream_list, s); - else - media_info->subtitle_stream_list = g_list_append - (media_info->subtitle_stream_list, s); - - GST_DEBUG_OBJECT (self, "create %s stream stream_index: %d", - gst_player_stream_info_get_stream_type (s), i); - } - - gst_player_stream_info_update_tags_and_caps (self, s); - } -} - -static void -video_changed_cb (G_GNUC_UNUSED GObject * object, gpointer user_data) -{ - GstPlayer *self = GST_PLAYER (user_data); - - g_mutex_lock (&self->lock); - gst_player_streams_info_create (self, self->media_info, - "n-video", GST_TYPE_PLAYER_VIDEO_INFO); - g_mutex_unlock (&self->lock); -} - -static void -audio_changed_cb (G_GNUC_UNUSED GObject * object, gpointer user_data) -{ - GstPlayer *self = GST_PLAYER (user_data); - - g_mutex_lock (&self->lock); - gst_player_streams_info_create (self, self->media_info, - "n-audio", GST_TYPE_PLAYER_AUDIO_INFO); - g_mutex_unlock (&self->lock); -} - -static void -subtitle_changed_cb (G_GNUC_UNUSED GObject * object, gpointer user_data) -{ - GstPlayer *self = GST_PLAYER (user_data); - - g_mutex_lock (&self->lock); - gst_player_streams_info_create (self, self->media_info, - "n-text", GST_TYPE_PLAYER_SUBTITLE_INFO); - g_mutex_unlock (&self->lock); -} - -static void * -get_title (GstTagList * tags) -{ - gchar *title = NULL; - - gst_tag_list_get_string (tags, GST_TAG_TITLE, &title); - if (!title) - gst_tag_list_get_string (tags, GST_TAG_TITLE_SORTNAME, &title); - - return title; -} - -static void * -get_container_format (GstTagList * tags) -{ - gchar *container = NULL; - - gst_tag_list_get_string (tags, GST_TAG_CONTAINER_FORMAT, &container); - - /* TODO: If container is not available then maybe consider - * parsing caps or file extension to guess the container format. - */ - - return container; -} - -static void * -get_from_tags (GstPlayer * self, GstPlayerMediaInfo * media_info, - void *(*func) (GstTagList *)) -{ - GList *l; - void *ret = NULL; - - if (media_info->tags) { - ret = func (media_info->tags); - if (ret) - return ret; - } - - /* if global tag does not exit then try video and audio streams */ - GST_DEBUG_OBJECT (self, "trying video tags"); - for (l = gst_player_get_video_streams (media_info); l != NULL; l = l->next) { - GstTagList *tags; - - tags = gst_player_stream_info_get_tags ((GstPlayerStreamInfo *) l->data); - if (tags) - ret = func (tags); - - if (ret) - return ret; - } - - GST_DEBUG_OBJECT (self, "trying audio tags"); - for (l = gst_player_get_audio_streams (media_info); l != NULL; l = l->next) { - GstTagList *tags; - - tags = gst_player_stream_info_get_tags ((GstPlayerStreamInfo *) l->data); - if (tags) - ret = func (tags); - - if (ret) - return ret; - } - - GST_DEBUG_OBJECT (self, "failed to get the information from tags"); - return NULL; -} - -static void * -get_cover_sample (GstTagList * tags) -{ - GstSample *cover_sample = NULL; - - gst_tag_list_get_sample (tags, GST_TAG_IMAGE, &cover_sample); - if (!cover_sample) - gst_tag_list_get_sample (tags, GST_TAG_PREVIEW_IMAGE, &cover_sample); - - return cover_sample; -} - -static GstPlayerMediaInfo * -gst_player_media_info_create (GstPlayer * self) -{ - GstPlayerMediaInfo *media_info; - GstQuery *query; - - GST_DEBUG_OBJECT (self, "begin"); - media_info = gst_player_media_info_new (self->uri); - media_info->duration = gst_player_get_duration (self); - media_info->tags = self->global_tags; - self->global_tags = NULL; - - query = gst_query_new_seeking (GST_FORMAT_TIME); - if (gst_element_query (self->playbin, query)) - gst_query_parse_seeking (query, NULL, &media_info->seekable, NULL, NULL); - gst_query_unref (query); - - /* create audio/video/sub streams */ - gst_player_streams_info_create (self, media_info, "n-video", - GST_TYPE_PLAYER_VIDEO_INFO); - gst_player_streams_info_create (self, media_info, "n-audio", - GST_TYPE_PLAYER_AUDIO_INFO); - gst_player_streams_info_create (self, media_info, "n-text", - GST_TYPE_PLAYER_SUBTITLE_INFO); - - media_info->title = get_from_tags (self, media_info, get_title); - media_info->container = - get_from_tags (self, media_info, get_container_format); - media_info->image_sample = get_from_tags (self, media_info, get_cover_sample); - - GST_DEBUG_OBJECT (self, "uri: %s title: %s duration: %" GST_TIME_FORMAT - " seekable: %s container: %s image_sample %p", - media_info->uri, media_info->title, GST_TIME_ARGS (media_info->duration), - media_info->seekable ? "yes" : "no", media_info->container, - media_info->image_sample); - - GST_DEBUG_OBJECT (self, "end"); - return media_info; -} - -static void -tags_changed_cb (GstPlayer * self, gint stream_index, GType type) -{ - GstPlayerStreamInfo *s; - - if (!self->media_info) - return; - - /* update the stream information */ - g_mutex_lock (&self->lock); - s = gst_player_stream_info_find (self->media_info, type, stream_index); - gst_player_stream_info_update_tags_and_caps (self, s); - g_mutex_unlock (&self->lock); - - emit_media_info_updated_signal (self); -} - -static void -video_tags_changed_cb (G_GNUC_UNUSED GstElement * playbin, gint stream_index, - gpointer user_data) -{ - tags_changed_cb (GST_PLAYER (user_data), stream_index, - GST_TYPE_PLAYER_VIDEO_INFO); -} - -static void -audio_tags_changed_cb (G_GNUC_UNUSED GstElement * playbin, gint stream_index, - gpointer user_data) -{ - tags_changed_cb (GST_PLAYER (user_data), stream_index, - GST_TYPE_PLAYER_AUDIO_INFO); -} - -static void -subtitle_tags_changed_cb (G_GNUC_UNUSED GstElement * playbin, gint stream_index, - gpointer user_data) -{ - tags_changed_cb (GST_PLAYER (user_data), stream_index, - GST_TYPE_PLAYER_SUBTITLE_INFO); -} - -static void -volume_changed_dispatch (gpointer user_data) -{ - g_signal_emit (user_data, signals[SIGNAL_VOLUME_CHANGED], 0); - g_object_notify_by_pspec (G_OBJECT (user_data), param_specs[PROP_VOLUME]); -} - -static void -volume_notify_cb (G_GNUC_UNUSED GObject * obj, G_GNUC_UNUSED GParamSpec * pspec, - GstPlayer * self) -{ - if (g_signal_handler_find (self, G_SIGNAL_MATCH_ID, - signals[SIGNAL_VOLUME_CHANGED], 0, NULL, NULL, NULL) != 0) { - gst_player_signal_dispatcher_dispatch (self->signal_dispatcher, self, - volume_changed_dispatch, g_object_ref (self), - (GDestroyNotify) g_object_unref); - } -} - -static void -mute_changed_dispatch (gpointer user_data) -{ - g_signal_emit (user_data, signals[SIGNAL_MUTE_CHANGED], 0); - g_object_notify_by_pspec (G_OBJECT (user_data), param_specs[PROP_MUTE]); -} - -static void -mute_notify_cb (G_GNUC_UNUSED GObject * obj, G_GNUC_UNUSED GParamSpec * pspec, - GstPlayer * self) -{ - if (g_signal_handler_find (self, G_SIGNAL_MATCH_ID, - signals[SIGNAL_MUTE_CHANGED], 0, NULL, NULL, NULL) != 0) { - gst_player_signal_dispatcher_dispatch (self->signal_dispatcher, self, - mute_changed_dispatch, g_object_ref (self), - (GDestroyNotify) g_object_unref); - } -} - -static gpointer -gst_player_main (gpointer data) -{ - GstPlayer *self = GST_PLAYER (data); - GstBus *bus; - GSource *source; - GSource *bus_source; - GstElement *scaletempo; - - GST_TRACE_OBJECT (self, "Starting main thread"); - - g_main_context_push_thread_default (self->context); - - source = g_idle_source_new (); - g_source_set_callback (source, (GSourceFunc) main_loop_running_cb, self, - NULL); - g_source_attach (source, self->context); - g_source_unref (source); - - self->playbin = gst_element_factory_make ("playbin", "playbin"); - - if (self->video_renderer) { - GstElement *video_sink = - gst_player_video_renderer_create_video_sink (self->video_renderer, - self); - - if (video_sink) - g_object_set (self->playbin, "video-sink", video_sink, NULL); - } - - scaletempo = gst_element_factory_make ("scaletempo", NULL); - if (scaletempo) { - if (gst_plugin_feature_check_version (GST_PLUGIN_FEATURE - (gst_element_get_factory (scaletempo)), 1, 6, 1)) { - g_object_set (self->playbin, "audio-filter", scaletempo, NULL); - } else { - gst_object_unref (scaletempo); - g_warning ("GstPlayer: scaletempo >= 1.6.1 is needed for preserving " - "audio pitch during trick modes"); - } - } else { - g_warning ("GstPlayer: scaletempo element not available. Audio pitch " - "will not be preserved during trick modes"); - } - - self->bus = bus = gst_element_get_bus (self->playbin); - bus_source = gst_bus_create_watch (bus); - g_source_set_callback (bus_source, (GSourceFunc) gst_bus_async_signal_func, - NULL, NULL); - g_source_attach (bus_source, self->context); - - g_signal_connect (G_OBJECT (bus), "message::error", G_CALLBACK (error_cb), - self); - g_signal_connect (G_OBJECT (bus), "message::warning", G_CALLBACK (warning_cb), - self); - g_signal_connect (G_OBJECT (bus), "message::eos", G_CALLBACK (eos_cb), self); - g_signal_connect (G_OBJECT (bus), "message::state-changed", - G_CALLBACK (state_changed_cb), self); - g_signal_connect (G_OBJECT (bus), "message::buffering", - G_CALLBACK (buffering_cb), self); - g_signal_connect (G_OBJECT (bus), "message::clock-lost", - G_CALLBACK (clock_lost_cb), self); - g_signal_connect (G_OBJECT (bus), "message::duration-changed", - G_CALLBACK (duration_changed_cb), self); - g_signal_connect (G_OBJECT (bus), "message::latency", - G_CALLBACK (latency_cb), self); - g_signal_connect (G_OBJECT (bus), "message::request-state", - G_CALLBACK (request_state_cb), self); - g_signal_connect (G_OBJECT (bus), "message::element", - G_CALLBACK (element_cb), self); - g_signal_connect (G_OBJECT (bus), "message::tag", G_CALLBACK (tags_cb), self); - - g_signal_connect (self->playbin, "video-changed", - G_CALLBACK (video_changed_cb), self); - g_signal_connect (self->playbin, "audio-changed", - G_CALLBACK (audio_changed_cb), self); - g_signal_connect (self->playbin, "text-changed", - G_CALLBACK (subtitle_changed_cb), self); - - g_signal_connect (self->playbin, "video-tags-changed", - G_CALLBACK (video_tags_changed_cb), self); - g_signal_connect (self->playbin, "audio-tags-changed", - G_CALLBACK (audio_tags_changed_cb), self); - g_signal_connect (self->playbin, "text-tags-changed", - G_CALLBACK (subtitle_tags_changed_cb), self); - g_signal_connect (self->playbin, "notify::volume", - G_CALLBACK (volume_notify_cb), self); - g_signal_connect (self->playbin, "notify::mute", - G_CALLBACK (mute_notify_cb), self); - - self->target_state = GST_STATE_NULL; - self->current_state = GST_STATE_NULL; - change_state (self, GST_PLAYER_STATE_STOPPED); - self->buffering = 100; - self->is_eos = FALSE; - self->is_live = FALSE; - - GST_TRACE_OBJECT (self, "Starting main loop"); - g_main_loop_run (self->loop); - GST_TRACE_OBJECT (self, "Stopped main loop"); - - g_source_destroy (bus_source); - g_source_unref (bus_source); - gst_object_unref (bus); - - remove_tick_source (self); - remove_ready_timeout_source (self); - - g_mutex_lock (&self->lock); - if (self->media_info) { - g_object_unref (self->media_info); - self->media_info = NULL; - } - - if (self->seek_source) - g_source_unref (self->seek_source); - self->seek_source = NULL; - g_mutex_unlock (&self->lock); - - g_main_context_pop_thread_default (self->context); - - self->target_state = GST_STATE_NULL; - self->current_state = GST_STATE_NULL; - if (self->playbin) { - gst_element_set_state (self->playbin, GST_STATE_NULL); - gst_object_unref (self->playbin); - self->playbin = NULL; - } - - GST_TRACE_OBJECT (self, "Stopped main thread"); - - return NULL; -} - -static gpointer -gst_player_init_once (G_GNUC_UNUSED gpointer user_data) -{ - gst_init (NULL, NULL); - - GST_DEBUG_CATEGORY_INIT (gst_player_debug, "gst-player", 0, "GstPlayer"); - gst_player_error_quark (); - - return NULL; -} - -/** - * gst_player_new: - * @video_renderer: (transfer full) (allow-none): GstPlayerVideoRenderer to use - * @signal_dispatcher: (transfer full) (allow-none): GstPlayerSignalDispatcher to use - * - * Creates a new #GstPlayer instance that uses @signal_dispatcher to dispatch - * signals to some event loop system, or emits signals directly if NULL is - * passed. See gst_player_g_main_context_signal_dispatcher_new(). - * - * Video is going to be rendered by @video_renderer, or if %NULL is provided - * no special video set up will be done and some default handling will be - * performed. - * - * Returns: a new #GstPlayer instance - */ -GstPlayer * -gst_player_new (GstPlayerVideoRenderer * video_renderer, - GstPlayerSignalDispatcher * signal_dispatcher) -{ - static GOnce once = G_ONCE_INIT; - GstPlayer *self; - - g_once (&once, gst_player_init_once, NULL); - - self = - g_object_new (GST_TYPE_PLAYER, "video-renderer", video_renderer, - "signal-dispatcher", signal_dispatcher, NULL); - - if (video_renderer) - g_object_unref (video_renderer); - if (signal_dispatcher) - g_object_unref (signal_dispatcher); - - return self; -} - -static gboolean -gst_player_play_internal (gpointer user_data) -{ - GstPlayer *self = GST_PLAYER (user_data); - GstStateChangeReturn state_ret; - - GST_DEBUG_OBJECT (self, "Play"); - - g_mutex_lock (&self->lock); - if (!self->uri) { - g_mutex_unlock (&self->lock); - return G_SOURCE_REMOVE; - } - g_mutex_unlock (&self->lock); - - remove_ready_timeout_source (self); - self->target_state = GST_STATE_PLAYING; - - if (self->current_state < GST_STATE_PAUSED) - change_state (self, GST_PLAYER_STATE_BUFFERING); - - if (self->current_state >= GST_STATE_PAUSED && !self->is_eos) { - state_ret = gst_element_set_state (self->playbin, GST_STATE_PLAYING); - } else { - state_ret = gst_element_set_state (self->playbin, GST_STATE_PAUSED); - } - - if (state_ret == GST_STATE_CHANGE_NO_PREROLL) { - self->is_live = TRUE; - GST_DEBUG_OBJECT (self, "Pipeline is live"); - } - - if (state_ret == GST_STATE_CHANGE_FAILURE) { - emit_error (self, g_error_new (GST_PLAYER_ERROR, GST_PLAYER_ERROR_FAILED, - "Failed to play")); - return G_SOURCE_REMOVE; - } else if (state_ret == GST_STATE_CHANGE_NO_PREROLL) { - self->is_live = TRUE; - GST_DEBUG_OBJECT (self, "Pipeline is live"); - } - - if (self->is_eos) { - gboolean ret; - - GST_DEBUG_OBJECT (self, "Was EOS, seeking to beginning"); - self->is_eos = FALSE; - ret = - gst_element_seek_simple (self->playbin, GST_FORMAT_TIME, - GST_SEEK_FLAG_FLUSH, 0); - if (!ret) { - GST_ERROR_OBJECT (self, "Seek to beginning failed"); - gst_player_stop_internal (self); - gst_player_play_internal (self); - } - } - - return G_SOURCE_REMOVE; -} - -/** - * gst_player_play: - * @player: #GstPlayer instance - * - * Request to play the loaded stream. - */ -void -gst_player_play (GstPlayer * self) -{ - g_return_if_fail (GST_IS_PLAYER (self)); - - g_main_context_invoke_full (self->context, G_PRIORITY_DEFAULT, - gst_player_play_internal, self, NULL); -} - -static gboolean -gst_player_pause_internal (gpointer user_data) -{ - GstPlayer *self = GST_PLAYER (user_data); - GstStateChangeReturn state_ret; - - GST_DEBUG_OBJECT (self, "Pause"); - - g_mutex_lock (&self->lock); - if (!self->uri) { - g_mutex_unlock (&self->lock); - return G_SOURCE_REMOVE; - } - g_mutex_unlock (&self->lock); - - tick_cb (self); - remove_tick_source (self); - remove_ready_timeout_source (self); - - self->target_state = GST_STATE_PAUSED; - - if (self->current_state < GST_STATE_PAUSED) - change_state (self, GST_PLAYER_STATE_BUFFERING); - - state_ret = gst_element_set_state (self->playbin, GST_STATE_PAUSED); - if (state_ret == GST_STATE_CHANGE_FAILURE) { - emit_error (self, g_error_new (GST_PLAYER_ERROR, GST_PLAYER_ERROR_FAILED, - "Failed to pause")); - return G_SOURCE_REMOVE; - } else if (state_ret == GST_STATE_CHANGE_NO_PREROLL) { - self->is_live = TRUE; - GST_DEBUG_OBJECT (self, "Pipeline is live"); - } - - if (self->is_eos) { - gboolean ret; - - GST_DEBUG_OBJECT (self, "Was EOS, seeking to beginning"); - self->is_eos = FALSE; - ret = - gst_element_seek_simple (self->playbin, GST_FORMAT_TIME, - GST_SEEK_FLAG_FLUSH, 0); - if (!ret) { - GST_ERROR_OBJECT (self, "Seek to beginning failed"); - gst_player_stop_internal (self); - gst_player_pause_internal (self); - } - } - - return G_SOURCE_REMOVE; -} - -/** - * gst_player_pause: - * @player: #GstPlayer instance - * - * Pauses the current stream. - */ -void -gst_player_pause (GstPlayer * self) -{ - g_return_if_fail (GST_IS_PLAYER (self)); - - g_main_context_invoke_full (self->context, G_PRIORITY_DEFAULT, - gst_player_pause_internal, self, NULL); -} - -static gboolean -gst_player_stop_internal (gpointer user_data) -{ - GstPlayer *self = GST_PLAYER (user_data); - - GST_DEBUG_OBJECT (self, "Stop"); - - tick_cb (self); - remove_tick_source (self); - - add_ready_timeout_source (self); - - self->target_state = GST_STATE_NULL; - self->current_state = GST_STATE_READY; - self->is_live = FALSE; - self->is_eos = FALSE; - gst_bus_set_flushing (self->bus, TRUE); - gst_element_set_state (self->playbin, GST_STATE_READY); - gst_bus_set_flushing (self->bus, FALSE); - change_state (self, GST_PLAYER_STATE_STOPPED); - self->buffering = 100; - g_mutex_lock (&self->lock); - if (self->media_info) { - g_object_unref (self->media_info); - self->media_info = NULL; - } - if (self->global_tags) { - gst_tag_list_unref (self->global_tags); - self->global_tags = NULL; - } - self->seek_pending = FALSE; - if (self->seek_source) { - g_source_destroy (self->seek_source); - g_source_unref (self->seek_source); - self->seek_source = NULL; - } - self->seek_position = GST_CLOCK_TIME_NONE; - self->last_seek_time = GST_CLOCK_TIME_NONE; - self->rate = 1.0; - g_mutex_unlock (&self->lock); - - return G_SOURCE_REMOVE; -} - -/** - * gst_player_stop: - * @player: #GstPlayer instance - * - * Stops playing the current stream and resets to the first position - * in the stream. - */ -void -gst_player_stop (GstPlayer * self) -{ - g_return_if_fail (GST_IS_PLAYER (self)); - - g_main_context_invoke_full (self->context, G_PRIORITY_DEFAULT, - gst_player_stop_internal, self, NULL); -} - -/* Must be called with lock from main context, releases lock! */ -static void -gst_player_seek_internal_locked (GstPlayer * self) -{ - gboolean ret; - GstClockTime position; - gdouble rate; - GstStateChangeReturn state_ret; - GstEvent *s_event; - GstSeekFlags flags = 0; - - if (self->seek_source) { - g_source_destroy (self->seek_source); - g_source_unref (self->seek_source); - self->seek_source = NULL; - } - - /* Only seek in PAUSED */ - if (self->current_state < GST_STATE_PAUSED) { - return; - } else if (self->current_state != GST_STATE_PAUSED) { - g_mutex_unlock (&self->lock); - state_ret = gst_element_set_state (self->playbin, GST_STATE_PAUSED); - if (state_ret == GST_STATE_CHANGE_FAILURE) { - emit_error (self, g_error_new (GST_PLAYER_ERROR, GST_PLAYER_ERROR_FAILED, - "Failed to seek")); - g_mutex_lock (&self->lock); - return; - } - g_mutex_lock (&self->lock); - return; - } - - self->last_seek_time = gst_util_get_timestamp (); - position = self->seek_position; - self->seek_position = GST_CLOCK_TIME_NONE; - self->seek_pending = TRUE; - rate = self->rate; - g_mutex_unlock (&self->lock); - - remove_tick_source (self); - self->is_eos = FALSE; - - flags |= GST_SEEK_FLAG_FLUSH; - -#if GST_CHECK_VERSION(1,5,0) - if (rate != 1.0) { - flags |= GST_SEEK_FLAG_TRICKMODE; - } -#endif - - if (rate >= 0.0) { - s_event = gst_event_new_seek (rate, GST_FORMAT_TIME, flags, - GST_SEEK_TYPE_SET, position, GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE); - } else { - s_event = gst_event_new_seek (rate, GST_FORMAT_TIME, flags, - GST_SEEK_TYPE_SET, G_GINT64_CONSTANT (0), GST_SEEK_TYPE_SET, position); - } - - GST_DEBUG_OBJECT (self, "Seek with rate %.2lf to %" GST_TIME_FORMAT, - rate, GST_TIME_ARGS (position)); - - ret = gst_element_send_event (self->playbin, s_event); - if (!ret) - emit_error (self, g_error_new (GST_PLAYER_ERROR, GST_PLAYER_ERROR_FAILED, - "Failed to seek to %" GST_TIME_FORMAT, GST_TIME_ARGS (position))); - - g_mutex_lock (&self->lock); -} - -static gboolean -gst_player_seek_internal (gpointer user_data) -{ - GstPlayer *self = GST_PLAYER (user_data); - - g_mutex_lock (&self->lock); - gst_player_seek_internal_locked (self); - g_mutex_unlock (&self->lock); - - return G_SOURCE_REMOVE; -} - -static gboolean -gst_player_set_rate_internal (gpointer user_data) -{ - GstPlayer *self = user_data; - - g_mutex_lock (&self->lock); - - self->seek_position = gst_player_get_position (self); - - /* If there is no seek being dispatch to the main context currently do that, - * otherwise we just updated the rate so that it will be taken by - * the seek handler from the main context instead of the old one. - */ - if (!self->seek_source) { - /* If no seek is pending then create new seek source */ - if (!self->seek_pending) { - self->seek_source = g_idle_source_new (); - g_source_set_callback (self->seek_source, - (GSourceFunc) gst_player_seek_internal, self, NULL); - g_source_attach (self->seek_source, self->context); - } - } - - g_mutex_unlock (&self->lock); - - return G_SOURCE_REMOVE; -} - -/** - * gst_player_set_rate: - * @player: #GstPlayer instance - * @rate: playback rate - * - * Playback at specified rate - */ -void -gst_player_set_rate (GstPlayer * self, gdouble rate) -{ - g_return_if_fail (GST_IS_PLAYER (self)); - g_return_if_fail (rate != 0.0); - - g_mutex_lock (&self->lock); - self->rate = rate; - g_mutex_unlock (&self->lock); - - gst_player_set_rate_internal (self); -} - -/** - * gst_player_get_rate: - * @player: #GstPlayer instance - * - * Returns: current playback rate - */ -gdouble -gst_player_get_rate (GstPlayer * self) -{ - g_return_val_if_fail (GST_IS_PLAYER (self), DEFAULT_RATE); - - return self->rate; -} - -static gboolean -gst_player_set_position_update_interval_internal (gpointer user_data) -{ - GstPlayer *self = user_data; - - g_mutex_lock (&self->lock); - - if (self->tick_source) { - remove_tick_source (self); - add_tick_source (self); - } - - g_mutex_unlock (&self->lock); - - return G_SOURCE_REMOVE; -} - -/** - * gst_player_set_position_update_interval: - * @player: #GstPlayer instance - * @interval: interval in ms - * - * Set interval in milliseconds between two position-updated signals. - * Pass 0 to stop updating the position. - */ -void -gst_player_set_position_update_interval (GstPlayer * self, guint interval) -{ - g_return_if_fail (GST_IS_PLAYER (self)); - g_return_if_fail (interval <= 10000); - - g_mutex_lock (&self->lock); - self->position_update_interval_ms = interval; - g_mutex_unlock (&self->lock); - - gst_player_set_position_update_interval_internal (self); -} - -/** - * gst_player_get_position_update_interval: - * @player: #GstPlayer instance - * - * Returns: current position update interval in milliseconds - */ -guint -gst_player_get_position_update_interval (GstPlayer * self) -{ - g_return_val_if_fail (GST_IS_PLAYER (self), - DEFAULT_POSITION_UPDATE_INTERVAL_MS); - - return self->position_update_interval_ms; -} - -/** - * gst_player_seek: - * @player: #GstPlayer instance - * @position: position to seek in nanoseconds - * - * Seeks the currently-playing stream to the absolute @position time - * in nanoseconds. - */ -void -gst_player_seek (GstPlayer * self, GstClockTime position) -{ - g_return_if_fail (GST_IS_PLAYER (self)); - g_return_if_fail (GST_CLOCK_TIME_IS_VALID (position)); - - g_mutex_lock (&self->lock); - if (self->media_info && !self->media_info->seekable) { - GST_DEBUG_OBJECT (self, "Media is not seekable"); - g_mutex_unlock (&self->lock); - return; - } - - self->seek_position = position; - - /* If there is no seek being dispatch to the main context currently do that, - * otherwise we just updated the seek position so that it will be taken by - * the seek handler from the main context instead of the old one. - */ - if (!self->seek_source) { - GstClockTime now = gst_util_get_timestamp (); - - /* If no seek is pending or it was started more than 250 mseconds ago seek - * immediately, otherwise wait until the 250 mseconds have passed */ - if (!self->seek_pending || (now - self->last_seek_time > 250 * GST_MSECOND)) { - self->seek_source = g_idle_source_new (); - g_source_set_callback (self->seek_source, - (GSourceFunc) gst_player_seek_internal, self, NULL); - GST_TRACE_OBJECT (self, "Dispatching seek to position %" GST_TIME_FORMAT, - GST_TIME_ARGS (position)); - g_source_attach (self->seek_source, self->context); - } else { - guint delay = 250000 - (now - self->last_seek_time) / 1000; - - /* Note that last_seek_time must be set to something at this point and - * it must be smaller than 250 mseconds */ - self->seek_source = g_timeout_source_new (delay); - g_source_set_callback (self->seek_source, - (GSourceFunc) gst_player_seek_internal, self, NULL); - - GST_TRACE_OBJECT (self, - "Delaying seek to position %" GST_TIME_FORMAT " by %u us", - GST_TIME_ARGS (position), delay); - g_source_attach (self->seek_source, self->context); - } - } - g_mutex_unlock (&self->lock); -} - -/** - * gst_player_get_uri: - * @player: #GstPlayer instance - * - * Gets the URI of the currently-playing stream. - * - * Returns: (transfer full): a string containing the URI of the - * currently-playing stream. g_free() after usage. - */ -gchar * -gst_player_get_uri (GstPlayer * self) -{ - gchar *val; - - g_return_val_if_fail (GST_IS_PLAYER (self), DEFAULT_URI); - - g_object_get (self, "uri", &val, NULL); - - return val; -} - -/** - * gst_player_set_uri: - * @player: #GstPlayer instance - * @uri: next URI to play. - * - * Sets the next URI to play. - */ -void -gst_player_set_uri (GstPlayer * self, const gchar * val) -{ - g_return_if_fail (GST_IS_PLAYER (self)); - - g_object_set (self, "uri", val, NULL); -} - -/** - * gst_player_get_position: - * @player: #GstPlayer instance - * - * Returns: the absolute position time, in nanoseconds, of the - * currently-playing stream. - */ -GstClockTime -gst_player_get_position (GstPlayer * self) -{ - GstClockTime val; - - g_return_val_if_fail (GST_IS_PLAYER (self), DEFAULT_POSITION); - - g_object_get (self, "position", &val, NULL); - - return val; -} - -/** - * gst_player_get_duration: - * @player: #GstPlayer instance - * - * Retrieves the duration of the media stream that self represents. - * - * Returns: the duration of the currently-playing media stream, in - * nanoseconds. - */ -GstClockTime -gst_player_get_duration (GstPlayer * self) -{ - GstClockTime val; - - g_return_val_if_fail (GST_IS_PLAYER (self), DEFAULT_DURATION); - - g_object_get (self, "duration", &val, NULL); - - return val; -} - -/** - * gst_player_get_volume: - * @player: #GstPlayer instance - * - * Returns the current volume level, as a percentage between 0 and 1. - * - * Returns: the volume as percentage between 0 and 1. - */ -gdouble -gst_player_get_volume (GstPlayer * self) -{ - gdouble val; - - g_return_val_if_fail (GST_IS_PLAYER (self), DEFAULT_VOLUME); - - g_object_get (self, "volume", &val, NULL); - - return val; -} - -/** - * gst_player_set_volume: - * @player: #GstPlayer instance - * @val: the new volume level, as a percentage between 0 and 1 - * - * Sets the volume level of the stream as a percentage between 0 and 1. - */ -void -gst_player_set_volume (GstPlayer * self, gdouble val) -{ - g_return_if_fail (GST_IS_PLAYER (self)); - - g_object_set (self, "volume", val, NULL); -} - -/** - * gst_player_get_mute: - * @player: #GstPlayer instance - * - * Returns: %TRUE if the currently-playing stream is muted. - */ -gboolean -gst_player_get_mute (GstPlayer * self) -{ - gboolean val; - - g_return_val_if_fail (GST_IS_PLAYER (self), DEFAULT_MUTE); - - g_object_get (self, "mute", &val, NULL); - - return val; -} - -/** - * gst_player_set_mute: - * @player: #GstPlayer instance - * @val: Mute state the should be set - * - * %TRUE if the currently-playing stream should be muted. - */ -void -gst_player_set_mute (GstPlayer * self, gboolean val) -{ - g_return_if_fail (GST_IS_PLAYER (self)); - - g_object_set (self, "mute", val, NULL); -} - -/** - * gst_player_get_pipeline: - * @player: #GstPlayer instance - * - * Returns: (transfer full): The internal playbin instance - */ -GstElement * -gst_player_get_pipeline (GstPlayer * self) -{ - GstElement *val; - - g_return_val_if_fail (GST_IS_PLAYER (self), NULL); - - g_object_get (self, "pipeline", &val, NULL); - - return val; -} - -/** - * gst_player_get_media_info: - * @player: #GstPlayer instance - * - * A Function to get the current media info #GstPlayerMediaInfo instance. - * - * Returns: (transfer full): media info instance. - * - * The caller should free it with g_object_unref() - */ -GstPlayerMediaInfo * -gst_player_get_media_info (GstPlayer * self) -{ - GstPlayerMediaInfo *info; - - g_return_val_if_fail (GST_IS_PLAYER (self), NULL); - - if (!self->media_info) - return NULL; - - g_mutex_lock (&self->lock); - info = gst_player_media_info_copy (self->media_info); - g_mutex_unlock (&self->lock); - - return info; -} - -/** - * gst_player_get_current_audio_track: - * @player: #GstPlayer instance - * - * A Function to get current audio #GstPlayerAudioInfo instance. - * - * Returns: (transfer full): current audio track. - * - * The caller should free it with g_object_unref() - */ -GstPlayerAudioInfo * -gst_player_get_current_audio_track (GstPlayer * self) -{ - GstPlayerAudioInfo *info; - - g_return_val_if_fail (GST_IS_PLAYER (self), NULL); - - if (!is_track_enabled (self, GST_PLAY_FLAG_AUDIO)) - return NULL; - - info = (GstPlayerAudioInfo *) gst_player_stream_info_get_current (self, - "current-audio", GST_TYPE_PLAYER_AUDIO_INFO); - return info; -} - -/** - * gst_player_get_current_video_track: - * @player: #GstPlayer instance - * - * A Function to get current video #GstPlayerVideoInfo instance. - * - * Returns: (transfer full): current video track. - * - * The caller should free it with g_object_unref() - */ -GstPlayerVideoInfo * -gst_player_get_current_video_track (GstPlayer * self) -{ - GstPlayerVideoInfo *info; - - g_return_val_if_fail (GST_IS_PLAYER (self), NULL); - - if (!is_track_enabled (self, GST_PLAY_FLAG_VIDEO)) - return NULL; - - info = (GstPlayerVideoInfo *) gst_player_stream_info_get_current (self, - "current-video", GST_TYPE_PLAYER_VIDEO_INFO); - return info; -} - -/** - * gst_player_get_current_subtitle_track: - * @player: #GstPlayer instance - * - * A Function to get current subtitle #GstPlayerSubtitleInfo instance. - * - * Returns: (transfer none): current subtitle track. - * - * The caller should free it with g_object_unref() - */ -GstPlayerSubtitleInfo * -gst_player_get_current_subtitle_track (GstPlayer * self) -{ - GstPlayerSubtitleInfo *info; - - g_return_val_if_fail (GST_IS_PLAYER (self), NULL); - - if (!is_track_enabled (self, GST_PLAY_FLAG_SUBTITLE)) - return NULL; - - info = (GstPlayerSubtitleInfo *) gst_player_stream_info_get_current (self, - "current-text", GST_TYPE_PLAYER_SUBTITLE_INFO); - return info; -} - -/** - * gst_player_set_audio_track: - * @player: #GstPlayer instance - * @stream_index: stream index - * - * Returns: %TRUE or %FALSE - * - * Sets the audio track @stream_idex. - */ -gboolean -gst_player_set_audio_track (GstPlayer * self, gint stream_index) -{ - GstPlayerStreamInfo *info; - - g_return_val_if_fail (GST_IS_PLAYER (self), 0); - - g_mutex_lock (&self->lock); - info = gst_player_stream_info_find (self->media_info, - GST_TYPE_PLAYER_AUDIO_INFO, stream_index); - g_mutex_unlock (&self->lock); - if (!info) { - GST_ERROR_OBJECT (self, "invalid audio stream index %d", stream_index); - return FALSE; - } - - g_object_set (G_OBJECT (self->playbin), "current-audio", stream_index, NULL); - GST_DEBUG_OBJECT (self, "set stream index '%d'", stream_index); - return TRUE; -} - -/** - * gst_player_set_video_track: - * @player: #GstPlayer instance - * @stream_index: stream index - * - * Returns: %TRUE or %FALSE - * - * Sets the video track @stream_index. - */ -gboolean -gst_player_set_video_track (GstPlayer * self, gint stream_index) -{ - GstPlayerStreamInfo *info; - - g_return_val_if_fail (GST_IS_PLAYER (self), 0); - - /* check if stream_index exist in our internal media_info list */ - g_mutex_lock (&self->lock); - info = gst_player_stream_info_find (self->media_info, - GST_TYPE_PLAYER_VIDEO_INFO, stream_index); - g_mutex_unlock (&self->lock); - if (!info) { - GST_ERROR_OBJECT (self, "invalid video stream index %d", stream_index); - return FALSE; - } - - g_object_set (G_OBJECT (self->playbin), "current-video", stream_index, NULL); - GST_DEBUG_OBJECT (self, "set stream index '%d'", stream_index); - return TRUE; -} - -/** - * gst_player_set_subtitle_track: - * @player: #GstPlayer instance - * @stream_index: stream index - * - * Returns: %TRUE or %FALSE - * - * Sets the subtitle strack @stream_index. - */ -gboolean -gst_player_set_subtitle_track (GstPlayer * self, gint stream_index) -{ - GstPlayerStreamInfo *info; - - g_return_val_if_fail (GST_IS_PLAYER (self), 0); - - g_mutex_lock (&self->lock); - info = gst_player_stream_info_find (self->media_info, - GST_TYPE_PLAYER_SUBTITLE_INFO, stream_index); - g_mutex_unlock (&self->lock); - if (!info) { - GST_ERROR_OBJECT (self, "invalid subtitle stream index %d", stream_index); - return FALSE; - } - - g_object_set (G_OBJECT (self->playbin), "current-text", stream_index, NULL); - GST_DEBUG_OBJECT (self, "set stream index '%d'", stream_index); - return TRUE; -} - -/** - * gst_player_set_audio_track_enabled: - * @player: #GstPlayer instance - * @enabled: TRUE or FALSE - * - * Enable or disable the current audio track. - */ -void -gst_player_set_audio_track_enabled (GstPlayer * self, gboolean enabled) -{ - g_return_if_fail (GST_IS_PLAYER (self)); - - if (enabled) - player_set_flag (self, GST_PLAY_FLAG_AUDIO); - else - player_clear_flag (self, GST_PLAY_FLAG_AUDIO); - - GST_DEBUG_OBJECT (self, "track is '%s'", enabled ? "Enabled" : "Disabled"); -} - -/** - * gst_player_set_video_track_enabled: - * @player: #GstPlayer instance - * @enabled: TRUE or FALSE - * - * Enable or disable the current video track. - */ -void -gst_player_set_video_track_enabled (GstPlayer * self, gboolean enabled) -{ - g_return_if_fail (GST_IS_PLAYER (self)); - - if (enabled) - player_set_flag (self, GST_PLAY_FLAG_VIDEO); - else - player_clear_flag (self, GST_PLAY_FLAG_VIDEO); - - GST_DEBUG_OBJECT (self, "track is '%s'", enabled ? "Enabled" : "Disabled"); -} - -/** - * gst_player_set_subtitle_track_enabled: - * @player: #GstPlayer instance - * @enabled: TRUE or FALSE - * - * Enable or disable the current subtitle track. - */ -void -gst_player_set_subtitle_track_enabled (GstPlayer * self, gboolean enabled) -{ - g_return_if_fail (GST_IS_PLAYER (self)); - - if (enabled) - player_set_flag (self, GST_PLAY_FLAG_SUBTITLE); - else - player_clear_flag (self, GST_PLAY_FLAG_SUBTITLE); - - GST_DEBUG_OBJECT (self, "track is '%s'", enabled ? "Enabled" : "Disabled"); -} - -/** - * gst_player_set_subtitle_uri: - * @player: #GstPlayer instance - * @uri: subtitle URI - * - * Returns: %TRUE or %FALSE - * - * Sets the external subtitle URI. - */ -gboolean -gst_player_set_subtitle_uri (GstPlayer * self, const gchar * suburi) -{ - g_return_val_if_fail (GST_IS_PLAYER (self), FALSE); - - g_mutex_lock (&self->lock); - g_free (self->suburi); - self->suburi = g_strdup (suburi); - g_mutex_unlock (&self->lock); - - gst_player_set_suburi_internal (self); - - return TRUE; -} - -/** - * gst_player_get_subtitle_uri: - * @player: #GstPlayer instance - * - * current subtitle URI - * - * Returns: (transfer full): URI of the current external subtitle. - * g_free() after usage. - */ -gchar * -gst_player_get_subtitle_uri (GstPlayer * self) -{ - gchar *val = NULL; - - g_return_val_if_fail (GST_IS_PLAYER (self), NULL); - - g_object_get (self, "suburi", &val, NULL); - - return val; -} - -/** - * gst_player_set_visualization: - * @player: #GstPlayer instance - * @name: visualization element obtained from - * #gst_player_visualizations_get() - * - * Returns: %TRUE if the visualizations was set correctly. Otherwise, - * %FALSE. - */ -gboolean -gst_player_set_visualization (GstPlayer * self, const gchar * name) -{ - g_return_val_if_fail (GST_IS_PLAYER (self), FALSE); - - g_mutex_lock (&self->lock); - if (self->current_vis_element) { - gst_object_unref (self->current_vis_element); - self->current_vis_element = NULL; - } - - if (name) { - self->current_vis_element = gst_element_factory_make (name, NULL); - if (!self->current_vis_element) - goto error_no_element; - gst_object_ref_sink (self->current_vis_element); - } - g_object_set (self->playbin, "vis-plugin", self->current_vis_element, NULL); - - g_mutex_unlock (&self->lock); - GST_DEBUG_OBJECT (self, "set vis-plugin to '%s'", name); - - return TRUE; - -error_no_element: - g_mutex_unlock (&self->lock); - GST_WARNING_OBJECT (self, "could not find visualization '%s'", name); - return FALSE; -} - -/** - * gst_player_get_current_visualization: - * @player: #GstPlayer instance - * - * Returns: (transfer full): Name of the currently enabled visualization. - * g_free() after usage. - */ -gchar * -gst_player_get_current_visualization (GstPlayer * self) -{ - gchar *name = NULL; - GstElement *vis_plugin = NULL; - - g_return_val_if_fail (GST_IS_PLAYER (self), NULL); - - if (!is_track_enabled (self, GST_PLAY_FLAG_VIS)) - return NULL; - - g_object_get (self->playbin, "vis-plugin", &vis_plugin, NULL); - - if (vis_plugin) { - GstElementFactory *factory = gst_element_get_factory (vis_plugin); - if (factory) - name = g_strdup (gst_plugin_feature_get_name (factory)); - gst_object_unref (vis_plugin); - } - - GST_DEBUG_OBJECT (self, "vis-plugin '%s' %p", name, vis_plugin); - - return name; -} - -/** - * gst_player_set_visualization_enabled: - * @player: #GstPlayer instance - * @enabled: TRUE or FALSE - * - * Enable or disable the visualization. - */ -void -gst_player_set_visualization_enabled (GstPlayer * self, gboolean enabled) -{ - g_return_if_fail (GST_IS_PLAYER (self)); - - if (enabled) - player_set_flag (self, GST_PLAY_FLAG_VIS); - else - player_clear_flag (self, GST_PLAY_FLAG_VIS); - - GST_DEBUG_OBJECT (self, "visualization is '%s'", - enabled ? "Enabled" : "Disabled"); -} - -struct CBChannelMap -{ - const gchar *label; /* channel label name */ - const gchar *name; /* get_name () */ -}; - -static const struct CBChannelMap cb_channel_map[] = { - /* GST_PLAYER_COLOR_BALANCE_BRIGHTNESS */ {"BRIGHTNESS", "brightness"}, - /* GST_PLAYER_COLOR_BALANCE_CONTRAST */ {"CONTRAST", "contrast"}, - /* GST_PLAYER_COLOR_BALANCE_SATURATION */ {"SATURATION", "saturation"}, - /* GST_PLAYER_COLOR_BALANCE_HUE */ {"HUE", "hue"}, -}; - -static GstColorBalanceChannel * -gst_player_color_balance_find_channel (GstPlayer * self, - GstPlayerColorBalanceType type) -{ - GstColorBalanceChannel *channel; - const GList *l, *channels; - - if (type < GST_PLAYER_COLOR_BALANCE_BRIGHTNESS || - type > GST_PLAYER_COLOR_BALANCE_HUE) - return NULL; - - channels = - gst_color_balance_list_channels (GST_COLOR_BALANCE (self->playbin)); - for (l = channels; l; l = l->next) { - channel = l->data; - if (g_strrstr (channel->label, cb_channel_map[type].label)) - return channel; - } - - return NULL; -} - -/** - * gst_player_has_color_balance: - * @player:#GstPlayer instance - * - * Checks whether the @player has color balance support available. - * - * Returns: %TRUE if @player has color balance support. Otherwise, - * %FALSE. - */ -gboolean -gst_player_has_color_balance (GstPlayer * self) -{ - const GList *channels; - - g_return_val_if_fail (GST_IS_PLAYER (self), FALSE); - - if (!GST_IS_COLOR_BALANCE (self->playbin)) - return FALSE; - - channels = - gst_color_balance_list_channels (GST_COLOR_BALANCE (self->playbin)); - return (channels != NULL); -} - -/** - * gst_player_set_color_balance: - * @player: #GstPlayer instance - * @type: #GstPlayerColorBalanceType - * @value: The new value for the @type, ranged [0,1] - * - * Sets the current value of the indicated channel @type to the passed - * value. - */ -void -gst_player_set_color_balance (GstPlayer * self, GstPlayerColorBalanceType type, - gdouble value) -{ - GstColorBalanceChannel *channel; - gdouble new_val; - - g_return_if_fail (GST_IS_PLAYER (self)); - g_return_if_fail (value >= 0.0 && value <= 1.0); - - if (!GST_IS_COLOR_BALANCE (self->playbin)) - return; - - channel = gst_player_color_balance_find_channel (self, type); - if (!channel) - return; - - value = CLAMP (value, 0.0, 1.0); - - /* Convert to channel range */ - new_val = channel->min_value + value * ((gdouble) channel->max_value - - (gdouble) channel->min_value); - - gst_color_balance_set_value (GST_COLOR_BALANCE (self->playbin), channel, - new_val); -} - -/** - * gst_player_get_color_balance: - * @player: #GstPlayer instance - * @type: #GstPlayerColorBalanceType - * - * Retrieve the current value of the indicated @type. - * - * Returns: The current value of @type, between [0,1]. In case of - * error -1 is returned. - */ -gdouble -gst_player_get_color_balance (GstPlayer * self, GstPlayerColorBalanceType type) -{ - GstColorBalanceChannel *channel; - gint value; - - g_return_val_if_fail (GST_IS_PLAYER (self), -1); - - if (!GST_IS_COLOR_BALANCE (self->playbin)) - return -1; - - channel = gst_player_color_balance_find_channel (self, type); - if (!channel) - return -1; - - value = gst_color_balance_get_value (GST_COLOR_BALANCE (self->playbin), - channel); - - return ((gdouble) value - - (gdouble) channel->min_value) / ((gdouble) channel->max_value - - (gdouble) channel->min_value); -} - -#define C_ENUM(v) ((gint) v) -#define C_FLAGS(v) ((guint) v) - -GType -gst_player_color_balance_type_get_type (void) -{ - static gsize id = 0; - static const GEnumValue values[] = { - {C_ENUM (GST_PLAYER_COLOR_BALANCE_HUE), "GST_PLAYER_COLOR_BALANCE_HUE", - "hue"}, - {C_ENUM (GST_PLAYER_COLOR_BALANCE_BRIGHTNESS), - "GST_PLAYER_COLOR_BALANCE_BRIGHTNESS", "brightness"}, - {C_ENUM (GST_PLAYER_COLOR_BALANCE_SATURATION), - "GST_PLAYER_COLOR_BALANCE_SATURATION", "saturation"}, - {C_ENUM (GST_PLAYER_COLOR_BALANCE_CONTRAST), - "GST_PLAYER_COLOR_BALANCE_CONTRAST", "contrast"}, - {0, NULL, NULL} - }; - - if (g_once_init_enter (&id)) { - GType tmp = g_enum_register_static ("GstPlayerColorBalanceType", values); - g_once_init_leave (&id, tmp); - } - - return (GType) id; -} - -/** - * gst_player_color_balance_type_get_name: - * @type: a #GstPlayerColorBalanceType - * - * Gets a string representing the given color balance type. - * - * Returns: (transfer none): a string with the name of the color - * balance type. - */ -const gchar * -gst_player_color_balance_type_get_name (GstPlayerColorBalanceType type) -{ - g_return_val_if_fail (type >= GST_PLAYER_COLOR_BALANCE_BRIGHTNESS && - type <= GST_PLAYER_COLOR_BALANCE_HUE, NULL); - - return cb_channel_map[type].name; -} - -GType -gst_player_state_get_type (void) -{ - static gsize id = 0; - static const GEnumValue values[] = { - {C_ENUM (GST_PLAYER_STATE_STOPPED), "GST_PLAYER_STATE_STOPPED", "stopped"}, - {C_ENUM (GST_PLAYER_STATE_BUFFERING), "GST_PLAYER_STATE_BUFFERING", - "buffering"}, - {C_ENUM (GST_PLAYER_STATE_PAUSED), "GST_PLAYER_STATE_PAUSED", "paused"}, - {C_ENUM (GST_PLAYER_STATE_PLAYING), "GST_PLAYER_STATE_PLAYING", "playing"}, - {0, NULL, NULL} - }; - - if (g_once_init_enter (&id)) { - GType tmp = g_enum_register_static ("GstPlayerState", values); - g_once_init_leave (&id, tmp); - } - - return (GType) id; -} - -/** - * gst_player_state_get_name: - * @state: a #GstPlayerState - * - * Gets a string representing the given state. - * - * Returns: (transfer none): a string with the name of the state. - */ -const gchar * -gst_player_state_get_name (GstPlayerState state) -{ - switch (state) { - case GST_PLAYER_STATE_STOPPED: - return "stopped"; - case GST_PLAYER_STATE_BUFFERING: - return "buffering"; - case GST_PLAYER_STATE_PAUSED: - return "paused"; - case GST_PLAYER_STATE_PLAYING: - return "playing"; - } - - g_assert_not_reached (); - return NULL; -} - -GType -gst_player_error_get_type (void) -{ - static gsize id = 0; - static const GEnumValue values[] = { - {C_ENUM (GST_PLAYER_ERROR_FAILED), "GST_PLAYER_ERROR_FAILED", "failed"}, - {0, NULL, NULL} - }; - - if (g_once_init_enter (&id)) { - GType tmp = g_enum_register_static ("GstPlayerError", values); - g_once_init_leave (&id, tmp); - } - - return (GType) id; -} - -/** - * gst_player_error_get_name: - * @error: a #GstPlayerError - * - * Gets a string representing the given error. - * - * Returns: (transfer none): a string with the given error. - */ -const gchar * -gst_player_error_get_name (GstPlayerError error) -{ - switch (error) { - case GST_PLAYER_ERROR_FAILED: - return "failed"; - } - - g_assert_not_reached (); - return NULL; -} diff --git a/lib/gst/player/gstplayer.h b/lib/gst/player/gstplayer.h deleted file mode 100644 index 3391b0f..0000000 --- a/lib/gst/player/gstplayer.h +++ /dev/null @@ -1,183 +0,0 @@ -/* GStreamer - * - * Copyright (C) 2014-2015 Sebastian Dröge <sebastian@centricular.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#ifndef __GST_PLAYER_H__ -#define __GST_PLAYER_H__ - -#include <gst/gst.h> -#include <gst/player/gstplayer-types.h> -#include <gst/player/gstplayer-signal-dispatcher.h> -#include <gst/player/gstplayer-video-renderer.h> -#include <gst/player/gstplayer-media-info.h> - -G_BEGIN_DECLS - -GType gst_player_state_get_type (void); -#define GST_TYPE_PLAYER_STATE (gst_player_state_get_type ()) - -/** - * GstPlayerState: - * @GST_PLAYER_STATE_STOPPED: the player is stopped. - * @GST_PLAYER_STATE_BUFFERING: the player is buffering. - * @GST_PLAYER_STATE_PAUSED: the player is paused. - * @GST_PLAYER_STATE_PLAYING: the player is currently playing a - * stream. - */ -typedef enum -{ - GST_PLAYER_STATE_STOPPED, - GST_PLAYER_STATE_BUFFERING, - GST_PLAYER_STATE_PAUSED, - GST_PLAYER_STATE_PLAYING -} GstPlayerState; - -const gchar *gst_player_state_get_name (GstPlayerState state); - -GQuark gst_player_error_quark (void); -GType gst_player_error_get_type (void); -#define GST_PLAYER_ERROR (gst_player_error_quark ()) -#define GST_TYPE_PLAYER_ERROR (gst_player_error_get_type ()) - -/** - * GstPlayerError: - * @GST_PLAYER_ERROR_FAILED: generic error. - */ -typedef enum { - GST_PLAYER_ERROR_FAILED = 0 -} GstPlayerError; - -const gchar *gst_player_error_get_name (GstPlayerError error); - -GType gst_player_color_balance_type_get_type (void); -#define GST_TYPE_PLAYER_COLOR_BALANCE_TYPE (gst_player_color_balance_type_get_type ()) - -/** - * GstPlayerColorBalanceType: - * @GST_PLAYER_COLOR_BALANCE_BRIGHTNESS: brightness or black level. - * @GST_PLAYER_COLOR_BALANCE_CONTRAST: contrast or luma gain. - * @GST_PLAYER_COLOR_BALANCE_SATURATION: color saturation or chroma - * gain. - * @GST_PLAYER_COLOR_BALANCE_HUE: hue or color balance. - */ -typedef enum -{ - GST_PLAYER_COLOR_BALANCE_BRIGHTNESS, - GST_PLAYER_COLOR_BALANCE_CONTRAST, - GST_PLAYER_COLOR_BALANCE_SATURATION, - GST_PLAYER_COLOR_BALANCE_HUE, -} GstPlayerColorBalanceType; - -const gchar *gst_player_color_balance_type_get_name (GstPlayerColorBalanceType type); - -#define GST_TYPE_PLAYER (gst_player_get_type ()) -#define GST_IS_PLAYER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_PLAYER)) -#define GST_IS_PLAYER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_PLAYER)) -#define GST_PLAYER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_PLAYER, GstPlayerClass)) -#define GST_PLAYER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PLAYER, GstPlayer)) -#define GST_PLAYER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_PLAYER, GstPlayerClass)) -#define GST_PLAYER_CAST(obj) ((GstPlayer*)(obj)) - - -GType gst_player_get_type (void); - -GstPlayer * gst_player_new (GstPlayerVideoRenderer * video_renderer, GstPlayerSignalDispatcher * signal_dispatcher); - -void gst_player_play (GstPlayer * player); -void gst_player_pause (GstPlayer * player); -void gst_player_stop (GstPlayer * player); - -void gst_player_seek (GstPlayer * player, - GstClockTime position); -void gst_player_set_rate (GstPlayer * player, - gdouble rate); -gdouble gst_player_get_rate (GstPlayer * player); - -void gst_player_set_position_update_interval (GstPlayer * player, - guint interval); -guint gst_player_get_position_update_interval (GstPlayer * player); - -gchar * gst_player_get_uri (GstPlayer * player); -void gst_player_set_uri (GstPlayer * player, - const gchar * uri); - -GstClockTime gst_player_get_position (GstPlayer * player); -GstClockTime gst_player_get_duration (GstPlayer * player); - -gdouble gst_player_get_volume (GstPlayer * player); -void gst_player_set_volume (GstPlayer * player, - gdouble val); - -gboolean gst_player_get_mute (GstPlayer * player); -void gst_player_set_mute (GstPlayer * player, - gboolean val); - -GstElement * gst_player_get_pipeline (GstPlayer * player); - -void gst_player_set_video_track_enabled (GstPlayer * player, - gboolean enabled); - -void gst_player_set_audio_track_enabled (GstPlayer * player, - gboolean enabled); - -void gst_player_set_subtitle_track_enabled (GstPlayer * player, - gboolean enabled); - -gboolean gst_player_set_audio_track (GstPlayer *player, - gint stream_index); - -gboolean gst_player_set_video_track (GstPlayer *player, - gint stream_index); - -gboolean gst_player_set_subtitle_track (GstPlayer *player, - gint stream_index); - -GstPlayerMediaInfo * gst_player_get_media_info (GstPlayer * player); - -GstPlayerAudioInfo * gst_player_get_current_audio_track - (GstPlayer * player); - -GstPlayerVideoInfo * gst_player_get_current_video_track - (GstPlayer * player); - -GstPlayerSubtitleInfo * gst_player_get_current_subtitle_track - (GstPlayer * player); - -gboolean gst_player_set_subtitle_uri (GstPlayer * player, - const gchar *uri); -gchar * gst_player_get_subtitle_uri (GstPlayer * player); - -gboolean gst_player_set_visualization (GstPlayer * player, - const gchar *name); - -void gst_player_set_visualization_enabled (GstPlayer * player, - gboolean enabled); - -gchar * gst_player_get_current_visualization (GstPlayer * player); - -gboolean gst_player_has_color_balance (GstPlayer * player); -void gst_player_set_color_balance (GstPlayer * player, - GstPlayerColorBalanceType type, - gdouble value); -gdouble gst_player_get_color_balance (GstPlayer * player, - GstPlayerColorBalanceType type); - -G_END_DECLS - -#endif /* __GST_PLAYER_H__ */ diff --git a/lib/gst/player/player.h b/lib/gst/player/player.h deleted file mode 100644 index 0fc91d6..0000000 --- a/lib/gst/player/player.h +++ /dev/null @@ -1,30 +0,0 @@ -/* GStreamer - * - * Copyright (C) 2014 Sebastian Dröge <sebastian@centricular.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#ifndef __PLAYER_H__ -#define __PLAYER_H__ - -#include <gst/player/gstplayer.h> -#include <gst/player/gstplayer-media-info.h> -#include <gst/player/gstplayer-g-main-context-signal-dispatcher.h> -#include <gst/player/gstplayer-video-overlay-video-renderer.h> -#include <gst/player/gstplayer-visualization.h> - -#endif /* __PLAYER_H__ */ diff --git a/m4/gtk-doc.m4 b/m4/gtk-doc.m4 deleted file mode 100644 index 3675543..0000000 --- a/m4/gtk-doc.m4 +++ /dev/null @@ -1,88 +0,0 @@ -dnl -*- mode: autoconf -*- - -# serial 2 - -dnl Usage: -dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) -AC_DEFUN([GTK_DOC_CHECK], -[ - AC_REQUIRE([PKG_PROG_PKG_CONFIG]) - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first - - ifelse([$1],[],[gtk_doc_requires="gtk-doc"],[gtk_doc_requires="gtk-doc >= $1"]) - AC_MSG_CHECKING([for gtk-doc]) - PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no]) - AC_MSG_RESULT($have_gtk_doc) - - if test "$have_gtk_doc" = "no"; then - AC_MSG_WARN([ - You will not be able to create source packages with 'make dist' - because $gtk_doc_requires is not found.]) - fi - - dnl check for tools we added during development - dnl Use AC_CHECK_PROG to avoid the check target using an absolute path that - dnl may not be writable by the user. Currently, automake requires that the - dnl test name must end in '.test'. - dnl https://bugzilla.gnome.org/show_bug.cgi?id=701638 - AC_CHECK_PROG([GTKDOC_CHECK],[gtkdoc-check],[gtkdoc-check.test]) - AC_PATH_PROG([GTKDOC_CHECK_PATH],[gtkdoc-check]) - AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) - AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) - - dnl for overriding the documentation installation directory - AC_ARG_WITH([html-dir], - AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, - [with_html_dir='${datadir}/gtk-doc/html']) - HTML_DIR="$with_html_dir" - AC_SUBST([HTML_DIR]) - - dnl enable/disable documentation building - AC_ARG_ENABLE([gtk-doc], - AS_HELP_STRING([--enable-gtk-doc], - [use gtk-doc to build documentation [[default=no]]]),, - [enable_gtk_doc=no]) - - AC_MSG_CHECKING([whether to build gtk-doc documentation]) - AC_MSG_RESULT($enable_gtk_doc) - - if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then - AC_MSG_ERROR([ - You must have $gtk_doc_requires installed to build documentation for - $PACKAGE_NAME. Please install gtk-doc or disable building the - documentation by adding '--disable-gtk-doc' to '[$]0'.]) - fi - - dnl don't check for glib if we build glib - if test "x$PACKAGE_NAME" != "xglib"; then - dnl don't fail if someone does not have glib - PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:]) - fi - - dnl enable/disable output formats - AC_ARG_ENABLE([gtk-doc-html], - AS_HELP_STRING([--enable-gtk-doc-html], - [build documentation in html format [[default=yes]]]),, - [enable_gtk_doc_html=yes]) - AC_ARG_ENABLE([gtk-doc-pdf], - AS_HELP_STRING([--enable-gtk-doc-pdf], - [build documentation in pdf format [[default=no]]]),, - [enable_gtk_doc_pdf=no]) - - if test -z "$GTKDOC_MKPDF"; then - enable_gtk_doc_pdf=no - fi - - if test -z "$AM_DEFAULT_VERBOSITY"; then - AM_DEFAULT_VERBOSITY=1 - fi - AC_SUBST([AM_DEFAULT_VERBOSITY]) - - AM_CONDITIONAL([HAVE_GTK_DOC], [test x$have_gtk_doc = xyes]) - AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) - AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) - AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) - AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) - AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"]) -]) diff --git a/m4/introspection.m4 b/m4/introspection.m4 deleted file mode 100644 index d89c3d9..0000000 --- a/m4/introspection.m4 +++ /dev/null @@ -1,96 +0,0 @@ -dnl -*- mode: autoconf -*- -dnl Copyright 2009 Johan Dahlin -dnl -dnl This file is free software; the author(s) gives unlimited -dnl permission to copy and/or distribute it, with or without -dnl modifications, as long as this notice is preserved. -dnl - -# serial 1 - -m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], -[ - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([LT_INIT],[$0])dnl setup libtool first - - dnl enable/disable introspection - m4_if([$2], [require], - [dnl - enable_introspection=yes - ],[dnl - AC_ARG_ENABLE(introspection, - AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], - [Enable introspection for this build]),, - [enable_introspection=auto]) - ])dnl - - AC_MSG_CHECKING([for gobject-introspection]) - - dnl presence/version checking - AS_CASE([$enable_introspection], - [no], [dnl - found_introspection="no (disabled, use --enable-introspection to enable)" - ],dnl - [yes],[dnl - PKG_CHECK_EXISTS([gobject-introspection-1.0],, - AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], - found_introspection=yes, - AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) - ],dnl - [auto],[dnl - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) - dnl Canonicalize enable_introspection - enable_introspection=$found_introspection - ],dnl - [dnl - AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) - ])dnl - - AC_MSG_RESULT([$found_introspection]) - - INTROSPECTION_SCANNER= - INTROSPECTION_COMPILER= - INTROSPECTION_GENERATE= - INTROSPECTION_GIRDIR= - INTROSPECTION_TYPELIBDIR= - if test "x$found_introspection" = "xyes"; then - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection - fi - AC_SUBST(INTROSPECTION_SCANNER) - AC_SUBST(INTROSPECTION_COMPILER) - AC_SUBST(INTROSPECTION_GENERATE) - AC_SUBST(INTROSPECTION_GIRDIR) - AC_SUBST(INTROSPECTION_TYPELIBDIR) - AC_SUBST(INTROSPECTION_CFLAGS) - AC_SUBST(INTROSPECTION_LIBS) - AC_SUBST(INTROSPECTION_MAKEFILE) - - AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") -]) - - -dnl Usage: -dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) - -AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], -[ - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) -]) - -dnl Usage: -dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) - - -AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], -[ - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) -]) diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am deleted file mode 100644 index e703e15..0000000 --- a/pkgconfig/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -pcfiles = \ - gstreamer-player-@GST_PLAYER_API_VERSION@.pc - -pcfiles_uninstalled = \ - gstreamer-player-@GST_PLAYER_API_VERSION@-uninstalled.pc - -all-local: $(pcfiles) $(pcfiles_uninstalled) - -### how to generate pc files -%-@GST_PLAYER_API_VERSION@.pc: %.pc - cp $< $@ -%-@GST_PLAYER_API_VERSION@-uninstalled.pc: %-uninstalled.pc - cp $< $@ - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = $(pcfiles) - -EXTRA_DIST = \ - gstreamer-player.pc.in \ - gstreamer-player-uninstalled.pc.in -CLEANFILES = $(pcfiles) $(pcfiles_uninstalled) diff --git a/pkgconfig/gstreamer-player-uninstalled.pc.in b/pkgconfig/gstreamer-player-uninstalled.pc.in deleted file mode 100644 index 79e6cb9..0000000 --- a/pkgconfig/gstreamer-player-uninstalled.pc.in +++ /dev/null @@ -1,14 +0,0 @@ -# the standard variables don't make sense for an uninstalled copy -prefix= -exec_prefix= -libdir=${pcfiledir}/../lib/gst/player -girdir=${pcfiledir}/../lib/gst/player -typelibdir=${pcfiledir}/../lib/gst/player -includedir=${pcfiledir}/../lib - -Name: gstreamer-player -Description: GStreamer Player API -Version: @VERSION@ -Requires: gstreamer-1.0 gstreamer-video-1.0 -Libs: ${libdir}/libgstplayer-@GST_PLAYER_API_VERSION@.la -Cflags: -I${includedir} -I@srcdir@/.. diff --git a/pkgconfig/gstreamer-player.pc.in b/pkgconfig/gstreamer-player.pc.in deleted file mode 100644 index 18ddb00..0000000 --- a/pkgconfig/gstreamer-player.pc.in +++ /dev/null @@ -1,15 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -datarootdir=${prefix}/share -datadir=${datarootdir} -girdir=${datadir}/gir-1.0 -typelibdir=${libdir}/girepository-1.0 -includedir=@includedir@/gst-player-@GST_PLAYER_API_VERSION@ - -Name: gstreamer-player -Description: GStreamer Player API -Version: @VERSION@ -Requires: gstreamer-1.0 gstreamer-video-1.0 -Libs: -L${libdir} -lgstplayer-@GST_PLAYER_API_VERSION@ -Cflags: -I${includedir} diff --git a/qt/play.pro b/qt/play.pro index d16440c..87a1490 100644 --- a/qt/play.pro +++ b/qt/play.pro @@ -6,8 +6,6 @@ CONFIG += c++11 DEFINES += GST_USE_UNSTABLE_API -INCLUDEPATH += ../lib - RESOURCES += qml.qrc # Additional import path used to resolve QML modules in Qt Creator's code model @@ -22,11 +20,8 @@ QT_CONFIG -= no-pkg-config CONFIG += link_pkgconfig PKGCONFIG = \ gstreamer-1.0 \ - gstreamer-audio-1.0 \ - gstreamer-tag-1.0 \ - gstreamer-pbutils-1.0 \ - gstreamer-video-1.0 \ - gstreamer-gl-1.0 + gstreamer-player-1.0 \ + gstreamer-tag-1.0 } macx { @@ -46,8 +41,6 @@ HEADERS += \ SOURCES += main.cpp \ qgstplayer.cpp \ - ../lib/gst/player/gstplayer.c \ - ../lib/gst/player/gstplayer-media-info.c \ player.cpp \ quickrenderer.cpp \ imagesample.cpp diff --git a/tests/Makefile.am b/tests/Makefile.am deleted file mode 100644 index fccb446..0000000 --- a/tests/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -TESTS = \ - test-player - -noinst_PROGRAMS = $(TESTS) - -TESTS_CFLAGS = \ - $(CHECK_CFLAGS) \ - $(GSTREAMER_CFLAGS) \ - $(GLIB_CFLAGS) \ - -I$(top_srcdir)/lib \ - -I$(top_builddir)/lib \ - $(WARNING_CFLAGS) -TESTS_LDADD = \ - $(CHECK_LIBS) \ - $(GSTREAMER_LIBS) \ - $(GLIB_LIBS) \ - $(top_builddir)/lib/gst/player/.libs/libgstplayer-@GST_PLAYER_API_VERSION@.la - -test_player_SOURCES = player.c -test_player_CFLAGS = $(TESTS_CFLAGS) -DTEST_PATH=\"$(srcdir)/media\" -test_player_LDADD = $(TESTS_LDADD) - -EXTRA_DIST = \ - media/audio.ogg \ - media/audio-video.ogg \ - media/audio-short.ogg \ - media/audio-video-short.ogg - -include $(top_srcdir)/check.mk - diff --git a/tests/media/audio-short.ogg b/tests/media/audio-short.ogg Binary files differdeleted file mode 100644 index 1bea567..0000000 --- a/tests/media/audio-short.ogg +++ /dev/null diff --git a/tests/media/audio-video-short.ogg b/tests/media/audio-video-short.ogg Binary files differdeleted file mode 100644 index 9e3330b..0000000 --- a/tests/media/audio-video-short.ogg +++ /dev/null diff --git a/tests/media/audio-video.ogg b/tests/media/audio-video.ogg Binary files differdeleted file mode 100644 index ed3d750..0000000 --- a/tests/media/audio-video.ogg +++ /dev/null diff --git a/tests/media/audio.ogg b/tests/media/audio.ogg Binary files differdeleted file mode 100644 index 71d3ca6..0000000 --- a/tests/media/audio.ogg +++ /dev/null diff --git a/tests/media/sintel.mkv b/tests/media/sintel.mkv Binary files differdeleted file mode 100644 index c14f1e6..0000000 --- a/tests/media/sintel.mkv +++ /dev/null diff --git a/tests/media/test_sub.srt b/tests/media/test_sub.srt deleted file mode 100644 index 80c42e9..0000000 --- a/tests/media/test_sub.srt +++ /dev/null @@ -1,17 +0,0 @@ - -1 -00:00:00,250 --> 00:00:10,500 -This is test 1. - -2 -00:00:14,250 --> 00:00:25,500 -This is test 2. - -3 -00:00:30,250 --> 00:00:40,500 -This is test 3. - -4 -00:00:43,250 --> 00:52:00,500 -This is test 4. - diff --git a/tests/player.c b/tests/player.c deleted file mode 100644 index dbb5b62..0000000 --- a/tests/player.c +++ /dev/null @@ -1,1491 +0,0 @@ -/* GStreamer - * - * Copyright (C) 2014-2015 Sebastian Dröge <sebastian@centricular.com> - * Copyright (C) 2015 Brijesh Singh <brijesh.ksingh@gmail.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -/* TODO: - * - start with pause, go to playing - * - play, pause, play - * - set uri in play/pause - * - play/pause after eos - * - seek in play/pause/stopped, after eos, back to 0, after duration - * - http buffering - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <check.h> - -#define fail_unless_equals_int(a, b) \ -G_STMT_START { \ - int first = a; \ - int second = b; \ - fail_unless(first == second, \ - "'" #a "' (%d) is not equal to '" #b"' (%d)", first, second); \ -} G_STMT_END; - -#define fail_unless_equals_uint64(a, b) \ -G_STMT_START { \ - guint64 first = a; \ - guint64 second = b; \ - fail_unless(first == second, \ - "'" #a "' (%" G_GUINT64_FORMAT ") is not equal to '" #b"' (%" \ - G_GUINT64_FORMAT ")", first, second); \ -} G_STMT_END; - -#define fail_unless_equals_string(a, b) \ -G_STMT_START { \ - const gchar *first = a; \ - const gchar *second = b; \ - fail_unless(strcmp(first, second) == 0, \ - "'" #a "' (%s) is not equal to '" #b "' (%s)", first, second); \ -} G_STMT_END; - -#define fail_unless_equals_double(a, b) \ -G_STMT_START { \ - double first = a; \ - double second = b; \ - fail_unless(first == second, \ - "'" #a "' (%lf) is not equal to '" #b"' (%lf)", first, second); \ -} G_STMT_END; - -#include <gst/player/player.h> - -GST_DEBUG_CATEGORY_STATIC (test_debug); -#define GST_CAT_DEFAULT test_debug - -START_TEST (test_create_and_free) -{ - GstPlayer *player; - - player = gst_player_new (NULL, NULL); - fail_unless (player != NULL); - g_object_unref (player); -} - -END_TEST; - -START_TEST (test_set_and_get_uri) -{ - GstPlayer *player; - gchar *uri; - - player = gst_player_new (NULL, NULL); - - fail_unless (player != NULL); - - gst_player_set_uri (player, "file:///path/to/a/file"); - uri = gst_player_get_uri (player); - - fail_unless (g_strcmp0 (uri, "file:///path/to/a/file") == 0); - - g_free (uri); - g_object_unref (player); -} - -END_TEST; - -START_TEST (test_set_and_get_position_update_interval) -{ - GstPlayer *player; - guint interval = 0; - - player = gst_player_new (NULL, NULL); - - fail_unless (player != NULL); - - gst_player_set_position_update_interval (player, 500); - interval = gst_player_get_position_update_interval (player); - - fail_unless (interval == 500); - - g_object_set (player, "position-update-interval", 1000, NULL); - g_object_get (player, "position-update-interval", &interval, NULL); - - fail_unless_equals_int (interval, 1000); - - g_object_unref (player); -} - -END_TEST; - -typedef enum -{ - STATE_CHANGE_BUFFERING, - STATE_CHANGE_DURATION_CHANGED, - STATE_CHANGE_END_OF_STREAM, - STATE_CHANGE_ERROR, - STATE_CHANGE_WARNING, - STATE_CHANGE_POSITION_UPDATED, - STATE_CHANGE_STATE_CHANGED, - STATE_CHANGE_VIDEO_DIMENSIONS_CHANGED, - STATE_CHANGE_MEDIA_INFO_UPDATED, - STATE_CHANGE_SEEK_DONE, -} TestPlayerStateChange; - -static const gchar * -test_player_state_change_get_name (TestPlayerStateChange change) -{ - switch (change) { - case STATE_CHANGE_BUFFERING: - return "buffering"; - case STATE_CHANGE_DURATION_CHANGED: - return "duration-changed"; - case STATE_CHANGE_END_OF_STREAM: - return "end-of-stream"; - case STATE_CHANGE_WARNING: - return "warning"; - case STATE_CHANGE_ERROR: - return "error"; - case STATE_CHANGE_POSITION_UPDATED: - return "position-updated"; - case STATE_CHANGE_STATE_CHANGED: - return "state-changed"; - case STATE_CHANGE_VIDEO_DIMENSIONS_CHANGED: - return "video-dimensions-changed"; - case STATE_CHANGE_MEDIA_INFO_UPDATED: - return "media-info-updated"; - case STATE_CHANGE_SEEK_DONE: - return "seek-done"; - default: - g_assert_not_reached (); - break; - } -} - -typedef struct _TestPlayerState TestPlayerState; -struct _TestPlayerState -{ - GMainLoop *loop; - - gint buffering_percent; - guint64 position, duration, seek_done_position; - gboolean end_of_stream, error, warning, seek_done; - GstPlayerState state; - gint width, height; - GstPlayerMediaInfo *media_info; - - void (*test_callback) (GstPlayer * player, TestPlayerStateChange change, - TestPlayerState * old_state, TestPlayerState * new_state); - gpointer test_data; -}; - -static void -test_player_state_change_debug (GstPlayer * player, - TestPlayerStateChange change, TestPlayerState * old_state, - TestPlayerState * new_state) -{ - GST_DEBUG_OBJECT (player, "Changed %s:\n" - "\tbuffering %d%% -> %d%%\n" - "\tposition %" GST_TIME_FORMAT " -> %" GST_TIME_FORMAT "\n" - "\tduration %" GST_TIME_FORMAT " -> %" GST_TIME_FORMAT "\n" - "\tseek position %" GST_TIME_FORMAT " -> %" GST_TIME_FORMAT "\n" - "\tend-of-stream %d -> %d\n" - "\terror %d -> %d\n" - "\tseek_done %d -> %d\n" - "\tstate %s -> %s\n" - "\twidth/height %d/%d -> %d/%d\n" - "\tmedia_info %p -> %p", - test_player_state_change_get_name (change), - old_state->buffering_percent, new_state->buffering_percent, - GST_TIME_ARGS (old_state->position), GST_TIME_ARGS (new_state->position), - GST_TIME_ARGS (old_state->duration), GST_TIME_ARGS (new_state->duration), - GST_TIME_ARGS (old_state->seek_done_position), - GST_TIME_ARGS (new_state->seek_done_position), old_state->end_of_stream, - new_state->end_of_stream, old_state->error, new_state->error, - old_state->seek_done, new_state->seek_done, - gst_player_state_get_name (old_state->state), - gst_player_state_get_name (new_state->state), old_state->width, - old_state->height, new_state->width, new_state->height, - old_state->media_info, new_state->media_info); -} - -static void -test_player_state_reset (TestPlayerState * state) -{ - state->buffering_percent = 100; - state->position = state->duration = state->seek_done_position = -1; - state->end_of_stream = state->error = state->seek_done = FALSE; - state->state = GST_PLAYER_STATE_STOPPED; - state->width = state->height = 0; - state->media_info = NULL; -} - -static void -buffering_cb (GstPlayer * player, gint percent, TestPlayerState * state) -{ - TestPlayerState old_state = *state; - - state->buffering_percent = percent; - test_player_state_change_debug (player, STATE_CHANGE_BUFFERING, &old_state, - state); - state->test_callback (player, STATE_CHANGE_BUFFERING, &old_state, state); -} - -static void -duration_changed_cb (GstPlayer * player, guint64 duration, - TestPlayerState * state) -{ - TestPlayerState old_state = *state; - - state->duration = duration; - test_player_state_change_debug (player, STATE_CHANGE_DURATION_CHANGED, - &old_state, state); - state->test_callback (player, STATE_CHANGE_DURATION_CHANGED, &old_state, - state); -} - -static void -end_of_stream_cb (GstPlayer * player, TestPlayerState * state) -{ - TestPlayerState old_state = *state; - - state->end_of_stream = TRUE; - test_player_state_change_debug (player, STATE_CHANGE_END_OF_STREAM, - &old_state, state); - state->test_callback (player, STATE_CHANGE_END_OF_STREAM, &old_state, state); -} - -static void -error_cb (GstPlayer * player, GError * error, TestPlayerState * state) -{ - TestPlayerState old_state = *state; - - state->error = TRUE; - test_player_state_change_debug (player, STATE_CHANGE_ERROR, &old_state, - state); - state->test_callback (player, STATE_CHANGE_ERROR, &old_state, state); -} - -static void -warning_cb (GstPlayer * player, GError * error, TestPlayerState * state) -{ - TestPlayerState old_state = *state; - - state->warning = TRUE; - test_player_state_change_debug (player, STATE_CHANGE_WARNING, &old_state, - state); - state->test_callback (player, STATE_CHANGE_WARNING, &old_state, state); -} - -static void -position_updated_cb (GstPlayer * player, guint64 position, - TestPlayerState * state) -{ - TestPlayerState old_state = *state; - - state->position = position; - test_player_state_change_debug (player, STATE_CHANGE_POSITION_UPDATED, - &old_state, state); - state->test_callback (player, STATE_CHANGE_POSITION_UPDATED, &old_state, - state); -} - -static void -media_info_updated_cb (GstPlayer * player, GstPlayerMediaInfo * media_info, - TestPlayerState * state) -{ - TestPlayerState old_state = *state; - - state->media_info = media_info; - - test_player_state_change_debug (player, STATE_CHANGE_MEDIA_INFO_UPDATED, - &old_state, state); - state->test_callback (player, STATE_CHANGE_MEDIA_INFO_UPDATED, &old_state, - state); -} - -static void -state_changed_cb (GstPlayer * player, GstPlayerState player_state, - TestPlayerState * state) -{ - TestPlayerState old_state = *state; - - state->state = player_state; - - if (player_state == GST_PLAYER_STATE_STOPPED) - test_player_state_reset (state); - - test_player_state_change_debug (player, STATE_CHANGE_STATE_CHANGED, - &old_state, state); - state->test_callback (player, STATE_CHANGE_STATE_CHANGED, &old_state, state); -} - -static void -video_dimensions_changed_cb (GstPlayer * player, gint width, gint height, - TestPlayerState * state) -{ - TestPlayerState old_state = *state; - - state->width = width; - state->height = height; - test_player_state_change_debug (player, STATE_CHANGE_VIDEO_DIMENSIONS_CHANGED, - &old_state, state); - state->test_callback (player, STATE_CHANGE_VIDEO_DIMENSIONS_CHANGED, - &old_state, state); -} - -static void -seek_done_cb (GstPlayer * player, guint64 position, TestPlayerState * state) -{ - TestPlayerState old_state = *state; - - state->seek_done = TRUE; - state->seek_done_position = position; - test_player_state_change_debug (player, STATE_CHANGE_SEEK_DONE, - &old_state, state); - state->test_callback (player, STATE_CHANGE_SEEK_DONE, &old_state, state); -} - -static GstPlayer * -test_player_new (TestPlayerState * state) -{ - GstPlayer *player; - GstElement *playbin, *fakesink; - - player = - gst_player_new (NULL, - gst_player_g_main_context_signal_dispatcher_new (NULL)); - fail_unless (player != NULL); - - test_player_state_reset (state); - - playbin = gst_player_get_pipeline (player); - fakesink = gst_element_factory_make ("fakesink", "audio-sink"); - g_object_set (fakesink, "sync", TRUE, NULL); - g_object_set (playbin, "audio-sink", fakesink, NULL); - fakesink = gst_element_factory_make ("fakesink", "video-sink"); - g_object_set (fakesink, "sync", TRUE, NULL); - g_object_set (playbin, "video-sink", fakesink, NULL); - gst_object_unref (playbin); - - g_signal_connect (player, "buffering", G_CALLBACK (buffering_cb), state); - g_signal_connect (player, "duration-changed", - G_CALLBACK (duration_changed_cb), state); - g_signal_connect (player, "end-of-stream", G_CALLBACK (end_of_stream_cb), - state); - g_signal_connect (player, "error", G_CALLBACK (error_cb), state); - g_signal_connect (player, "warning", G_CALLBACK (warning_cb), state); - g_signal_connect (player, "position-updated", - G_CALLBACK (position_updated_cb), state); - g_signal_connect (player, "state-changed", G_CALLBACK (state_changed_cb), - state); - g_signal_connect (player, "media-info-updated", - G_CALLBACK (media_info_updated_cb), state); - g_signal_connect (player, "video-dimensions-changed", - G_CALLBACK (video_dimensions_changed_cb), state); - g_signal_connect (player, "seek-done", G_CALLBACK (seek_done_cb), state); - - return player; -} - -static void -test_play_audio_video_eos_cb (GstPlayer * player, TestPlayerStateChange change, - TestPlayerState * old_state, TestPlayerState * new_state) -{ - gint step = GPOINTER_TO_INT (new_state->test_data); - gboolean video; - - video = ! !(step & 0x10); - step = (step & (~0x10)); - - switch (step) { - case 0: - fail_unless_equals_int (change, STATE_CHANGE_STATE_CHANGED); - fail_unless_equals_int (old_state->state, GST_PLAYER_STATE_STOPPED); - fail_unless_equals_int (new_state->state, GST_PLAYER_STATE_BUFFERING); - new_state->test_data = - GINT_TO_POINTER ((video ? 0x10 : 0x00) | (step + 1)); - break; - case 1: - fail_unless_equals_int (change, STATE_CHANGE_MEDIA_INFO_UPDATED); - new_state->test_data = - GINT_TO_POINTER ((video ? 0x10 : 0x00) | (step + 1)); - break; - case 2: - fail_unless_equals_int (change, STATE_CHANGE_VIDEO_DIMENSIONS_CHANGED); - if (video) { - fail_unless_equals_int (new_state->width, 320); - fail_unless_equals_int (new_state->height, 240); - } else { - fail_unless_equals_int (new_state->width, 0); - fail_unless_equals_int (new_state->height, 0); - } - new_state->test_data = - GINT_TO_POINTER ((video ? 0x10 : 0x00) | (step + 1)); - break; - case 3: - fail_unless_equals_int (change, STATE_CHANGE_DURATION_CHANGED); - fail_unless_equals_uint64 (new_state->duration, - G_GUINT64_CONSTANT (464399092)); - new_state->test_data = - GINT_TO_POINTER ((video ? 0x10 : 0x00) | (step + 1)); - break; - case 4: - fail_unless_equals_int (change, STATE_CHANGE_POSITION_UPDATED); - fail_unless_equals_uint64 (new_state->position, G_GUINT64_CONSTANT (0)); - new_state->test_data = - GINT_TO_POINTER ((video ? 0x10 : 0x00) | (step + 1)); - break; - case 5: - fail_unless_equals_int (change, STATE_CHANGE_STATE_CHANGED); - fail_unless_equals_int (old_state->state, GST_PLAYER_STATE_BUFFERING); - fail_unless_equals_int (new_state->state, GST_PLAYER_STATE_PLAYING); - new_state->test_data = - GINT_TO_POINTER ((video ? 0x10 : 0x00) | (step + 1)); - break; - case 6: - if (change == STATE_CHANGE_POSITION_UPDATED) { - fail_unless (old_state->position <= new_state->position); - } else { - fail_unless_equals_uint64 (old_state->position, old_state->duration); - fail_unless_equals_int (change, STATE_CHANGE_END_OF_STREAM); - new_state->test_data = - GINT_TO_POINTER ((video ? 0x10 : 0x00) | (step + 1)); - } - break; - case 7: - fail_unless_equals_int (change, STATE_CHANGE_STATE_CHANGED); - fail_unless_equals_int (old_state->state, GST_PLAYER_STATE_PLAYING); - fail_unless_equals_int (new_state->state, GST_PLAYER_STATE_STOPPED); - new_state->test_data = - GINT_TO_POINTER ((video ? 0x10 : 0x00) | (step + 1)); - g_main_loop_quit (new_state->loop); - break; - default: - fail (); - break; - } -} - -START_TEST (test_play_audio_eos) -{ - GstPlayer *player; - TestPlayerState state; - gchar *uri; - - memset (&state, 0, sizeof (state)); - state.loop = g_main_loop_new (NULL, FALSE); - state.test_callback = test_play_audio_video_eos_cb; - state.test_data = GINT_TO_POINTER (0); - - player = test_player_new (&state); - - fail_unless (player != NULL); - - uri = gst_filename_to_uri (TEST_PATH "/audio-short.ogg", NULL); - fail_unless (uri != NULL); - gst_player_set_uri (player, uri); - g_free (uri); - - gst_player_play (player); - g_main_loop_run (state.loop); - - fail_unless_equals_int (GPOINTER_TO_INT (state.test_data), 8); - - g_object_unref (player); - g_main_loop_unref (state.loop); -} - -END_TEST; - -static void -test_audio_info (GstPlayerMediaInfo * media_info) -{ - gint i = 0; - GList *list; - - for (list = gst_player_get_audio_streams (media_info); - list != NULL; list = list->next) { - GstPlayerStreamInfo *stream = (GstPlayerStreamInfo *) list->data; - GstPlayerAudioInfo *audio_info = (GstPlayerAudioInfo *) stream; - - fail_unless (gst_player_stream_info_get_tags (stream) != NULL); - fail_unless (gst_player_stream_info_get_caps (stream) != NULL); - fail_unless_equals_string (gst_player_stream_info_get_stream_type (stream), - "audio"); - - if (i == 0) { - fail_unless_equals_string (gst_player_stream_info_get_codec (stream), - "MPEG-1 Layer 3 (MP3)"); - fail_unless_equals_int (gst_player_audio_info_get_sample_rate - (audio_info), 48000); - fail_unless_equals_int (gst_player_audio_info_get_channels (audio_info), - 2); - fail_unless_equals_int (gst_player_audio_info_get_max_bitrate - (audio_info), 192000); - fail_unless (gst_player_audio_info_get_language (audio_info) != NULL); - } else { - fail_unless_equals_string (gst_player_stream_info_get_codec (stream), - "MPEG-4 AAC"); - fail_unless_equals_int (gst_player_audio_info_get_sample_rate - (audio_info), 48000); - fail_unless_equals_int (gst_player_audio_info_get_channels (audio_info), - 6); - fail_unless (gst_player_audio_info_get_language (audio_info) != NULL); - } - - i++; - } -} - -static void -test_video_info (GstPlayerMediaInfo * media_info) -{ - GList *list; - - for (list = gst_player_get_video_streams (media_info); - list != NULL; list = list->next) { - gint fps_d, fps_n; - guint par_d, par_n; - GstPlayerStreamInfo *stream = (GstPlayerStreamInfo *) list->data; - GstPlayerVideoInfo *video_info = (GstPlayerVideoInfo *) stream; - - fail_unless (gst_player_stream_info_get_tags (stream) != NULL); - fail_unless (gst_player_stream_info_get_caps (stream) != NULL); - fail_unless_equals_int (gst_player_stream_info_get_index (stream), 0); - fail_unless (strstr (gst_player_stream_info_get_codec (stream), - "H.264") != NULL - || strstr (gst_player_stream_info_get_codec (stream), "H264") != NULL); - fail_unless_equals_int (gst_player_video_info_get_width (video_info), 320); - fail_unless_equals_int (gst_player_video_info_get_height (video_info), 240); - gst_player_video_info_get_framerate (video_info, &fps_n, &fps_d); - fail_unless_equals_int (fps_n, 24); - fail_unless_equals_int (fps_d, 1); - gst_player_video_info_get_pixel_aspect_ratio (video_info, &par_n, &par_d); - fail_unless_equals_int (par_n, 33); - fail_unless_equals_int (par_d, 20); - } -} - -static void -test_subtitle_info (GstPlayerMediaInfo * media_info) -{ - GList *list; - - for (list = gst_player_get_subtitle_streams (media_info); - list != NULL; list = list->next) { - GstPlayerStreamInfo *stream = (GstPlayerStreamInfo *) list->data; - GstPlayerSubtitleInfo *sub = (GstPlayerSubtitleInfo *) stream; - - fail_unless_equals_string (gst_player_stream_info_get_stream_type (stream), - "subtitle"); - fail_unless (gst_player_stream_info_get_tags (stream) != NULL); - fail_unless (gst_player_stream_info_get_caps (stream) != NULL); - fail_unless_equals_string (gst_player_stream_info_get_codec (stream), - "Timed Text"); - fail_unless (gst_player_subtitle_info_get_language (sub) != NULL); - } -} - -static void -test_media_info_object (GstPlayer * player, GstPlayerMediaInfo * media_info) -{ - GList *list; - - /* gloabl tag */ - fail_unless (gst_player_media_info_is_seekable (media_info) == TRUE); - fail_unless (gst_player_media_info_get_tags (media_info) != NULL); - fail_unless_equals_string (gst_player_media_info_get_title (media_info), - "Sintel"); - fail_unless_equals_string (gst_player_media_info_get_container_format - (media_info), "Matroska"); - fail_unless (gst_player_media_info_get_image_sample (media_info) == NULL); - fail_unless (strstr (gst_player_media_info_get_uri (media_info), - "sintel.mkv") != NULL); - - /* number of streams */ - list = gst_player_media_info_get_stream_list (media_info); - fail_unless (list != NULL); - fail_unless_equals_int (g_list_length (list), 10); - - list = gst_player_get_video_streams (media_info); - fail_unless (list != NULL); - fail_unless_equals_int (g_list_length (list), 1); - - list = gst_player_get_audio_streams (media_info); - fail_unless (list != NULL); - fail_unless_equals_int (g_list_length (list), 2); - - list = gst_player_get_subtitle_streams (media_info); - fail_unless (list != NULL); - fail_unless_equals_int (g_list_length (list), 7); - - /* test subtitle */ - test_subtitle_info (media_info); - - /* test audio */ - test_audio_info (media_info); - - /* test video */ - test_video_info (media_info); -} - -static void -test_play_media_info_cb (GstPlayer * player, TestPlayerStateChange change, - TestPlayerState * old_state, TestPlayerState * new_state) -{ - gint completed = GPOINTER_TO_INT (new_state->test_data); - - if (change == STATE_CHANGE_MEDIA_INFO_UPDATED) { - test_media_info_object (player, new_state->media_info); - new_state->test_data = GINT_TO_POINTER (completed + 1); - g_main_loop_quit (new_state->loop); - } else if (change == STATE_CHANGE_END_OF_STREAM || - change == STATE_CHANGE_ERROR) { - g_main_loop_quit (new_state->loop); - } -} - -START_TEST (test_play_media_info) -{ - GstPlayer *player; - TestPlayerState state; - gchar *uri; - - memset (&state, 0, sizeof (state)); - state.loop = g_main_loop_new (NULL, FALSE); - state.test_callback = test_play_media_info_cb; - state.test_data = GINT_TO_POINTER (0); - - player = test_player_new (&state); - - fail_unless (player != NULL); - - uri = gst_filename_to_uri (TEST_PATH "/sintel.mkv", NULL); - fail_unless (uri != NULL); - gst_player_set_uri (player, uri); - g_free (uri); - - gst_player_play (player); - g_main_loop_run (state.loop); - - fail_unless_equals_int (GPOINTER_TO_INT (state.test_data), 1); - g_object_unref (player); - g_main_loop_unref (state.loop); -} - -END_TEST; - -static void -test_play_error_invalid_external_suburi_cb (GstPlayer * player, - TestPlayerStateChange change, TestPlayerState * old_state, - TestPlayerState * new_state) -{ - gint steps = GPOINTER_TO_INT (new_state->test_data); - - if (new_state->state == GST_PLAYER_STATE_PLAYING && !steps) { - gchar *suburi; - - suburi = gst_filename_to_uri (TEST_PATH "/foo.srt", NULL); - fail_unless (suburi != NULL); - - new_state->test_data = GINT_TO_POINTER (steps + 1); - /* load invalid suburi */ - fail_unless (gst_player_set_subtitle_uri (player, suburi) != FALSE); - g_free (suburi); - - } else if (steps && change == STATE_CHANGE_WARNING) { - new_state->test_data = GINT_TO_POINTER (steps + 1); - g_main_loop_quit (new_state->loop); - - } else if (change == STATE_CHANGE_END_OF_STREAM || - change == STATE_CHANGE_ERROR) - g_main_loop_quit (new_state->loop); -} - -static void -test_play_stream_disable_cb (GstPlayer * player, - TestPlayerStateChange change, TestPlayerState * old_state, - TestPlayerState * new_state) -{ - gint steps = GPOINTER_TO_INT (new_state->test_data) & 0xf; - gint mask = GPOINTER_TO_INT (new_state->test_data) & 0xf0; - - if (new_state->state == GST_PLAYER_STATE_PLAYING && !steps) { - new_state->test_data = GINT_TO_POINTER (0x10 + steps + 1); - gst_player_set_audio_track_enabled (player, FALSE); - - } else if (mask == 0x10 && change == STATE_CHANGE_POSITION_UPDATED) { - GstPlayerAudioInfo *audio; - - audio = gst_player_get_current_audio_track (player); - fail_unless (audio == NULL); - new_state->test_data = GINT_TO_POINTER (0x20 + steps + 1); - gst_player_set_subtitle_track_enabled (player, FALSE); - - } else if (mask == 0x20 && change == STATE_CHANGE_POSITION_UPDATED) { - GstPlayerSubtitleInfo *sub; - - sub = gst_player_get_current_subtitle_track (player); - fail_unless (sub == NULL); - new_state->test_data = GINT_TO_POINTER (0x30 + steps + 1); - g_main_loop_quit (new_state->loop); - - } else if (change == STATE_CHANGE_END_OF_STREAM || - change == STATE_CHANGE_ERROR) { - g_main_loop_quit (new_state->loop); - } -} - -START_TEST (test_play_stream_disable) -{ - GstPlayer *player; - TestPlayerState state; - gchar *uri; - - memset (&state, 0, sizeof (state)); - state.loop = g_main_loop_new (NULL, FALSE); - state.test_callback = test_play_stream_disable_cb; - state.test_data = GINT_TO_POINTER (0); - - player = test_player_new (&state); - - fail_unless (player != NULL); - - uri = gst_filename_to_uri (TEST_PATH "/sintel.mkv", NULL); - fail_unless (uri != NULL); - gst_player_set_uri (player, uri); - g_free (uri); - - gst_player_play (player); - g_main_loop_run (state.loop); - - fail_unless_equals_int (GPOINTER_TO_INT (state.test_data), 0x33); - - g_object_unref (player); - g_main_loop_unref (state.loop); -} - -END_TEST; - -static void -test_play_stream_switch_audio_cb (GstPlayer * player, - TestPlayerStateChange change, TestPlayerState * old_state, - TestPlayerState * new_state) -{ - gint steps = GPOINTER_TO_INT (new_state->test_data); - - if (new_state->state == GST_PLAYER_STATE_PLAYING && !steps) { - gint ret; - - new_state->test_data = GINT_TO_POINTER (steps + 1); - ret = gst_player_set_audio_track (player, 1); - fail_unless_equals_int (ret, 1); - - } else if (steps && change == STATE_CHANGE_POSITION_UPDATED) { - gint index; - GstPlayerAudioInfo *audio; - - audio = gst_player_get_current_audio_track (player); - fail_unless (audio != NULL); - index = gst_player_stream_info_get_index ((GstPlayerStreamInfo *) audio); - fail_unless_equals_int (index, 1); - g_object_unref (audio); - - new_state->test_data = GINT_TO_POINTER (steps + 1); - g_main_loop_quit (new_state->loop); - - } else if (change == STATE_CHANGE_END_OF_STREAM || - change == STATE_CHANGE_ERROR) { - g_main_loop_quit (new_state->loop); - } -} - -START_TEST (test_play_stream_switch_audio) -{ - GstPlayer *player; - TestPlayerState state; - gchar *uri; - - memset (&state, 0, sizeof (state)); - state.loop = g_main_loop_new (NULL, FALSE); - state.test_callback = test_play_stream_switch_audio_cb; - state.test_data = GINT_TO_POINTER (0); - - player = test_player_new (&state); - - fail_unless (player != NULL); - - uri = gst_filename_to_uri (TEST_PATH "/sintel.mkv", NULL); - fail_unless (uri != NULL); - gst_player_set_uri (player, uri); - g_free (uri); - - gst_player_play (player); - g_main_loop_run (state.loop); - - fail_unless_equals_int (GPOINTER_TO_INT (state.test_data), 2); - - g_object_unref (player); - g_main_loop_unref (state.loop); -} - -END_TEST; - -static void -test_play_stream_switch_subtitle_cb (GstPlayer * player, - TestPlayerStateChange change, TestPlayerState * old_state, - TestPlayerState * new_state) -{ - gint steps = GPOINTER_TO_INT (new_state->test_data); - - if (new_state->state == GST_PLAYER_STATE_PLAYING && !steps) { - gint ret; - - new_state->test_data = GINT_TO_POINTER (steps + 1); - ret = gst_player_set_subtitle_track (player, 5); - fail_unless_equals_int (ret, 1); - - } else if (steps && change == STATE_CHANGE_POSITION_UPDATED) { - gint index; - GstPlayerSubtitleInfo *sub; - - sub = gst_player_get_current_subtitle_track (player); - fail_unless (sub != NULL); - index = gst_player_stream_info_get_index ((GstPlayerStreamInfo *) sub); - fail_unless_equals_int (index, 5); - g_object_unref (sub); - - new_state->test_data = GINT_TO_POINTER (steps + 1); - g_main_loop_quit (new_state->loop); - - } else if (change == STATE_CHANGE_END_OF_STREAM || - change == STATE_CHANGE_ERROR) { - g_main_loop_quit (new_state->loop); - } -} - -START_TEST (test_play_stream_switch_subtitle) -{ - GstPlayer *player; - TestPlayerState state; - gchar *uri; - - memset (&state, 0, sizeof (state)); - state.loop = g_main_loop_new (NULL, FALSE); - state.test_callback = test_play_stream_switch_subtitle_cb; - state.test_data = GINT_TO_POINTER (0); - - player = test_player_new (&state); - - fail_unless (player != NULL); - - uri = gst_filename_to_uri (TEST_PATH "/sintel.mkv", NULL); - fail_unless (uri != NULL); - gst_player_set_uri (player, uri); - g_free (uri); - - gst_player_play (player); - g_main_loop_run (state.loop); - - fail_unless_equals_int (GPOINTER_TO_INT (state.test_data), 2); - - g_object_unref (player); - g_main_loop_unref (state.loop); -} - -END_TEST; - -START_TEST (test_play_error_invalid_external_suburi) -{ - GstPlayer *player; - TestPlayerState state; - gchar *uri; - - memset (&state, 0, sizeof (state)); - state.loop = g_main_loop_new (NULL, FALSE); - state.test_callback = test_play_error_invalid_external_suburi_cb; - state.test_data = GINT_TO_POINTER (0); - - player = test_player_new (&state); - - fail_unless (player != NULL); - - uri = gst_filename_to_uri (TEST_PATH "/audio-video.ogg", NULL); - fail_unless (uri != NULL); - gst_player_set_uri (player, uri); - g_free (uri); - - gst_player_play (player); - g_main_loop_run (state.loop); - - fail_unless_equals_int (GPOINTER_TO_INT (state.test_data), 2); - - g_object_unref (player); - g_main_loop_unref (state.loop); -} - -END_TEST; - -static gboolean -has_subtitle_stream (TestPlayerState * new_state) -{ - if (gst_player_get_subtitle_streams (new_state->media_info)) - return TRUE; - - return FALSE; -} - -static void -test_play_external_suburi_cb (GstPlayer * player, - TestPlayerStateChange change, TestPlayerState * old_state, - TestPlayerState * new_state) -{ - gint steps = GPOINTER_TO_INT (new_state->test_data); - - if (new_state->state == GST_PLAYER_STATE_PLAYING && !steps) { - gchar *suburi; - - suburi = gst_filename_to_uri (TEST_PATH "/test_sub.srt", NULL); - fail_unless (suburi != NULL); - - fail_unless (gst_player_set_subtitle_uri (player, suburi) != FALSE); - g_free (suburi); - new_state->test_data = GINT_TO_POINTER (steps + 1); - - } else if (change == STATE_CHANGE_MEDIA_INFO_UPDATED && - has_subtitle_stream (new_state)) { - gchar *current_suburi, *suburi; - - current_suburi = gst_player_get_subtitle_uri (player); - fail_unless (current_suburi != NULL); - suburi = gst_filename_to_uri (TEST_PATH "/test_sub.srt", NULL); - fail_unless (suburi != NULL); - - fail_unless_equals_int (g_strcmp0 (current_suburi, suburi), 0); - - g_free (current_suburi); - g_free (suburi); - new_state->test_data = GINT_TO_POINTER (steps + 1); - g_main_loop_quit (new_state->loop); - - } else if (change == STATE_CHANGE_END_OF_STREAM || - change == STATE_CHANGE_ERROR) - g_main_loop_quit (new_state->loop); -} - -START_TEST (test_play_external_suburi) -{ - GstPlayer *player; - TestPlayerState state; - gchar *uri; - - memset (&state, 0, sizeof (state)); - state.loop = g_main_loop_new (NULL, FALSE); - state.test_callback = test_play_external_suburi_cb; - state.test_data = GINT_TO_POINTER (0); - - player = test_player_new (&state); - - fail_unless (player != NULL); - - uri = gst_filename_to_uri (TEST_PATH "/audio-video.ogg", NULL); - fail_unless (uri != NULL); - gst_player_set_uri (player, uri); - g_free (uri); - - gst_player_play (player); - g_main_loop_run (state.loop); - - fail_unless_equals_int (GPOINTER_TO_INT (state.test_data), 2); - - g_object_unref (player); - g_main_loop_unref (state.loop); -} - -END_TEST; - -static void -test_play_rate_cb (GstPlayer * player, - TestPlayerStateChange change, TestPlayerState * old_state, - TestPlayerState * new_state) -{ - gint steps = GPOINTER_TO_INT (new_state->test_data) & 0xf; - gint mask = GPOINTER_TO_INT (new_state->test_data) & 0xf0; - - if (new_state->state == GST_PLAYER_STATE_PLAYING && !steps) { - guint64 dur = -1, pos = -1; - - g_object_get (player, "position", &pos, "duration", &dur, NULL); - pos = pos + dur * 0.2; /* seek 20% */ - gst_player_seek (player, pos); - - /* default rate should be 1.0 */ - fail_unless_equals_double (gst_player_get_rate (player), 1.0); - new_state->test_data = GINT_TO_POINTER (mask + steps + 1); - } else if (change == STATE_CHANGE_END_OF_STREAM || - change == STATE_CHANGE_ERROR) { - g_main_loop_quit (new_state->loop); - } else if (steps == 1 && change == STATE_CHANGE_SEEK_DONE) { - if (mask == 0x10) - gst_player_set_rate (player, 1.5); - else if (mask == 0x20) - gst_player_set_rate (player, -1.0); - - new_state->test_data = GINT_TO_POINTER (mask + steps + 1); - } else if (steps && (change == STATE_CHANGE_POSITION_UPDATED)) { - if (steps == 10) { - g_main_loop_quit (new_state->loop); - } else { - if (mask == 0x10 && (new_state->position > old_state->position)) - new_state->test_data = GINT_TO_POINTER (mask + steps + 1); - else if (mask == 0x20 && (new_state->position < old_state->position)) - new_state->test_data = GINT_TO_POINTER (mask + steps + 1); - } - } -} - -START_TEST (test_play_forward_rate) -{ - GstPlayer *player; - TestPlayerState state; - gchar *uri; - - memset (&state, 0, sizeof (state)); - state.loop = g_main_loop_new (NULL, FALSE); - state.test_callback = test_play_rate_cb; - state.test_data = GINT_TO_POINTER (0x10); - - player = test_player_new (&state); - - fail_unless (player != NULL); - - uri = gst_filename_to_uri (TEST_PATH "/audio.ogg", NULL); - fail_unless (uri != NULL); - gst_player_set_uri (player, uri); - g_free (uri); - - gst_player_play (player); - g_main_loop_run (state.loop); - - fail_unless_equals_int (GPOINTER_TO_INT (state.test_data) & 0xf, 10); - - g_object_unref (player); - g_main_loop_unref (state.loop); -} - -END_TEST; - -START_TEST (test_play_backward_rate) -{ - GstPlayer *player; - TestPlayerState state; - gchar *uri; - - memset (&state, 0, sizeof (state)); - state.loop = g_main_loop_new (NULL, FALSE); - state.test_callback = test_play_rate_cb; - state.test_data = GINT_TO_POINTER (0x20); - - player = test_player_new (&state); - - fail_unless (player != NULL); - - uri = gst_filename_to_uri (TEST_PATH "/audio.ogg", NULL); - fail_unless (uri != NULL); - gst_player_set_uri (player, uri); - g_free (uri); - - gst_player_play (player); - g_main_loop_run (state.loop); - - fail_unless_equals_int (GPOINTER_TO_INT (state.test_data) & 0xf, 10); - - g_object_unref (player); - g_main_loop_unref (state.loop); -} - -END_TEST; - -START_TEST (test_play_audio_video_eos) -{ - GstPlayer *player; - TestPlayerState state; - gchar *uri; - - memset (&state, 0, sizeof (state)); - state.loop = g_main_loop_new (NULL, FALSE); - state.test_callback = test_play_audio_video_eos_cb; - state.test_data = GINT_TO_POINTER (0x10); - - player = test_player_new (&state); - - fail_unless (player != NULL); - - uri = gst_filename_to_uri (TEST_PATH "/audio-video-short.ogg", NULL); - fail_unless (uri != NULL); - gst_player_set_uri (player, uri); - g_free (uri); - - gst_player_play (player); - g_main_loop_run (state.loop); - - fail_unless_equals_int (GPOINTER_TO_INT (state.test_data) & (~0x10), 8); - - g_object_unref (player); - g_main_loop_unref (state.loop); -} - -END_TEST; - -static void -test_play_error_invalid_uri_cb (GstPlayer * player, - TestPlayerStateChange change, TestPlayerState * old_state, - TestPlayerState * new_state) -{ - gint step = GPOINTER_TO_INT (new_state->test_data); - - switch (step) { - case 0: - fail_unless_equals_int (change, STATE_CHANGE_STATE_CHANGED); - fail_unless_equals_int (old_state->state, GST_PLAYER_STATE_STOPPED); - fail_unless_equals_int (new_state->state, GST_PLAYER_STATE_BUFFERING); - new_state->test_data = GINT_TO_POINTER (step + 1); - break; - case 1: - fail_unless_equals_int (change, STATE_CHANGE_ERROR); - new_state->test_data = GINT_TO_POINTER (step + 1); - break; - case 2: - fail_unless_equals_int (change, STATE_CHANGE_STATE_CHANGED); - fail_unless_equals_int (old_state->state, GST_PLAYER_STATE_BUFFERING); - fail_unless_equals_int (new_state->state, GST_PLAYER_STATE_STOPPED); - new_state->test_data = GINT_TO_POINTER (step + 1); - g_main_loop_quit (new_state->loop); - break; - default: - fail (); - break; - } -} - -START_TEST (test_play_error_invalid_uri) -{ - GstPlayer *player; - TestPlayerState state; - - memset (&state, 0, sizeof (state)); - state.loop = g_main_loop_new (NULL, FALSE); - state.test_callback = test_play_error_invalid_uri_cb; - state.test_data = GINT_TO_POINTER (0); - - player = test_player_new (&state); - - fail_unless (player != NULL); - - gst_player_set_uri (player, "foo://bar"); - - gst_player_play (player); - g_main_loop_run (state.loop); - - fail_unless_equals_int (GPOINTER_TO_INT (state.test_data), 3); - - g_object_unref (player); - g_main_loop_unref (state.loop); -} - -END_TEST; - -static void -test_play_error_invalid_uri_and_play_cb (GstPlayer * player, - TestPlayerStateChange change, TestPlayerState * old_state, - TestPlayerState * new_state) -{ - gint step = GPOINTER_TO_INT (new_state->test_data); - gchar *uri; - - switch (step) { - case 0: - fail_unless_equals_int (change, STATE_CHANGE_STATE_CHANGED); - fail_unless_equals_int (old_state->state, GST_PLAYER_STATE_STOPPED); - fail_unless_equals_int (new_state->state, GST_PLAYER_STATE_BUFFERING); - new_state->test_data = GINT_TO_POINTER (step + 1); - break; - case 1: - fail_unless_equals_int (change, STATE_CHANGE_ERROR); - new_state->test_data = GINT_TO_POINTER (step + 1); - break; - case 2: - fail_unless_equals_int (change, STATE_CHANGE_STATE_CHANGED); - fail_unless_equals_int (old_state->state, GST_PLAYER_STATE_BUFFERING); - fail_unless_equals_int (new_state->state, GST_PLAYER_STATE_STOPPED); - new_state->test_data = GINT_TO_POINTER (step + 1); - - uri = gst_filename_to_uri (TEST_PATH "/audio-short.ogg", NULL); - fail_unless (uri != NULL); - gst_player_set_uri (player, uri); - g_free (uri); - - gst_player_play (player); - break; - case 3: - fail_unless_equals_int (change, STATE_CHANGE_STATE_CHANGED); - fail_unless_equals_int (old_state->state, GST_PLAYER_STATE_STOPPED); - fail_unless_equals_int (new_state->state, GST_PLAYER_STATE_BUFFERING); - new_state->test_data = GINT_TO_POINTER (step + 1); - break; - case 4: - fail_unless_equals_int (change, STATE_CHANGE_MEDIA_INFO_UPDATED); - new_state->test_data = GINT_TO_POINTER (step + 1); - break; - case 5: - fail_unless_equals_int (change, STATE_CHANGE_VIDEO_DIMENSIONS_CHANGED); - fail_unless_equals_int (new_state->width, 0); - fail_unless_equals_int (new_state->height, 0); - new_state->test_data = GINT_TO_POINTER (step + 1); - break; - case 6: - fail_unless_equals_int (change, STATE_CHANGE_DURATION_CHANGED); - fail_unless_equals_uint64 (new_state->duration, - G_GUINT64_CONSTANT (464399092)); - new_state->test_data = GINT_TO_POINTER (step + 1); - break; - case 7: - fail_unless_equals_int (change, STATE_CHANGE_POSITION_UPDATED); - fail_unless_equals_uint64 (new_state->position, G_GUINT64_CONSTANT (0)); - new_state->test_data = GINT_TO_POINTER (step + 1); - break; - case 8: - fail_unless_equals_int (change, STATE_CHANGE_STATE_CHANGED); - fail_unless_equals_int (old_state->state, GST_PLAYER_STATE_BUFFERING); - fail_unless_equals_int (new_state->state, GST_PLAYER_STATE_PLAYING); - new_state->test_data = GINT_TO_POINTER (step + 1); - g_main_loop_quit (new_state->loop); - break; - default: - fail (); - break; - } -} - -START_TEST (test_play_error_invalid_uri_and_play) -{ - GstPlayer *player; - TestPlayerState state; - - memset (&state, 0, sizeof (state)); - state.loop = g_main_loop_new (NULL, FALSE); - state.test_callback = test_play_error_invalid_uri_and_play_cb; - state.test_data = GINT_TO_POINTER (0); - - player = test_player_new (&state); - - fail_unless (player != NULL); - - gst_player_set_uri (player, "foo://bar"); - - gst_player_play (player); - g_main_loop_run (state.loop); - - fail_unless_equals_int (GPOINTER_TO_INT (state.test_data), 9); - - g_object_unref (player); - g_main_loop_unref (state.loop); -} - -END_TEST; - -static void -test_play_seek_done_cb (GstPlayer * player, - TestPlayerStateChange change, TestPlayerState * old_state, - TestPlayerState * new_state) -{ - gint step = GPOINTER_TO_INT (new_state->test_data) & (~0x10); - - if (new_state->state == GST_PLAYER_STATE_PLAYING && !step) { - gst_player_seek (player, 0); - new_state->test_data = GINT_TO_POINTER (step + 1); - } else if (change == STATE_CHANGE_SEEK_DONE || change == STATE_CHANGE_ERROR) { - fail_unless_equals_int (change, STATE_CHANGE_SEEK_DONE); - fail_unless_equals_uint64 (new_state->seek_done_position, - G_GUINT64_CONSTANT (0)); - new_state->test_data = GINT_TO_POINTER (step + 1); - g_main_loop_quit (new_state->loop); - } -} - -START_TEST (test_play_audio_video_seek_done) -{ - GstPlayer *player; - TestPlayerState state; - gchar *uri; - - memset (&state, 0, sizeof (state)); - state.loop = g_main_loop_new (NULL, FALSE); - state.test_callback = test_play_seek_done_cb; - state.test_data = GINT_TO_POINTER (0); - - player = test_player_new (&state); - - fail_unless (player != NULL); - - uri = gst_filename_to_uri (TEST_PATH "/audio-video.ogg", NULL); - fail_unless (uri != NULL); - gst_player_set_uri (player, uri); - g_free (uri); - - gst_player_play (player); - g_main_loop_run (state.loop); - - fail_unless_equals_int (GPOINTER_TO_INT (state.test_data) & (~0x10), 2); - - g_object_unref (player); - g_main_loop_unref (state.loop); -} - -END_TEST; - -static void -test_play_position_update_interval_cb (GstPlayer * player, - TestPlayerStateChange change, TestPlayerState * old_state, - TestPlayerState * new_state) -{ - static gboolean do_quit = TRUE; - static GstClockTime last_position = GST_CLOCK_TIME_NONE; - - gint steps = GPOINTER_TO_INT (new_state->test_data); - - if (new_state->state == GST_PLAYER_STATE_PLAYING && !steps) { - new_state->test_data = GINT_TO_POINTER (steps + 1); - } else if (steps && change == STATE_CHANGE_POSITION_UPDATED) { - GstClockTime position = gst_player_get_position (player); - new_state->test_data = GINT_TO_POINTER (steps + 1); - - if (GST_CLOCK_TIME_IS_VALID (last_position)) { - GstClockTime interval = GST_CLOCK_DIFF (last_position, position); - GST_DEBUG_OBJECT (player, - "position update interval: %" GST_TIME_FORMAT "\n", - GST_TIME_ARGS (interval)); - fail_unless (interval > (590 * GST_MSECOND) - && interval < (610 * GST_MSECOND)); - } - - last_position = position; - - if (do_quit && position >= 2000 * GST_MSECOND) { - do_quit = FALSE; - gst_player_set_position_update_interval (player, 0); - g_main_loop_quit (new_state->loop); - } - } else if (change == STATE_CHANGE_END_OF_STREAM || - change == STATE_CHANGE_ERROR) { - g_main_loop_quit (new_state->loop); - } -} - -static gboolean -quit_loop_cb (gpointer user_data) -{ - GMainLoop *loop = user_data; - g_main_loop_quit (loop); - - return G_SOURCE_REMOVE; -} - -START_TEST (test_play_position_update_interval) -{ - GstPlayer *player; - TestPlayerState state; - gchar *uri; - - memset (&state, 0, sizeof (state)); - state.loop = g_main_loop_new (NULL, FALSE); - state.test_callback = test_play_position_update_interval_cb; - state.test_data = GINT_TO_POINTER (0); - - player = test_player_new (&state); - gst_player_set_position_update_interval (player, 600); - - fail_unless (player != NULL); - - uri = gst_filename_to_uri (TEST_PATH "/sintel.mkv", NULL); - fail_unless (uri != NULL); - gst_player_set_uri (player, uri); - g_free (uri); - - gst_player_play (player); - g_main_loop_run (state.loop); - - fail_unless_equals_int (GPOINTER_TO_INT (state.test_data), 5); - - g_timeout_add (2000, quit_loop_cb, state.loop); - g_main_loop_run (state.loop); - - fail_unless_equals_int (GPOINTER_TO_INT (state.test_data), 5); - - g_object_unref (player); - g_main_loop_unref (state.loop); -} - -END_TEST; - -static Suite * -player_suite (void) -{ - Suite *s = suite_create ("GstPlayer"); - - TCase *tc_general = tcase_create ("general"); - - tcase_set_timeout (tc_general, 120); - tcase_add_test (tc_general, test_create_and_free); - tcase_add_test (tc_general, test_set_and_get_uri); - tcase_add_test (tc_general, test_set_and_get_position_update_interval); - tcase_add_test (tc_general, test_play_position_update_interval); - tcase_add_test (tc_general, test_play_audio_eos); - tcase_add_test (tc_general, test_play_audio_video_eos); - tcase_add_test (tc_general, test_play_error_invalid_uri); - tcase_add_test (tc_general, test_play_error_invalid_uri_and_play); - tcase_add_test (tc_general, test_play_media_info); - tcase_add_test (tc_general, test_play_stream_disable); - tcase_add_test (tc_general, test_play_stream_switch_audio); - tcase_add_test (tc_general, test_play_stream_switch_subtitle); - tcase_add_test (tc_general, test_play_error_invalid_external_suburi); - tcase_add_test (tc_general, test_play_external_suburi); - tcase_add_test (tc_general, test_play_forward_rate); - tcase_add_test (tc_general, test_play_backward_rate); - tcase_add_test (tc_general, test_play_audio_video_seek_done); - suite_add_tcase (s, tc_general); - - return s; -} - -int -main (int argc, char **argv) -{ - int number_failed; - Suite *s; - SRunner *sr; - - gst_init (NULL, NULL); - - GST_DEBUG_CATEGORY_INIT (test_debug, "test", 0, "GstPlayer test"); - - s = player_suite (); - sr = srunner_create (s); - - srunner_run_all (sr, CK_NORMAL); - - number_failed = srunner_ntests_failed (sr); - - srunner_free (sr); - return (number_failed == 0) ? 0 : -1; -} diff --git a/win32/gst-play/gst-play.vcxproj b/win32/gst-play/gst-play.vcxproj index ee23397..cfc3e1b 100644 --- a/win32/gst-play/gst-play.vcxproj +++ b/win32/gst-play/gst-play.vcxproj @@ -34,30 +34,26 @@ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(GSTREAMER_1_0_ROOT_X86)\share\vs\2010\libs\gstreamer-1.0.props" /> - <Import Project="$(GSTREAMER_1_0_ROOT_X86)\share\vs\2010\libs\gstreamer-pbutils-1.0.props" /> + <Import Project="$(GSTREAMER_1_0_ROOT_X86)\share\vs\2010\libs\gstreamer-player-1.0.props" /> <Import Project="$(GSTREAMER_1_0_ROOT_X86)\share\vs\2010\libs\gstreamer-tag-1.0.props" /> - <Import Project="$(GSTREAMER_1_0_ROOT_X86)\share\vs\2010\libs\gstreamer-video-1.0.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(GSTREAMER_1_0_ROOT_X86)\share\vs\2010\libs\gstreamer-1.0.props" /> - <Import Project="$(GSTREAMER_1_0_ROOT_X86)\share\vs\2010\libs\gstreamer-pbutils-1.0.props" /> + <Import Project="$(GSTREAMER_1_0_ROOT_X86)\share\vs\2010\libs\gstreamer-player-1.0.props" /> <Import Project="$(GSTREAMER_1_0_ROOT_X86)\share\vs\2010\libs\gstreamer-tag-1.0.props" /> - <Import Project="$(GSTREAMER_1_0_ROOT_X86)\share\vs\2010\libs\gstreamer-video-1.0.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(GSTREAMER_1_0_ROOT_X86_64)\share\vs\2010\libs\gstreamer-1.0.props" /> - <Import Project="$(GSTREAMER_1_0_ROOT_X86_64)\share\vs\2010\libs\gstreamer-pbutils-1.0.props" /> + <Import Project="$(GSTREAMER_1_0_ROOT_X86_64)\share\vs\2010\libs\gstreamer-player-1.0.props" /> <Import Project="$(GSTREAMER_1_0_ROOT_X86_64)\share\vs\2010\libs\gstreamer-tag-1.0.props" /> - <Import Project="$(GSTREAMER_1_0_ROOT_X86_64)\share\vs\2010\libs\gstreamer-video-1.0.props" /> </ImportGroup> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(GSTREAMER_1_0_ROOT_X86_64)\share\vs\2010\libs\gstreamer-1.0.props" /> - <Import Project="$(GSTREAMER_1_0_ROOT_X86_64)\share\vs\2010\libs\gstreamer-pbutils-1.0.props" /> + <Import Project="$(GSTREAMER_1_0_ROOT_X86_64)\share\vs\2010\libs\gstreamer-player-1.0.props" /> <Import Project="$(GSTREAMER_1_0_ROOT_X86_64)\share\vs\2010\libs\gstreamer-tag-1.0.props" /> - <Import Project="$(GSTREAMER_1_0_ROOT_X86_64)\share\vs\2010\libs\gstreamer-video-1.0.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> @@ -97,10 +93,7 @@ <ItemGroup> <ClInclude Include="..\..\gst-play\gst-play-kb.h" /> </ItemGroup> - <ItemGroup> - <Library Include="..\libgstplayer\lib\libgstplayer.lib" /> - </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/win32/gst-play/gst-play.vcxproj.filters b/win32/gst-play/gst-play.vcxproj.filters index 1f972be..24eedbc 100644 --- a/win32/gst-play/gst-play.vcxproj.filters +++ b/win32/gst-play/gst-play.vcxproj.filters @@ -22,9 +22,4 @@ <Filter>source</Filter> </ClInclude> </ItemGroup> - <ItemGroup> - <Library Include="..\libgstplayer\lib\libgstplayer.lib"> - <Filter>lib</Filter> - </Library> - </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/win32/gst-player.sln b/win32/gst-player.sln index 280d7e1..ab09837 100644 --- a/win32/gst-player.sln +++ b/win32/gst-player.sln @@ -4,11 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 VisualStudioVersion = 12.0.21005.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gst-play", "gst-play\gst-play.vcxproj", "{C2483DBB-5396-4E7C-9015-6DFF40977D9A}" - ProjectSection(ProjectDependencies) = postProject - {50C02A39-7349-4A6A-A2FD-B231C04FD485} = {50C02A39-7349-4A6A-A2FD-B231C04FD485} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgstplayer", "libgstplayer\libgstplayer.vcxproj", "{50C02A39-7349-4A6A-A2FD-B231C04FD485}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/win32/libgstplayer/libgstplayer.vcxproj b/win32/libgstplayer/libgstplayer.vcxproj deleted file mode 100644 index 371cb1c..0000000 --- a/win32/libgstplayer/libgstplayer.vcxproj +++ /dev/null @@ -1,92 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{50C02A39-7349-4A6A-A2FD-B231C04FD485}</ProjectGuid> - <RootNamespace>libgstplayer</RootNamespace> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v120</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(GSTREAMER_1_0_ROOT_X86)\share\vs\2010\libs\gstreamer-1.0.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(GSTREAMER_1_0_ROOT_X86)\share\vs\2010\libs\gstreamer-1.0.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(GSTREAMER_1_0_ROOT_X86_64)\share\vs\2010\libs\gstreamer-1.0.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="$(GSTREAMER_1_0_ROOT_X86_64)\share\vs\2010\libs\gstreamer-1.0.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>./lib</OutDir> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <SDLCheck>true</SDLCheck> - <AdditionalIncludeDirectories>..\..\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <ClInclude Include="..\..\lib\gst\player\gstplayer-media-info-private.h" /> - <ClInclude Include="..\..\lib\gst\player\gstplayer-media-info.h" /> - <ClInclude Include="..\..\lib\gst\player\gstplayer.h" /> - <ClInclude Include="..\..\lib\gst\player\player.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\lib\gst\player\gstplayer-media-info.c" /> - <ClCompile Include="..\..\lib\gst\player\gstplayer.c" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/win32/libgstplayer/libgstplayer.vcxproj.filters b/win32/libgstplayer/libgstplayer.vcxproj.filters deleted file mode 100644 index 72d9843..0000000 --- a/win32/libgstplayer/libgstplayer.vcxproj.filters +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="source"> - <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> - <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> - </Filter> - <Filter Include="include"> - <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> - <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions> - </Filter> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\lib\gst\player\gstplayer.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="..\..\lib\gst\player\gstplayer-media-info.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="..\..\lib\gst\player\player.h"> - <Filter>include</Filter> - </ClInclude> - <ClInclude Include="..\..\lib\gst\player\gstplayer-media-info-private.h"> - <Filter>source</Filter> - </ClInclude> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\lib\gst\player\gstplayer-media-info.c"> - <Filter>source</Filter> - </ClCompile> - <ClCompile Include="..\..\lib\gst\player\gstplayer.c"> - <Filter>source</Filter> - </ClCompile> - </ItemGroup> -</Project>
\ No newline at end of file |