ffmpeg-normalize 1.31.0__py2.py3-none-any.whl → 1.31.2__py2.py3-none-any.whl

ffmpeg_normalize/__main__.py

@@ -559,6 +559,7 @@ def main() -> None:
         extra_input_options=extra_input_options,
         extra_output_options=extra_output_options,
         output_format=cli_args.output_format,
+        extension=cli_args.extension,
         dry_run=cli_args.dry_run,
         progress=cli_args.progress,
     )

ffmpeg_normalize/_ffmpeg_normalize.py

@@ -79,6 +79,7 @@ class FFmpegNormalize:
         extra_input_options (list, optional): Extra input options. Defaults to None.
         extra_output_options (list, optional): Extra output options. Defaults to None.
         output_format (str, optional): Output format. Defaults to None.
+        extension (str, optional): Output file extension to use for output files that were not explicitly specified. Defaults to "mkv".
         dry_run (bool, optional): Dry run. Defaults to False.
         debug (bool, optional): Debug. Defaults to False.
         progress (bool, optional): Progress. Defaults to False.
@@ -117,6 +118,7 @@ class FFmpegNormalize:
         extra_input_options: list[str] | None = None,
         extra_output_options: list[str] | None = None,
         output_format: str | None = None,
+        extension: str = "mkv",
         dry_run: bool = False,
         debug: bool = False,
         progress: bool = False,
@@ -197,6 +199,7 @@ class FFmpegNormalize:
         self.post_filter = post_filter
 
         self.output_format = output_format
+        self.extension = extension
         self.dry_run = dry_run
         self.debug = debug
         self.progress = progress

ffmpeg_normalize/_media_file.py

@@ -67,7 +67,12 @@ class MediaFile:
         self.skip = False
         self.input_file = input_file
         self.output_file = output_file
-        self.output_ext = os.path.splitext(output_file)[1][1:]
+        current_ext = os.path.splitext(output_file)[1][1:]
+        # we need to check if it's empty, e.g. /dev/null or NUL
+        if current_ext == "" or self.output_file == NUL:
+            self.output_ext = self.ffmpeg_normalize.extension
+        else:
+            self.output_ext = current_ext
         self.streams: StreamDict = {"audio": {}, "video": {}, "subtitle": {}}
 
         self.parse_streams()
@@ -177,8 +182,7 @@ class MediaFile:
             and len(self.streams["audio"].values()) > 1
         ):
             _logger.warning(
-                "Output file only supports one stream. "
-                "Keeping only first audio stream."
+                "Output file only supports one stream. Keeping only first audio stream."
             )
             first_stream = list(self.streams["audio"].values())[0]
             self.streams["audio"] = {first_stream.stream_id: first_stream}
@@ -390,7 +394,12 @@ class MediaFile:
 
         # other audio options (if any)
         if self.ffmpeg_normalize.audio_bitrate:
-            cmd.extend(["-b:a", str(self.ffmpeg_normalize.audio_bitrate)])
+            if self.ffmpeg_normalize.audio_codec == "libvorbis":
+                # libvorbis takes just a "-b" option, for some reason
+                # https://github.com/slhck/ffmpeg-normalize/issues/277
+                cmd.extend(["-b", str(self.ffmpeg_normalize.audio_bitrate)])
+            else:
+                cmd.extend(["-b:a", str(self.ffmpeg_normalize.audio_bitrate)])
         if self.ffmpeg_normalize.sample_rate:
             cmd.extend(["-ar", str(self.ffmpeg_normalize.sample_rate)])
         if self.ffmpeg_normalize.audio_channels:
@@ -420,13 +429,18 @@ class MediaFile:
         # if dry run, only show sample command
         if self.ffmpeg_normalize.dry_run:
             cmd.append(self.output_file)
+            _logger.warning("Dry run used, not actually running second-pass command")
             CommandRunner(dry=True).run_command(cmd)
             yield 100
             return
 
