Skip to content

Remove getKeyFrameIndexForPtsUsingEncoderIndex #486

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 2 commits into from
Jan 30, 2025
Merged

Remove getKeyFrameIndexForPtsUsingEncoderIndex #486

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
6515963
Remove getKeyFrameIndexForPtsUsingEncoderIndex
NicolasHug Jan 28, 2025
ae593d1
Merge branch 'main' of github.com:pytorch/torchcodec into remove_method
NicolasHug Jan 30, 2025
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
14 changes: 4 additions & 10 deletions src/torchcodec/decoders/_core/VideoDecoder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,14 +550,6 @@ torch::Tensor VideoDecoder::getKeyFrameIndices(int streamIndex) {
return keyFrameIndices;
}

int VideoDecoder::getKeyFrameIndexForPtsUsingEncoderIndex(
AVStream* stream,
int64_t pts) const {
int currentKeyFrameIndex =
av_index_search_timestamp(stream, pts, AVSEEK_FLAG_BACKWARD);
return currentKeyFrameIndex;
}

int VideoDecoder::getKeyFrameIndexForPtsUsingScannedIndex(
const std::vector<VideoDecoder::FrameInfo>& keyFrames,
int64_t pts) const {
Expand Down Expand Up @@ -694,9 +686,11 @@ int VideoDecoder::getKeyFrameIndexForPts(
const StreamInfo& streamInfo,
int64_t pts) const {
if (streamInfo.keyFrames.empty()) {
return getKeyFrameIndexForPtsUsingEncoderIndex(streamInfo.stream, pts);
return av_index_search_timestamp(
streamInfo.stream, pts, AVSEEK_FLAG_BACKWARD);
} else {
return getKeyFrameIndexForPtsUsingScannedIndex(streamInfo.keyFrames, pts);
}
return getKeyFrameIndexForPtsUsingScannedIndex(streamInfo.keyFrames, pts);
}

/*
Expand Down
3 changes: 0 additions & 3 deletions src/torchcodec/decoders/_core/VideoDecoder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,9 +423,6 @@ class VideoDecoder {
int getKeyFrameIndexForPtsUsingScannedIndex(
const std::vector<VideoDecoder::FrameInfo>& keyFrames,
int64_t pts) const;
// Return key frame index, from FFmpeg. Potentially less accurate
int getKeyFrameIndexForPtsUsingEncoderIndex(AVStream* stream, int64_t pts)
const;

int64_t secondsToIndexLowerBound(
double seconds,
Expand Down
Loading