Skip to content

Better variable names for scanFileAndUpdateMetadataAndIndex #454

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 1 commit into from
Jan 21, 2025
Merged

Better variable names for scanFileAndUpdateMetadataAndIndex #454

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 21 additions & 19 deletions src/torchcodec/decoders/_core/VideoDecoder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,13 +562,14 @@ void VideoDecoder::scanFileAndUpdateMetadataAndIndex() {
if (packet->flags & AV_PKT_FLAG_DISCARD) {
continue;
}
auto& stream = containerMetadata_.streams[streamIndex];
stream.minPtsFromScan =
std::min(stream.minPtsFromScan.value_or(INT64_MAX), packet->pts);
stream.maxPtsFromScan = std::max(
stream.maxPtsFromScan.value_or(INT64_MIN),
auto& streamMetadata = containerMetadata_.streams[streamIndex];
streamMetadata.minPtsFromScan = std::min(
streamMetadata.minPtsFromScan.value_or(INT64_MAX), packet->pts);
streamMetadata.maxPtsFromScan = std::max(
streamMetadata.maxPtsFromScan.value_or(INT64_MIN),
packet->pts + packet->duration);
stream.numFramesFromScan = stream.numFramesFromScan.value_or(0) + 1;
streamMetadata.numFramesFromScan =
streamMetadata.numFramesFromScan.value_or(0) + 1;

FrameInfo frameInfo;
frameInfo.pts = packet->pts;
Expand All @@ -578,16 +579,17 @@ void VideoDecoder::scanFileAndUpdateMetadataAndIndex() {
}
streams_[streamIndex].allFrames.push_back(frameInfo);
}
for (size_t i = 0; i < containerMetadata_.streams.size(); ++i) {
auto& streamMetadata = containerMetadata_.streams[i];
auto stream = formatContext_->streams[i];
for (size_t streamIndex = 0; streamIndex < containerMetadata_.streams.size();
Copy link
Member Author

Choose a reason for hiding this comment

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

also renamed i to streamIndex since streamIndex is already (and properly) used just above, and just below.

++streamIndex) {
auto& streamMetadata = containerMetadata_.streams[streamIndex];
auto avStream = formatContext_->streams[streamIndex];
if (streamMetadata.minPtsFromScan.has_value()) {
streamMetadata.minPtsSecondsFromScan =
*streamMetadata.minPtsFromScan * av_q2d(stream->time_base);
*streamMetadata.minPtsFromScan * av_q2d(avStream->time_base);
}
if (streamMetadata.maxPtsFromScan.has_value()) {
streamMetadata.maxPtsSecondsFromScan =
*streamMetadata.maxPtsFromScan * av_q2d(stream->time_base);
*streamMetadata.maxPtsFromScan * av_q2d(avStream->time_base);
}
}
int ffmepgStatus =
Expand All @@ -597,23 +599,23 @@ void VideoDecoder::scanFileAndUpdateMetadataAndIndex() {
"Could not seek file to pts=0: " +
getFFMPEGErrorStringFromErrorCode(ffmepgStatus));
}
for (auto& [streamIndex, stream] : streams_) {
for (auto& [streamIndex, streamInfo] : streams_) {
std::sort(
stream.keyFrames.begin(),
stream.keyFrames.end(),
streamInfo.keyFrames.begin(),
streamInfo.keyFrames.end(),
[](const FrameInfo& frameInfo1, const FrameInfo& frameInfo2) {
return frameInfo1.pts < frameInfo2.pts;
});
std::sort(
stream.allFrames.begin(),
stream.allFrames.end(),
streamInfo.allFrames.begin(),
streamInfo.allFrames.end(),
[](const FrameInfo& frameInfo1, const FrameInfo& frameInfo2) {
return frameInfo1.pts < frameInfo2.pts;
});

for (size_t i = 0; i < stream.allFrames.size(); ++i) {
if (i + 1 < stream.allFrames.size()) {
stream.allFrames[i].nextPts = stream.allFrames[i + 1].pts;
for (size_t i = 0; i < streamInfo.allFrames.size(); ++i) {
if (i + 1 < streamInfo.allFrames.size()) {
streamInfo.allFrames[i].nextPts = streamInfo.allFrames[i + 1].pts;
}
}
}
Expand Down
Loading