Skip to content

Remove get_frame_by_name test util #310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 29, 2024
Merged

Remove get_frame_by_name test util #310

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee214df
Remove get_frame_by_name test util
NicolasHug Oct 28, 2024
bb3b2c7
revert
NicolasHug Oct 28, 2024
0834956
Merge branch 'main' of github.com:pytorch/torchcodec into frames_by_name
NicolasHug Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 17 additions & 11 deletions test/decoders/test_video_decoder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ def test_getitem_int(self, num_ffmpeg_threads):

ref_frame0 = NASA_VIDEO.get_frame_data_by_index(0)
ref_frame1 = NASA_VIDEO.get_frame_data_by_index(1)
ref_frame180 = NASA_VIDEO.get_frame_by_name("time6.000000")
ref_frame_last = NASA_VIDEO.get_frame_by_name("time12.979633")
ref_frame180 = NASA_VIDEO.get_frame_data_by_index(180)
ref_frame_last = NASA_VIDEO.get_frame_data_by_index(289)

assert_tensor_equal(ref_frame0, decoder[0])
assert_tensor_equal(ref_frame1, decoder[1])
Expand All @@ -74,8 +74,8 @@ def test_getitem_numpy_int(self):

ref_frame0 = NASA_VIDEO.get_frame_data_by_index(0)
ref_frame1 = NASA_VIDEO.get_frame_data_by_index(1)
ref_frame180 = NASA_VIDEO.get_frame_by_name("time6.000000")
ref_frame_last = NASA_VIDEO.get_frame_by_name("time12.979633")
ref_frame180 = NASA_VIDEO.get_frame_data_by_index(180)
ref_frame_last = NASA_VIDEO.get_frame_data_by_index(289)

# test against numpy.int64
assert_tensor_equal(ref_frame0, decoder[numpy.int64(0)])
Expand Down Expand Up @@ -140,7 +140,7 @@ def test_getitem_slice(self):
)
assert_tensor_equal(ref8, slice8)

