all repos — mgba @ e838c4fb0e1a585ec925d8d04d13ec33d09e55b3

mGBA Game Boy Advance Emulator

Qt: Add HEVC and NVENC to video formats
Vicki Pfau vi@endrift.com
Sun, 26 Mar 2017 12:24:45 -0700
commit

e838c4fb0e1a585ec925d8d04d13ec33d09e55b3

parent

aff1486ec5fe3185de59d20665c4042b715853ae

2 files changed, 11 insertions(+), 2 deletions(-)

jump to
M src/platform/qt/VideoView.cppsrc/platform/qt/VideoView.cpp

@@ -63,7 +63,9 @@ }

if (s_vcodecMap.empty()) { s_vcodecMap["dirac"] = "libschroedinger"; s_vcodecMap["h264"] = "libx264"; + s_vcodecMap["h264 nvenc"] = "h264_nvenc"; s_vcodecMap["hevc"] = "libx265"; + s_vcodecMap["hevc nvenc"] = "hevc_nvenc"; s_vcodecMap["theora"] = "libtheora"; s_vcodecMap["vp8"] = "libvpx"; s_vcodecMap["vp9"] = "libvpx-vp9";

@@ -458,6 +460,8 @@

QString VideoView::sanitizeCodec(const QString& codec, const QMap<QString, QString>& mapping) { QString sanitized = codec.toLower(); sanitized = sanitized.remove(QChar('.')); + sanitized = sanitized.remove(QChar('(')); + sanitized = sanitized.remove(QChar(')')); if (mapping.contains(sanitized)) { sanitized = mapping[sanitized]; }
M src/platform/qt/VideoView.uisrc/platform/qt/VideoView.ui

@@ -266,12 +266,17 @@ </property>

</item> <item> <property name="text"> - <string>VP8</string> + <string>h.264 (NVENC)</string> + </property> + </item> + <item> + <property name="text"> + <string>HEVC</string> </property> </item> <item> <property name="text"> - <string>Xvid</string> + <string>VP8</string> </property> </item> <item>