all repos — mgba @ 6b12eddfba654300833e3806d83011d978480f2c

mGBA Game Boy Advance Emulator

FFmpeg: Add more presets
Vicki Pfau vi@endrift.com
Sun, 02 Feb 2020 16:46:42 -0800
commit

6b12eddfba654300833e3806d83011d978480f2c

parent

8f1c3172c8f0c87093951f8715a95abe39f1bf85

3 files changed, 42 insertions(+), 0 deletions(-)

jump to
M CHANGESCHANGES

@@ -32,6 +32,7 @@ - Qt: Fix window title not updating after shutting down game

- Qt: Fix GIF view not allowing manual filename entry - Util: Fix crash reading invalid ELFs Misc: + - FFmpeg: Add more presets - Qt: Renderer can be changed while a game is running - Qt: Fix non-SDL build (fixes mgba.io/i/1656) - Switch: Make OpenGL scale adjustable while running
M src/platform/qt/VideoView.cppsrc/platform/qt/VideoView.cpp

@@ -112,6 +112,15 @@

void VideoView::updatePresets() { m_presets.clear(); + addPreset(m_ui.preset4K, { + .container = QString(), + .vcodec = QString(), + .acodec = QString(), + .vbr = 0, + .abr = 0, + .dims = maintainAspect(QSize(3840, 2160)) + }); + addPreset(m_ui.preset1080, { .container = QString(), .vcodec = QString(),

@@ -173,6 +182,14 @@ addPreset(m_ui.presetWebM, {

.container = "WebM", .vcodec = "VP9", .acodec = "Opus", + .vbr = 800, + .abr = 128 + }); + + addPreset(m_ui.presetMP4, { + .container = "MP4", + .vcodec = "h.264", + .acodec = "AAC", .vbr = 800, .abr = 128 });
M src/platform/qt/VideoView.uisrc/platform/qt/VideoView.ui

@@ -134,6 +134,13 @@ </attribute>

</widget> </item> <item> + <widget class="QRadioButton" name="presetMP4"> + <property name="text"> + <string>MP4</string> + </property> + </widget> + </item> + <item> <widget class="QRadioButton" name="presetLossless"> <property name="text"> <string>&amp;Lossless</string>

@@ -150,6 +157,13 @@ </layout>

</item> <item> <layout class="QVBoxLayout" name="verticalLayout_3"> + <item> + <widget class="QRadioButton" name="preset4K"> + <property name="text"> + <string>4K</string> + </property> + </widget> + </item> <item> <widget class="QRadioButton" name="preset1080"> <property name="text">

@@ -289,6 +303,11 @@ <property name="text">

<string>FFV1</string> </property> </item> + <item> + <property name="text"> + <string>None</string> + </property> + </item> </widget> </item> <item>

@@ -324,6 +343,11 @@ </item>

<item> <property name="text"> <string>Uncompressed</string> + </property> + </item> + <item> + <property name="text"> + <string>None</string> </property> </item> </widget>