Merge branch 'main' of github.com:pytorch/torchcodec into encoding_yolo

Author: NicolasHug

CMakeLists.txt

@@ -7,5 +7,5 @@ add_subdirectory(src/torchcodec/_core)
 option(BUILD_TESTS "Build tests" OFF)
 if(BUILD_TESTS)
     enable_testing()
-    add_subdirectory(test/decoders)
+    add_subdirectory(test)
 endif()

src/torchcodec/_core/SingleStreamDecoder.cpp

@@ -17,15 +17,10 @@
 #include "torch/types.h"
 
 extern "C" {
-#include <libavcodec/avcodec.h>
 #include <libavfilter/buffersink.h>
 #include <libavfilter/buffersrc.h>
-#include <libavformat/avformat.h>
 #include <libavutil/imgutils.h>
 #include <libavutil/log.h>
-#include <libavutil/pixdesc.h>
-#include <libswresample/swresample.h>
-#include <libswscale/swscale.h>
 }
 
 namespace facebook::torchcodec {

test/decoders/CMakeLists.txt test/CMakeLists.txttest/decoders/CMakeLists.txt renamed to test/CMakeLists.txt

@@ -23,7 +23,7 @@ add_executable(
 
 target_include_directories(VideoDecoderTest SYSTEM PRIVATE ${TORCH_INCLUDE_DIRS})
 target_include_directories(VideoDecoderTest SYSTEM PRIVATE ${libav_include_dirs})
-target_include_directories(VideoDecoderTest PRIVATE ../../)
+target_include_directories(VideoDecoderTest PRIVATE ../)
 
 target_link_libraries(
   VideoDecoderTest

test/decoders/VideoDecoderTest.cpp test/VideoDecoderTest.cpptest/decoders/VideoDecoderTest.cpp renamed to test/VideoDecoderTest.cpp

@@ -34,7 +34,7 @@ std::string getResourcePath(const std::string& filename) {
 #else
   std::filesystem::path dirPath = std::filesystem::path(__FILE__);
   std::string filepath =
-      dirPath.parent_path().string() + "/../resources/" + filename;
+      dirPath.parent_path().string() + "/resources/" + filename;
 #endif
   return filepath;
 }

test/decoders/__init__.py

@@ -18,7 +18,7 @@
     VideoStreamMetadata,
 )
 
-from ..utils import (
+from .utils import (
     assert_frames_equal,
     AV1_VIDEO,
     cpu_and_cuda,

test/samplers/__init__.py

@@ -18,7 +18,7 @@
 )
 from torchcodec.decoders import AudioDecoder, VideoDecoder
 
-from ..utils import NASA_AUDIO_MP3, NASA_VIDEO
+from .utils import NASA_AUDIO_MP3, NASA_VIDEO
 
 
 # TODO: Expected values in these tests should be based on the assets's

test/decoders/test_decoders.py test/test_decoders.pytest/decoders/test_decoders.py renamed to test/test_decoders.py

@@ -41,7 +41,7 @@
     seek_to_pts,
 )
 
-from ..utils import (
+from .utils import (
     assert_frames_equal,
     cpu_and_cuda,
     NASA_AUDIO,
@@ -996,6 +996,78 @@ def seek(self, offset: int, whence: int) -> bytes:
 
         assert file_counter.num_seeks > last_frame_seeks
 
+    def test_file_like_method_check_fails(self):
+        class ReadMethodMissing:
+            def seek(self, offset: int, whence: int) -> bytes:
+                return bytes()
+
+        with pytest.raises(RuntimeError, match="must implement a read method"):
+            create_from_file_like(ReadMethodMissing(), "approximate")
+
+        class SeekMethodMissing:
+            def read(self, size: int) -> bytes:
+                return bytes()
+
+        with pytest.raises(RuntimeError, match="must implement a seek method"):
+            create_from_file_like(SeekMethodMissing(), "approximate")
+
+        class ReadMethodWrongSignature:
+            def __init__(self, file: io.RawIOBase):
+                self._file = file
+
+            # io.RawIOBase says we should accept a single int; wrong signature on purpose
+            def read(self) -> bytes:
+                return bytes()
+
+            def seek(self, offset: int, whence: int) -> bytes:
+                return self._file.seeK(offset, whence)
+
+        with pytest.raises(
+            TypeError, match="takes 1 positional argument but 2 were given"
+        ):
+            create_from_file_like(
+                ReadMethodWrongSignature(open(NASA_VIDEO.path, mode="rb", buffering=0)),
+                "approximate",
+            )
+
+        class SeekMethodWrongSignature:
+            def __init__(self, file: io.RawIOBase):
+                self._file = file
+
+            def read(self, size: int) -> bytes:
+                return self._file.read(size)
+
+            # io.RawIOBase says we should accept two ints; wrong signature on purpose
+            def seek(self, offset: int) -> bytes:
+                return bytes()
+
+        with pytest.raises(
+            TypeError, match="takes 2 positional arguments but 3 were given"
+        ):
+            create_from_file_like(
+                SeekMethodWrongSignature(open(NASA_VIDEO.path, mode="rb", buffering=0)),
+                "approximate",
+            )
+
+    def test_file_like_read_fails(self):
+        class BadReader(io.RawIOBase):
+
+            def __init__(self, file: io.RawIOBase):
+                self._file = file
+
+            def read(self, size: int) -> bytes:
+                # We intentionally read more than requested.
+                return self._file.read(size + 10)
+
+            def seek(self, offset: int, whence: int) -> bytes:
+                return self._file.seek(offset, whence)
+
+        with pytest.raises(RuntimeError, match="does not conform to read protocol"):
+            create_from_file_like(
+                BadReader(open(NASA_VIDEO.path, mode="rb", buffering=0)),
+                "approximate",
+            )
+
 
 class TestAudioEncoderOps: