xaymar/obs-vfw-encoders
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
Michael Fabian Dirks
2017-03-15 17:14:30 +01:00
parent ae3cc11509
commit 9cd891b6b3
4 changed files with 63 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+8 -8
View File
@@ -8,14 +8,14 @@ SET(enc-vfw_VERSION_MAJOR 0)
SET(enc-vfw_VERSION_MINOR 1) SET(enc-vfw_VERSION_MINOR 1)
SET(enc-vfw_VERSION_PATCH 0) SET(enc-vfw_VERSION_PATCH 0)
SET(enc-vfw_VERSION_BUILD 0) SET(enc-vfw_VERSION_BUILD 0)
configure_file( #configure_file(
"${PROJECT_SOURCE_DIR}/#Resources/package.in.bat" # "${PROJECT_SOURCE_DIR}/#Resources/package.in.bat"
"${PROJECT_SOURCE_DIR}/#Resources/package.bat" # "${PROJECT_SOURCE_DIR}/#Resources/package.bat"
) #)
configure_file( #configure_file(
"${PROJECT_SOURCE_DIR}/#Resources/Installer.in.iss" # "${PROJECT_SOURCE_DIR}/#Resources/Installer.in.iss"
"${PROJECT_SOURCE_DIR}/#Resources/Installer.iss" # "${PROJECT_SOURCE_DIR}/#Resources/Installer.iss"
) #)
configure_file( configure_file(
"${PROJECT_SOURCE_DIR}/Include/Version.h.in" "${PROJECT_SOURCE_DIR}/Include/Version.h.in"
"${PROJECT_BINARY_DIR}/Include/Version.h" "${PROJECT_BINARY_DIR}/Include/Version.h"
Include/enc-vfw.h
+3 -2
View File
@@ -30,6 +30,7 @@ namespace VFW {
static const char* get_name(void* type_data); static const char* get_name(void* type_data);
static void get_defaults(obs_data_t *settings); static void get_defaults(obs_data_t *settings);
static obs_properties_t* get_properties(void *type_data, void *data);
static void* create(obs_data_t *settings, obs_encoder_t *encoder); static void* create(obs_data_t *settings, obs_encoder_t *encoder);
Encoder(obs_data_t *settings, obs_encoder_t *encoder); Encoder(obs_data_t *settings, obs_encoder_t *encoder);
@@ -40,8 +41,8 @@ namespace VFW {
static bool encode(void *data, struct encoder_frame *frame, struct encoder_packet *packet, bool *received_packet); static bool encode(void *data, struct encoder_frame *frame, struct encoder_packet *packet, bool *received_packet);
bool encode(struct encoder_frame *frame, struct encoder_packet *packet, bool *received_packet); bool encode(struct encoder_frame *frame, struct encoder_packet *packet, bool *received_packet);
static obs_properties_t* get_properties(void *data); static bool cb_configure(obs_properties_t *pr, obs_property_t *p, void *data);
obs_properties_t* get_properties(); static bool cb_about(obs_properties_t *pr, obs_property_t *p, void *data);
static bool update(void *data, obs_data_t *settings); static bool update(void *data, obs_data_t *settings);
bool update(obs_data_t* settings); bool update(obs_data_t* settings);
Include/plugin.h
+9 -1
View File
@@ -23,8 +23,16 @@
#include "Version.h" #include "Version.h"
// Logging // Logging
#define PLOG(level, ...) blog(level, __VA_ARGS__); #define PLOG(level, ...) blog(level, "[VFW] " __VA_ARGS__);
#define PLOG_ERROR(...) PLOG(LOG_ERROR, __VA_ARGS__) #define PLOG_ERROR(...) PLOG(LOG_ERROR, __VA_ARGS__)
#define PLOG_WARNING(...) PLOG(LOG_WARNING, __VA_ARGS__) #define PLOG_WARNING(...) PLOG(LOG_WARNING, __VA_ARGS__)
#define PLOG_INFO(...) PLOG(LOG_INFO, __VA_ARGS__) #define PLOG_INFO(...) PLOG(LOG_INFO, __VA_ARGS__)
#define PLOG_DEBUG(...) PLOG(LOG_DEBUG, __VA_ARGS__) #define PLOG_DEBUG(...) PLOG(LOG_DEBUG, __VA_ARGS__)
// Properties
#define PROP_BITRATE "Bitrate"
#define PROP_QUALITY "Quality"
#define PROP_KEYFRAME_INTERVAL "KeyframeInterval"
#define PROP_CONFIGURE "Configure"
#define PROP_ABOUT "About"
Source/enc-vfw.cpp
+43 -28
View File
@@ -5,7 +5,9 @@
#include <vector> #include <vector>
#include <map> #include <map>
std::map<std::string, VFW::Info> _IdToInfo; std::map<std::string, VFW::Info*> _IdToInfo;
#define snprintf sprintf_s
bool VFW::Initialize() { bool VFW::Initialize() {
// Initialize all VFW Encoders (we can only use one anyway) // Initialize all VFW Encoders (we can only use one anyway)
@@ -24,33 +26,33 @@ bool VFW::Initialize() {
snprintf(nameBuf.data(), nameBuf.size(), "%ls (" PLUGIN_NAME ")", icinfo.szDescription); snprintf(nameBuf.data(), nameBuf.size(), "%ls (" PLUGIN_NAME ")", icinfo.szDescription);
// Track // Track
VFW::Info info; VFW::Info* info = new VFW::Info();
info.Id = std::string(idBuf.data()); info->Id = std::string(idBuf.data());
info.Name = std::string(nameBuf.data()); info->Name = std::string(nameBuf.data());
info.icInfo = icinfo; info->icInfo = icinfo;
// Register // Register
std::memset(&info.obsInfo, 0, sizeof(obs_encoder_info)); std::memset(&info->obsInfo, 0, sizeof(obs_encoder_info));
info.obsInfo.id = info.Id.data(); info->obsInfo.id = info->Id.data();
info.obsInfo.type = OBS_ENCODER_VIDEO; info->obsInfo.type = OBS_ENCODER_VIDEO;
info.obsInfo.codec = "vidc"; info->obsInfo.codec = "vidc";
info.obsInfo.type_data = &info; // circular reference but whatever, it's not reference counted info->obsInfo.type_data = info; // circular reference but whatever, it's not reference counted
info.obsInfo.get_name = VFW::Encoder::get_name; info->obsInfo.get_name = VFW::Encoder::get_name;
info.obsInfo.create = VFW::Encoder::create; info->obsInfo.create = VFW::Encoder::create;
info.obsInfo.destroy = VFW::Encoder::destroy; info->obsInfo.destroy = VFW::Encoder::destroy;
info.obsInfo.encode = VFW::Encoder::encode; info->obsInfo.encode = VFW::Encoder::encode;
info.obsInfo.get_properties = VFW::Encoder::get_properties; info->obsInfo.get_properties = VFW::Encoder::get_properties;
info.obsInfo.update = VFW::Encoder::update; info->obsInfo.update = VFW::Encoder::update;
info.obsInfo.get_extra_data = VFW::Encoder::get_extra_data; info->obsInfo.get_extra_data = VFW::Encoder::get_extra_data;
info.obsInfo.get_sei_data = VFW::Encoder::get_sei_data; info->obsInfo.get_sei_data = VFW::Encoder::get_sei_data;
info.obsInfo.get_video_info = VFW::Encoder::get_video_info; info->obsInfo.get_video_info = VFW::Encoder::get_video_info;
PLOG_INFO("%s %s", PLOG_INFO("Registering: %s %s",
info.Id.data(), info->Id.data(),
info.Name.data()); info->Name.data());
obs_register_encoder(&info.obsInfo); obs_register_encoder(&info->obsInfo);
_IdToInfo.insert(std::make_pair(info.Id, info)); _IdToInfo.insert(std::make_pair(info->Id, info));
} }
ICClose(hIC); ICClose(hIC);
} }
@@ -95,16 +97,29 @@ bool VFW::Encoder::encode(struct encoder_frame *frame, struct encoder_packet *pa
return false; return false;
} }
obs_properties_t* VFW::Encoder::get_properties(void *data) { obs_properties_t* VFW::Encoder::get_properties(void *type_data, void *data) {
return static_cast<VFW::Encoder*>(data)->get_properties(); VFW::Info* info = static_cast<VFW::Info*>(type_data);
}
obs_properties_t* VFW::Encoder::get_properties() {
obs_properties_t* pr = obs_properties_create(); obs_properties_t* pr = obs_properties_create();
obs_property_t* p;
p = obs_properties_add_int(pr, PROP_BITRATE, "Bitrate", 1, 1000000, 1);
p = obs_properties_add_float(pr, PROP_QUALITY, "Quality", 1, 100, 0.01);
p = obs_properties_add_float(pr, PROP_KEYFRAME_INTERVAL, "Keyframe Interval", 0.01, 30.00, 0.01);
p = obs_properties_add_button(pr, PROP_CONFIGURE, "Configure", cb_configure);
p = obs_properties_add_button(pr, PROP_ABOUT, "Configure", cb_about);
return pr; return pr;
} }
bool VFW::Encoder::cb_configure(obs_properties_t *pr, obs_property_t *p, void *data) {
return false;
}
bool VFW::Encoder::cb_about(obs_properties_t *pr, obs_property_t *p, void *data) {
return false;
}
bool VFW::Encoder::update(void *data, obs_data_t *settings) { bool VFW::Encoder::update(void *data, obs_data_t *settings) {
return static_cast<VFW::Encoder*>(data)->update(settings); return static_cast<VFW::Encoder*>(data)->update(settings);
} }