[libcamera-devel,v2,2/5] test: v4l2_device: Implement functions inside class definition in cpp files
diff mbox series

Message ID 20190511111115.16727-3-niklas.soderlund@ragnatech.se
State Accepted
Headers show
Series
  • test: v4l2_device: Cleanups and a small speed increase
Related show

Commit Message

Niklas Söderlund May 11, 2019, 11:11 a.m. UTC 
Align the style of the formats test with the other v4l2_device tests by
impending the functions in the class definition instead of first
declaring the class and then implement the functions. There is no
functional change only restructuring of existing code to align with the
style of other tests.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 test/v4l2_device/formats.cpp | 58 +++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 30 deletions(-)

Patch
diff mbox series 

diff --git a/test/v4l2_device/formats.cpp b/test/v4l2_device/formats.cpp
index 007e7e9487b57772..72676c9d334a69b0 100644
--- a/test/v4l2_device/formats.cpp
+++ b/test/v4l2_device/formats.cpp
@@ -18,36 +18,34 @@  using namespace libcamera;
 class Format : public V4L2DeviceTest
 {
 protected:
-	int run() override;
+	int run()
+	{
+		V4L2DeviceFormat format = {};
+
+		int ret = capture_->getFormat(&format);
+		if (ret) {
+			cerr << "Failed to get format" << endl;
+			return TestFail;
+		}
+
+		format.size = { UINT_MAX, UINT_MAX };
+		ret = capture_->setFormat(&format);
+		if (ret) {
+			cerr << "Failed to set format: image resolution is invalid: "
+			     << "(UINT_MAX x UINT_MAX) but setFormat() should not fail."
+			     << endl;
+			return TestFail;
+		}
+
+		if (format.size.width == UINT_MAX ||
+		    format.size.height == UINT_MAX) {
+			cerr << "Failed to update image format = (UINT_MAX x UINT_MAX)"
+			     << endl;
+			return TestFail;
+		}
+
+		return TestPass;
+	}
 };
 
-int Format::run()
-{
-	V4L2DeviceFormat format = {};
-
-	int ret = capture_->getFormat(&format);
-	if (ret) {
-		cerr << "Failed to get format" << endl;
-		return TestFail;
-	}
-
-	format.size = { UINT_MAX, UINT_MAX };
-	ret = capture_->setFormat(&format);
-	if (ret) {
-		cerr << "Failed to set format: image resolution is invalid: "
-		     << "(UINT_MAX x UINT_MAX) but setFormat() should not fail."
-		     << endl;
-		return TestFail;
-	}
-
-	if (format.size.width == UINT_MAX ||
-	    format.size.height == UINT_MAX) {
-		cerr << "Failed to update image format = (UINT_MAX x UINT_MAX)"
-		     << endl;
-		return TestFail;
-	}
-
-	return TestPass;
-}
-
 TEST_REGISTER(Format);