@@ -5,6 +5,8 @@
* Camera capture session
*/
+#include "camera_session.h"
+
#include <iomanip>
#include <iostream>
#include <limits.h>
@@ -16,7 +18,6 @@
#include "../common/event_loop.h"
#include "../common/stream_options.h"
-#include "camera_session.h"
#include "capture_script.h"
#include "file_sink.h"
#ifdef HAVE_KMS
@@ -248,8 +249,8 @@ int CameraSession::start()
streamNames_.clear();
for (unsigned int index = 0; index < config_->size(); ++index) {
StreamConfiguration &cfg = config_->at(index);
- streamNames_[cfg.stream()] = "cam" + std::to_string(cameraIndex_)
- + "-stream" + std::to_string(index);
+ streamNames_[cfg.stream()] = "cam" + std::to_string(cameraIndex_) +
+ "-stream" + std::to_string(index);
}
camera_->requestCompleted.connect(this, &CameraSession::requestComplete);
@@ -7,8 +7,8 @@
#include "kms_sink.h"
-#include <array>
#include <algorithm>
+#include <array>
#include <assert.h>
#include <iostream>
#include <limits.h>
@@ -122,7 +122,7 @@ int KMSSink::configure(const libcamera::CameraConfiguration &config)
for (const DRM::Mode &mode : modes) {
unsigned int modeArea = mode.hdisplay * mode.vdisplay;
unsigned int distance = modeArea > cfgArea ? modeArea - cfgArea
- : cfgArea - modeArea;
+ : cfgArea - modeArea;
if (distance < bestDistance) {
mode_ = &mode;
@@ -395,8 +395,9 @@ bool KMSSink::setupComposition(DRM::FrameBuffer *drmBuffer)
/* 1. Scale the frame buffer to full screen, preserving aspect ratio. */
libcamera::Rectangle src = framebuffer;
- libcamera::Rectangle dst = display.size().boundedToAspectRatio(framebuffer.size())
- .centeredTo(display.center());
+ libcamera::Rectangle dst = display.size()
+ .boundedToAspectRatio(framebuffer.size())
+ .centeredTo(display.center());
if (testModeSet(drmBuffer, src, dst)) {
std::cout << "KMS: full-screen scaled output, square pixels"
@@ -5,6 +5,8 @@
* cam - The libcamera swiss army knife
*/
+#include "main.h"
+
#include <atomic>
#include <iomanip>
#include <iostream>
@@ -19,7 +21,6 @@
#include "../common/stream_options.h"
#include "camera_session.h"
-#include "main.h"
using namespace libcamera;
Let's make the autoformatter happier. Signed-off-by: Milan Zamazal <mzamazal@redhat.com> --- src/apps/cam/camera_session.cpp | 7 ++++--- src/apps/cam/kms_sink.cpp | 9 +++++---- src/apps/cam/main.cpp | 3 ++- 3 files changed, 11 insertions(+), 8 deletions(-)