diff --git a/CMakeLists.txt b/CMakeLists.txt index 3263b10..9632ec4 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 3.4.1) project(AirplayServer) set (CMAKE_CXX_STANDARD 11) +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DCMAKE_BUILD_TYPE=Debug") add_subdirectory(lib/curve25519) add_subdirectory(lib/ed25519) @@ -17,5 +18,7 @@ include_directories ( renderers ${GTK_INCLUDE_DIRS} ) include_directories ( renderers ${GST_INCLUDE_DIRS} ) target_link_libraries ( AirplayServer renderers airplay ${GLIB_LDFLAGS} ${GTK_LIBRARIES} ${GST_LIBRARIES}) -install(PROGRAMS AirplayServer DESTINATION bin) +set (path CMAKE_SOURCE_DIR) + +install(PROGRAMS AirplayServer DESTINATION path/../) diff --git a/renderers/video_renderer.h b/renderers/video_renderer.h index 9fa0ff4..37fc067 100644 --- a/renderers/video_renderer.h +++ b/renderers/video_renderer.h @@ -35,6 +35,14 @@ extern "C" { #include "../lib/logger.h" #include "../lib/raop_ntp.h" +#include + +#ifdef GDK_WINDOWING_X11 +#include // for GDK_WINDOW_XID +#endif +#ifdef GDK_WINDOWING_WIN32 +#include // 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 diff --git a/renderers/video_renderer_gstreamer.c b/renderers/video_renderer_gstreamer.c index 05cc7d1..88595d3 100644 --- a/renderers/video_renderer_gstreamer.c +++ b/renderers/video_renderer_gstreamer.c @@ -29,6 +29,7 @@ #include + 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); } diff --git a/uxplay.cpp b/uxplay.cpp index 695184d..a859ea5 100755 --- a/uxplay.cpp +++ b/uxplay.cpp @@ -53,50 +53,9 @@ #define DEFAULT_HW_ADDRESS { (char) 0x48, (char) 0x5d, (char) 0x60, (char) 0x7c, (char) 0xee, (char) 0x22 } -static guintptr video_window_handle = 0; - -static GstBusSyncReply bus_sync_handler (GstBus * bus, GstMessage * message, gpointer user_data) { - // ignore anything but 'prepare-window-handle' element messages - if (!gst_is_video_overlay_prepare_window_handle_message (message)) - return GST_BUS_PASS; - - if (video_window_handle != 0) { - GstVideoOverlay *overlay; - - // GST_MESSAGE_SRC (message) will be the video sink element - overlay = GST_VIDEO_OVERLAY (GST_MESSAGE_SRC (message)); - gst_video_overlay_set_window_handle (overlay, video_window_handle); - } else { - g_warning ("Should have obtained video_window_handle by now!"); - } - - gst_message_unref (message); - return GST_BUS_DROP; -} - -static void video_widget_realize_cb (GtkWidget * widget, gpointer data) { - - printf("Hallo"); - #ifdef GDK_WINDOWING_X11 - { - gulong xid = GDK_WINDOW_XID (gtk_widget_get_window (widget)); - video_window_handle = xid; - } - #endif - #ifdef GDK_WINDOWING_WIN32 - { - HWND wnd = GDK_WINDOW_HWND (gtk_widget_get_window (widget)); - video_window_handle = (guintptr) wnd; - } - #endif -} - - - - int start_server(std::vector hw_addr, std::string name, background_mode_t background_mode, - audio_device_t audio_device, bool low_latency, bool debug_log); + audio_device_t audio_device, bool low_latency, bool debug_log, gulong embed_xid); int stop_server(); @@ -160,7 +119,6 @@ void print_info(char *name) { static void gtk_destroy (GtkWidget * widget, gpointer data) { gtk_main_quit(); } - int main(int argc, char *argv[]) { init_signals(); @@ -210,35 +168,40 @@ int main(int argc, char *argv[]) { parse_hw_addr(mac_address, server_hw_addr); } - if (start_server(server_hw_addr, server_name, background, audio_device, low_latency, debug_log) != 0) { - return 1; - } - /* + + //GTK gtk_init (&argc, &argv); - GtkWidget *video_window; - GtkWidget *app_window; + + GtkWidget *app_window, *video_window; + GdkWindow *video_window_xwindow; app_window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (app_window), "AirplayLinux"); video_window = gtk_drawing_area_new (); - g_signal_connect (video_window, "realize",G_CALLBACK (video_widget_realize_cb), NULL); + gtk_widget_set_size_request(video_window, 800, 600); g_signal_connect (video_window, "destroy",G_CALLBACK (gtk_destroy), NULL); - gtk_widget_set_double_buffered (video_window, FALSE); + //gtk_widget_set_double_buffered (video_window, FALSE); gtk_container_add (GTK_CONTAINER (app_window), video_window); gtk_widget_show_all (app_window); gtk_widget_realize (video_window); - g_assert (video_window_handle != 0); + + video_window_xwindow = gtk_widget_get_window (video_window); + gulong embed_xid = GDK_WINDOW_XID (video_window_xwindow); + if (start_server(server_hw_addr, server_name, background, audio_device, low_latency, debug_log, embed_xid) != 0) { + return 1; + } - gulong xid = GDK_WINDOW_XID (gtk_widget_get_window (video_window)); - video_window_handle = xid; + + gtk_main(); - */ - + + /* running = true; while (running) { sleep(1); } + */ LOGI("Stopping..."); stop_server(); @@ -301,8 +264,7 @@ extern "C" void log_callback(void *cls, int level, const char *msg) { } -int start_server(std::vector hw_addr, std::string name, background_mode_t background_mode, - audio_device_t audio_device, bool low_latency, bool debug_log) { +int start_server(std::vector hw_addr, std::string name, background_mode_t background_mode, audio_device_t audio_device, bool low_latency, bool debug_log, gulong embed_xid) { raop_callbacks_t raop_cbs; memset(&raop_cbs, 0, sizeof(raop_cbs)); raop_cbs.conn_init = conn_init; @@ -341,7 +303,10 @@ int start_server(std::vector hw_addr, std::string name, background_mode_t return -1; } - if (video_renderer) video_renderer_start(video_renderer); + if (video_renderer) { + set_video_overlay2(video_renderer, embed_xid); + video_renderer_start(video_renderer); + } if (audio_renderer) audio_renderer_start(audio_renderer); unsigned short port = 0;