-        temp_dir = mkdtemp()
-        temp_file = os.path.join(temp_dir, f"out.{self.output_ext}")
-        cmd.append(temp_file)
+        # special case: if output is a null device, write directly to it
+        if self.output_file == NUL:
+            cmd.append(self.output_file)
+        else:
+            temp_dir = mkdtemp()
+            temp_file = os.path.join(temp_dir, f"out.{self.output_ext}")
+            cmd.append(temp_file)
 
         cmd_runner = CommandRunner()
         try:
@@ -438,13 +452,15 @@ class MediaFile:
                 )
                 raise e
             else:
-                _logger.debug(
-                    f"Moving temporary file from {temp_file} to {self.output_file}"
-                )
-                move(temp_file, self.output_file)
-                rmtree(temp_dir, ignore_errors=True)
+                if self.output_file != NUL:
+                    _logger.debug(
+                        f"Moving temporary file from {temp_file} to {self.output_file}"
+                    )
+                    move(temp_file, self.output_file)
+                    rmtree(temp_dir, ignore_errors=True)
         except Exception as e:
-            rmtree(temp_dir, ignore_errors=True)
+            if self.output_file != NUL:
+                rmtree(temp_dir, ignore_errors=True)
             raise e
 
         output = cmd_runner.get_output()

ffmpeg_normalize/_version.py

@@ -1 +1 @@
-__version__ = "1.31.0"
+__version__ = "1.31.2"

