mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-11 11:51:34 +00:00
Code Issues 1 Projects Releases Wiki Activity

playback/player: player: Build against GstPlayer version from gst-plugins-bad everywhere

Browse source 
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.
This commit is contained in:
Sebastian Dröge 2016-01-04 10:11:20 +02:00
parent addb63586b
commit f509043c1d
8 changed files with 10 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
playback/player/android/jni/Android.mk
View file

@ -3,17 +3,8 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := gstplayer LOCAL_MODULE := gstplayer
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := player.c
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_SHARED_LIBRARIES := gstreamer_android LOCAL_SHARED_LIBRARIES := gstreamer_android
LOCAL_LDLIBS := -llog -landroid LOCAL_LDLIBS := -llog -landroid
include $(BUILD_SHARED_LIBRARY) 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 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_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 include $(GSTREAMER_NDK_BUILD_PATH)/gstreamer-1.0.mk

2
playback/player/android/jni/player.c
View file

@ -25,7 +25,7 @@
#include <android/native_window.h> #include <android/native_window.h>
#include <android/native_window_jni.h> #include <android/native_window_jni.h>
#include "gst/player/player.h" #include <gst/player/player.h>
GST_DEBUG_CATEGORY_STATIC (debug_category); GST_DEBUG_CATEGORY_STATIC (debug_category);
#define GST_CAT_DEFAULT debug_category #define GST_CAT_DEFAULT debug_category

5
playback/player/gst-play/Makefile.am
View file

@ -2,9 +2,8 @@ bin_PROGRAMS = gst-play
gst_play_SOURCES = gst-play.c gst-play-kb.c gst-play-kb.h 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 \ LDADD = $(GSTREAMER_LIBS) $(GLIB_LIBS) $(LIBM)
$(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 noinst_HEADERS = gst-play-kb.h

5
playback/player/gtk/Makefile.am
View file

@ -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 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 \ LDADD = $(GSTREAMER_LIBS) $(GTK_LIBS) $(GTK_X11_LIBS) $(GLIB_LIBS) $(LIBM) $(GMODULE_LIBS)
$(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 noinst_HEADERS = gtk-play-resources.h gtk-video-renderer.h

1
playback/player/gtk/gtk-play.c
View file

@ -24,7 +24,6 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/tag/tag.h> #include <gst/tag/tag.h>
#include <gst/video/videooverlay.h>
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>
#include <gdk/gdk.h> #include <gdk/gdk.h>

33
playback/player/ios/GstPlay.xcodeproj/project.pbxproj
View file

@ -23,8 +23,6 @@
AD2B885C198D65470070367B /* MainStoryboard_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AD2B885A198D65470070367B /* MainStoryboard_iPad.storyboard */; }; AD2B885C198D65470070367B /* MainStoryboard_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AD2B885A198D65470070367B /* MainStoryboard_iPad.storyboard */; };
AD2B8861198D65780070367B /* LibraryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AD2B885E198D65780070367B /* LibraryViewController.m */; }; AD2B8861198D65780070367B /* LibraryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AD2B885E198D65780070367B /* LibraryViewController.m */; };
AD2B8862198D65780070367B /* VideoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AD2B8860198D65780070367B /* VideoViewController.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 */ /* End PBXBuildFile section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
@ -53,12 +51,6 @@
AD2B885E198D65780070367B /* LibraryViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LibraryViewController.m; sourceTree = "<group>"; }; 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>"; }; 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>"; }; 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 */ /* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */ /* Begin PBXFrameworksBuildPhase section */
@ -79,7 +71,6 @@
AD2B8812198D631B0070367B = { AD2B8812198D631B0070367B = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
AD2B8868198D69ED0070367B /* gst */,
AD2B8826198D631B0070367B /* GstPlay */, AD2B8826198D631B0070367B /* GstPlay */,
AD2B881D198D631B0070367B /* Frameworks */, AD2B881D198D631B0070367B /* Frameworks */,
AD2B881C198D631B0070367B /* Products */, AD2B881C198D631B0070367B /* Products */,
@ -140,28 +131,6 @@
name = "Supporting Files"; name = "Supporting Files";
sourceTree = "<group>"; 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 */ /* End PBXGroup section */
/* Begin PBXNativeTarget section */ /* Begin PBXNativeTarget section */
@ -229,14 +198,12 @@
isa = PBXSourcesBuildPhase; isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
E95DEC9B1B8332F100CC3512 /* gstplayer-media-info.c in Sources */,
AD2B8861198D65780070367B /* LibraryViewController.m in Sources */, AD2B8861198D65780070367B /* LibraryViewController.m in Sources */,
AD2B8831198D631B0070367B /* AppDelegate.m in Sources */, AD2B8831198D631B0070367B /* AppDelegate.m in Sources */,
AD2B8862198D65780070367B /* VideoViewController.m in Sources */, AD2B8862198D65780070367B /* VideoViewController.m in Sources */,
AD2B8858198D637A0070367B /* EaglUIVIew.m in Sources */, AD2B8858198D637A0070367B /* EaglUIVIew.m in Sources */,
AD2B882D198D631B0070367B /* main.m in Sources */, AD2B882D198D631B0070367B /* main.m in Sources */,
AD2B8837198D631B0070367B /* gst_ios_init.m in Sources */, AD2B8837198D631B0070367B /* gst_ios_init.m in Sources */,
AD2B886C198D69ED0070367B /* gstplayer.c in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };

2
playback/player/ios/GstPlay/VideoViewController.m
View file

@ -1,5 +1,5 @@
#import "VideoViewController.h" #import "VideoViewController.h"
#import <gst/player/gstplayer.h> #import <gst/player/player.h>
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
@interface VideoViewController () { @interface VideoViewController () {

11
playback/player/qt/play.pro
View file

@ -6,8 +6,6 @@ CONFIG += c++11
DEFINES += GST_USE_UNSTABLE_API DEFINES += GST_USE_UNSTABLE_API
INCLUDEPATH += ../lib
RESOURCES += qml.qrc RESOURCES += qml.qrc
# Additional import path used to resolve QML modules in Qt Creator's code model # 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 CONFIG += link_pkgconfig
PKGCONFIG = \ PKGCONFIG = \
gstreamer-1.0 \ gstreamer-1.0 \
gstreamer-audio-1.0 \ gstreamer-player-1.0 \
gstreamer-tag-1.0 \ gstreamer-tag-1.0
gstreamer-pbutils-1.0 \
gstreamer-video-1.0 \
gstreamer-gl-1.0
} }
macx { macx {
@ -46,8 +41,6 @@ HEADERS += \
SOURCES += main.cpp \ SOURCES += main.cpp \
qgstplayer.cpp \ qgstplayer.cpp \
../lib/gst/player/gstplayer.c \
../lib/gst/player/gstplayer-media-info.c \
player.cpp \ player.cpp \
quickrenderer.cpp \ quickrenderer.cpp \
imagesample.cpp imagesample.cpp