Dev (#86)

* feat: add InvalidAtmosInputError

* feat: add support to detect adm

* refactor: swap logger type

* refactor: use boolean for detection

* feat: add support for adm

* feat: update

* feat: update

* fix: automatic delay in output file name #84

* feat: improve docs #79

* feat: update

* feat: re-work temp path system #82

* feat: v1.3.4rc1

* refactor: update

* refactor: temporarily disable test

* feat: deprecate `--parse-elementary-delay`

* refactor: update payload for removed `--parse-elementary-delay`

* refactor: update doc

* refactor: get delay relative to video in the object now

* feat: re worked delay handling logic #84
refactor: returned strings of delay are now consistent without brackets

* feat: setup to handle delay better #84

* feat: update

* feat: update

* feat: update

---------

Co-authored-by: jessielw <[email protected]>

Author: jessielw

CHANGELOG.md

@@ -5,6 +5,24 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Added
+
+- Added support for ADM BWF for **AC4** and **Atmos** profiles.
+
+### Changed
+
+- Logger for failure to get source bitrate from config is now a `debug` instead of a `warning`.
+- Default temporary path behavior changed to use short, platform-specific per-input job folders (reduces Windows long-path issues).
+- `--parse-elementary-delay` is now deprecated and will be removed on **1.4.0**. This is all now handled automatically and internally.
+  - If the arg is passed you will get a warning and it'll be ignored.
+
+### Fixed
+
+- DDP resetting detected delay for the output file name only (was properly stripped still).
+- Output names being generated automatically could potentially output the wrong delay in the filename.
+
 ## [1.3.3] - 2025-09-24
 
 ### Added

deezy/audio_encoders/dee/ac4.py

@@ -67,9 +67,7 @@ def encode(self):
 
         # delay
         delay = self.get_delay(
-            audio_track_info,
             self.payload.delay,
-            self.payload.parse_elementary_delay,
             file_input,
         )
 
@@ -89,27 +87,21 @@ def encode(self):
             # and will be ignored if not present. Keep existing generate_output_filename
             # as the fallback to avoid changing default behavior.
             if self.payload.output_template:
-                ignore_delay, delay_was_stripped = self.compute_template_delay_flags(
-                    audio_track_info, delay, self.payload.parse_elementary_delay
-                )
                 output = mi_parser.render_output_template(
                     template=str(self.payload.output_template),
                     suffix=".ac4",
                     output_channels="2.0",
+                    delay_was_stripped=delay.is_delay(),
+                    delay_relative_to_video=audio_track_info.delay_relative_to_video,
                     worker_id=self.payload.worker_id,
-                    ignore_delay=ignore_delay,
-                    delay_was_stripped=delay_was_stripped,
                 )
                 if self.payload.output_preview:
                     logger.info(f"Output preview: {output}")
                     return output
             else:
-                ignore_delay, delay_was_stripped = self.compute_template_delay_flags(
-                    audio_track_info, delay, self.payload.parse_elementary_delay
-                )
                 output = mi_parser.generate_output_filename(
-                    ignore_delay,
-                    delay_was_stripped,
+                    delay_was_stripped=delay.is_delay(),
+                    delay_relative_to_video=audio_track_info.delay_relative_to_video,
                     suffix=".ac4",
                     output_channels="2.0",
                     worker_id=self.payload.worker_id,
@@ -123,14 +115,7 @@ def encode(self):
         logger.debug(f"Output path {output}.")
 
         # temp dir: prefer a user-provided centralized temp base (per-input subfolder)
-        # so users can collect all temp files in one place. If not provided, use
-        # the adjacent per-input cache folder (<parent>/<stem>_deezy).
-        user_temp_base = getattr(self.payload, "temp_dir", None)
-        if user_temp_base:
-            temp_dir = Path(user_temp_base) / f"{file_input.stem}_deezy"
-            temp_dir.mkdir(parents=True, exist_ok=True)
-        else:
-            temp_dir = self._adjacent_temp_dir(file_input)
+        temp_dir = self._get_temp_dir(file_input, self.payload.temp_dir)
         logger.debug(f"Temp directory {temp_dir}.")
 
         # check disk space
@@ -149,11 +134,7 @@ def encode(self):
         self._early_output_exists_check(output, self.payload.overwrite)
 
         # decode TrueHD to atmos mezz
-        if audio_track_info.thd_atmos:
-            if not self.payload.truehdd_path:
-                raise DependencyNotFoundError(
-                    "Failed to locate truehdd, this is required for atmos work flows"
-                )
+        if self.payload.truehdd_path and audio_track_info.thd_atmos:
             # optionally stagger/jitter and limit concurrent TrueHD jobs
             self._maybe_jitter()
             self._acquire_truehdd()
@@ -175,6 +156,10 @@ def encode(self):
                     logger.info("Reusing decoded atmos from temp folder")
                     decoded_mezz_path = temp_dir / "atmos_meta.atmos"
                 else:
+                    if not self.payload.truehdd_path:
+                        raise DependencyNotFoundError(
+                            "Failed to locate truehdd, this is required for atmos work flows"
+                        )
                     decoded_mezz_path = decode_truehd_to_atmos(
                         output_dir=temp_dir,
                         file_input=self.payload.file_input,
@@ -200,7 +185,13 @@ def encode(self):
                 self._release_truehdd()
             # make input_file_path point to the decoded mezz when TrueHD path used
             input_file_path = decoded_mezz_path
-        # if not truehd we know it's valid channel based audio since we checked above
+
+        # check if we're processing adm atmos wav file
+        elif audio_track_info.adm_atmos_wav:
+            input_file_path = file_input
+            logger.info("Using ADM BWF input")
+
+        # if not truehd/adm we know it's valid channel based audio since we checked above
         else:
             # generate ffmpeg cmd
             ffmpeg_cmd = self._generate_ffmpeg_cmd(
@@ -276,6 +267,9 @@ def encode(self):
             fps=fps,
             delay=delay,
             temp_dir=temp_dir,
+            atmos_enabled=bool(
+                audio_track_info.adm_atmos_wav or audio_track_info.thd_atmos
+            ),
         )
         logger.debug(f"{json_path=}.")
 

deezy/audio_encoders/dee/atmos.py

@@ -8,6 +8,7 @@
 from deezy.enums.codec_format import CodecFormat
 from deezy.exceptions import (
     DependencyNotFoundError,
+    InvalidAtmosInputError,
     InvalidExtensionError,
     OutputFileNotFoundError,
 )
@@ -62,9 +63,7 @@ def encode(self):
 
         # delay
         delay = self.get_delay(
-            audio_track_info,
             self.payload.delay,
-            self.payload.parse_elementary_delay,
             file_input,
         )
 
@@ -84,27 +83,21 @@ def encode(self):
             # and will be ignored if not present. Keep existing generate_output_filename
             # as the fallback to avoid changing default behavior.
             if self.payload.output_template:
-                ignore_delay, delay_was_stripped = self.compute_template_delay_flags(
-                    audio_track_info, delay, self.payload.parse_elementary_delay
-                )
                 output = mi_parser.render_output_template(
                     template=str(self.payload.output_template),
                     suffix=".ec3",
                     output_channels=str(self.payload.atmos_mode.get_str_channels()),
+                    delay_was_stripped=delay.is_delay(),
+                    delay_relative_to_video=audio_track_info.delay_relative_to_video,
                     worker_id=self.payload.worker_id,
-                    ignore_delay=ignore_delay,
-                    delay_was_stripped=delay_was_stripped,
                 )
                 if self.payload.output_preview:
                     logger.info(f"Output preview: {output}")
                     return output
             else:
-                ignore_delay, delay_was_stripped = self.compute_template_delay_flags(
-                    audio_track_info, delay, self.payload.parse_elementary_delay
-                )
                 output = mi_parser.generate_output_filename(
-                    ignore_delay,
-                    delay_was_stripped,
+                    delay_was_stripped=delay.is_delay(),
+                    delay_relative_to_video=audio_track_info.delay_relative_to_video,
                     suffix=".ec3",
                     output_channels=str(self.payload.atmos_mode.get_str_channels()),
                     worker_id=self.payload.worker_id,
@@ -118,14 +111,7 @@ def encode(self):
         logger.debug(f"Output path {output}.")
 
         # temp dir: prefer a user-provided centralized temp base (per-input subfolder)
-        # so users can collect all temp files in one place. If not provided, use
-        # the adjacent per-input cache folder (<parent>/<stem>_deezy).
-        user_temp_base = getattr(self.payload, "temp_dir", None)
-        if user_temp_base:
-            temp_dir = Path(user_temp_base) / f"{file_input.stem}_deezy"
-            temp_dir.mkdir(parents=True, exist_ok=True)
-        else:
-            temp_dir = self._adjacent_temp_dir(file_input)
+        temp_dir = self._get_temp_dir(file_input, self.payload.temp_dir)
         logger.debug(f"Temp directory {temp_dir}.")
 
         # check disk space
@@ -141,56 +127,72 @@ def encode(self):
         # destination already exists and the user didn't request overwrite.
         self._early_output_exists_check(output, self.payload.overwrite)
 
-        # decode TrueHD to atmos mezz
-        if not self.payload.truehdd_path:
-            raise DependencyNotFoundError(
-                "Failed to locate truehdd, this is required for atmos work flows"
-            )
+        # dee input path variable
+        dee_input_path: Path | None = None
 
-        # optionally stagger/jitter and limit concurrent TrueHD jobs
-        self._maybe_jitter()
-        self._acquire_truehdd()
-        try:
-            truehdd_signature = f"truehdd:{self.payload.thd_warp_mode.to_truehdd_cmd()}"
-            metadata_path = self._metadata_path_for_output(temp_dir, output)
-            if getattr(
-                self.payload, "reuse_temp_files", False
-            ) and self._check_reuse_signature(
-                metadata_path,
-                str(CodecFormat.ATMOS),
-                truehdd_signature,
-                "atmos_meta.atmos",
-                temp_dir,
-            ):
-                logger.info("Reusing extracted wav from temp folder")
-                decoded_mezz_path = temp_dir / "atmos_meta.atmos"
-            else:
-                decoded_mezz_path = decode_truehd_to_atmos(
-                    output_dir=temp_dir,
-                    file_input=self.payload.file_input,
-                    track_index=self.payload.track_index,
-                    ffmpeg_path=self.payload.ffmpeg_path,
-                    truehdd_path=self.payload.truehdd_path,
-                    bed_conform=self.payload.bed_conform,
-                    warp_mode=self.payload.thd_warp_mode,
-                    duration=audio_track_info.duration,
-                    step_info={"current": 1, "total": 3, "name": "truehdd"},
-                    no_progress_bars=self.payload.no_progress_bars,
+        # check if we're processing truehd atmos
+        if self.payload.truehdd_path and audio_track_info.thd_atmos:
+            # optionally stagger/jitter and limit concurrent TrueHD jobs
+            self._maybe_jitter()
+            self._acquire_truehdd()
+            try:
+                truehdd_signature = (
+                    f"truehdd:{self.payload.thd_warp_mode.to_truehdd_cmd()}"
                 )
-                if getattr(self.payload, "reuse_temp_files", False):
-                    self._write_signature_metadata(
-                        metadata_path,
-                        str(CodecFormat.ATMOS),
-                        truehdd_signature,
-                        "atmos_meta.atmos",
-                        file_input,
+                metadata_path = self._metadata_path_for_output(temp_dir, output)
+                if getattr(
+                    self.payload, "reuse_temp_files", False
+                ) and self._check_reuse_signature(
+                    metadata_path,
+                    str(CodecFormat.ATMOS),
+                    truehdd_signature,
+                    "atmos_meta.atmos",
+                    temp_dir,
+                ):
+                    dee_input_path = temp_dir / "atmos_meta.atmos"
+                    logger.info("Reusing extracted wav from temp folder")
+                else:
+                    if self.payload.truehdd_path:
+                        raise DependencyNotFoundError(
+                            "Failed to locate truehdd, this is required for TrueHD Atmos work flows"
+                        )
+                    dee_input_path = decode_truehd_to_atmos(
+                        output_dir=temp_dir,
+                        file_input=self.payload.file_input,
+                        track_index=self.payload.track_index,
+                        ffmpeg_path=self.payload.ffmpeg_path,
+                        truehdd_path=self.payload.truehdd_path,
+                        bed_conform=self.payload.bed_conform,
+                        warp_mode=self.payload.thd_warp_mode,
+                        duration=audio_track_info.duration,
+                        step_info={"current": 1, "total": 3, "name": "truehdd"},
+                        no_progress_bars=self.payload.no_progress_bars,
                     )
-        finally:
-            self._release_truehdd()
+                    if getattr(self.payload, "reuse_temp_files", False):
+                        self._write_signature_metadata(
+                            metadata_path,
+                            str(CodecFormat.ATMOS),
+                            truehdd_signature,
+                            "atmos_meta.atmos",
+                            file_input,
+                        )
+            finally:
+                self._release_truehdd()
+
+        # check if we're processing adm atmos wav file
+        elif audio_track_info.adm_atmos_wav:
+            dee_input_path = file_input
+            logger.info("Using ADM BWF input")
+
+        # if it's anything raise an error
+        else:
+            raise InvalidAtmosInputError(
+                "Cannot process input, not a valid Atmos format"
+            )
 
         # generate JSON
         json_generator = DeeJSONGenerator(
-            input_file_path=decoded_mezz_path,
+            input_file_path=dee_input_path,
             output_file_path=output,
             output_dir=temp_dir,
             codec_format=CodecFormat.ATMOS,