Skip to content

Commit 1ce975c

Browse files
authored
v1.1.7
1 parent d380e31 commit 1ce975c

19 files changed

+722
-633
lines changed

include/args.hpp

Lines changed: 69 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -7,64 +7,76 @@
77

88
class Argument {
99
protected:
10-
static QString AudioRate(QString, QString);
11-
static QString AudioChannels(QString, QString);
12-
static QString VideoCodec(QString);
13-
static QString AudioCodec(QString);
14-
static QString AudioCodecMulti(QString, QString);
10+
static QString audioRate(QString rate, QString stream);
11+
static QString audioChannels(QString channels, QString stream);
12+
static QString videoCodec(QString codec);
13+
static QString audioCodec(QString codec);
14+
static QString subtitleCodec(QString codec);
15+
static QString mapChapters();
16+
static QString audioCodecMulti(QString codec, QString stream);
1517
static QString x265Params();
16-
static QString Threads(int);
17-
static QString Colors(QString, QString, QString);
18-
static QString Crop(int, int, int, int);
19-
static QString EntropyCoding(int);
20-
static QString BFrame(int);
21-
static QString ReferenceFrame(int);
22-
static QString MasterDisplay(QString);
23-
static QString HDR10Opt();
24-
static QString Deinterlace();
25-
static QString DeinterlaceCUDA();
26-
static QString Colors(QString, QString, QString, QString);
27-
static QString MaxCllFall(int, int);
28-
static QString HDRPlus(QString);
29-
static QString DBVisionProfile(QString);
30-
static QString DBVisionRPU(QString);
31-
static QString MapVideo(QString, QString, int);
32-
static QString MapMux(QString, int);
33-
static QString MapAll(QString, QString);
34-
static QString DownMix(double);
35-
static QString PixelFormat(QString);
36-
static QString Pass(int);
37-
static QString VideoPreset(QString);
38-
static QString VideoProfile(QString);
39-
static QString VideoProfileLevel(QString);
40-
static QString VideoBitrate(int);
41-
static QString AudioBitrate(int, QString);
42-
static QString ConstantRateFactor(int);
43-
static QString ConstantQuantizer(int);
44-
static QString Quantizer(int);
45-
static QString ConstantVideoQuality(int);
46-
static QString ConstantAudioQuality(int, QString);
47-
static QString VideoResolution(int, int);
48-
static QString VideoResizeAlgo(QString);
49-
static QString PassLogFile(QString);
50-
static QString TransposeVideo(int);
51-
static QString FlipVideo(QString);
52-
static QString NoAutoRotate();
53-
static QString AudioTitle(QString, QString);
54-
static QString AudioLang(QString, QString);
55-
static QString Tier(int);
56-
static QString SharpenVideo(QString, QString);
57-
static QString AddTimecodes(int, int, int, int);
58-
static QString VideoTune(QString);
59-
static QString VSPipe(QString, QString);
60-
static QString FFMpeg(QString);
61-
static QString Override();
62-
static QString Input(QString);
63-
static QString Output(QString);
64-
static QString AddComma();
65-
static QString AddColin();
66-
static QString EnableFilters();
67-
static QString ConcludeFilters();
18+
static QString setFastPass();
19+
static QString appleTag();
20+
static QString threads(int threads);
21+
static QString colors(QString matrix, QString transfer, QString primaries);
22+
static QString crop(int x, int y, int width, int height);
23+
static QString entropyCoding(int coder);
24+
static QString bFrame(int bFrame);
25+
static QString referenceFrame(int refFrame);
26+
static QString masterDisplay(QString display);
27+
static QString hdr10Opt();
28+
static QString deinterlace();
29+
static QString deinterlaceCUDA();
30+
static QString colors(QString matrix, QString transfer, QString primaries, QString range);
31+
static QString maxCllFall(int cll, int fall);
32+
static QString hdrPlus(QString path);
33+
static QString dbVisionProfile(QString profile);
34+
static QString dbVisionRPU(QString path);
35+
static QString mapVideo(QString type, QString s1, int s2);
36+
static QString mapMux(QString type, int s1);
37+
static QString mapAll(QString type, QString s1);
38+
static QString mapSingle(QString type);
39+
static QString downMix(double channels);
40+
static QString pixelFormat(QString format);
41+
static QString pass(int pass);
42+
static QString videoPreset(QString preset);
43+
static QString videoProfile(QString profile);
44+
static QString videoProfileLevel(QString level);
45+
static QString metaData1();
46+
static QString metaData2(QString str);
47+
static QString videoBitrate(int bitrate);
48+
static QString audioBitrate(int bitrate, QString stream);
49+
static QString constantRateFactor(int crf);
50+
static QString constantQuantizer(int strength);
51+
static QString quantizer(int strength);
52+
static QString buffer(int bitrate);
53+
static QString constantVideoQuality(int quality);
54+
static QString constantAudioQuality(int quality, QString stream);
55+
static QString videoResolution(int width, int height);
56+
static QString videoResizeAlgo(QString algo);
57+
static QString passLogFile();
58+
static QString transposeVideo(int transpose);
59+
static QString flipVideo(QString flip);
60+
static QString noAutoRotate();
61+
static QString vp9Quality(QString quality);
62+
static QString audioMetadata(QString stream);
63+
static QString audioTitle(QString title);
64+
static QString audioLang(QString lang);
65+
static QString tier(int tier);
66+
static QString sharpenVideo(QString radius, QString strength);
67+
static QString addTimecodes(int hour, int minute, int second, int millisecond);
68+
static QString videoTune(QString tune);
69+
static QString override();
70+
static QString addComma();
71+
static QString statsFile(QString path);
72+
static QString allThreads();
73+
static QString addColin();
74+
static QString enableFilters();
75+
static QString input();
76+
static QString concludeFilters();
77+
static QString nullPath();
78+
static QString vsPipe();
79+
static QString vs();
6880
};
6981

