From 409480dd2436802b1ee7516595139732e19474fb Mon Sep 17 00:00:00 2001 From: Scott Schneider Date: Wed, 15 Jan 2025 14:02:06 -0800 Subject: [PATCH] Reference must be on device; drive-by NULL -> nullptr --- src/torchcodec/decoders/_core/CudaDevice.cpp | 2 +- test/decoders/test_video_decoder.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/torchcodec/decoders/_core/CudaDevice.cpp b/src/torchcodec/decoders/_core/CudaDevice.cpp index 69fef471..5dc1c6d4 100644 --- a/src/torchcodec/decoders/_core/CudaDevice.cpp +++ b/src/torchcodec/decoders/_core/CudaDevice.cpp @@ -265,7 +265,7 @@ std::optional findCudaCodec( const AVCodecID& codecId) { throwErrorIfNonCudaDevice(device); - void* i = NULL; + void* i = nullptr; AVCodecPtr c; while (c = av_codec_iterate(&i)) { diff --git a/test/decoders/test_video_decoder.py b/test/decoders/test_video_decoder.py index 8b15c1a3..4632e5ff 100644 --- a/test/decoders/test_video_decoder.py +++ b/test/decoders/test_video_decoder.py @@ -448,7 +448,9 @@ def test_get_frame_played_at_h265(self, device): # Non-regression test for https://github.com/pytorch/torchcodec/issues/179 decoder = VideoDecoder(H265_VIDEO.path, device=device) ref_frame6 = H265_VIDEO.get_frame_data_by_index(5) - assert_frames_equal(ref_frame6, decoder.get_frame_played_at(0.5).data) + assert_frames_equal( + ref_frame6.to(device=device), decoder.get_frame_played_at(0.5).data + ) @pytest.mark.parametrize("device", cpu_and_cuda()) def test_get_frame_played_at_fails(self, device):