53 lines
2.2 KiB
Diff
53 lines
2.2 KiB
Diff
From 9d035f728745f13311ed13d057565ca3b45523aa Mon Sep 17 00:00:00 2001
|
|
From: Jan Grulich <jgrulich@redhat.com>
|
|
Date: Tue, 24 Sep 2024 11:20:02 +0000
|
|
Subject: [PATCH] Bug 1920460 - WebRTC backport: PipeWire camera: get max FPS
|
|
for each format when specified as list r=pehrsons,webrtc-reviewers
|
|
|
|
In many cases, the framerate can be specified as list of possible values
|
|
and in that case, we would end up with max FPS to be set to 0 as this
|
|
case was not handled.
|
|
|
|
This is a simple backport of an WebRTC upstream change.
|
|
|
|
Upstream commit: 3aa47cfd30dc965446cf1405bb062b756a62e6d1
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D223112
|
|
---
|
|
.../modules/video_capture/linux/pipewire_session.cc | 12 ++++++++++--
|
|
.../moz-patch-stack/3aa47cfd30.no-op-cherry-pick-msg | 1 +
|
|
2 files changed, 11 insertions(+), 2 deletions(-)
|
|
create mode 100644 third_party/libwebrtc/moz-patch-stack/3aa47cfd30.no-op-cherry-pick-msg
|
|
|
|
diff --git a/third_party/libwebrtc/modules/video_capture/linux/pipewire_session.cc b/third_party/libwebrtc/modules/video_capture/linux/pipewire_session.cc
|
|
index d9bc49d521b03..e5db278ff6a99 100644
|
|
--- a/third_party/libwebrtc/modules/video_capture/linux/pipewire_session.cc
|
|
+++ b/third_party/libwebrtc/modules/video_capture/linux/pipewire_session.cc
|
|
@@ -17,6 +17,8 @@
|
|
#include <spa/param/video/raw.h>
|
|
#include <spa/pod/parser.h>
|
|
|
|
+#include <algorithm>
|
|
+
|
|
#include "common_video/libyuv/include/webrtc_libyuv.h"
|
|
#include "modules/video_capture/device_info_impl.h"
|
|
#include "rtc_base/logging.h"
|
|
@@ -152,9 +154,15 @@ void PipeWireNode::OnNodeParam(void* data,
|
|
|
|
fract = static_cast<spa_fraction*>(SPA_POD_BODY(val));
|
|
|
|
- if (choice == SPA_CHOICE_None)
|
|
+ if (choice == SPA_CHOICE_None) {
|
|
cap.maxFPS = 1.0 * fract[0].num / fract[0].denom;
|
|
- else if (choice == SPA_CHOICE_Range && fract[1].num > 0)
|
|
+ } else if (choice == SPA_CHOICE_Enum) {
|
|
+ for (uint32_t i = 1; i < n_items; i++) {
|
|
+ cap.maxFPS = std::max(
|
|
+ static_cast<int32_t>(1.0 * fract[i].num / fract[i].denom),
|
|
+ cap.maxFPS);
|
|
+ }
|
|
+ } else if (choice == SPA_CHOICE_Range && fract[1].num > 0)
|
|
cap.maxFPS = 1.0 * fract[1].num / fract[1].denom;
|
|
}
|
|
}
|