ld-chroma-decoder: Added first/last field/frame line command-line opt…

…ions, and padding command-line option.
happycube · Feb 19, 2022 · 08f32a5 · 08f32a5
1 parent f40b683
commit 08f32a5
Show file tree

Hide file tree

Showing 6 changed files with 256 additions and 59 deletions.
diff --git a/tools/ld-analyse/tbcsource.cpp b/tools/ld-analyse/tbcsource.cpp
@@ -36,7 +36,7 @@ TbcSource::TbcSource(QObject *parent) : QObject(parent)
     palConfiguration.chromaFilter = PalColour::transform2DFilter;
     ntscConfiguration = ntscColour.getConfiguration();
     outputConfiguration.pixelFormat = OutputWriter::PixelFormat::RGB48;
-    outputConfiguration.usePadding = false;
+    outputConfiguration.paddingAmount = 1;
 }
 
 // Public methods -----------------------------------------------------------------------------------------------------

diff --git a/tools/ld-chroma-decoder/main.cpp b/tools/ld-chroma-decoder/main.cpp
@@ -174,6 +174,12 @@ int main(int argc, char *argv[])
                                        QCoreApplication::translate("main", "Output in black and white"));
     parser.addOption(setBwModeOption);
 
+    // Option to select output padding (-pad)
+    QCommandLineOption outputPaddingOption(QStringList() << "pad" << "output-padding",
+                                       QCoreApplication::translate("main", "Pad the output frame to a multiple of this many pixels on both axes (1 means no padding, maximum is 32)"),
+                                       QCoreApplication::translate("main", "number"));
+    parser.addOption(outputPaddingOption);
+
     // Option to select which decoder to use (-f)
     QCommandLineOption decoderOption(QStringList() << "f" << "decoder",
                                      QCoreApplication::translate("main", "Decoder to use (pal2d, transform2d, transform3d, ntsc1d, ntsc2d, ntsc3d, ntsc3dnoadapt, mono; default automatic)"),
@@ -182,10 +188,34 @@ int main(int argc, char *argv[])
 
     // Option to select the number of threads (-t)
     QCommandLineOption threadsOption(QStringList() << "t" << "threads",
-                                        QCoreApplication::translate("main", "Specify the number of concurrent threads (default number of logical CPUs)"),
-                                        QCoreApplication::translate("main", "number"));
+                                     QCoreApplication::translate("main", "Specify the number of concurrent threads (default number of logical CPUs)"),
+                                     QCoreApplication::translate("main", "number"));
     parser.addOption(threadsOption);
 
+    // Option to override calculated firstActiveFieldLine in our video parameters (-ffll)
+    QCommandLineOption firstFieldLineOption(QStringList() << "ffll" << "first_active_field_line",
+                                            QCoreApplication::translate("main", "The first visible line of a field. Range 1-259 for NTSC (default: 20), 2-308 for PAL (default: 22)"),
+                                            QCoreApplication::translate("main", "number"));
+    parser.addOption(firstFieldLineOption);
+
+    // Option to override calculated lastActiveFieldLine in our video parameters (-lfll)
+    QCommandLineOption lastFieldLineOption(QStringList() << "lfll" << "last_active_field_line",
+                                           QCoreApplication::translate("main", "The last visible line of a field. Range 1-259 for NTSC (default: 259), 2-308 for PAL (default: 308)"),
+                                           QCoreApplication::translate("main", "number"));
+    parser.addOption(lastFieldLineOption);
+
+    // Option to override calculated firstActiveFrameLine in our video parameters (-ffrl)
+    QCommandLineOption firstFrameLineOption(QStringList() << "ffrl" << "first_active_frame_line",
+                                            QCoreApplication::translate("main", "The first visible line of a frame. Range 1-525 for NTSC (default: 40), 1-620 for PAL (default: 44)"),
+                                            QCoreApplication::translate("main", "number"));
+    parser.addOption(firstFrameLineOption);
+
+    // Option to override calculated lastActiveFieldLine in our video parameters (-lfll)
+    QCommandLineOption lastFrameLineOption(QStringList() << "lfrl" << "last_active_frame_line",
+                                           QCoreApplication::translate("main", "The last visible line of a frame. Range 1-525 for NTSC (default: 525), 1-620 for PAL (default: 620)"),
+                                           QCoreApplication::translate("main", "number"));
+    parser.addOption(lastFrameLineOption);
+
     // -- NTSC decoder options --
 
     // Option to overlay the adaptive filter map
@@ -247,7 +277,7 @@ int main(int argc, char *argv[])
 
     // Positional argument to specify output video file
     parser.addPositionalArgument("output", QCoreApplication::translate("main", "Specify output file (omit or - for piped output)"));
