eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-17 13:19:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup compilation

Browse Source
This commit is contained in:
Bruno Herbelin
2023-05-30 15:07:43 +02:00
parent 22aba74ed9
commit 4b7db87444
4 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Decorations.cpp
View File

@@ -21,14 +21,9 @@
#include <glm/gtx/vector_angle.hpp> #include <glm/gtx/vector_angle.hpp>
#include <glm/gtx/component_wise.hpp> #include <glm/gtx/component_wise.hpp>
#include "Decorations.h"
#include "Visitor.h" #include "Visitor.h"
#include "BoundingBoxVisitor.h"
#include "ImageShader.h"
#include "GlmToolkit.h" #include "GlmToolkit.h"
#include "Resource.h" #include "Decorations.h"
#include "Log.h"
#include "imgui.h" #include "imgui.h"
#include <glad/glad.h> #include <glad/glad.h>

1
src/NetworkSource.cpp
View File

@@ -30,7 +30,6 @@
#include "osc/OscOutboundPacketStream.h" #include "osc/OscOutboundPacketStream.h"
#include "SystemToolkit.h" #include "SystemToolkit.h"
#include "defines.h"
#include "Stream.h" #include "Stream.h"
#include "Decorations.h" #include "Decorations.h"
#include "Visitor.h" #include "Visitor.h"

12
src/NetworkToolkit.h
View File

@@ -49,18 +49,6 @@ struct StreamConfig {
width = 0; width = 0;
height = 0; height = 0;
} }
inline StreamConfig& operator = (const StreamConfig& o) {
if (this != &o) {
this->client_name = o.client_name;
this->client_address = o.client_address;
this->port = o.port;
this->protocol = o.protocol;
this->width = o.width;
this->height = o.height;
}
return *this;
}
}; };
//typedef enum { //typedef enum {

11
src/Streamer.cpp
View File

@@ -21,6 +21,7 @@
#include <sstream> #include <sstream>
#include <iostream> #include <iostream>
#include <cstring> #include <cstring>
#include <algorithm>
// Desktop OpenGL function loader // Desktop OpenGL function loader
#include <glad/glad.h> #include <glad/glad.h>
@@ -37,7 +38,6 @@
#include "Settings.h" #include "Settings.h"
#include "GstToolkit.h" #include "GstToolkit.h"
#include "SystemToolkit.h" #include "SystemToolkit.h"
#include "Session.h"
#include "Log.h" #include "Log.h"
#include "Connection.h" #include "Connection.h"
#include "NetworkToolkit.h" #include "NetworkToolkit.h"
@@ -48,6 +48,15 @@
#define STREAMER_DEBUG #define STREAMER_DEBUG
#endif #endif
/// oscsend 127.0.0.1 71510 /vimix/request is 9000 "vimixclient"
/// oscdump -L 9000 | xargs -L1 -P1 sh -c 'gst-launch-1.0 udpsrc port=$3 caps="application/x-rtp,media=(string)video,encoding-name=(string)RAW,sampling=(string)RGB,width=(string)$5,height=(string)$6" ! rtpvrawdepay ! queue max-size-buffers=10 ! videoconvert ! autovideosink'
/// oscsend 127.0.0.1 71510 /vimix/request is 9000 "h264"
/// oscdump -L 9000 | xargs -L1 -P1 sh -c 'gst-launch-1.0 udpsrc port=$3 caps="application/x-rtp,media=(string)video,encoding-name=(string)H264" ! rtph264depay ! queue ! decodebin ! videoconvert ! autovideosink'
/// oscsend 127.0.0.1 71510 /vimix/request is 9000 "jpeg"
/// oscdump -L 9000 | xargs -L1 -P1 sh -c 'gst-launch-1.0 udpsrc port=$3 caps="application/x-rtp,media=(string)video,encoding-name=(string)JPEG" ! rtpjpegdepay ! queue ! decodebin ! videoconvert ! autovideosink'
void Streaming::RequestListener::ProcessMessage( const osc::ReceivedMessage& m, void Streaming::RequestListener::ProcessMessage( const osc::ReceivedMessage& m,
const IpEndpointName& remoteEndpoint ) const IpEndpointName& remoteEndpoint )
{ {