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

Allow Aplpha channel for Bundle (Session Group Source)

Browse Source
This commit is contained in:
Bruno Herbelin
2023-03-12 15:06:50 +01:00
parent bc5e1c7df9
commit 731d7e5d6b
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/InfoVisitor.cpp
View File

@@ -181,14 +181,15 @@ void InfoVisitor::visit (SessionGroupSource& s)
uint T = s.session()->numSources(); uint T = s.session()->numSources();
if (T>N) if (T>N)
oss << " (" << std::to_string(T) << " total)"; oss << " (" << std::to_string(T) << " total)";
oss << std::endl;
if (s.session()->frame()){ if (s.session()->frame()){
if (brief_) { if (brief_) {
oss << ", RGB, " << s.session()->frame()->width() << " x " << s.session()->frame()->height(); oss << (s.session()->frame()->flags() & FrameBuffer::FrameBuffer_alpha ? "RGBA, " : "RGB, ");
oss << s.session()->frame()->width() << " x " << s.session()->frame()->height();
} }
else { else {
oss << std::endl; oss << (s.session()->frame()->flags() & FrameBuffer::FrameBuffer_alpha ? "RGBA" : "RGB") << std::endl;
oss << "RGB" << std::endl;
oss << s.session()->frame()->width() << " x " << s.session()->frame()->height(); oss << s.session()->frame()->width() << " x " << s.session()->frame()->height();
} }
} }

10
src/SessionSource.cpp
View File

@@ -24,14 +24,10 @@
#include "defines.h" #include "defines.h"
#include "Log.h" #include "Log.h"
#include "FrameBuffer.h" #include "FrameBuffer.h"
#include "ImageShader.h"
#include "ImageProcessingShader.h"
#include "Resource.h" #include "Resource.h"
#include "Decorations.h" #include "Decorations.h"
#include "SearchVisitor.h" #include "Visitor.h"
#include "Session.h" #include "Session.h"
#include "SessionCreator.h"
#include "Mixer.h"
#include "SessionSource.h" #include "SessionSource.h"
@@ -377,7 +373,7 @@ void SessionGroupSource::init()
if ( resolution_.x > 0.f && resolution_.y > 0.f ) { if ( resolution_.x > 0.f && resolution_.y > 0.f ) {
// valid resolution given to create render view // valid resolution given to create render view
session_->setResolution( resolution_ ); session_->setResolution( resolution_, true );
// deep update to make sure reordering of sources // deep update to make sure reordering of sources
++View::need_deep_update_; ++View::need_deep_update_;
@@ -389,7 +385,7 @@ void SessionGroupSource::init()
texturesurface_->setTextureIndex( session_->frame()->texture() ); texturesurface_->setTextureIndex( session_->frame()->texture() );
// create Frame buffer matching size of session // create Frame buffer matching size of session
FrameBuffer *renderbuffer = new FrameBuffer( session_->frame()->resolution() ); FrameBuffer *renderbuffer = new FrameBuffer( session_->frame()->resolution(), FrameBuffer::FrameBuffer_alpha );
// set the renderbuffer of the source and attach rendering nodes // set the renderbuffer of the source and attach rendering nodes
attach(renderbuffer); attach(renderbuffer);