Skip to content
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

Jump to bottom

Fix deadlock in H.264 encoder #28

Merged
merged 1 commit into from
Apr 20, 2021
Merged

Fix deadlock in H.264 encoder #28

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
6 changes: 4 additions & 2 deletions libcamera_encoder.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,10 @@ class LibcameraEncoder: public LibcameraApp<VideoOptions>
if (!buffer || !mem)
throw std::runtime_error("no buffer to encode");
int64_t timestamp_ns = buffer->metadata().timestamp;
std::lock_guard<std::mutex> lock(encode_buffer_queue_mutex_);
encode_buffer_queue_.push(std::move(completed_request));
{
std::lock_guard<std::mutex> lock(encode_buffer_queue_mutex_);
encode_buffer_queue_.push(std::move(completed_request));
}
int index = encoder_->EncodeBuffer(buffer->planes()[0].fd.fd(), buffer->planes()[0].length,
mem, w, h, stride, timestamp_ns / 1000);
// Could use index as a reference to this buffer, but we don't seem to need it.
Expand Down