From 4cad43abe14924c7d433c07b2b479103f66c5f11 Mon Sep 17 00:00:00 2001
From: Satakun Utama <linesofcodes@dailitation.xyz>
Date: Tue, 19 Aug 2025 13:02:39 +0700
Subject: [PATCH] DNxHD support, Better screen reader support

---
 README.md                                    |  2 +-
 solid-src/src/App.tsx                        | 32 ++++++++++--
 solid-src/src/components/DNxHDOptions.tsx    | 55 ++++++++++++++++++++
 solid-src/src/components/H264Options.tsx     |  2 +-
 solid-src/src/components/encoders/libaom.tsx | 11 ++--
 solid-src/src/util/ffmpeg.ts                 | 11 ++++
 6 files changed, 102 insertions(+), 11 deletions(-)
 create mode 100644 solid-src/src/components/DNxHDOptions.tsx

diff --git a/README.md b/README.md
index 1fcf6c6..947ffbe 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ encoders supported by your FFmpeg install will show up.
     -   [ ] av1_nvenc
     -   [ ] av1_qsv
     -   [ ] av1_vaapi
--   [ ] DNxHD
+-   [x] DNxHD (Does not provide options to deal with its pickiness yet)
 -   [ ] H.264
     -   [x] libx264
     -   [x] libx264rgb (Untested, but _should_ work)
diff --git a/solid-src/src/App.tsx b/solid-src/src/App.tsx
index 9fab9e5..a78912a 100644
--- a/solid-src/src/App.tsx
+++ b/solid-src/src/App.tsx
@@ -27,6 +27,7 @@ import { generateRandomString } from "./util/string";
 import "./css/icons.css";
 import BreezeIcon from "./components/BreezeIcon";
 import AV1Options from "./components/AV1Options";
+import DNxHDOptions from "./components/DNxHDOptions";
 
 const commonCodecs = new Set(["h264", "hevc", "vp8", "vp9", "av1", "dnxhd"]);
 
@@ -540,7 +541,9 @@ function App() {
                                             0
                                         }
                                     >
-                                        <label>Encoder</label>
+                                        <label for="videoEncoder">
+                                            Encoder
+                                        </label>
                                         <select
                                             name="videoEncoder"
                                             id="videoEncoder"
@@ -589,14 +592,31 @@ function App() {
                                             onParamChanged={onParametersChanged}
                                         />
                                     </Match>
+                                    <Match
+                                        when={
+                                            selectedCodec()?.shortName ===
+                                            "dnxhd"
+                                        }
+                                    >
+                                        <DNxHDOptions
+                                            codec={selectedCodec()}
+                                            params={ffmpegParams}
+                                            onParamChanged={onParametersChanged}
+                                        />
+                                    </Match>
                                 </Switch>
                                 <div class="row flex-col align-items-center">
                                     <h3 class="k-form-section-title">
                                         Extra Arguments
                                     </h3>
                                 </div>
-                                <form class="k-form">
-                                    <label>Global Options</label>
+                                <form
+                                    class="k-form"
+                                    onsubmit={(e) => e.preventDefault()}
+                                >
+                                    <label for="globalopts">
+                                        Global Options
+                                    </label>
                                     <input
                                         type="text"
                                         name="globalopts"
@@ -608,7 +628,7 @@ function App() {
                                             setGlobalopts(e.target.value);
                                         }}
                                     />
-                                    <label>Input Options</label>
+                                    <label for="inputopts">Input Options</label>
                                     <input
                                         type="text"
                                         name="inputopts"
@@ -620,7 +640,9 @@ function App() {
                                             setInputopts(e.target.value);
                                         }}
                                     />
-                                    <label>Output Options</label>
+                                    <label for="outputopts">
+                                        Output Options
+                                    </label>
                                     <input
                                         type="text"
                                         name="outputopts"
