Skip to content

Commit d58dbc3

Browse files
DaGooseYTDaGooseYT
authored
v1.2.0
1 parent 5d5140f commit d58dbc3

35 files changed

+2992
-491
lines changed

Diff for: ‎EncodeGUI.vcxproj

+2
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@
150150
<ClCompile Include="src\args\ratecontrol.cpp" />
151151
<ClCompile Include="src\args\resolution.cpp" />
152152
<ClCompile Include="src\args\sharpen.cpp" />
153+
<ClCompile Include="src\args\subtitleargs.cpp" />
153154
<ClCompile Include="src\args\tier.cpp" />
154155
<ClCompile Include="src\args\timecode.cpp" />
155156
<ClCompile Include="src\args\transpose.cpp" />
@@ -184,6 +185,7 @@
184185
<ClCompile Include="src\ui\preview.cpp" />
185186
<ClCompile Include="src\ui\script.cpp" />
186187
<ClCompile Include="src\ui\settings.cpp" />
188+
<ClCompile Include="src\ui\subtitles.cpp" />
187189
<ClCompile Include="src\ui\theora.cpp" />
188190
<ClCompile Include="src\ui\updater.cpp" />
189191
<ClCompile Include="src\ui\vpx.cpp" />

Diff for: ‎EncodeGUI.vcxproj.filters

+6
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,12 @@
203203
<ClCompile Include="src\ui\enviornment.cpp">
204204
<Filter>Source Files</Filter>
205205
</ClCompile>
206+
<ClCompile Include="src\args\subtitleargs.cpp">
207+
<Filter>Source Files</Filter>
208+
</ClCompile>
209+
<ClCompile Include="src\ui\subtitles.cpp">
210+
<Filter>Source Files</Filter>
211+
</ClCompile>
206212
</ItemGroup>
207213
<ItemGroup>
208214
<ClInclude Include="include\vapoursynth.hpp">

Diff for: ‎EncodeGUI.vcxproj.user

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
</SourceMap>
1111
</PropertyGroup>
1212
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release_linux|x64'">
13-
<QtLastBackgroundBuild>2023-05-06T21:16:29.8492274Z</QtLastBackgroundBuild>
13+
<QtLastBackgroundBuild>2023-07-30T18:25:40.8532871Z</QtLastBackgroundBuild>
1414
</PropertyGroup>
1515
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
16-
<QtLastBackgroundBuild>2023-05-06T21:16:29.9331130Z</QtLastBackgroundBuild>
16+
<QtLastBackgroundBuild>2023-07-30T18:25:40.9424893Z</QtLastBackgroundBuild>
1717
</PropertyGroup>
1818
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
19-
<QtLastBackgroundBuild>2023-05-06T21:16:29.8911192Z</QtLastBackgroundBuild>
19+
<QtLastBackgroundBuild>2023-07-30T18:25:40.8884966Z</QtLastBackgroundBuild>
2020
</PropertyGroup>
2121
</Project>

Diff for: ‎assets/icon.icns

379 KB
Binary file not shown.

Diff for: ‎egui_darwin.pro

