external/fastocloud
1
0
Fork 0
mirror of https://github.com/fastogt/fastocloud.git synced 2025-03-09 23:18:50 +00:00
Code Issues Releases Wiki Activity

Without cairo

Browse source
This commit is contained in:
atopilski 2023-05-11 23:27:32 -06:00
parent 38f2cbcc46
commit 1477935f91
7 changed files with 0 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/base/gst_constants.h
View file

@ -113,7 +113,6 @@
#define AUDIO_MIXER "audiomixer" #define AUDIO_MIXER "audiomixer"
#define INTERLEAVE "interleave" #define INTERLEAVE "interleave"
#define DEINTERLEAVE "deinterleave" #define DEINTERLEAVE "deinterleave"
#define CAIRO_OVERLAY "cairooverlay"
#define TEXT_OVERLAY "textoverlay" #define TEXT_OVERLAY "textoverlay"
#define VIDEO_CROP "videocrop" #define VIDEO_CROP "videocrop"
#define SPECTRUM "spectrum" #define SPECTRUM "spectrum"

3
src/stream/CMakeLists.txt
View file

@ -341,7 +341,6 @@ SET(DUMPERS_SOURCES
FIND_PACKAGE(GLIB REQUIRED gobject) FIND_PACKAGE(GLIB REQUIRED gobject)
FIND_PACKAGE(Gstreamer 1.8.0 REQUIRED) FIND_PACKAGE(Gstreamer 1.8.0 REQUIRED)
FIND_PACKAGE(Cairo REQUIRED)
IF(OS_WINDOWS) IF(OS_WINDOWS)
SET(PLATFORM_HEADER) SET(PLATFORM_HEADER)
@ -383,7 +382,6 @@ SET(CLIENT_LIBRARIES
${CLIENT_LIBRARIES} ${CLIENT_LIBRARIES}
${GLIB_LIBRARIES} ${GLIB_GOBJECT_LIBRARIES} ${GLIB_LIBRARIES} ${GLIB_GOBJECT_LIBRARIES}
${GSTREAMER_LIBRARIES} ${GSTREAMER_APP_LIBRARY} ${GSTREAMER_VIDEO_LIBRARY} ${GSTREAMER_LIBRARIES} ${GSTREAMER_APP_LIBRARY} ${GSTREAMER_VIDEO_LIBRARY}
${CAIRO_LIBRARIES}
${FASTOML_LIBRARIES} ${FASTOML_LIBRARIES}
${COMMON_LIBRARIES} ${COMMON_LIBRARIES}
${STREAMER_COMMON} ${STREAMER_COMMON}
@ -399,7 +397,6 @@ SET(PRIVATE_INCLUDE_DIRECTORIES_CORE
${GSTREAMER_INCLUDE_DIR} ${GSTREAMER_INCLUDE_DIR}
${GLIB_INCLUDE_DIR} ${GLIB_INCLUDE_DIR}
${GLIBCONFIG_INCLUDE_DIR} ${GLIBCONFIG_INCLUDE_DIR}
${CAIRO_INCLUDE_DIRS}
${DEPENDENS_INCLUDE_DIRS} ${DEPENDENS_INCLUDE_DIRS}
# ${JSONC_INCLUDE_DIRS} # ${JSONC_INCLUDE_DIRS}
${COMMON_INCLUDE_DIRS} ${COMMON_INCLUDE_DIRS}

1
src/stream/elements/element.cpp
View file

@ -557,7 +557,6 @@ DECLARE_ELEMENT_TRAITS_SPECIALIZATION(VIDEO_MIXER)
DECLARE_ELEMENT_TRAITS_SPECIALIZATION(AUDIO_MIXER) DECLARE_ELEMENT_TRAITS_SPECIALIZATION(AUDIO_MIXER)
DECLARE_ELEMENT_TRAITS_SPECIALIZATION(INTERLEAVE) DECLARE_ELEMENT_TRAITS_SPECIALIZATION(INTERLEAVE)
DECLARE_ELEMENT_TRAITS_SPECIALIZATION(DEINTERLEAVE) DECLARE_ELEMENT_TRAITS_SPECIALIZATION(DEINTERLEAVE)
DECLARE_ELEMENT_TRAITS_SPECIALIZATION(CAIRO_OVERLAY)
DECLARE_ELEMENT_TRAITS_SPECIALIZATION(TEXT_OVERLAY) DECLARE_ELEMENT_TRAITS_SPECIALIZATION(TEXT_OVERLAY)
DECLARE_ELEMENT_TRAITS_SPECIALIZATION(VIDEO_CROP) DECLARE_ELEMENT_TRAITS_SPECIALIZATION(VIDEO_CROP)
DECLARE_ELEMENT_TRAITS_SPECIALIZATION(SPECTRUM) DECLARE_ELEMENT_TRAITS_SPECIALIZATION(SPECTRUM)

1
src/stream/elements/element.h
View file

@ -119,7 +119,6 @@ enum SupportedElements {
ELEMENT_AUDIO_MIXER, ELEMENT_AUDIO_MIXER,
ELEMENT_INTERLEAVE, ELEMENT_INTERLEAVE,
ELEMENT_DEINTERLEAVE, ELEMENT_DEINTERLEAVE,
ELEMENT_CAIRO_OVERLAY,
ELEMENT_TEXT_OVERLAY, ELEMENT_TEXT_OVERLAY,
ELEMENT_VIDEO_CROP, ELEMENT_VIDEO_CROP,
ELEMENT_SPECTRUM, ELEMENT_SPECTRUM,

4
src/stream/elements/video/video.cpp
View file

@ -88,10 +88,6 @@ Element* make_video_deinterlace(const std::string& deinterlace, const std::strin
return nullptr; return nullptr;
} }
gboolean ElementCairoOverlay::RegisterDrawCallback(draw_callback_t cb, gpointer user_data) {
return RegisterCallback("draw", G_CALLBACK(cb), user_data);
}
} // namespace video } // namespace video
} // namespace elements } // namespace elements
} // namespace stream } // namespace stream