7082
#endif // !ARGUMENT_H

include/audioinfo.hpp

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,29 @@
77

88
class AudioInfo {
99
public:
10-
static void SetCodec(QString);
11-
static void SetLanguage(QString);
12-
static void SetSampleRate(QString);
13-
static void SetChannels(QString);
14-
static void SetStream(QString);
15-
16-
static QString GetCodec(int);
17-
static QString GetLanguage(int);
18-
static QString GetSampleRate(int);
19-
static QString GetChannels(int);
20-
static QString GetStream(int);
21-
22-
static int TotalStreams();
23-
static void AddStream();
24-
25-
static void ClearAll();
10+
static void setCodec(QString codec);
11+
static void setLanguage(QString language);
12+
static void setSampleRate(QString sampleRate);
13+
static void setChannels(QString channels);
14+
static void setStream(QString stream);
15+
16+
static QString getCodec(int index);
17+
static QString getLanguage(int index);
18+
static QString getSampleRate(int index);
19+
static QString getChannels(int index);
20+
static QString getStream(int index);
21+
22+
static int totalStreams();
23+
static void addStream();
24+
static void clearAll();
2625

2726
private:
28-
static QStringList Codec;
29-
static QStringList Language;
30-
static QStringList SampleRate;
31-
static QStringList Channels;
32-
static QStringList Stream;
33-
static int Streams;
27+
static QStringList _codec;
28+
static QStringList _language;
29+
static QStringList _sampleRate;
30+
static QStringList _channels;
31+
static QStringList _stream;
32+
static int _streams;
3433
};
3534

3635
#endif // !AUDIOINFO_H

include/audiosubinforegex.hpp

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
#ifndef AUDIOSUBINFOREGEX_H
44
#define AUDIOSUBINFOREGEX_H
55

6-
#include "audioinfo.hpp"
7-
#include "subtitleinfo.hpp"
8-
96
#include <QtCore/QRegularExpression>
107
#include <QtWidgets/QMessageBox>
118
#include <QtWidgets/QWidget>
129
#include <QtCore/QString>
1310
#include <QtCore/QList>
1411

12+
#include "audioinfo.hpp"
13+
#include "subtitleinfo.hpp"
14+
1515
class AudioSubInfoRegex {
1616
public:
17-
static void AudioInfoRegex(QString);
18-
static void SubInfoRegex(QString);
19-
static void ChapterInfoRegex(QString);
17+
static void audioInfoRegex(QString output);
18+
static void subInfoRegex(QString output);
19+
static void chapterInfoRegex(QString output);
2020

2121
private:
2222
enum GetInfo {
@@ -25,19 +25,18 @@ class AudioSubInfoRegex {
2525
Chapter = 2
2626
};
2727

28-
static QString AudioCodec;
29-
static QString AudioLanguage;
30-
static QString SampleRate;
31-
static QString Channels;
32-
static QString AudioStreams;
33-
34-
static QString SubCodec;
35-
static QString SubLanguage;
36-
static QString SubStreams;
28+
static QString _audioCodec;
29+
static QString _audioLanguage;
30+
static QString _sampleRate;
31+
static QString _channels;
32+
static QString _audioStreams;
33+
static QString _subCodec;
34+
static QString _subLanguage;
35+
static QString _subStreams;
3736

38-
static QList<QRegularExpression> Indexer;
37+
static QList<QRegularExpression> _indexer;
3938

40-
static void SetupPattern();
39+
static void setupPattern();
4140
};
4241

4342
#endif // !AUDIOSUBINFOREGEX_H

include/checks.hpp

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#define VC1 5
1616
#define MPEG2 6
1717
#define MPEG4 7
18+
#define HUFFYUV 8
1819

1920
#define AAC 0
2021
#define MP3 1
@@ -32,19 +33,19 @@
3233

3334
class Checks {
3435
public:
35-
static bool CheckFFMpeg(QString);
36-
static bool CheckFFProbe(QString);
37-
static bool CheckVsPipe(QString);
38-
static bool CheckVsScript(QString);
39-
static bool CheckVapourSynth(QString);
40-
static bool CheckInputExists(QString);
41-
static bool CheckInput(QString);
42-
static bool CheckOutput(QString);
43-
static bool CheckOutputOverwrite(QString);
44-
static bool CheckVideoCompatability(int, QString);
45-
static bool CheckAudioCompatability(int, QString);
46-
static bool CheckSubtitleCompatability(QString, QString);
47-
static bool FileCheck(QString);
36+
static bool checkFFMpeg(QString path);
37+
static bool checkFFProbe(QString path);
38+
static bool checkVsPipe(QString path);
39+
static bool checkVsScript(QString path);
40+
static bool checkVapourSynth(QString path);
41+
static bool checkInputExists(QString path);
42+
static bool checkInput(QString input);
43+
static bool checkOutput(QString output);
44+
static bool checkOutputOverwrite(QString path);
45+
static bool checkVideoCompatability(int format, QString container);
46+
static bool checkAudioCompatability(int format, QString container);
47+
static bool checkSubtitleCompatability(QString format, QString container);
48+
static bool fileCheck(QString path);
4849
};
4950

5051
#endif // !CHECKS_H

0 commit comments

Comments
 (0)