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

Cleanup headers and dependencies

Browse Source
This commit is contained in:
Bruno Herbelin
2021-11-13 00:14:05 +01:00
parent 8e3bf786c0
commit c271cad9aa
6 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ActionManager.h
View File

@@ -2,6 +2,7 @@
#define ACTIONMANAGER_H
#include <list>
#include <string>
#include <atomic>
#include <tinyxml2.h>

1
DialogToolkit.h
View File

@@ -4,7 +4,6 @@
#include <string>
#include <list>
#include <vector>
#include <thread>
#include <future>

2
Loopback.cpp
View File

@@ -17,8 +17,6 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
**/
#include <thread>
// Desktop OpenGL function loader
#include <glad/glad.h>

9
MediaPlayer.cpp
View File

@@ -17,9 +17,6 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
**/
#include <thread>
using namespace std;
// Desktop OpenGL function loader
#include <glad/glad.h>
@@ -238,7 +235,7 @@ MediaInfo MediaPlayer::UriDiscoverer(const std::string &uri)
return video_stream_info;
}
void MediaPlayer::open (const std::string & filename, const string &uri)
void MediaPlayer::open (const std::string & filename, const std::string &uri)
{
// set path
filename_ = BaseToolkit::transliterate( filename );
@@ -287,7 +284,7 @@ void MediaPlayer::execute_open()
// "uridecodebin uri=file:///path_to_file/filename.mp4 ! videoconvert ! appsink "
// equivalent to command line
// "gst-launch-1.0 uridecodebin uri=file:///path_to_file/filename.mp4 ! videoconvert ! ximagesink"
string description = "uridecodebin name=decoder uri=" + uri_ + " ! queue max-size-time=0 ! ";
std::string description = "uridecodebin name=decoder uri=" + uri_ + " ! queue max-size-time=0 ! ";
// NB: queue adds some control over the buffer, thereby limiting the frame delay. zero size means no buffering
// string description = "uridecodebin name=decoder uri=" + uri_ + " decoder. ! ";
@@ -341,7 +338,7 @@ void MediaPlayer::execute_open()
gst_pipeline_set_auto_flush_bus( GST_PIPELINE(pipeline_), true);
// GstCaps *caps = gst_static_caps_get (&frame_render_caps);
string capstring = "video/x-raw,format=RGBA,width="+ std::to_string(media_.width) +
std::string capstring = "video/x-raw,format=RGBA,width="+ std::to_string(media_.width) +
",height=" + std::to_string(media_.height);
GstCaps *caps = gst_caps_from_string(capstring.c_str());
if (!gst_video_info_from_caps (&v_frame_video_info_, caps)) {

5
SessionSource.cpp
View File

@@ -17,11 +17,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
**/
#include <glm/gtc/matrix_transform.hpp>
#include <thread>
#include <chrono>
#include <algorithm>
#include <glm/gtc/matrix_transform.hpp>
#include "defines.h"
#include "Log.h"
#include "FrameBuffer.h"

8
Stream.cpp
View File

@@ -17,10 +17,6 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
**/
#include <thread>
using namespace std;
// Desktop OpenGL function loader
#include <glad/glad.h>
@@ -127,7 +123,7 @@ void Stream::execute_open()
opened_ = false;
// Add custom app sink to the gstreamer pipeline
string description = description_;
std::string description = description_;
description += " ! appsink name=sink";
// parse pipeline descriptor
@@ -143,7 +139,7 @@ void Stream::execute_open()
gst_pipeline_set_auto_flush_bus( GST_PIPELINE(pipeline_), true);
// GstCaps *caps = gst_static_caps_get (&frame_render_caps);
string capstring = "video/x-raw,format=RGBA,width="+ std::to_string(width_) +
std::string capstring = "video/x-raw,format=RGBA,width="+ std::to_string(width_) +
",height=" + std::to_string(height_);
GstCaps *caps = gst_caps_from_string(capstring.c_str());
if (!caps || !gst_video_info_from_caps (&v_frame_video_info_, caps)) {