Skip to content

Commit

Permalink
Merge pull request #901 from vrunk11/ld-disc-stacker_update
Browse files Browse the repository at this point in the history 
Ld disc stacker update
  • Loading branch information
@happycube
happycube authored Sep 22, 2024
2 parents 76b471d + 9502c51 commit 05a447e
Show file tree
Hide file tree
Showing 6 changed files with 716 additions and 652 deletions.
7 changes: 7 additions & 0 deletions compile.bat
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
@echo off
mkdir build
cd build
cmake -G "MinGW Makefiles" ../ -DCMAKE_BUILD_TYPE=Release
make -j 3
move /y E:\Dev\git\ld-disc-stacker_enhance\ld-decode\build\tools\ld-disc-stacker\ld-disc-stacker.exe E:\Dev\git\ld-decode-tools-build-template\ld-disc-stacker.exe
pause
117 changes: 62 additions & 55 deletions tools/ld-disc-stacker/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,28 +58,28 @@ int main(int argc, char *argv[])
"(c)2020-2022 Simon Inns\n"
"2024 updated by Vrunk11\n"
"GPLv3 Open-Source - github: https://github.com/happycube/ld-decode"
"\n"
"For more info on stacking mode, use --help-mode");
"\n"
"For more info on stacking mode, use --help-mode");
//parser.addHelpOption();
parser.addVersionOption();

// Add the standard debug options --debug and --quiet
addStandardDebugOptions(parser);
QCommandLineOption HelpOption(QStringList() << "?" << "h" << "help",
QCommandLineOption HelpOption(QStringList() << "?" << "h" << "help",
QCoreApplication::translate("main", "Displays help on commandline options."));
parser.addOption(HelpOption);
// Option to show more info during stacking
parser.addOption(HelpOption);
// Option to show more info during stacking
QCommandLineOption helpModeOption(QStringList() << "help-mode",
QCoreApplication::translate("main", "Show info about stacking mode"));
parser.addOption(helpModeOption);
// Option to show more info during stacking
// Option to show more info during stacking
QCommandLineOption verboseOption(QStringList() << "V" << "verbose",
QCoreApplication::translate("main", "Show more info during stacking"));
parser.addOption(verboseOption);
// Option to specify a different JSON input file
QCommandLineOption inputJsonOption(QStringList() << "input-json",
QCoreApplication::translate("main", "Specify the input JSON file for the first input file (default input.json)"),
Expand All @@ -103,15 +103,15 @@ int main(int argc, char *argv[])
"main", "Specify the number of concurrent threads (default is the number of logical CPUs)"),
QCoreApplication::translate("main", "number"));
parser.addOption(threadsOption);
// Option to select the stacking mode (-m)
QCommandLineOption modeOption(QStringList() << "m" << "mode",
QCoreApplication::translate(
"main", "Specify the stacking mode to use (default is 3) 0 = mean / 1 = median / 2 = smart mean / 3 = smart neighbor / 4 = neighbor"),
QCoreApplication::translate("main", "number"));
QCoreApplication::translate("main", "number"));
parser.addOption(modeOption);
// Option to select the smart-threshold (-st)
// Option to select the smart-threshold (-st)
QCommandLineOption smartThresholdOption(QStringList() << "st" << "smart-threshold",
QCoreApplication::translate(
"main", "Specify the range of value in 8 bit (0~128) for selecting sample where the distance to the median didnt exceed the selected value for applying mean (default is 15)"),
Expand All @@ -135,6 +135,12 @@ int main(int argc, char *argv[])
QCoreApplication::translate(
"main", "Pass-through dropouts present on every source"));
parser.addOption(passthroughOption);

// Option to check integrity off every source and remove bad frame
QCommandLineOption integrityOption(QStringList() << "it" << "integrity",
QCoreApplication::translate(
"main", "Check if frames contain skip or sample drop and discard bad source for specific frame"));
parser.addOption(integrityOption);