diff --git a/solid-src/src/components/DNxHDOptions.tsx b/solid-src/src/components/DNxHDOptions.tsx
new file mode 100644
index 0000000..2457284
--- /dev/null
+++ b/solid-src/src/components/DNxHDOptions.tsx
@@ -0,0 +1,55 @@
+import { os } from "@neutralinojs/lib";
+import { type CodecInfo, type FFmpegParams } from "../util/ffmpeg";
+import BreezeIcon from "./BreezeIcon";
+
+/**
+ * Options for H.264/H.265 codecs
+ */
+function DNxHDOptions(props: {
+    codec: CodecInfo | undefined;
+    params: FFmpegParams;
+    onParamChanged: (key: string, value: any) => void;
+}) {
+    return (
+        <section id="commonLossyOptions">
+            <div class="row flex-col align-items-center">
+                <h3 class="k-form-section-title">Encoder Options</h3>
+            </div>
+            <div class="k-form">
+                <label>Help</label>
+                <div>
+                    <button
+                        class="icon-button"
+                        onclick={() =>
+                            os.open("https://askubuntu.com/a/907515")
+                        }
+                        title="DNxHD is a picky encoder."
+                    >
+                        <BreezeIcon icon="help-about" alt="Help" />
+                    </button>
+                </div>
+                <label for="profile">Profile</label>
+                <select
+                    class="k-dropdown"
+                    name="profile"
+                    id="profile"
+                    value={props.params.outputopts?.profile ?? "dnxhd"}
+                    oninput={(e) => {
+                        props.onParamChanged("outputopts", {
+                            profile: e.target.value,
+                        });
+                    }}
+                >
+                    <option value="dnxhd">DNxHD</option>
+                    <option value="dnxhr_444">DNxHR 444</option>
+                    <option value="dnxhr_hqx">DNxHR HQX</option>
+                    <option value="dnxhr_hq">DNxHR HQ</option>
+                    <option value="dnxhr_sq">DNxHR SQ</option>
+                    <option value="dnxhr_lb">DNxHR LB</option>
+                </select>
+            </div>
+        </section>
+    );
+}
+
+export default DNxHDOptions;
diff --git a/solid-src/src/components/H264Options.tsx b/solid-src/src/components/H264Options.tsx
index c481260..ed37466 100644
--- a/solid-src/src/components/H264Options.tsx
+++ b/solid-src/src/components/H264Options.tsx
@@ -63,7 +63,7 @@ function H264Options(props: {
                         <BreezeIcon icon="help-about" alt="Help" />
                     </button>
                 </div>
-                <label>Preset</label>
+                <label for="encodingPreset">Preset</label>
                 <select
                     class="k-dropdown"
                     name="encodingPreset"
diff --git a/solid-src/src/components/encoders/libaom.tsx b/solid-src/src/components/encoders/libaom.tsx
index 37e7439..31867b5 100644
--- a/solid-src/src/components/encoders/libaom.tsx
+++ b/solid-src/src/components/encoders/libaom.tsx
@@ -64,10 +64,12 @@ function LibaomOptions(props: {
                         <BreezeIcon icon="help-about" alt="Help" />
                     </button>
                 </div>
-                <label>Rate-control modes</label>
+                <label for="rateControlMode">Rate-control modes</label>
                 <select
                     class="k-dropdown"
                     onchange={(e) => setRateControlMode(e.target.value)}
+                    name="rateControlMode"
+                    id="rateControlMode"
                 >
                     <option value="Constant">Constant Quality</option>
                     <option value="Constrained">Constrained Quality</option>
@@ -80,7 +82,7 @@ function LibaomOptions(props: {
                         rateControlMode() === "Constrained"
                     }
                 >
-                    <label>CRF</label>
+                    <label for="crf">CRF</label>
                     <input
                         type="number"
                         name="crf"
@@ -97,12 +99,13 @@ function LibaomOptions(props: {
                     />
                 </Show>
                 <Show when={rateControlMode() !== "Constant"}>
-                    <label>Bitrate</label>
-                    <div class="row gap2">
+                    <label for="bitrate">Bitrate</label>
+                    <div class="row gap2 align-items-center">
                         <input
                             type="number"
                             name="bitrate"
                             id="bitrate"
+                            aria-label="Kbps"
                             value={props.params.vbitrate ?? DEFAULT_BITRATE}
                             oninput={(e) => {
                                 props.onParamChanged(
diff --git a/solid-src/src/util/ffmpeg.ts b/solid-src/src/util/ffmpeg.ts
index 2cc6d00..4b86545 100644
--- a/solid-src/src/util/ffmpeg.ts
+++ b/solid-src/src/util/ffmpeg.ts
@@ -103,6 +103,10 @@ export interface FFmpegParams {
      * Extra parameters defined by users
      */
     useropts: ExtraFFmpegArguments;
+    /**
+     * Extra output parameters defined by Vencoder
+     */
+    outputopts?: { [key: string]: string };
 }
 
 const NULL_LOCATION = window.NL_OS === "Windows" ? "NUL" : "/dev/null";
@@ -129,6 +133,13 @@ export function generateOutputCommand(params: FFmpegParams) {
         globalopts += " " + params.useropts.global;
     }
 
+    if (params.outputopts !== undefined) {
+        console.log(params.outputopts);
+        for (const key of Object.keys(params.outputopts)) {
+            outputopts += ` -${key} ${params.outputopts[key]}`.trimEnd();
+        }
+    }
+
     if (params.twopass) {
         const commonOpts = `${globalopts}${inputopts} -i "${params.inputFile ?? "{fileName}"}" -c:v ${params.encoder ?? params.vcodec} -b:v ${
             params.vbitrate ?? DEFAULT_BITRATE