}
// Prioritize 59.94 > 60 > 29.97. If none of those are found, then pick the highest one.
- for (const pair<int, int> &desired : vector<pair<int, int>>{ { 60000, 1001 }, { 60, 0 }, { 30000, 1001 } }) {
+ for (const pair<int, int> &desired : vector<pair<int, int>>{ { 60000, 1001 }, { 60, 1 }, { 30000, 1001 } }) {
for (const auto &it : video_modes) {
if (it.second.frame_rate_num * desired.second == desired.first * it.second.frame_rate_den) {
return it.first;
for ( ;; ) {
unique_ptr<Frame> frame;
{
- unique_lock<mutex> lock(frame_queue_mutex);
- frame_queues_changed.wait(lock, [this]{
- return should_quit.should_quit() || !pending_video_frames.empty();
- });
- if (should_quit.should_quit()) {
+ unique_lock<mutex> lock(frame_queue_mutex);
+ frame_queues_changed.wait(lock, [this]{
+ return should_quit.should_quit() || !pending_video_frames.empty();
+ });
+ if (should_quit.should_quit()) {
return;
}
frame = move(pending_video_frames.front());