Skip to content

Commit

Permalink
Added Stereoscopic 3D options
Browse files Browse the repository at this point in the history
  • Loading branch information
llamaret committed Mar 21, 2020
1 parent 628ebbb commit a189169
Show file tree
Hide file tree
Showing 46 changed files with 1,899 additions and 198 deletions.
8 changes: 8 additions & 0 deletions converter/conversionparameters.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,14 @@ int parseFFmpegArguments(QStringList& args, int index, ConversionParameters& res
CHECK_OPTION_1("-vf", rotate_90more, true);
CHECK_OPTION_1("-vf", rotate_90less, true);
CHECK_OPTION_1("-vf", rotate_180, true);
CHECK_OPTION_1("-vf", rggm, true);
CHECK_OPTION_1("-vf", rbgm, true);
CHECK_OPTION_1("-vf", rcc, true);
CHECK_OPTION_1("-vf", rchc, true);
CHECK_OPTION_1("-vf", rcd, true);
CHECK_OPTION_1("-vf", gmgm, true);
CHECK_OPTION_1("-vf", gmc, true);
CHECK_OPTION_1("-vf", ybc, true);
CHECK_OPTION_1("-sameq", video_same_quality, true);
CHECK_OPTION_1("-deinterlace", video_deinterlace, true);
CHECK_OPTION_2_METHOD("-b", video_bitrate, toInt);
Expand Down
16 changes: 16 additions & 0 deletions converter/conversionparameters.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,14 @@ class ConversionParameters
bool rotate_90more;
bool rotate_90less;
bool rotate_180;
bool rggm;
bool rbgm;
bool rcc;
bool rchc;
bool rcd;
bool gmgm;
bool gmc;
bool ybc;
bool copy_video;
bool video_same_quality; ///< whether to keep all video quality (-sameq option in ffmpeg)
bool video_deinterlace;
Expand Down Expand Up @@ -106,6 +114,14 @@ class ConversionParameters
rotate_90more(false),
rotate_90less(false),
rotate_180(false),
rggm(false),
rbgm(false),
rcc(false),
rchc(false),
rcd(false),
gmgm(false),
gmc(false),
ybc(false),
copy_video(false),
video_same_quality(false),
video_deinterlace(false),
Expand Down
38 changes: 35 additions & 3 deletions converter/ffmpeginterface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -507,8 +507,8 @@ QStringList FFmpegInterface::Private::getOptionList(const ConversionParameters &
list.append("-deinterlace");
}

// begining insert subtitle or disable color or flip or rotate
if (o.insert_subtitle || o.disable_color || o.vertical_flip || o.horizontal_flip || o.rotate_90more || o.rotate_90less || o.rotate_180)
// begining insert subtitle or disable color or flip or rotate or stereoscopic
if (o.insert_subtitle || o.disable_color || o.vertical_flip || o.horizontal_flip || o.rotate_90more || o.rotate_90less || o.rotate_180 || o.rggm || o.rbgm || o.rcc || o.rchc || o.rcd || o.gmgm || o.gmc || o.ybc)
{
list.append("-vf");
}
Expand Down Expand Up @@ -566,7 +566,39 @@ QStringList FFmpegInterface::Private::getOptionList(const ConversionParameters &
{
list.append("transpose=2,transpose=2");
}
// finishing insert subtitle or disable color or flip or rotate
if (o.rggm)
{
list.append("stereo3d=sbs2l:argg");
}
if (o.rbgm)
{
list.append("stereod3d=sbs2l:arbg");
}
if (o.rcc)
{
list.append("stereo3d=sbs2l:arcc");
}
if (o.rchc)
{
list.append("stereo3d=sbs2l:arch");
}
if (o.rcd)
{
list.append("stereo3d=sbs2l:arcd");
}
if (o.gmgm)
{
list.append("stereo3d=sbs2l:agmg");
}
if (o.gmc)
{
list.append("stereo3d=sbs2l:agmc");
}
if (o.ybc)
{
list.append("stereo3d=sbs2l:aybc");
}
// finishing insert subtitle or disable color or flip or rotate or stereoscopic

// video bitrate
if (o.video_bitrate > 0) {
Expand Down
Binary file modified icons/banner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
49 changes: 49 additions & 0 deletions icons/facebook.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
49 changes: 49 additions & 0 deletions icons/github.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
57 changes: 57 additions & 0 deletions icons/gitter.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
65 changes: 65 additions & 0 deletions icons/liberapay.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions icons/open-collective.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
64 changes: 64 additions & 0 deletions icons/patreon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit a189169

Please sign in to comment.