{ffmpeg_normalize-1.31.0.dist-info → ffmpeg_normalize-1.31.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ffmpeg-normalize
-Version: 1.31.0
+Version: 1.31.2
 Summary: Normalize audio via ffmpeg
 Home-page: https://github.com/slhck/ffmpeg-normalize
 Author: Werner Robitza
@@ -671,6 +671,20 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 # Changelog
 
 
+## v1.31.2 (2025-03-19)
+
+* Fix: special handling of /dev/null.
+
+
+## v1.31.1 (2025-02-19)
+
+* Fix bitrate setting for libvorbis, fixes #277.
+
+* Update issue templates.
+
+* Prevent blank issues.
+
+
 ## v1.31.0 (2024-12-15)
 
 * Update docs and completions.

ffmpeg_normalize-1.31.2.dist-info/RECORD

@@ -0,0 +1,16 @@
+ffmpeg_normalize/__init__.py,sha256=aAhlk93ZE6SQcWUDzZQcw9vJh0bJcKEUNFGhVc5ZIto,453
+ffmpeg_normalize/__main__.py,sha256=qOiycud87-wBceNLujaPZgWCTwJr7kaJM-IBvz4D7f4,19431
+ffmpeg_normalize/_cmd_utils.py,sha256=S7PLXQAZHmJ30RM9K6b--vXuxMf-cQHtaFOPtILxz-4,5360
+ffmpeg_normalize/_errors.py,sha256=brTQ4osJ4fTA8wnyMPVVYfGwJ0wqeShRFydTEwi_VEY,48
+ffmpeg_normalize/_ffmpeg_normalize.py,sha256=JIVE03ZJi-jOvnc7OuftQEqloQwwyO7ZD3PIMFmIvbo,11283
+ffmpeg_normalize/_logger.py,sha256=3Ap4Fxg7xGrzz7h4IGuNEf0KKstx0Rq_eLbHPrHzcrI,1841
+ffmpeg_normalize/_media_file.py,sha256=ko5Jn0OxaDsIHbsm-CKWu96chf-8CA5aVUcxGUrPTEU,18863
+ffmpeg_normalize/_streams.py,sha256=LIllXl4SKLxlyPVjD3ieHqc_byF2eUTjnK-clh2g_CY,20211
+ffmpeg_normalize/_version.py,sha256=6MP_NMOhYOl3gX-No5ZuL2yHjzinJzxgtxqL3H5MNuc,23
+ffmpeg_normalize/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ffmpeg_normalize-1.31.2.dist-info/LICENSE,sha256=zeqAHGWrSIwdPHsZMZv1_N0gGFO1xxjcZEz9CplR4EM,1086
+ffmpeg_normalize-1.31.2.dist-info/METADATA,sha256=CJJ8-L3WwkbJgfY_MBewdmtjGJmsMRcHRt62pXKj9DU,60274
+ffmpeg_normalize-1.31.2.dist-info/WHEEL,sha256=fS9sRbCBHs7VFcwJLnLXN1MZRR0_TVTxvXKzOnaSFs8,110
+ffmpeg_normalize-1.31.2.dist-info/entry_points.txt,sha256=X0EC5ptb0iGOxrk3Aa65dVQtvUixngLd_2-iAtSixdc,68
+ffmpeg_normalize-1.31.2.dist-info/top_level.txt,sha256=wnUkr17ckPrrU1JsxZQiXbEBUnHKsC64yck-MemEBuI,17
+ffmpeg_normalize-1.31.2.dist-info/RECORD,,

ffmpeg_normalize-1.31.0.dist-info/RECORD

@@ -1,16 +0,0 @@
-ffmpeg_normalize/__init__.py,sha256=aAhlk93ZE6SQcWUDzZQcw9vJh0bJcKEUNFGhVc5ZIto,453
-ffmpeg_normalize/__main__.py,sha256=AuyIcMU1WxGamczZtZyISfgMsEIt3Y1kSJ87dCoH9J4,19393
-ffmpeg_normalize/_cmd_utils.py,sha256=S7PLXQAZHmJ30RM9K6b--vXuxMf-cQHtaFOPtILxz-4,5360
-ffmpeg_normalize/_errors.py,sha256=brTQ4osJ4fTA8wnyMPVVYfGwJ0wqeShRFydTEwi_VEY,48
-ffmpeg_normalize/_ffmpeg_normalize.py,sha256=VoxhER57Ew0RKC_WcGpoCmyKKoqsHYuqNFMm7z4BPM4,11080
-ffmpeg_normalize/_logger.py,sha256=3Ap4Fxg7xGrzz7h4IGuNEf0KKstx0Rq_eLbHPrHzcrI,1841
-ffmpeg_normalize/_media_file.py,sha256=KUAjyI5hAGv5M-Y7NurrS8nmH0gelgIfw9CbLYWOWf8,17972
-ffmpeg_normalize/_streams.py,sha256=LIllXl4SKLxlyPVjD3ieHqc_byF2eUTjnK-clh2g_CY,20211
-ffmpeg_normalize/_version.py,sha256=jYtGJTa-bBcDTtE3IrYQBdcmjbk5Cfx7X6sxv2dEPwg,23
-ffmpeg_normalize/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ffmpeg_normalize-1.31.0.dist-info/LICENSE,sha256=zeqAHGWrSIwdPHsZMZv1_N0gGFO1xxjcZEz9CplR4EM,1086
-ffmpeg_normalize-1.31.0.dist-info/METADATA,sha256=TaXepF_i6VrztwLBsg8SEik_g3TOss4RQSTuX0RuUqI,60081
-ffmpeg_normalize-1.31.0.dist-info/WHEEL,sha256=fS9sRbCBHs7VFcwJLnLXN1MZRR0_TVTxvXKzOnaSFs8,110
-ffmpeg_normalize-1.31.0.dist-info/entry_points.txt,sha256=X0EC5ptb0iGOxrk3Aa65dVQtvUixngLd_2-iAtSixdc,68
-ffmpeg_normalize-1.31.0.dist-info/top_level.txt,sha256=wnUkr17ckPrrU1JsxZQiXbEBUnHKsC64yck-MemEBuI,17
-ffmpeg_normalize-1.31.0.dist-info/RECORD,,