Skip to content

Minimises number of frames sent to decoder by keeping track of which … #44

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

Open
Multihuntr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Minimises number of frames sent to decoder by keeping track of which … #44

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
18 changes: 9 additions & 9 deletions src/VideoLoader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,9 @@ void VideoLoader::impl::read_file() {
seek(file, req.frame);

auto nonkey_frame_count = 0;
while (req.count > 0 && av_read_frame(file.fmt_ctx_.get(), &raw_pkt) >= 0) {
bool got_frame[req.count] = {false};
auto frames_left = req.count;
while (frames_left > 0 && av_read_frame(file.fmt_ctx_.get(), &raw_pkt) >= 0) {
auto pkt = pkt_ptr(&raw_pkt, av_packet_unref);

stats_.bytes_read += pkt->size;
Expand Down Expand Up @@ -424,23 +426,21 @@ void VideoLoader::impl::read_file() {
continue;
} else {
req.frame += nonkey_frame_count + 1;
req.count -= nonkey_frame_count + 1;
nonkey_frame_count = 0;
}
final_try = false;
} else {
nonkey_frame_count++;
// A hueristic so we don't go way over... what should "20" be?
if (frame > req.frame + req.count + 20) {
// This should end the loop
req.frame += nonkey_frame_count;
req.count -= nonkey_frame_count;
nonkey_frame_count = 0;
}
}
}
seek_hack = 1;

auto idx = frame-req.frame;
if (idx >= 0 && idx < req.count && !got_frame[idx]) {
got_frame[idx] = true;
frames_left--;
}

log_.info() << device_id_ << ": Sending " << (key ? " key " : "nonkey")
<< " frame " << frame << " to the decoder."
<< " size = " << pkt->size
Expand Down