From 1477935f91e7c0d404b74447f40113d90a89e5ea Mon Sep 17 00:00:00 2001 From: atopilski Date: Thu, 11 May 2023 23:27:32 -0600 Subject: [PATCH] Without cairo --- src/base/gst_constants.h | 1 - src/stream/CMakeLists.txt | 3 --- src/stream/elements/element.cpp | 1 - src/stream/elements/element.h | 1 - src/stream/elements/video/video.cpp | 4 ---- src/stream/elements/video/video.h | 12 ------------ src/stream/stypes.h | 1 - 7 files changed, 23 deletions(-) diff --git a/src/base/gst_constants.h b/src/base/gst_constants.h index b9a90d7..d52a5fa 100644 --- a/src/base/gst_constants.h +++ b/src/base/gst_constants.h @@ -113,7 +113,6 @@ #define AUDIO_MIXER "audiomixer" #define INTERLEAVE "interleave" #define DEINTERLEAVE "deinterleave" -#define CAIRO_OVERLAY "cairooverlay" #define TEXT_OVERLAY "textoverlay" #define VIDEO_CROP "videocrop" #define SPECTRUM "spectrum" diff --git a/src/stream/CMakeLists.txt b/src/stream/CMakeLists.txt index 7a75895..7a42051 100644 --- a/src/stream/CMakeLists.txt +++ b/src/stream/CMakeLists.txt @@ -341,7 +341,6 @@ SET(DUMPERS_SOURCES FIND_PACKAGE(GLIB REQUIRED gobject) FIND_PACKAGE(Gstreamer 1.8.0 REQUIRED) -FIND_PACKAGE(Cairo REQUIRED) IF(OS_WINDOWS) SET(PLATFORM_HEADER) @@ -383,7 +382,6 @@ SET(CLIENT_LIBRARIES ${CLIENT_LIBRARIES} ${GLIB_LIBRARIES} ${GLIB_GOBJECT_LIBRARIES} ${GSTREAMER_LIBRARIES} ${GSTREAMER_APP_LIBRARY} ${GSTREAMER_VIDEO_LIBRARY} - ${CAIRO_LIBRARIES} ${FASTOML_LIBRARIES} ${COMMON_LIBRARIES} ${STREAMER_COMMON} @@ -399,7 +397,6 @@ SET(PRIVATE_INCLUDE_DIRECTORIES_CORE ${GSTREAMER_INCLUDE_DIR} ${GLIB_INCLUDE_DIR} ${GLIBCONFIG_INCLUDE_DIR} - ${CAIRO_INCLUDE_DIRS} ${DEPENDENS_INCLUDE_DIRS} # ${JSONC_INCLUDE_DIRS} ${COMMON_INCLUDE_DIRS} diff --git a/src/stream/elements/element.cpp b/src/stream/elements/element.cpp index ef84d73..e06665d 100644 --- a/src/stream/elements/element.cpp +++ b/src/stream/elements/element.cpp @@ -557,7 +557,6 @@ DECLARE_ELEMENT_TRAITS_SPECIALIZATION(VIDEO_MIXER) DECLARE_ELEMENT_TRAITS_SPECIALIZATION(AUDIO_MIXER) DECLARE_ELEMENT_TRAITS_SPECIALIZATION(INTERLEAVE) DECLARE_ELEMENT_TRAITS_SPECIALIZATION(DEINTERLEAVE) -DECLARE_ELEMENT_TRAITS_SPECIALIZATION(CAIRO_OVERLAY) DECLARE_ELEMENT_TRAITS_SPECIALIZATION(TEXT_OVERLAY) DECLARE_ELEMENT_TRAITS_SPECIALIZATION(VIDEO_CROP) DECLARE_ELEMENT_TRAITS_SPECIALIZATION(SPECTRUM) diff --git a/src/stream/elements/element.h b/src/stream/elements/element.h index ac39450..2816289 100644 --- a/src/stream/elements/element.h +++ b/src/stream/elements/element.h @@ -119,7 +119,6 @@ enum SupportedElements { ELEMENT_AUDIO_MIXER, ELEMENT_INTERLEAVE, ELEMENT_DEINTERLEAVE, - ELEMENT_CAIRO_OVERLAY, ELEMENT_TEXT_OVERLAY, ELEMENT_VIDEO_CROP, ELEMENT_SPECTRUM, diff --git a/src/stream/elements/video/video.cpp b/src/stream/elements/video/video.cpp index 481651f..045e67b 100644 --- a/src/stream/elements/video/video.cpp +++ b/src/stream/elements/video/video.cpp @@ -88,10 +88,6 @@ Element* make_video_deinterlace(const std::string& deinterlace, const std::strin return nullptr; } -gboolean ElementCairoOverlay::RegisterDrawCallback(draw_callback_t cb, gpointer user_data) { - return RegisterCallback("draw", G_CALLBACK(cb), user_data); -} - } // namespace video } // namespace elements } // namespace stream diff --git a/src/stream/elements/video/video.h b/src/stream/elements/video/video.h index 2488cbb..cb6921a 100644 --- a/src/stream/elements/video/video.h +++ b/src/stream/elements/video/video.h @@ -14,7 +14,6 @@ #pragma once -#include // for cairo_t #include // for string #include @@ -87,17 +86,6 @@ typedef ElementEx ElementVideoBox; typedef ElementEx ElementVideoMixer; typedef ElementEx ElementVideoCrop; -class ElementCairoOverlay : public ElementEx { - public: - typedef ElementEx base_class; - using base_class::base_class; - - typedef void ( - *draw_callback_t)(GstElement* overlay, cairo_t* cr, guint64 timestamp, guint64 duration, gpointer user_data); - - gboolean RegisterDrawCallback(draw_callback_t cb, gpointer user_data) WARN_UNUSED_RESULT; -}; - class ElementTextOverlay : public ElementEx { public: typedef ElementEx base_class; diff --git a/src/stream/stypes.h b/src/stream/stypes.h index bc4f6c2..9ffd973 100644 --- a/src/stream/stypes.h +++ b/src/stream/stypes.h @@ -45,7 +45,6 @@ #define VIDEOMIXER_NAME_1U "videomixer_%lu" #define INTERLIVE_NAME_1U "interlive_%lu" -#define CAIRO_NAME_1U "cairo_%lu" #define TEXT_OVERLAY_NAME_1U "text_%lu" #define QUEUE2_NAME_1U "queue2_%lu"