+96
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
QT += core widgets gui network
2+
TEMPLATE = app
3+
TARGET = EncodeGUI
4+
DESTDIR = ./x64/Release
5+
CONFIG += ./x64/Release
6+
LIBS += -L"."
7+
DEPENDPATH += .
8+
INCLUDEPATH += ./include
9+
MOC_DIR += ./x64/Release
10+
OBJECTS_DIR += ./x64/Release
11+
RC_FILE = ./assets/EncodeGUI.rc
12+
ICON = ./assets/icon.icns
13+
HEADERS += ./include/args.hpp \
14+
./include/checks.hpp \
15+
./include/audioinfo.hpp \
16+
./include/processerror.hpp \
17+
./include/progressinfo.hpp \
18+
./include/subtitleinfo.hpp \
19+
./include/videoinfo.hpp \
20+
./include/videoinfolist.hpp \
21+
./include/mediaconfig.hpp \
22+
./include/scriptbuilder.hpp \
23+
./include/audiosubinforegex.hpp \
24+
./include/processerrorregex.hpp \
25+
./include/progressinforegex.hpp \
26+
./include/videoinforegex.hpp \
27+
./include/updater.hpp \
28+
./include/vapoursynth.hpp \
29+
./include/encodegui.hpp \
30+
./include/ffloader.hpp \
31+
./include/darwin/ui_encodegui.hpp \
32+
./include/darwin/ui_updater.hpp \
33+
./include/darwin/ui_preview.hpp
34+
SOURCES += ./src/args/audioargs.cpp \
35+
./src/args/bitrate.cpp \
36+
./src/args/chapters.cpp \
37+
./src/args/codec.cpp \
38+
./src/args/colorsargs.cpp \
39+
./src/args/entropy.cpp \
40+
./src/args/frame.cpp \
41+
./src/args/hdr.cpp \
42+
./src/args/map.cpp \
43+
./src/args/misc.cpp \
44+
./src/args/pass.cpp \
45+
./src/args/preset.cpp \
46+
./src/args/profile.cpp \
47+
./src/args/ratecontrol.cpp \
48+
./src/args/resolution.cpp \
49+
./src/args/sharpen.cpp \
50+
./src/args/subtitleargs.cpp \
51+
./src/args/tier.cpp \
52+
./src/args/timecode.cpp \
53+
./src/args/transpose.cpp \
54+
./src/args/tune.cpp \
55+
./src/args/vspipe.cpp \
56+
./src/checks/files.cpp \
57+
./src/checks/process.cpp \
58+
./src/io/audioinfo.cpp \
59+
./src/io/processError.cpp \
60+
./src/io/progressinfo.cpp \
61+
./src/io/subtitleinfo.cpp \
62+
./src/io/videoinfo.cpp \
63+
./src/io/videoinfolist.cpp \
64+
./src/process/ffloader.cpp \
65+
./src/process/mediaconfig.cpp \
66+
./src/process/processworker.cpp \
67+
./src/process/scriptbuilder.cpp \
68+
./src/regex/audiosubinforegex.cpp \
69+
./src/regex/processerrorregex.cpp \
70+
./src/regex/progressinforegex.cpp \
71+
./src/regex/videoinforegex.cpp \
72+
./src/ui/audio.cpp \
73+
./src/ui/av1.cpp \
74+
./src/ui/avc.cpp \
75+
./src/ui/config.cpp \
76+
./src/ui/enviornment.cpp \
77+
./src/ui/encodegui.cpp \
78+
./src/ui/hevc.cpp \
79+
./src/ui/jobs.cpp \
80+
./src/ui/msgbox.cpp \
81+
./src/ui/preview.cpp \
82+
./src/ui/script.cpp \
83+
./src/ui/settings.cpp \
84+
./src/ui/subtitles.cpp \
85+
./src/ui/theora.cpp \
86+
./src/ui/updater.cpp \
87+
./src/ui/vpx.cpp \
88+
./src/ui/vs.cpp \
89+
./src/vs/colors.cpp \
90+
./src/vs/rife.cpp \
91+
./src/vs/srmd.cpp \
92+
./src/vs/waifu2x.cpp \
93+
./src/vs/svpflow.cpp \
94+
./src/vs/vapoursynth.cpp \
95+
./src/main.cpp
96+
RESOURCES += ./assets/EncodeGUI.qrc

