ffmpeg-normalize 1.37.7__tar.gz → 1.37.8__tar.gz

{ffmpeg_normalize-1.37.7 → ffmpeg_normalize-1.37.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ffmpeg-normalize
-Version: 1.37.7
+Version: 1.37.8
 Summary: Normalize audio via ffmpeg
 Keywords: ffmpeg,normalize,audio
 Author: Werner Robitza
@@ -14,7 +14,6 @@ Classifier: Topic :: Multimedia :: Sound/Audio :: Analysis
 Classifier: Topic :: Multimedia :: Sound/Audio :: Conversion
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -25,7 +24,7 @@ Requires-Dist: colorama>=0.4.6 ; sys_platform == 'win32'
 Requires-Dist: ffmpeg-progress-yield>=1.0.1
 Requires-Dist: colorlog==6.7.0
 Requires-Dist: mutagen>=1.47.0
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Project-URL: Homepage, https://github.com/slhck/ffmpeg-normalize
 Project-URL: Repository, https://github.com/slhck/ffmpeg-normalize
 Description-Content-Type: text/markdown
@@ -58,7 +57,7 @@ This program normalizes media files to a certain loudness level using the EBU R1
 
 ## 🚀 Quick Start
 
-1. Install a recent version of [ffmpeg](https://ffmpeg.org/download.html)
+1. Install a recent version of [ffmpeg](https://ffmpeg.org/download.html) and Python 3.10 or higher
 2. Run `pip3 install ffmpeg-normalize` and `ffmpeg-normalize /path/to/your/file.mp4`, alternatively install [`uv`](https://docs.astral.sh/uv/getting-started/installation/) and run `uvx ffmpeg-normalize /path/to/your/file.mp4`
 3. Done! 🎧 (the normalized file will be called `normalized/file.mkv`)
 

{ffmpeg_normalize-1.37.7 → ffmpeg_normalize-1.37.8}/README.md

@@ -26,7 +26,7 @@ This program normalizes media files to a certain loudness level using the EBU R1
 
 ## 🚀 Quick Start
 
-1. Install a recent version of [ffmpeg](https://ffmpeg.org/download.html)
+1. Install a recent version of [ffmpeg](https://ffmpeg.org/download.html) and Python 3.10 or higher
 2. Run `pip3 install ffmpeg-normalize` and `ffmpeg-normalize /path/to/your/file.mp4`, alternatively install [`uv`](https://docs.astral.sh/uv/getting-started/installation/) and run `uvx ffmpeg-normalize /path/to/your/file.mp4`
 3. Done! 🎧 (the normalized file will be called `normalized/file.mkv`)
 

{ffmpeg_normalize-1.37.7 → ffmpeg_normalize-1.37.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "ffmpeg-normalize"
-version = "1.37.7"
+version = "1.37.8"
 description = "Normalize audio via ffmpeg"
 readme = "README.md"
 license = "MIT"
@@ -21,14 +21,13 @@ classifiers = [
     "Topic :: Multimedia :: Sound/Audio :: Conversion",
     "Natural Language :: English",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3.14",
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 dependencies = [
     "tqdm>=4.64.1",
     "colorama>=0.4.6; platform_system=='Windows'",
@@ -50,7 +49,7 @@ package-data = {"ffmpeg_normalize" = ["data/**/*.json"]}
 
 [dependency-groups]
 dev = [
-    "pytest>=8.1.1,<9",
+    "pytest>=9.0.3",
     "ruff>=0.12.11",
     "types-tqdm",
     "shtab>=1.7.0",

{ffmpeg_normalize-1.37.7 → ffmpeg_normalize-1.37.8}/src/ffmpeg_normalize/_media_file.py

@@ -660,6 +660,14 @@ class MediaFile:
             if self.ffmpeg_normalize.pre_filter:
                 filter_chain.append(self.ffmpeg_normalize.pre_filter)
 
+            # Apply channel conversion before normalization so that the
+            # normalization filter operates on the same channel layout that
+            # was measured in the first pass. See issue #316.
+            if self.ffmpeg_normalize.audio_channels:
+                filter_chain.append(
+                    f"aformat=sample_fmts=fltp:channel_layouts={self.ffmpeg_normalize.audio_channels}c"
+                )
+
             filter_chain.append(normalization_filter)
 
             if self.ffmpeg_normalize.post_filter:

{ffmpeg_normalize-1.37.7 → ffmpeg_normalize-1.37.8}/src/ffmpeg_normalize/_streams.py

@@ -210,6 +210,10 @@ class AudioStream(MediaStream):
         Get a filter string for current_filter, with the pre-filter
         added before. Applies the input label before.
 
+        If a target channel count is set via ``audio_channels``, a channel
+        layout conversion is inserted before the analysis/normalization
+        filter so that measurements reflect the downmixed signal.
+
         Args:
             current_filter (str): The current filter.
 
@@ -220,10 +224,33 @@ class AudioStream(MediaStream):
         filter_chain = []
         if self.media_file.ffmpeg_normalize.pre_filter:
             filter_chain.append(self.media_file.ffmpeg_normalize.pre_filter)
+        channel_conversion = self._get_channel_conversion_filter()
+        if channel_conversion:
+            filter_chain.append(channel_conversion)
         filter_chain.append(current_filter)
         filter_str = input_label + ",".join(filter_chain)
         return filter_str
 
+    def _get_channel_conversion_filter(self) -> str | None:
+        """
+        Return an ``aformat`` filter string that downmixes/upmixes to the
+        requested channel count, or None if no conversion is configured.
+
+        The ``Nc`` channel-layout notation matches ffmpeg's default layout
+        selection for ``-ac N``, so the analysis pass measures the same
+        signal that the output will contain.
+
+        A float planar sample format is requested so the downmix is not
+        attenuated to fit an integer range. This is what the analysis
+        measurement should reflect, since the volume gain is applied in
+        the filter graph (where samples are also float) before being
+        written to the output codec.
+        """
+        audio_channels = self.media_file.ffmpeg_normalize.audio_channels
+        if not audio_channels:
+            return None
+        return f"aformat=sample_fmts=fltp:channel_layouts={audio_channels}c"
+
     def parse_astats(self) -> Iterator[float]:
         """
         Use ffmpeg with astats filter to get the mean (RMS) and max (peak) volume of the input file.