-
+    
     // Process the command line options and arguments given by the user
     parser.process(a);
 
@@ -317,7 +347,7 @@ int main(int argc, char *argv[])
             return -1;
         }
     }
-
+    
     if (parser.isSet(chromaGainOption)) {
         const double value = parser.value(chromaGainOption).toDouble();
         palConfig.chromaGain = value;
@@ -395,10 +425,26 @@ int main(int argc, char *argv[])
         }
     }
 
-
     if (parser.isSet(ntscPhaseComp)) {
         combConfig.phaseCompensation = true;
     }
+
+    LdDecodeMetaData::LineParameters lineParameters;
+    if (parser.isSet(firstFieldLineOption)) {
+        lineParameters.firstActiveFieldLine = parser.value(firstFieldLineOption).toInt();
+    }
+
+    if (parser.isSet(lastFieldLineOption)) {
+        lineParameters.lastActiveFieldLine = parser.value(lastFieldLineOption).toInt();
+    }
+
+    if (parser.isSet(firstFrameLineOption)) {
+        lineParameters.firstActiveFrameLine = parser.value(firstFrameLineOption).toInt();
+    }
+
+    if (parser.isSet(lastFrameLineOption)) {
+        lineParameters.lastActiveFrameLine = parser.value(lastFrameLineOption).toInt();
+    }
 
     // Work out the metadata filename
     QString inputJsonFileName = inputFileName + ".json";
@@ -412,7 +458,9 @@ int main(int argc, char *argv[])
         qInfo() << "Unable to open ld-decode metadata file";
         return -1;
     }
-
+
+    metaData.processLineParameters(lineParameters);
+
     // Reverse field order if required
     if (parser.isSet(setReverseOption)) {
         qInfo() << "Expected field order is reversed to second field/first field";
@@ -440,7 +488,7 @@ int main(int argc, char *argv[])
         qCritical() << "Can only show FFTs with the transform2d/transform3d decoders";
         return -1;
     }
-
+    
     // Select the decoder
     QScopedPointer<Decoder> decoder;
     if (decoderName == "pal2d") {
@@ -500,6 +548,14 @@ int main(int argc, char *argv[])
         return -1;
     }
 
+    if (parser.isSet(outputPaddingOption)) {
+        outputConfig.paddingAmount = parser.value(outputPaddingOption).toInt();
+        if (outputConfig.paddingAmount < 1 || outputConfig.paddingAmount > 32) {
+            qInfo() << "Invalid value" << outputConfig.paddingAmount << "specified for padding amount, defaulting to 8.";
+            outputConfig.paddingAmount = 8;
+        }
+    }
+
     // Perform the processing
     DecoderPool decoderPool(*decoder, inputFileName, metaData, outputConfig, outputFileName, startFrame, length, maxThreads);
     if (!decoderPool.process()) {

diff --git a/tools/ld-chroma-decoder/outputwriter.cpp b/tools/ld-chroma-decoder/outputwriter.cpp
@@ -62,12 +62,14 @@ void OutputWriter::updateConfiguration(LdDecodeMetaData::VideoParameters &_video
     activeHeight = videoParameters.lastActiveFrameLine - videoParameters.firstActiveFrameLine;
     outputHeight = activeHeight;
 
-    if (config.usePadding) {
-        // Both width and height should be divisible by 8, as video codecs expect this.
-        // Expand horizontal active region so the width is divisible by 8.
+    if (config.paddingAmount > 1) {
+        // Some video codecs require the width and height of a video to be divisible by
+        // a given number of samples on each axis.
+
+        // Expand horizontal active region so the width is divisible by the specified padding factor.
         while (true) {
             activeWidth = videoParameters.activeVideoEnd - videoParameters.activeVideoStart;
-            if ((activeWidth % 8) == 0) {
+            if ((activeWidth % config.paddingAmount) == 0) {
                 break;
             }
 
@@ -79,10 +81,10 @@ void OutputWriter::updateConfiguration(LdDecodeMetaData::VideoParameters &_video
             }
         }
 
-        // Insert empty padding lines so the height is divisible by 8
+        // Insert empty padding lines so the height is divisible by by the specified padding factor.
         while (true) {
             outputHeight = topPadLines + activeHeight + bottomPadLines;
-            if ((outputHeight % 8) == 0) {
+            if ((outputHeight % config.paddingAmount) == 0) {
                 break;
             }
 

diff --git a/tools/ld-chroma-decoder/outputwriter.h b/tools/ld-chroma-decoder/outputwriter.h
@@ -50,7 +50,7 @@ class OutputWriter {
 
     // Output settings
     struct Configuration {
-        bool usePadding = true;
+        qint32 paddingAmount = 8;
         PixelFormat pixelFormat = RGB48;
         bool outputY4m = false;
     };