xaymar/obs-ffmpeg-encoder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 14 Wiki Activity

encoder: Set unique Id to actual encoder name and add unsupported tag

Browse Source
This commit is contained in:
Michael Fabian 'Xaymar' Dirks
2019-07-25 02:41:15 +02:00
parent 8b2fafbbd1
commit fbf5ffb921
1 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/encoder.cpp
+18 -19
View File
@@ -54,29 +54,20 @@ extern "C" {
enum class keyframe_type { Seconds, Frames }; enum class keyframe_type { Seconds, Frames };
obsffmpeg::encoder_factory::encoder_factory(AVCodec* codec) : avcodec_ptr(codec), info() {} obsffmpeg::encoder_factory::encoder_factory(AVCodec* codec) : avcodec_ptr(codec), info()
obsffmpeg::encoder_factory::~encoder_factory() {}
void obsffmpeg::encoder_factory::register_encoder()
{ {
// Generate unique name from given Id // Unique Id is FFmpeg name.
{ this->info.uid = avcodec_ptr->name;
std::stringstream sstr;
sstr << "ffmpeg-" << avcodec_ptr->name << "-0x" << std::uppercase << std::setfill('0') << std::setw(8)
<< std::hex << avcodec_ptr->capabilities;
this->info.uid = sstr.str();
}
// Also generate a human readable name while we're at it. // Also generate a human readable name while we're at it.
// TODO: Figure out a way to translate from names to other names.
{ {
std::stringstream sstr; std::stringstream sstr;
sstr << (avcodec_ptr->long_name ? avcodec_ptr->long_name : avcodec_ptr->name) << " (" if (!obsffmpeg::has_codec_handler(avcodec_ptr->name)) {
<< avcodec_ptr->name << ")"; sstr << "[UNSUPPORTED] ";
std::string caps = ffmpeg::tools::translate_encoder_capabilities(avcodec_ptr->capabilities); }
if (caps.length() != 0) { sstr << (avcodec_ptr->long_name ? avcodec_ptr->long_name : avcodec_ptr->name);
sstr << " [" << caps << "]"; if (avcodec_ptr->long_name) {
sstr << " (" << avcodec_ptr->name << ")";
} }
this->info.readable_name = sstr.str(); this->info.readable_name = sstr.str();
@@ -91,19 +82,27 @@ void obsffmpeg::encoder_factory::register_encoder()
if (desc) { if (desc) {
this->info.codec = desc->name; this->info.codec = desc->name;
} else { } else {
// Fall back to encoder name in the case that FFmpeg itself doesn't know
// what codec this actually is.
this->info.codec = avcodec_ptr->name; this->info.codec = avcodec_ptr->name;
} }
} }
this->info.oei.id = this->info.uid.c_str(); this->info.oei.id = this->info.uid.c_str();
this->info.oei.codec = this->info.codec.c_str(); this->info.oei.codec = this->info.codec.c_str();
// Is this a deprecated encoder?
#ifndef _DEBUG #ifndef _DEBUG
// Is this a deprecated encoder?
if (!obsffmpeg::has_codec_handler(avcodec_ptr->name)) { if (!obsffmpeg::has_codec_handler(avcodec_ptr->name)) {
this->info.oei.caps |= OBS_ENCODER_CAP_DEPRECATED; this->info.oei.caps |= OBS_ENCODER_CAP_DEPRECATED;
} }
#endif #endif
}
obsffmpeg::encoder_factory::~encoder_factory() {}
void obsffmpeg::encoder_factory::register_encoder()
{
// Detect encoder type (only Video and Audio supported) // Detect encoder type (only Video and Audio supported)
if (avcodec_ptr->type == AVMediaType::AVMEDIA_TYPE_VIDEO) { if (avcodec_ptr->type == AVMediaType::AVMEDIA_TYPE_VIDEO) {
this->info.oei.type = obs_encoder_type::OBS_ENCODER_VIDEO; this->info.oei.type = obs_encoder_type::OBS_ENCODER_VIDEO;