12
src/stream/elements/video/video.h
View file

@ -14,7 +14,6 @@
#pragma once #pragma once
#include <cairo.h> // for cairo_t
#include <string> // for string #include <string> // for string
#include <common/media/types.h> #include <common/media/types.h>
@ -87,17 +86,6 @@ typedef ElementEx<ELEMENT_VIDEO_BOX> ElementVideoBox;
typedef ElementEx<ELEMENT_VIDEO_MIXER> ElementVideoMixer; typedef ElementEx<ELEMENT_VIDEO_MIXER> ElementVideoMixer;
typedef ElementEx<ELEMENT_VIDEO_CROP> ElementVideoCrop; typedef ElementEx<ELEMENT_VIDEO_CROP> ElementVideoCrop;
class ElementCairoOverlay : public ElementEx<ELEMENT_CAIRO_OVERLAY> {
public:
typedef ElementEx<ELEMENT_CAIRO_OVERLAY> 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<ELEMENT_TEXT_OVERLAY> { class ElementTextOverlay : public ElementEx<ELEMENT_TEXT_OVERLAY> {
public: public:
typedef ElementEx<ELEMENT_TEXT_OVERLAY> base_class; typedef ElementEx<ELEMENT_TEXT_OVERLAY> base_class;

1
src/stream/stypes.h
View file

@ -45,7 +45,6 @@
#define VIDEOMIXER_NAME_1U "videomixer_%lu" #define VIDEOMIXER_NAME_1U "videomixer_%lu"
#define INTERLIVE_NAME_1U "interlive_%lu" #define INTERLIVE_NAME_1U "interlive_%lu"
#define CAIRO_NAME_1U "cairo_%lu"
#define TEXT_OVERLAY_NAME_1U "text_%lu" #define TEXT_OVERLAY_NAME_1U "text_%lu"
#define QUEUE2_NAME_1U "queue2_%lu" #define QUEUE2_NAME_1U "queue2_%lu"