ref180 = NASA_VIDEO.get_frame_by_name("time6.000000")
ref180 = NASA_VIDEO.get_frame_data_by_index(180)
slice180 = decoder[180:181]
assert slice180.shape == torch.Size(
[
Expand Down Expand Up @@ -258,8 +258,8 @@ def test_iteration(self):
ref_frame1 = NASA_VIDEO.get_frame_data_by_index(1)
ref_frame9 = NASA_VIDEO.get_frame_data_by_index(9)
ref_frame35 = NASA_VIDEO.get_frame_data_by_index(35)
ref_frame180 = NASA_VIDEO.get_frame_by_name("time6.000000")
ref_frame_last = NASA_VIDEO.get_frame_by_name("time12.979633")
ref_frame180 = NASA_VIDEO.get_frame_data_by_index(180)
ref_frame_last = NASA_VIDEO.get_frame_data_by_index(289)

# Access an arbitrary frame to make sure that the later iteration
# still works as expected. The underlying C++ decoder object is
Expand Down Expand Up @@ -392,10 +392,16 @@ def test_get_frames_at_fails(self):
def test_get_frame_played_at(self):
decoder = VideoDecoder(NASA_VIDEO.path)

ref_frame6 = NASA_VIDEO.get_frame_by_name("time6.000000")
assert_tensor_equal(ref_frame6, decoder.get_frame_played_at(6.006).data)
assert_tensor_equal(ref_frame6, decoder.get_frame_played_at(6.02).data)
assert_tensor_equal(ref_frame6, decoder.get_frame_played_at(6.039366).data)
ref_frame_played_at_6 = NASA_VIDEO.get_frame_data_by_index(180)
assert_tensor_equal(
ref_frame_played_at_6, decoder.get_frame_played_at(6.006).data
)
assert_tensor_equal(
ref_frame_played_at_6, decoder.get_frame_played_at(6.02).data
)
assert_tensor_equal(
ref_frame_played_at_6, decoder.get_frame_played_at(6.039366).data
)
assert isinstance(decoder.get_frame_played_at(6.02).pts_seconds, float)
assert isinstance(decoder.get_frame_played_at(6.02).duration_seconds, float)

Expand Down
40 changes: 30 additions & 10 deletions test/decoders/test_video_decoder_ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@

torch._dynamo.config.capture_dynamic_output_shape_ops = True

INDEX_OF_FRAME_AT_6_SECONDS = 180


class ReferenceDecoder:
def __init__(self):
Expand Down Expand Up @@ -67,7 +69,9 @@ def test_seek_and_next(self):
assert_tensor_equal(frame1, reference_frame1)
seek_to_pts(decoder, 6.0)
frame_time6, _, _ = get_next_frame(decoder)
reference_frame_time6 = NASA_VIDEO.get_frame_by_name("time6.000000")
reference_frame_time6 = NASA_VIDEO.get_frame_data_by_index(
INDEX_OF_FRAME_AT_6_SECONDS
)
assert_tensor_equal(frame_time6, reference_frame_time6)

def test_get_frame_at_pts(self):
Expand All @@ -76,7 +80,9 @@ def test_get_frame_at_pts(self):
# This frame has pts=6.006 and duration=0.033367, so it should be visible
# at timestamps in the range [6.006, 6.039367) (not including the last timestamp).
frame6, _, _ = get_frame_at_pts(decoder, 6.006)
reference_frame6 = NASA_VIDEO.get_frame_by_name("time6.000000")
reference_frame6 = NASA_VIDEO.get_frame_data_by_index(
INDEX_OF_FRAME_AT_6_SECONDS
)
assert_tensor_equal(frame6, reference_frame6)
frame6, _, _ = get_frame_at_pts(decoder, 6.02)
assert_tensor_equal(frame6, reference_frame6)
Expand All @@ -98,7 +104,9 @@ def test_get_frame_at_index(self):
assert_tensor_equal(frame0, reference_frame0)
# The frame that is played at 6 seconds is frame 180 from a 0-based index.
frame6, _, _ = get_frame_at_index(decoder, stream_index=3, frame_index=180)
reference_frame6 = NASA_VIDEO.get_frame_by_name("time6.000000")
reference_frame6 = NASA_VIDEO.get_frame_data_by_index(
INDEX_OF_FRAME_AT_6_SECONDS
)
assert_tensor_equal(frame6, reference_frame6)

def test_get_frame_with_info_at_index(self):
Expand All @@ -108,7 +116,9 @@ def test_get_frame_with_info_at_index(self):
frame6, pts, duration = get_frame_at_index(
decoder, stream_index=3, frame_index=180
)
reference_frame6 = NASA_VIDEO.get_frame_by_name("time6.000000")
reference_frame6 = NASA_VIDEO.get_frame_data_by_index(
INDEX_OF_FRAME_AT_6_SECONDS
)
assert_tensor_equal(frame6, reference_frame6)
assert pts.item() == pytest.approx(6.006, rel=1e-3)
assert duration.item() == pytest.approx(0.03337, rel=1e-3)
Expand All @@ -121,7 +131,9 @@ def test_get_frames_at_indices(self):
decoder, stream_index=3, frame_indices=[0, 180]
)
reference_frame0 = NASA_VIDEO.get_frame_data_by_index(0)
reference_frame180 = NASA_VIDEO.get_frame_by_name("time6.000000")
reference_frame180 = NASA_VIDEO.get_frame_data_by_index(
INDEX_OF_FRAME_AT_6_SECONDS
)
assert_tensor_equal(frames0and180[0], reference_frame0)
assert_tensor_equal(frames0and180[1], reference_frame180)

Expand Down Expand Up @@ -301,7 +313,7 @@ def test_throws_exception_at_eof(self):
add_video_stream(decoder)
seek_to_pts(decoder, 12.979633)
last_frame, _, _ = get_next_frame(decoder)
reference_last_frame = NASA_VIDEO.get_frame_by_name("time12.979633")
reference_last_frame = NASA_VIDEO.get_frame_data_by_index(289)
assert_tensor_equal(last_frame, reference_last_frame)
with pytest.raises(IndexError, match="no more frames"):
get_next_frame(decoder)
Expand Down Expand Up @@ -331,7 +343,9 @@ def get_frame1_and_frame_time6(decoder):
decoder = create_from_file(str(NASA_VIDEO.path))
frame0, frame_time6 = get_frame1_and_frame_time6(decoder)
reference_frame0 = NASA_VIDEO.get_frame_data_by_index(0)
reference_frame_time6 = NASA_VIDEO.get_frame_by_name("time6.000000")
reference_frame_time6 = NASA_VIDEO.get_frame_data_by_index(
INDEX_OF_FRAME_AT_6_SECONDS
)
assert_tensor_equal(frame0, reference_frame0)
assert_tensor_equal(frame_time6, reference_frame_time6)

Expand All @@ -349,7 +363,9 @@ def class_based_get_frame1_and_frame_time6(
decoder = ReferenceDecoder()
frame0, frame_time6 = class_based_get_frame1_and_frame_time6(decoder)
reference_frame0 = NASA_VIDEO.get_frame_data_by_index(0)
reference_frame_time6 = NASA_VIDEO.get_frame_by_name("time6.000000")
reference_frame_time6 = NASA_VIDEO.get_frame_data_by_index(
INDEX_OF_FRAME_AT_6_SECONDS
)
assert_tensor_equal(frame0, reference_frame0)
assert_tensor_equal(frame_time6, reference_frame_time6)

Expand All @@ -376,7 +392,9 @@ def test_create_decoder(self, create_from):
assert_tensor_equal(frame1, reference_frame1)
seek_to_pts(decoder, 6.0)
frame_time6, _, _ = get_next_frame(decoder)
reference_frame_time6 = NASA_VIDEO.get_frame_by_name("time6.000000")
reference_frame_time6 = NASA_VIDEO.get_frame_data_by_index(
INDEX_OF_FRAME_AT_6_SECONDS
)
assert_tensor_equal(frame_time6, reference_frame_time6)

# Keeping the metadata tests below for now, but we should remove them
Expand Down Expand Up @@ -459,7 +477,9 @@ def test_color_conversion_library(self, color_conversion_library):
assert_tensor_equal(frame1, reference_frame1)
seek_to_pts(decoder, 6.0)
frame_time6, *_ = get_next_frame(decoder)
reference_frame_time6 = NASA_VIDEO.get_frame_by_name("time6.000000")
reference_frame_time6 = NASA_VIDEO.get_frame_data_by_index(
INDEX_OF_FRAME_AT_6_SECONDS
)
assert_tensor_equal(frame_time6, reference_frame_time6)

# We choose arbitrary values for width and height scaling to get better
Expand Down
1 change: 1 addition & 0 deletions test/resources/nasa_13013.mp4.stream3.frame000180.pt
View file
Open in desktop
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are symlinks, so they're super cheap. I'll figure out in another PR whether we can just plainly rename/remove the existing "timexxx" frames.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nasa_13013.mp4.time6.000000.pt
1 change: 1 addition & 0 deletions test/resources/nasa_13013.mp4.stream3.frame000289.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nasa_13013.mp4.time12.979633.pt
3 changes: 0 additions & 3 deletions test/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,6 @@ def get_frame_info(

return self.frames[stream_index][idx]

def get_frame_by_name(self, name: str) -> torch.Tensor:
return _load_tensor_from_file(f"{self.filename}.{name}.pt")

@property
def empty_pts_seconds(self) -> torch.Tensor:
return torch.empty([0], dtype=torch.float64)
Expand Down
Loading