Skip to content

Fallback to best_effort_timestamp in case of invalid PTS #2916

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

Closed
wants to merge 2 commits into from
Closed

Fallback to best_effort_timestamp in case of invalid PTS #2916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dff90eb
Fallback to best_effort_timestamp in case of invalid PTS
mthrok Dec 12, 2022
6f1eae8
fix style
mthrok Dec 20, 2022
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
Binary file added test/torchaudio_unittest/assets/RATRACE_wave_f_nm_np1_fr_goo_37.avi
View file
Open in desktop
Binary file not shown.
5 changes: 5 additions & 0 deletions test/torchaudio_unittest/assets/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
* RATRACE_wave_f_nm_np1_fr_goo_37.avi
* Source: HMDB-51 dataset ("wave" subset)
https://serre-lab.clps.brown.edu/resource/hmdb-a-large-human-motion-database/#Downloads
* License: Creative Commons Attribution 4.0 International License.
* Note: This file does not have proper PTS values thus useful for testing seek for such files.
56 changes: 31 additions & 25 deletions test/torchaudio_unittest/io/stream_reader_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,35 +446,39 @@ def test_seek_invalid_mode(self):
# Test keyframe seek
# The source mp4 video has two key frames the first frame and 203rd frame at 8.08 second.
# If the seek time stamp is smaller than 8.08, it will seek into the first frame at 0.0 second.
("nasa_13013.mp4", "key", 0.2, (0, 0)),
("nasa_13013.mp4", "key", 8.04, (0, 0)),
("nasa_13013.mp4", "key", 8.08, (0, 202)),
("nasa_13013.mp4", "key", 8.12, (0, 202)),
("nasa_13013.mp4", "key", 0.2, (0, slice(None))),
("nasa_13013.mp4", "key", 8.04, (0, slice(None))),
("nasa_13013.mp4", "key", 8.08, (0, slice(202, None))),
("nasa_13013.mp4", "key", 8.12, (0, slice(202, None))),
# The source avi video has one keyframe every twelve frames 0, 12, 24,.. or every 0.4004 seconds.
# if we seek to a time stamp smaller than 0.4004 it will seek into the first frame at 0.0 second.
("nasa_13013.avi", "key", 0.2, (0, 0)),
("nasa_13013.avi", "key", 1.01, (0, 24)),
("nasa_13013.avi", "key", 7.37, (0, 216)),
("nasa_13013.avi", "key", 7.7, (0, 216)),
("nasa_13013.avi", "key", 0.2, (0, slice(None))),
("nasa_13013.avi", "key", 1.01, (0, slice(24, None))),
("nasa_13013.avi", "key", 7.37, (0, slice(216, None))),
("nasa_13013.avi", "key", 7.7, (0, slice(216, None))),
# Test precise seek
("nasa_13013.mp4", "precise", 0.0, (0, 0)),
("nasa_13013.mp4", "precise", 0.2, (0, 5)),
("nasa_13013.mp4", "precise", 8.04, (0, 201)),
("nasa_13013.mp4", "precise", 8.08, (0, 202)),
("nasa_13013.mp4", "precise", 8.12, (0, 203)),
("nasa_13013.avi", "precise", 0.0, (0, 0)),
("nasa_13013.avi", "precise", 0.2, (0, 1)),
("nasa_13013.avi", "precise", 8.1, (0, 238)),
("nasa_13013.avi", "precise", 8.14, (0, 239)),
("nasa_13013.avi", "precise", 8.17, (0, 240)),
("nasa_13013.mp4", "precise", 0.0, (0, slice(None))),
("nasa_13013.mp4", "precise", 0.2, (0, slice(5, None))),
("nasa_13013.mp4", "precise", 8.04, (0, slice(201, None))),
("nasa_13013.mp4", "precise", 8.08, (0, slice(202, None))),
("nasa_13013.mp4", "precise", 8.12, (0, slice(203, None))),
("nasa_13013.avi", "precise", 0.0, (0, slice(None))),
("nasa_13013.avi", "precise", 0.2, (0, slice(1, None))),
("nasa_13013.avi", "precise", 8.1, (0, slice(238, None))),
("nasa_13013.avi", "precise", 8.14, (0, slice(239, None))),
("nasa_13013.avi", "precise", 8.17, (0, slice(240, None))),
# Test precise seek on video with invalid PTS
("RATRACE_wave_f_nm_np1_fr_goo_37.avi", "precise", 0.0, (0, slice(None))),
("RATRACE_wave_f_nm_np1_fr_goo_37.avi", "precise", 0.2, (0, slice(4, -1))),
("RATRACE_wave_f_nm_np1_fr_goo_37.avi", "precise", 0.3, (0, slice(7, -1))),
# Test any seek
# The source avi video has one keyframe every twelve frames 0, 12, 24,.. or every 0.4004 seconds.
("nasa_13013.avi", "any", 0.0, (0, 0)),
("nasa_13013.avi", "any", 0.56, (0, 12)),
("nasa_13013.avi", "any", 7.77, (0, 228)),
("nasa_13013.avi", "any", 0.2002, (11, 12)),
("nasa_13013.avi", "any", 0.233567, (10, 12)),
("nasa_13013.avi", "any", 0.266933, (9, 12)),
("nasa_13013.avi", "any", 0.0, (0, slice(None))),
("nasa_13013.avi", "any", 0.56, (0, slice(12, None))),
("nasa_13013.avi", "any", 7.77, (0, slice(228, None))),
("nasa_13013.avi", "any", 0.2002, (11, slice(12, None))),
("nasa_13013.avi", "any", 0.233567, (10, slice(12, None))),
("nasa_13013.avi", "any", 0.266933, (9, slice(12, None))),
]
)
def test_seek_modes(self, src, mode, seek_time, ref_indices):
Expand Down Expand Up @@ -506,7 +510,9 @@ def test_seek_modes(self, src, mode, seek_time, ref_indices):

hyp_index, ref_index = ref_indices

self.assertEqual(frame[hyp_index:], ref_frames[ref_index:])
hyp, ref = frame[hyp_index:], ref_frames[ref_index]
print(hyp.shape, ref.shape)
self.assertEqual(hyp, ref)


def _to_fltp(original):
Expand Down
3 changes: 2 additions & 1 deletion torchaudio/csrc/ffmpeg/stream_reader/stream_processor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ int StreamProcessor::process_packet(AVPacket* packet) {
// and just not discard any.
//
// Note: discard_before_pts < 0 is UB.
if (discard_before_pts <= 0 || pFrame1->pts >= discard_before_pts) {
if (discard_before_pts <= 0 || pFrame1->pts >= discard_before_pts ||
pFrame1->best_effort_timestamp >= discard_before_pts) {
send_frame(pFrame1);
}

Expand Down