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

Added GTK

Browse Source
This commit is contained in:
julian@kiedaisch.net
2020-04-20 18:01:11 +02:00
parent 4c44ac6c7a
commit fd86607fdd
4 changed files with 56 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
renderers/video_renderer.h
View File

@@ -35,6 +35,14 @@ extern "C" {
#include "../lib/logger.h"
#include "../lib/raop_ntp.h"
#include <gtk/gtk.h>
#ifdef GDK_WINDOWING_X11
#include <gdk/gdkx.h> // for GDK_WINDOW_XID
#endif
#ifdef GDK_WINDOWING_WIN32
#include <gdk/gdkwin32.h> // for GDK_WINDOW_HWND
#endif
typedef enum background_mode_e {
BACKGROUND_MODE_ON, // Always show background
@@ -49,6 +57,7 @@ void video_renderer_start(video_renderer_t *renderer);
void video_renderer_render_buffer(video_renderer_t *renderer, raop_ntp_t *ntp, unsigned char* data, int data_len, uint64_t pts, int type);
void video_renderer_flush(video_renderer_t *renderer);
void video_renderer_destroy(video_renderer_t *renderer);
void set_video_overlay2(video_renderer_t *renderer, gulong embed_xid);
/**
* Update background according to background mode and connection activity

34
renderers/video_renderer_gstreamer.c
View File

@@ -29,6 +29,7 @@
#include <gst/video/videooverlay.h>
struct video_renderer_s {
logger_t *logger;
GstElement *appsrc, *pipeline, *sink, *decodebin, *videoconvert, *queue;
@@ -46,28 +47,23 @@ 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 ! xvimagesink name=video_sink", &error);
renderer->pipeline = gst_parse_launch("appsrc name=video_source is-live=true ! queue ! decodebin ! videoconvert ! xvimagesink name=video_sink sync=false", &error);
/*
renderer->pipeline = gst_pipeline_new(NULL);
renderer->pipeline = gst_pipeline_new("test-pipeline");
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->sink = gst_element_factory_make("xvimagesink","video_sink");
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_object_set (G_OBJECT (renderer->appsrc),
"is-live", TRUE, NULL);
g_object_set (renderer->sink, "sync", FALSE, NULL);
gst_bin_add_many(GST_BIN (renderer->pipeline), renderer->appsrc, renderer->queue, renderer->decodebin, renderer->videoconvert, renderer->sink, NULL);
gst_element_link_many (renderer->appsrc,renderer->queue, renderer->decodebin, renderer->videoconvert, renderer->sink, NULL);
*/
g_assert (renderer->pipeline);
renderer->appsrc = gst_bin_get_by_name (GST_BIN (renderer->pipeline), "video_source");
renderer->sink = gst_bin_get_by_name (GST_BIN (renderer->pipeline), "video_sink");
@@ -76,6 +72,13 @@ video_renderer_t *video_renderer_init(logger_t *logger, background_mode_t backgr
return renderer;
}
void set_video_overlay2(video_renderer_t *renderer, gulong embed_xid) {
gst_video_overlay_set_window_handle (GST_VIDEO_OVERLAY (renderer->sink), embed_xid);
}
void video_renderer_start(video_renderer_t *renderer) {
//g_signal_connect( renderer->pipeline, "deep-notify", G_CALLBACK(gst_object_default_deep_notify ), NULL );
gst_element_set_state (renderer->pipeline, GST_STATE_PLAYING);
@@ -91,6 +94,7 @@ void video_renderer_render_buffer(video_renderer_t *renderer, raop_ntp_t *ntp, u
gst_buffer_fill(buffer, 0, data, data_len);
gst_app_src_push_buffer (GST_APP_SRC(renderer->appsrc), buffer);
//gst_video_overlay_set_window_handle (GST_VIDEO_OVERLAY (renderer->sink), window_handle);
}