Diff for: ‎src/args/audioargs.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/// </summary>
66
/// <param name="rate">The sample rate of the audio.</param>
77
/// <returns>String representation of the argument.</returns>
8-
QString Argument::audioRate(QString rate, QString stream) {
8+
QString Argument::audioRate(QString rate, int stream) {
99
return(QString("-ar:%1 %2").arg(stream).arg(rate));
1010
}
1111

@@ -14,7 +14,7 @@ QString Argument::audioRate(QString rate, QString stream) {
1414
/// </summary>
1515
/// <param name="stream">Stream number</param>
1616
/// <returns>String representation of the argument.</returns>
17-
QString Argument::audioMetadata(QString stream) {
17+
QString Argument::audioMetadata(int stream) {
1818
return(QString("-metadata:s:a:%1").arg(stream));
1919
}
2020

@@ -25,7 +25,7 @@ QString Argument::audioMetadata(QString stream) {
2525
/// <param name="title">The contents to be added to the title.</param>
2626
/// <returns>String representation of the argument.</returns>
2727
QString Argument::audioTitle(QString title) {
28-
return(QString("title=\"%2\"").arg(title));
28+
return(QString("title=%2").arg(title));
2929
}
3030

3131
/// <summary>
@@ -43,7 +43,7 @@ QString Argument::audioLang(QString lang) {
4343
/// </summary>
4444
/// <param name="channels">The number of audio channels</param>
4545
/// <returns>String representation of the argument.</returns>
46-
QString Argument::audioChannels(QString channels, QString stream) {
46+
QString Argument::audioChannels(QString channels, int stream) {
4747
return(QString("-ac:%1 %2").arg(stream).arg(channels));
4848
}
4949

Diff for: ‎src/args/bitrate.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ QString Argument::videoBitrate(int bitrate) {
1414
/// </summary>
1515
/// <param name="bitrate">The bitrate value.</param>
1616
/// <returns>String representation of the argument.</returns>
17-
QString Argument::audioBitrate(int bitrate, QString stream) {
17+
QString Argument::audioBitrate(int bitrate, int stream) {
1818
return(QString("-b:a:%1 %2k").arg(stream).arg(bitrate));
1919
}
2020

Diff for: ‎src/args/codec.cpp

+12-2
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,25 @@ QString Argument::subtitleCodec(QString codec) {
2828
}
2929

3030
/// <summary>
31-
/// Verbatim to AudioCodec, but adds stream specifier.
31+
/// Verbatim to audioCodec(), but adds stream specifier.
3232
/// </summary>
3333
/// <param name="codec">The codec to use.</param>
3434
/// <param name="stream">The stream number to use.</param>
3535
/// <returns>String representation of the argument.</returns>
36-
QString Argument::audioCodecMulti(QString codec, QString stream) {
36+
QString Argument::audioCodecMulti(QString codec, int stream) {
3737
return(QString("-c:a:%1 %2").arg(stream).arg(codec));
3838
}
3939

40+
/// <summary>
41+
/// Verbatim to subtitleCodec(), but adds stream specifier.
42+
/// </summary>
43+
/// <param name="codec">The codec to use.</param>
44+
/// <param name="stream">The stream number to use.</param>
45+
/// <returns>String representation of the argument.</returns>
46+
QString Argument::subtitleCodecMulti(QString codec, int stream) {
47+
return(QString("-c:s:%1 %2").arg(stream).arg(codec));
48+
}
49+
4050
/// <summary>
4151
/// Enables the x265 additional parameters.
4252
/// </summary>

Diff for: ‎src/args/map.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
/// <param name="s1">Stream 1 selection.</param>
88
/// <param name="s2">Stream 2 selection.</param>
99
/// <returns>String representation of the argument.</returns>
10-
QString Argument::mapVideo(QString type, QString s1, int s2) {
10+
QString Argument::mapVideo(QString type, int s1, int s2) {
1111
return(QString("-map %1:%2:%3").arg(s1).arg(type).arg(s2));
1212
}
1313

@@ -36,6 +36,6 @@ QString Argument::mapSingle(QString type) {
3636
/// <param name="type">The stream type to target.</param>
3737
/// <param name="s1">Stream one identifier.</param>
3838
/// <returns>String representation of the argument.</returns>
39-
QString Argument::mapAll(QString type, QString s1) {
40-
return(QString("-map %1:%2").arg(s1).arg(type));
39+
QString Argument::mapAll(QString type, int s1) {
40+
return(QString("-map %1:%2?").arg(s1).arg(type));
4141
}

Diff for: ‎src/args/misc.cpp

+8-3
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ QString Argument::passLogFile() {
4242
}
4343

4444
/// <summary>
45-
///
45+
/// Sets VP9 encoder to use all CPU threads.
4646
/// </summary>
4747
/// <returns>String representation of the argument.</returns>
4848
QString Argument::allThreads() {
@@ -79,7 +79,12 @@ QString Argument::deinterlace() {
7979
/// <param name="path">Tempfile path.</param>
8080
/// <returns>String representation of the argument.</returns>
8181
QString Argument::statsFile(QString path) {
82+
#ifdef Q_OS_WINDOWS
8283
return(QString("pass=1:stats='%2\\x265.log'").arg(path));
84+
#endif
85+
#ifdef Q_OS_DARWIN
86+
return(QString("pass=1:stats='%2/x265.log'").arg(path));
87+
#endif
8388
}
8489

8590
/// <summary>
@@ -118,7 +123,7 @@ QString Argument::nullPath() {
118123
/// Writes string metadata to the video file.
119124
/// </summary>
120125
/// <returns>String representation of the argument.</returns>
121-
QString Argument::metaData1() {
126+
QString Argument::videoMetadata() {
122127
return(QString("-metadata:g"));
123128
}
124129

@@ -127,6 +132,6 @@ QString Argument::metaData1() {
127132
/// </summary>
128133
/// <param name="str">The string to write.</param>
129134
/// <returns>String representation of the argument.</returns>
130-
QString Argument::metaData2(QString str) {
135+
QString Argument::encoder(QString str) {
131136
return(QString("encoding_tool=%1").arg(str));
132137
}

Diff for: ‎src/args/ratecontrol.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ QString Argument::constantVideoQuality(int quality) {
1414
/// </summary>
1515
/// <param name="quality">The quality level of the audio.</param>
1616
/// <returns>String representation of the argument.</returns>
17-
QString Argument::constantAudioQuality(int quality, QString stream) {
17+
QString Argument::constantAudioQuality(int quality, int stream) {
1818
return(QString("-q:a:%1 %2").arg(stream).arg(quality));
1919
}
2020

Diff for: ‎src/args/subtitleargs.cpp

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#include "args.hpp"
2+
3+
/// <summary>
4+
/// Sets the metadata for subtitle streams.
5+
/// </summary>
6+
/// <param name="stream">Stream number</param>
7+
/// <returns>String representation of the argument.</returns>
8+
QString Argument::subtitleMetadata(int stream) {
9+
return(QString("-metadata:s:s:%1").arg(stream));
10+
}
11+
12+
/// <summary>
13+
/// Sets the subtitle title for a specific audio stream.
14+
/// </summary>
15+
/// <param name="stream">The stream file specifier.</param>
16+
/// <param name="title">The contents to be added to the title.</param>
17+
/// <returns>String representation of the argument.</returns>
18+
QString Argument::subtitleTitle(QString title) {
19+
return(QString("title=%2").arg(title));
20+
}
21+
22+
/// <summary>
23+
/// Sets the subtitle language for a specific audio stream.
24+
/// </summary>
25+
/// <param name="stream">The stream file specifier.</param>
26+
/// <param name="lang">The language.</param>
27+
/// <returns>String representation of the argument.</returns>
28+
QString Argument::subtitleLang(QString lang) {
29+
return(QString("language=%2").arg(lang));
30+
}

Diff for: ‎src/checks/process.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,13 @@ bool Checks::checkAudioCompatability(int format, QString container) {
127127
bool Checks::checkSubtitleCompatability(QString format, QString container) {
128128
bool result = false;
129129

130-
if ((format.contains(QString("subrip")) || format.contains(QString("srt"))) && container.contains(QString(".mkv")))
130+
if ((format.contains(QString("SRT")) || format.contains(QString("srt"))) && container.contains(QString(".mkv")))
131131
result = true;
132-
if (format.contains(QString("webvtt")) && container.contains(QString(".mkv")) || container.contains(QString(".webm")))
132+
if (format.contains(QString("WebVTT")) && container.contains(QString(".mkv")) || container.contains(QString(".webm")))
133133
result = true;
134-
if ((format.contains(QString("ass")) || format.contains(QString("ssa"))) && container.contains(QString(".mkv")))
134+
if ((format.contains(QString("ASS")) || format.contains(QString("ssa"))) && container.contains(QString(".mkv")))
135135
result = true;
136-
if (format.contains(QString("mov_text")) && (container.contains(QString(".mp4")) || container.contains(QString(".mov")) || container.contains(QString(".3gp"))))
136+
if (format.contains(QString("TXTT")) && (container.contains(QString(".mp4")) || container.contains(QString(".mov")) || container.contains(QString(".3gp"))))
137137
result = true;
138138

139139
return(result);

Diff for: ‎src/io/processerror.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -271,14 +271,6 @@ bool ProcessError::getVkQueueError() {
271271
return(_vkQueueError);
272272
}
273273

274-
/// <summary>
275-
/// Receives the out of VRAM error.
276-
/// </summary>
277-
/// <returns>True or false.</returns>
278-
bool ProcessError::getVramError() {
279-
return(_vram);
280-
}
281-
282274
/// <summary>
283275
/// Receives the probe size warning.
284276
/// </summary>
@@ -343,6 +335,14 @@ bool ProcessError::getInvalidGpuError() {
343335
return(_invalidGpu);
344336
}
345337

338+
/// <summary>
339+
/// Receives the out of VRAM error.
340+
/// </summary>
341+
/// <returns>True or false.</returns>
342+
bool ProcessError::getVramError() {
343+
return(_vram);
344+
}
345+
346346
/// <summary>
347347
/// Receives the minimum number of threads allowed.
348348
/// </summary>

0 commit comments

Comments
 (0)