Skip to content

S
stitchEm
Unverified Commit 600fa497 authored by Wieland Morgenstern's avatar Wieland Morgenstern Committed by GitHub
Browse files
Options

Merge pull request #95 from stitchEm/w-m/studio-disable-nvenc 

Disable NVENC output in Studio
parents 93a48ba8 307afe18
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 0 deletions
CHANGELOG.md 0 → 100644
View file @ 600fa497
### Current master
* disabled unsupported NVENC output options in VideoStitch Studio (#88)
### v2.4.0 (2020-05-03)
* initial binary release
apps/src/videostitch-studio-gui/src/centralwidget/processtab/videoprocess.cpp
View file @ 600fa497
...@@ -108,6 +108,11 @@ void VideoProcess::updateSupportedCodecs() { ...@@ -108,6 +108,11 @@ void VideoProcess::updateSupportedCodecs() {
ui->comboCodec->clear(); ui->comboCodec->clear();
QStringList codecs = currentFormat->getSupportedCodecs(); QStringList codecs = currentFormat->getSupportedCodecs();
codecs.removeOne(VideoStitch::VideoCodec::getStringFromEnum(VideoStitch::VideoCodec::VideoCodecEnum::MPEG4)); codecs.removeOne(VideoStitch::VideoCodec::getStringFromEnum(VideoStitch::VideoCodec::VideoCodecEnum::MPEG4));
// TODO: not implemented in Studio (CodecFactory, formats/codecs)
codecs.removeOne(VideoStitch::VideoCodec::getStringFromEnum(VideoStitch::VideoCodec::VideoCodecEnum::NVENC_H264));
codecs.removeOne(VideoStitch::VideoCodec::getStringFromEnum(VideoStitch::VideoCodec::VideoCodecEnum::NVENC_HEVC));
for (const QString& data : codecs) { for (const QString& data : codecs) {
const VideoStitch::VideoCodec::VideoCodecEnum codec = VideoStitch::VideoCodec::getEnumFromString(data); const VideoStitch::VideoCodec::VideoCodecEnum codec = VideoStitch::VideoCodec::getEnumFromString(data);
ui->comboCodec->addItem(VideoStitch::VideoCodec::getDisplayNameFromEnum(codec), data); ui->comboCodec->addItem(VideoStitch::VideoCodec::getDisplayNameFromEnum(codec), data);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment