RomanNum3ral
/
obs-streamFX
mirror of https://github.com/RomanNum3ral/obs-StreamFX.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gfx-source-texture: Formatting and refactoring

This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2018-09-28 23:31:21 +02:00
parent bc89eaf33a
commit bb5c1f80b5
2 changed files with 43 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
source/gfx-source-texture.cpp
View File

@ -17,52 +17,59 @@
#include "gfx-source-texture.h" #include "gfx-source-texture.h"
gfx::source_texture::~source_texture() { gfx::source_texture::~source_texture()
obs_source_remove_active_child(m_parent, m_source); {
if (m_source) { obs_source_remove_active_child(target, source);
obs_source_release(m_source); if (source) {
m_source = nullptr; obs_source_release(source);
source = nullptr;
} }
m_rt = nullptr; m_rt = nullptr;
} }
gfx::source_texture::source_texture(obs_source_t* parent) { gfx::source_texture::source_texture(obs_source_t* parent)
m_rt = std::make_shared<gs::rendertarget>(GS_RGBA, GS_ZS_NONE); {
m_parent = parent; m_rt = std::make_shared<gs::rendertarget>(GS_RGBA, GS_ZS_NONE);
target = parent;
} }
obs_source_t* gfx::source_texture::get_object() { obs_source_t* gfx::source_texture::get_object()
return m_source; {
return source;
} }
obs_source_t* gfx::source_texture::get_parent() { obs_source_t* gfx::source_texture::get_parent()
return m_parent; {
return target;
} }
gfx::source_texture::source_texture(const char* name, obs_source_t* parent) : source_texture(parent) { gfx::source_texture::source_texture(const char* name, obs_source_t* parent) : source_texture(parent)
m_source = obs_get_source_by_name(name); {
if (!m_source) { source = obs_get_source_by_name(name);
if (!source) {
throw std::invalid_argument("No such source."); throw std::invalid_argument("No such source.");
} }
if (!obs_source_add_active_child(m_parent, m_source)) { if (!obs_source_add_active_child(target, source)) {
throw std::runtime_error("Recursion is not allowed."); throw std::runtime_error("Recursion is not allowed.");
} }
} }
gfx::source_texture::source_texture(std::string name, obs_source_t* parent) : source_texture(name.c_str(), parent) {} gfx::source_texture::source_texture(std::string name, obs_source_t* parent) : source_texture(name.c_str(), parent) {}
gfx::source_texture::source_texture(obs_source_t* src, obs_source_t* parent) : source_texture(parent) { gfx::source_texture::source_texture(obs_source_t* src, obs_source_t* parent) : source_texture(parent)
m_source = src; {
if (!m_source) { source = src;
if (!source) {
throw std::invalid_argument("No such source."); throw std::invalid_argument("No such source.");
} }
if (!obs_source_add_active_child(m_parent, m_source)) { if (!obs_source_add_active_child(target, source)) {
throw std::runtime_error("Recursion is not allowed."); throw std::runtime_error("Recursion is not allowed.");
} }
} }
std::shared_ptr<gs::texture> gfx::source_texture::render(size_t width, size_t height) { std::shared_ptr<gs::texture> gfx::source_texture::render(size_t width, size_t height)
if (!m_source) { {
if (!source) {
throw std::invalid_argument("Missing source to render."); throw std::invalid_argument("Missing source to render.");
} }
if ((width == 0) || (width >= 16384)) { if ((width == 0) || (width >= 16384)) {
@ -74,10 +81,11 @@ std::shared_ptr<gs::texture> gfx::source_texture::render(size_t width, size_t he
{ {
auto op = m_rt->render((uint32_t)width, (uint32_t)height); auto op = m_rt->render((uint32_t)width, (uint32_t)height);
vec4 black; vec4_zero(&black); vec4 black;
vec4_zero(&black);
gs_ortho(0, (float_t)width, 0, (float_t)height, 0, 1); gs_ortho(0, (float_t)width, 0, (float_t)height, 0, 1);
gs_clear(GS_CLEAR_COLOR, &black, 0, 0); gs_clear(GS_CLEAR_COLOR, &black, 0, 0);
obs_source_video_render(m_source); obs_source_video_render(source);
} }
std::shared_ptr<gs::texture> tex; std::shared_ptr<gs::texture> tex;

17
source/gfx-source-texture.h
View File

@ -16,19 +16,24 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
#pragma once #pragma once
#include <string>
#include <obs.h>
#include <memory> #include <memory>
#include "gs-texture.h" #include <string>
#include "gs-rendertarget.h" #include "gs-rendertarget.h"
#include "gs-texture.h"
extern "C" {
#include <obs.h>
}
namespace gfx { namespace gfx {
class source_texture { class source_texture {
obs_source_t* m_source; obs_source_t* source;
obs_source_t* m_parent; obs_source_t* target;
std::shared_ptr<gs::rendertarget> m_rt; std::shared_ptr<gs::rendertarget> m_rt;
source_texture(obs_source_t* parent); source_texture(obs_source_t* parent);
public: public:
~source_texture(); ~source_texture();
source_texture(const char* name, obs_source_t* parent); source_texture(const char* name, obs_source_t* parent);
@ -40,4 +45,4 @@ namespace gfx {
std::shared_ptr<gs::texture> render(size_t width, size_t height); std::shared_ptr<gs::texture> render(size_t width, size_t height);
}; };
} } // namespace gfx