// Positional argument to specify input video file
parser.addPositionalArgument("inputs", QCoreApplication::translate(
Expand All @@ -146,32 +152,32 @@ int main(int argc, char *argv[])

// Process the command line options and arguments given by the user -----------------------------------------------
parser.process(a);
// show info about stacking mode
if (parser.isSet(helpModeOption)) {
qInfo() << "ld-disc-stacker - Disc stacking for ld-decode\n";
// show info about stacking mode
if (parser.isSet(helpModeOption)) {
qInfo() << "ld-disc-stacker - Disc stacking for ld-decode\n";
qInfo() << "(c)2020-2022 Simon Inns";
qInfo() << "2024 updated by Vrunk11";
qInfo() << "GPLv3 Open-Source - github: https://github.com/happycube/ld-decode";
qInfo() << "For more info on stacking mode, use --help-mode\n";
qInfo() << "Mode:\n";
qInfo() << "(0) mean : average all samples not marked as dropouts using mean\n";
qInfo() << "(1) median : find the median from samples not marked as dropout\n";
qInfo() << "(2) smart mean : find the median from samples not marked as dropout then average all value within (median + smartThreshold) or (median - smart Threshold) using mean\n";
qInfo() << "(3) smart neighbor : find the median for every surroundings pixel not marked as dropout then find the closest sample to the surrounding median value for each neighbor";
qInfo() << " then take the closest value to the median of the current sample from the different closest value found";
qInfo() << " then average all value within (selectedSample + smartThreshold) or (selectedSample - smart threshold) using mean";
qInfo() << " when only 2 sources are available, it take the closest sample to the neighbor\n";
qInfo() << "(4) neighbor : find the median for every surroundings pixel not marked as dropout then find the closest sample to the surrounding median value for each neighbor";
qInfo() << " then take the closest value to the median of the current sample from the different closest value found then average the selected sample with the median";
qInfo() << " when only 2 sources are available, it take the closest sample to the neighbor";
return 0; // Exit after showing detailed help
}
// Check for help options first
if (parser.isSet(HelpOption)) {
parser.showHelp(); // This will exit the application
}
qInfo() << "For more info on stacking mode, use --help-mode\n";
qInfo() << "Mode:\n";
qInfo() << "(0) mean : average all samples not marked as dropouts using mean\n";
qInfo() << "(1) median : find the median from samples not marked as dropout\n";
qInfo() << "(2) smart mean : find the median from samples not marked as dropout then average all value within (median + smartThreshold) or (median - smart Threshold) using mean\n";
qInfo() << "(3) smart neighbor : find the median for every surroundings pixel not marked as dropout then find the closest sample to the surrounding median value for each neighbor";
qInfo() << " then take the closest value to the median of the current sample from the different closest value found";
qInfo() << " then average all value within (selectedSample + smartThreshold) or (selectedSample - smart threshold) using mean";
qInfo() << " when only 2 sources are available, it take the closest sample to the neighbor\n";
qInfo() << "(4) neighbor : find the median for every surroundings pixel not marked as dropout then find the closest sample to the surrounding median value for each neighbor";
qInfo() << " then take the closest value to the median of the current sample from the different closest value found then average the selected sample with the median";
qInfo() << " when only 2 sources are available, it take the closest sample to the neighbor";
return 0; // Exit after showing detailed help
}
// Check for help options first
if (parser.isSet(HelpOption)) {
parser.showHelp(); // This will exit the application
}

// Standard logging options
processStandardDebugOptions(parser);
Expand All @@ -182,9 +188,10 @@ int main(int argc, char *argv[])
bool noDiffDod = parser.isSet(noDiffDodOption);
bool noMap = parser.isSet(noMapOption);
bool passThrough = parser.isSet(passthroughOption);

bool integrityCheck = parser.isSet(integrityOption);

// Get the arguments from the parser
qint32 mode = 3;
qint32 mode = 3;
if (parser.isSet(modeOption)) {
mode = parser.value(modeOption).toInt();

Expand All @@ -193,20 +200,20 @@ int main(int argc, char *argv[])
mode = 3;
}
}
// Get the arguments from the parser
qint32 smartThreshold = (15*256);
if (parser.isSet(smartThresholdOption)) {
qint32 smartThreshold = (15*256);
if (parser.isSet(smartThresholdOption)) {
smartThreshold = parser.value(smartThresholdOption).toInt();

if (smartThreshold > 128 || smartThreshold < 0) {
qInfo() << "Specified threshold (" << (smartThreshold) << ") is out off range using 15 instead";
smartThreshold = (15*256);
smartThreshold = (15*256);
}
else
{
smartThreshold = (smartThreshold*256);
}
else
{
smartThreshold = (smartThreshold*256);
}
}

// Get the arguments from the parser
Expand Down Expand Up @@ -400,20 +407,20 @@ int main(int argc, char *argv[])
qInfo() << "Disc stacking relies on accurate VBI frame numbering to match source frames together";
return 1;
}
else if(noMap)
{
if(!videoParameters.isMapped)
{
qInfo() << "Source video" << i << "has not been mapped - be carefull using option no-map";
}
}
else if(noMap)
{
if(!videoParameters.isMapped)
{
qInfo() << "Source video" << i << "has not been mapped - be carefull using option no-map";
}
}
}

// Perform the disc stacking processes ----------------------------------------------------------------------------
qInfo() << "Initial source checks are ok and sources are loaded";
qint32 result = 0;
StackingPool stackingPool(outputFilename, outputJsonFilename, maxThreads,
ldDecodeMetaData, sourceVideos, mode, smartThreshold, reverse, noDiffDod, passThrough, verbose);
ldDecodeMetaData, sourceVideos, mode, smartThreshold, reverse, noDiffDod, passThrough, integrityCheck, verbose);
if (!stackingPool.process()) result = 1;

// Close open source video files
Expand Down
Loading

0 comments on commit 05a447e

Please sign in to comment.