Renaming

Author: NicolasHug

src/torchcodec/_core/BetaCudaDeviceInterface.cpp

@@ -513,22 +513,22 @@ void BetaCudaDeviceInterface::convertAVFrameToFrameOutput(
 }
 
 void BetaCudaDeviceInterface::FrameBuffer::markAsBeingDecoded(int slotId) {
-  auto it = frameBuffer_.find(slotId);
+  auto it = map_.find(slotId);
   TORCH_CHECK(
-      it == frameBuffer_.end(),
+      it == map_.end(),
       "Slot ",
       slotId,
       " is already occupied. This should never happen.");
 
-  frameBuffer_.emplace(slotId, Slot(slotId, SlotState::BEING_DECODED));
+  map_.emplace(slotId, Slot(slotId, SlotState::BEING_DECODED));
 }
 
 void BetaCudaDeviceInterface::FrameBuffer::markSlotReadyAndSetInfo(
     int slotId,
     CUVIDPARSERDISPINFO* dispInfo) {
-  auto it = frameBuffer_.find(slotId);
+  auto it = map_.find(slotId);
   TORCH_CHECK(
-      it != frameBuffer_.end(),
+      it != map_.end(),
       "Could not find matching slot with slotId ",
       slotId,
       ". This should never happen.");
@@ -538,19 +538,19 @@ void BetaCudaDeviceInterface::FrameBuffer::markSlotReadyAndSetInfo(
 }
 
 void BetaCudaDeviceInterface::FrameBuffer::free(int slotId) {
-  auto it = frameBuffer_.find(slotId);
+  auto it = map_.find(slotId);
   TORCH_CHECK(
-      it != frameBuffer_.end(),
+      it != map_.end(),
       "Tried to free non-existing slot with slotId",
       slotId,
       ". This should never happen.");
-  frameBuffer_.erase(it);
+  map_.erase(it);
 }
 
 BetaCudaDeviceInterface::FrameBuffer::Slot*
 BetaCudaDeviceInterface::FrameBuffer::findReadySlotWithLowestPts() {
   Slot* outputSlot = nullptr;
-  for (auto& [_, slot] : frameBuffer_) {
+  for (auto& [_, slot] : map_) {
     if (slot.state == SlotState::READY_FOR_OUTPUT &&
         (outputSlot == nullptr ||
          slot.dispInfo.timestamp < outputSlot->dispInfo.timestamp)) {

src/torchcodec/_core/BetaCudaDeviceInterface.h

@@ -90,11 +90,11 @@ class BetaCudaDeviceInterface : public DeviceInterface {
     Slot* findReadySlotWithLowestPts();
 
     void clear() {
-      frameBuffer_.clear();
+      map_.clear();
     }
 
    private:
-    std::unordered_map<int, Slot> frameBuffer_;
+    std::unordered_map<int, Slot> map_;
   };
 
   UniqueAVFrame convertCudaFrameToAVFrame(

test/test_decoders.py

@@ -1406,9 +1406,13 @@ def test_get_frames_at_tensor_indices(self):
     @pytest.mark.parametrize("asset", (NASA_VIDEO, TEST_SRC_2_720P, BT709_FULL_RANGE))
     @pytest.mark.parametrize("contiguous_indices", (True, False))
     @pytest.mark.parametrize("seek_mode", ("exact", "approximate"))
-    def test_beta_cuda_interface_get_frame_at(self, asset, contiguous_indices, seek_mode):
+    def test_beta_cuda_interface_get_frame_at(
+        self, asset, contiguous_indices, seek_mode
+    ):
         ref_decoder = VideoDecoder(asset.path, device="cuda", seek_mode=seek_mode)
-        beta_decoder = VideoDecoder(asset.path, device="cuda:0:beta", seek_mode=seek_mode)
+        beta_decoder = VideoDecoder(
+            asset.path, device="cuda:0:beta", seek_mode=seek_mode
+        )
 
         assert ref_decoder.metadata == beta_decoder.metadata
 
@@ -1429,9 +1433,13 @@ def test_beta_cuda_interface_get_frame_at(self, asset, contiguous_indices, seek_
     @pytest.mark.parametrize("asset", (NASA_VIDEO, TEST_SRC_2_720P, BT709_FULL_RANGE))
     @pytest.mark.parametrize("contiguous_indices", (True, False))
     @pytest.mark.parametrize("seek_mode", ("exact", "approximate"))
-    def test_beta_cuda_interface_get_frames_at(self, asset, contiguous_indices, seek_mode):
+    def test_beta_cuda_interface_get_frames_at(
+        self, asset, contiguous_indices, seek_mode
+    ):
         ref_decoder = VideoDecoder(asset.path, device="cuda", seek_mode=seek_mode)
-        beta_decoder = VideoDecoder(asset.path, device="cuda:0:beta", seek_mode=seek_mode)
+        beta_decoder = VideoDecoder(
+            asset.path, device="cuda:0:beta", seek_mode=seek_mode
+        )
 
         assert ref_decoder.metadata == beta_decoder.metadata
 
@@ -1454,7 +1462,9 @@ def test_beta_cuda_interface_get_frames_at(self, asset, contiguous_indices, seek
     @pytest.mark.parametrize("seek_mode", ("exact", "approximate"))
     def test_beta_cuda_interface_get_frame_played_at(self, asset, seek_mode):
         ref_decoder = VideoDecoder(asset.path, device="cuda", seek_mode=seek_mode)
-        beta_decoder = VideoDecoder(asset.path, device="cuda:0:beta", seek_mode=seek_mode)
+        beta_decoder = VideoDecoder(
+            asset.path, device="cuda:0:beta", seek_mode=seek_mode
+        )
 
         assert ref_decoder.metadata == beta_decoder.metadata
 
@@ -1474,7 +1484,9 @@ def test_beta_cuda_interface_get_frame_played_at(self, asset, seek_mode):
     @pytest.mark.parametrize("seek_mode", ("exact", "approximate"))
     def test_beta_cuda_interface_get_frames_played_at(self, asset, seek_mode):
         ref_decoder = VideoDecoder(asset.path, device="cuda", seek_mode=seek_mode)
-        beta_decoder = VideoDecoder(asset.path, device="cuda:0:beta", seek_mode=seek_mode)
+        beta_decoder = VideoDecoder(
+            asset.path, device="cuda:0:beta", seek_mode=seek_mode
+        )
 
         assert ref_decoder.metadata == beta_decoder.metadata
 
@@ -1496,7 +1508,9 @@ def test_beta_cuda_interface_get_frames_played_at(self, asset, seek_mode):
     def test_beta_cuda_interface_backwards(self, asset, seek_mode):
 
         ref_decoder = VideoDecoder(asset.path, device="cuda", seek_mode=seek_mode)
-        beta_decoder = VideoDecoder(asset.path, device="cuda:0:beta", seek_mode=seek_mode)
+        beta_decoder = VideoDecoder(
+            asset.path, device="cuda:0:beta", seek_mode=seek_mode
+        )
 
         assert ref_decoder.metadata == beta_decoder.metadata