julian/AirplayServer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gstreamer fixes

Browse Source
This commit is contained in:
julian@kiedaisch.net
2020-04-19 22:49:28 +02:00
parent 688d361e5e
commit bf97700ffe
4 changed files with 107 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
renderers/video_renderer.h
View File

@@ -35,6 +35,7 @@ extern "C" {
#include "../lib/logger.h"
#include "../lib/raop_ntp.h"
typedef enum background_mode_e {
BACKGROUND_MODE_ON, // Always show background
BACKGROUND_MODE_AUTO, // Only show background while there's an active connection

45
renderers/video_renderer_gstreamer.c
View File

@@ -29,16 +29,10 @@
#include <gst/video/videooverlay.h>
//#include <glib.h>
//#include <gdk/gdkx.h>
//#include <gtk/gtk.h>
struct video_renderer_s {
logger_t *logger;
GstElement *appsrc, *pipeline, *sink;
GstElement *appsrc, *pipeline, *sink, *decodebin, *videoconvert, *queue;
//GtkWidget *main_window, *video_window;
//GdkWindow *window;
};
video_renderer_t *video_renderer_init(logger_t *logger, background_mode_t background_mode, bool low_latency) {
@@ -52,7 +46,26 @@ video_renderer_t *video_renderer_init(logger_t *logger, background_mode_t backgr
renderer->logger = logger;
renderer->pipeline = gst_parse_launch("appsrc name=video_source is-live=true ! queue ! decodebin ! videoconvert ! autovideosink name=video_sink sync=false", &error);
renderer->pipeline = gst_parse_launch("appsrc name=video_source is-live=true ! queue ! decodebin ! videoconvert ! xvimagesink name=video_sink", &error);
/*
renderer->pipeline = gst_pipeline_new(NULL);
renderer->appsrc = gst_element_factory_make("appsrc","video_source");
g_object_set (renderer->appsrc, "is_live", true, NULL);
renderer->sink = gst_element_factory_make("autovideosink","video_sink");
g_object_set (renderer->sink, "sync", false, NULL);
renderer->queue = gst_element_factory_make("queue",NULL);
renderer->decodebin = gst_element_factory_make("decodebin",NULL);
renderer->videoconvert = gst_element_factory_make("videoconvert",NULL);
gst_bin_add_many(GST_BIN (renderer->pipeline),
renderer->appsrc,
renderer->queue,
renderer->decodebin,
renderer->videoconvert,
renderer->sink,
NULL);
//gst_element_link (renderer->appsrc, renderer->sink);
*/
g_assert (renderer->pipeline);
@@ -60,22 +73,6 @@ video_renderer_t *video_renderer_init(logger_t *logger, background_mode_t backgr
renderer->sink = gst_bin_get_by_name (GST_BIN (renderer->pipeline), "video_sink");
/*
//GTK
gtk_init (NULL, NULL);
renderer->main_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
g_signal_connect (G_OBJECT (renderer->main_window), "delete-event", G_CALLBACK (video_renderer_destroy), renderer);
gtk_window_set_title (GTK_WINDOW (renderer->main_window), "AirplayServer");
renderer->video_window = gtk_drawing_area_new ();
gtk_container_add (GTK_CONTAINER (renderer->main_window), renderer->video_window);
gtk_container_set_border_width (GTK_CONTAINER (renderer->main_window), 16);
//gtk_widget_set_double_buffered (renderer->video_window, FALSE);
gtk_widget_show_all (renderer->main_window);
renderer->window = gtk_widget_get_window (renderer->video_window);
gulong embed_xid = GDK_WINDOW_XID (renderer->window);
gst_video_overlay_set_window_handle (GST_VIDEO_OVERLAY (renderer->appsrc), embed_xid);
*/
return renderer;
}