Rename underscore-prefixed binding factory functions to make_something

Differential Revision: D102682526

Pull Request resolved: #1384

Author: mthrok

src/spdl/io/_core.py

@@ -164,8 +164,11 @@ def __init__(
         name: str | None = None,
         **kwargs: Any,
     ) -> None:
-        self._demuxer: _libspdl.Demuxer = _libspdl._demuxer(
-            _resolve_src(src), demux_config=demux_config, name=name, **kwargs
+        self._demuxer: _libspdl.Demuxer = _libspdl.make_demuxer(
+            _resolve_src(src),
+            demux_config=demux_config,
+            name=name,
+            **kwargs,  # pyre-ignore[6]
         )
 
     def demux_audio(
@@ -461,7 +464,7 @@ class BSF(Generic[TCodec, TPackets]):
     """
 
     def __init__(self, codec: TCodec, bsf: str) -> None:
-        self._bsf: Any = _libspdl._make_bsf(codec, bsf)
+        self._bsf: Any = _libspdl.make_bsf(codec, bsf)  # pyre-ignore[6]
 
     def filter(self, packets: TPackets, flush: bool = False) -> TPackets | None:
         """Apply the filter to the input packets
@@ -621,8 +624,10 @@ def Decoder(
     if filter_desc is not None:
         filter_desc = _resolve_filter_graph(filter_desc, codec)
 
-    return _libspdl._make_decoder(
-        codec, filter_desc=filter_desc, decode_config=decode_config
+    return _libspdl.make_decoder(
+        codec,
+        filter_desc=filter_desc,
+        decode_config=decode_config,  # pyre-ignore[6]
     )
 
 
@@ -893,7 +898,7 @@ def decode_image_nvjpeg(
 
 def _get_decoder() -> "NvDecDecoder":
     if getattr(_THREAD_LOCAL, "_decoder", None) is None:
-        _THREAD_LOCAL._decoder = _libspdl_cuda._nvdec_decoder()  # pyre-ignore[16]
+        _THREAD_LOCAL._decoder = _libspdl_cuda.make_nvdec_decoder()  # pyre-ignore[16]
     return _THREAD_LOCAL._decoder
 
 

src/spdl/io/lib/_libspdl.pyi

@@ -60,19 +60,19 @@ void register_bsf(nb::module_& m) {
           nb::call_guard<nb::gil_scoped_release>());
 
   m.def(
-      "_make_bsf",
+      "make_bsf",
       [](const VideoCodec& codec, const std::string& name) {
         return std::make_unique<BSF<MediaType::Video>>(codec, name);
       },
       nb::call_guard<nb::gil_scoped_release>());
   m.def(
-      "_make_bsf",
+      "make_bsf",
       [](const AudioCodec& codec, const std::string& name) {
         return std::make_unique<BSF<MediaType::Audio>>(codec, name);
       },
       nb::call_guard<nb::gil_scoped_release>());
   m.def(
-      "_make_bsf",
+      "make_bsf",
       [](const ImageCodec& codec, const std::string& name) {
         return std::make_unique<BSF<MediaType::Image>>(codec, name);
       },

src/spdl/io/lib/_libspdl_cuda.pyi

@@ -95,23 +95,23 @@ void register_decoding(nb::module_& m) {
           "Flush the decoder and yield remaining frames");
 
   m.def(
-      "_make_decoder",
+      "make_decoder",
       &_make_decoder<MediaType::Audio>,
       nb::call_guard<nb::gil_scoped_release>(),
       nb::arg("codec"),
       nb::kw_only(),
       nb::arg("decode_config") = nb::none(),
       nb::arg("filter_desc") = nb::none());
   m.def(
-      "_make_decoder",
+      "make_decoder",
       &_make_decoder<MediaType::Video>,
       nb::call_guard<nb::gil_scoped_release>(),
       nb::arg("codec"),
       nb::kw_only(),
       nb::arg("decode_config") = nb::none(),
       nb::arg("filter_desc") = nb::none());
   m.def(
-      "_make_decoder",
+      "make_decoder",
       &_make_decoder<MediaType::Image>,
       nb::call_guard<nb::gil_scoped_release>(),
       nb::arg("codec"),

src/spdl/io/lib/core/bsf.cpp

@@ -312,7 +312,7 @@ void register_demuxing(nb::module_& m) {
       .def("_drop", &PyDemuxer::_drop);
 
   m.def(
-      "_demuxer",
+      "make_demuxer",
       &_make_demuxer,
       nb::arg("src"),
       nb::kw_only(),
@@ -321,7 +321,7 @@ void register_demuxing(nb::module_& m) {
       nb::arg("name") = nb::none());
 
   m.def(
-      "_demuxer",
+      "make_demuxer",
       &_make_demuxer_memoryview,
       nb::arg("src"),
       nb::kw_only(),

src/spdl/io/lib/core/decoding.cpp

@@ -272,7 +272,7 @@ The frame buffer must be initialized with init_buffer() before calling this.
           nb::call_guard<nb::gil_scoped_release>());
 
   m.def(
-      "_nvdec_decoder",
+      "make_nvdec_decoder",
       []() -> std::unique_ptr<NvDecDecoder> {
 #ifdef SPDL_USE_NVCODEC
         return std::make_unique<NvDecDecoder>();

src/spdl/io/lib/core/demuxing.cpp

@@ -323,7 +323,7 @@ def tearDown(self) -> None:
         # Clean up any cached decoders after each test
         spdl.io._core._del_cached_decoder()
 
-    @patch("spdl.io._core._libspdl_cuda._nvdec_decoder")
+    @patch("spdl.io._core._libspdl_cuda.make_nvdec_decoder")
     def test_decoder_caching_same_thread(self, mock_nvdec_decoder: MagicMock) -> None:
         """Verify that nvdec_decoder returns the same cached instance within the same thread."""
         # Setup: Mock decoder creation to return a mock object
@@ -343,7 +343,7 @@ def test_decoder_caching_same_thread(self, mock_nvdec_decoder: MagicMock) -> Non
             mock_nvdec_decoder.call_count, 1, "Decoder should be created only once"
         )
 
-    @patch("spdl.io._core._libspdl_cuda._nvdec_decoder")
+    @patch("spdl.io._core._libspdl_cuda.make_nvdec_decoder")
     def test_decoder_no_caching(self, mock_nvdec_decoder: MagicMock) -> None:
         """Verify that nvdec_decoder creates a new instance when use_cache=False."""
         # Setup: Mock decoder creation to return different mock objects each time
@@ -366,7 +366,7 @@ def test_decoder_no_caching(self, mock_nvdec_decoder: MagicMock) -> None:
             mock_nvdec_decoder.call_count, 2, "Decoder should be created twice"
         )
 
-    @patch("spdl.io._core._libspdl_cuda._nvdec_decoder")
+    @patch("spdl.io._core._libspdl_cuda.make_nvdec_decoder")
     def test_decoder_caching_different_threads(
         self, mock_nvdec_decoder: MagicMock
     ) -> None:
@@ -412,7 +412,7 @@ def get_decoder_in_thread():
             creation_count["count"], 2, "Decoder should be created once per thread"
         )
 
-    @patch("spdl.io._core._libspdl_cuda._nvdec_decoder")
+    @patch("spdl.io._core._libspdl_cuda.make_nvdec_decoder")
     def test_decoder_cache_cleared_on_crop(self, mock_nvdec_decoder: MagicMock) -> None:
         """Verify that providing crop parameters forces recreation of the decoder.
 
@@ -449,7 +449,7 @@ def test_decoder_cache_cleared_on_crop(self, mock_nvdec_decoder: MagicMock) -> N
             "Decoder should be recreated when crop parameters change",
         )
 
-    @patch("spdl.io._core._libspdl_cuda._nvdec_decoder")
+    @patch("spdl.io._core._libspdl_cuda.make_nvdec_decoder")
     def test_cache_cleanup_with_hasattr_delattr(
         self, mock_nvdec_decoder: MagicMock
     ) -> None:
@@ -471,7 +471,7 @@ def test_cache_cleanup_with_hasattr_delattr(
             "Decoder should be created twice after cache clear",
         )
 
-    @patch("spdl.io._core._libspdl_cuda._nvdec_decoder")
+    @patch("spdl.io._core._libspdl_cuda.make_nvdec_decoder")
     def test_thread_local_isolation_with_getattr(
         self, mock_nvdec_decoder: MagicMock
     ) -> None: