Add video tab (#131)

This tab will allow switching scenes based on the video output of sources.
This commit is contained in:
WarmUpTill
2021-03-05 14:08:17 +01:00
committed by GitHub
parent 78e14df620
commit e4bb034303
14 changed files with 1142 additions and 31 deletions

View File

@@ -59,6 +59,7 @@ public:
void setupAudioTab();
void setupSceneGroupTab();
void setupTriggerTab();
void setupVideoTab();
void setTabOrder();
static bool DisplayMessage(QString msg, bool question = false);
@@ -82,6 +83,9 @@ public:
bool addSelect = true);
static void populateAudioSelection(QComboBox *sel,
bool addSelect = true);
static void populateVideoSelection(QComboBox *sel,
bool addScenes = true,
bool addSelect = true);
static void populateMediaSelection(QComboBox *sel,
bool addSelect = true);
static void populateProcessSelection(QComboBox *sel,
@@ -201,6 +205,12 @@ public slots:
void on_audioDown_clicked();
void on_audioFallback_toggled(bool on);
void on_videoAdd_clicked();
void on_videoRemove_clicked();
void on_videoUp_clicked();
void on_videoDown_clicked();
void on_getScreenshot_clicked();
void on_sceneGroupAdd_clicked();
void on_sceneGroupRemove_clicked();
void on_sceneGroupUp_clicked();

View File

@@ -19,6 +19,7 @@ enum class PauseTarget {
Idle,
Sequence,
Audio,
Video,
};
struct PauseEntry : SceneSwitcherEntry {

View File

@@ -0,0 +1,98 @@
#pragma once
#include <QSpinBox>
#include "switch-generic.hpp"
constexpr auto video_func = 9;
constexpr auto default_priority_9 = video_func;
enum class videoSwitchType {
MATCH,
DIFFER,
HAS_NOT_CHANGED,
};
class AdvSSScreenshotObj {
public:
AdvSSScreenshotObj(obs_source_t *source);
~AdvSSScreenshotObj();
void Screenshot();
void Download();
void Copy();
void MarkDone();
gs_texrender_t *texrender = nullptr;
gs_stagesurf_t *stagesurf = nullptr;
OBSWeakSource weakSource;
std::string path;
QImage image;
uint32_t cx = 0;
uint32_t cy = 0;
int stage = 0;
bool done = false;
std::chrono::high_resolution_clock::time_point time;
};
struct VideoSwitch : virtual SceneSwitcherEntry {
static bool pause;
videoSwitchType condition = videoSwitchType::MATCH;
OBSWeakSource videoSource = nullptr;
std::string file = obs_module_text("AdvSceneSwitcher.enterPath");
double duration = 0;
bool ignoreInactiveSource = false;
std::unique_ptr<AdvSSScreenshotObj> screenshotData = nullptr;
std::chrono::high_resolution_clock::time_point previousTime{};
QImage matchImage;
std::chrono::milliseconds currentMatchDuration{};
const char *getType() { return "video"; }
bool initialized();
bool valid();
void save(obs_data_t *obj);
void load(obs_data_t *obj);
void getScreenshot();
bool loadImageFromFile();
bool checkMatch();
VideoSwitch(){};
friend void swap(VideoSwitch &first, VideoSwitch &second);
};
class VideoSwitchWidget : public SwitchWidget {
Q_OBJECT
public:
VideoSwitchWidget(QWidget *parent, VideoSwitch *s);
VideoSwitch *getSwitchData();
void setSwitchData(VideoSwitch *s);
static void swapSwitchData(VideoSwitchWidget *as1,
VideoSwitchWidget *as2);
void UpdatePreviewTooltip();
void SetFilePath(const QString &text);
private slots:
void SourceChanged(const QString &text);
void ConditionChanged(int cond);
void DurationChanged(double dur);
void FilePathChanged();
void BrowseButtonClicked();
void IgnoreInactiveChanged(int state);
private:
QComboBox *videoSources;
QComboBox *condition;
QDoubleSpinBox *duration;
QLineEdit *filePath;
QPushButton *browseButton;
QCheckBox *ignoreInactiveSource;
VideoSwitch *switchData;
};

View File

@@ -21,6 +21,7 @@
#include "switch-transitions.hpp"
#include "switch-window.hpp"
#include "switch-sequence.hpp"
#include "switch-video.hpp"
constexpr auto default_interval = 300;
constexpr auto previous_scene_name = "Previous Scene";
@@ -113,12 +114,15 @@ struct SwitcherData {
std::deque<AudioSwitch> audioSwitches;
AudioSwitchFallback audioFallback;
std::deque<VideoSwitch> videoSwitches;
std::deque<SceneGroup> sceneGroups;
std::vector<int> functionNamesByPriority = std::vector<int>{
default_priority_0, default_priority_1, default_priority_2,
default_priority_3, default_priority_4, default_priority_5,
default_priority_6, default_priority_7, default_priority_8};
default_priority_6, default_priority_7, default_priority_8,
default_priority_9};
struct ThreadPrio {
std::string name;
@@ -164,6 +168,9 @@ struct SwitcherData {
bool prioFuncsValid();
bool tabOrderValid();
void resetTabOrder();
void writeSceneInfoToFile();
void writeToStatusFile(QString status);
@@ -193,6 +200,8 @@ struct SwitcherData {
OBSWeakSource &transition);
void checkAudioSwitchFallback(OBSWeakSource &scene,
OBSWeakSource &transition);
void checkVideoSwitch(bool &match, OBSWeakSource &scene,
OBSWeakSource &transition);
void checkNoMatchSwitch(bool &match, OBSWeakSource &scene,
OBSWeakSource &transition, int &sleep);
void checkSwitchCooldown(bool &match);
@@ -215,6 +224,7 @@ struct SwitcherData {
void saveAudioSwitches(obs_data_t *obj);
void saveSceneGroups(obs_data_t *obj);
void saveSceneTriggers(obs_data_t *obj);
void saveVideoSwitches(obs_data_t *obj);
void saveGeneralSettings(obs_data_t *obj);
void saveHotkeys(obs_data_t *obj);
void saveVersion(obs_data_t *obj, std::string currentVersion);
@@ -235,6 +245,7 @@ struct SwitcherData {
void loadAudioSwitches(obs_data_t *obj);
void loadSceneGroups(obs_data_t *obj);
void loadSceneTriggers(obs_data_t *obj);
void loadVideoSwitches(obs_data_t *obj);
void loadGeneralSettings(obs_data_t *obj);
void loadHotkeys(obs_data_t *obj);