pytorch/torchcodec - 3.12 fixes

Differential Revision: D77327183

Pull Request resolved: #744

Author: fried

test/test_ops.py

@@ -4,6 +4,7 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
+import contextlib
 import io
 import os
 from functools import partial
@@ -555,11 +556,7 @@ def test_color_conversion_library_with_dimension_order(
     def test_color_conversion_library_with_generated_videos(
         self, tmp_path, width, height, width_scaling_factor, height_scaling_factor
     ):
-        ffmpeg_cli = "ffmpeg"
-        if os.environ.get("IN_FBCODE_TORCHCODEC") == "1":
-            import importlib.resources
 
-            ffmpeg_cli = importlib.resources.path(__package__, "ffmpeg")
         # We consider filtergraph to be the reference color conversion library.
         # However the video decoder sometimes uses swscale as that is faster.
         # The exact color conversion library used is an implementation detail
@@ -573,22 +570,32 @@ def test_color_conversion_library_with_generated_videos(
         # We don't specify a particular encoder because the ffmpeg binary could
         # be configured with different encoders. For the purposes of this test,
         # the actual encoder is irrelevant.
-        command = [
-            ffmpeg_cli,
-            "-y",
-            "-f",
-            "lavfi",
-            "-i",
-            "color=blue",
-            "-pix_fmt",
-            "yuv420p",
-            "-s",
-            f"{width}x{height}",
-            "-frames:v",
-            "1",
-            video_path,
-        ]
-        subprocess.check_call(command)
+        with contextlib.ExitStack() as stack:
+            ffmpeg_cli = "ffmpeg"
+
+            if os.environ.get("IN_FBCODE_TORCHCODEC") == "1":
+                import importlib.resources
+
+                ffmpeg_cli = stack.enter_context(
+                    importlib.resources.path(__package__, "ffmpeg")
+                )
+
+            command = [
+                ffmpeg_cli,
+                "-y",
+                "-f",
+                "lavfi",
+                "-i",
+                "color=blue",
+                "-pix_fmt",
+                "yuv420p",
+                "-s",
+                f"{width}x{height}",
+                "-frames:v",
+                "1",
+                video_path,
+            ]
+            subprocess.check_call(command)
 
         decoder = create_from_file(str(video_path))
         add_video_stream(decoder)