diff options
Diffstat (limited to 'test/v4l2_subdevice/list_formats.cpp')
| -rw-r--r-- | test/v4l2_subdevice/list_formats.cpp | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/test/v4l2_subdevice/list_formats.cpp b/test/v4l2_subdevice/list_formats.cpp index 067dc5ed..9cbd7b94 100644 --- a/test/v4l2_subdevice/list_formats.cpp +++ b/test/v4l2_subdevice/list_formats.cpp @@ -5,13 +5,15 @@ * libcamera V4L2 Subdevice format handling test */ -#include <iomanip> #include <iostream> #include <vector> #include <libcamera/geometry.h> -#include "v4l2_subdevice.h" +#include <libcamera/base/utils.h> + +#include "libcamera/internal/v4l2_subdevice.h" + #include "v4l2_subdevice_test.h" using namespace std; @@ -35,8 +37,7 @@ void ListFormatsTest::printFormats(unsigned int pad, { cout << "Enumerate formats on pad " << pad << endl; for (const SizeRange &size : sizes) { - cout << " mbus code: 0x" << setfill('0') << setw(4) - << hex << code << endl; + cout << " mbus code: " << utils::hex(code, 4) << endl; cout << " min width: " << dec << size.min.width << endl; cout << " min height: " << dec << size.min.height << endl; cout << " max width: " << dec << size.max.width << endl; @@ -47,29 +48,29 @@ void ListFormatsTest::printFormats(unsigned int pad, int ListFormatsTest::run() { /* List all formats available on existing "Scaler" pads. */ - ImageFormats formats; + V4L2Subdevice::Formats formats; formats = scaler_->formats(0); - if (formats.isEmpty()) { + if (formats.empty()) { cerr << "Failed to list formats on pad 0 of subdevice " << scaler_->entity()->name() << endl; return TestFail; } - for (unsigned int code : formats.formats()) - printFormats(0, code, formats.sizes(code)); + for (unsigned int code : utils::map_keys(formats)) + printFormats(0, code, formats[code]); formats = scaler_->formats(1); - if (formats.isEmpty()) { + if (formats.empty()) { cerr << "Failed to list formats on pad 1 of subdevice " << scaler_->entity()->name() << endl; return TestFail; } - for (unsigned int code : formats.formats()) - printFormats(1, code, formats.sizes(code)); + for (unsigned int code : utils::map_keys(formats)) + printFormats(1, code, formats[code]); /* List format on a non-existing pad, format vector shall be empty. */ formats = scaler_->formats(2); - if (!formats.isEmpty()) { + if (!formats.empty()) { cerr << "Listing formats on non-existing pad 2 of subdevice " << scaler_->entity()->name() << " should return an empty format list" << endl; @@ -79,4 +80,4 @@ int ListFormatsTest::run() return TestPass; } -TEST_REGISTER(ListFormatsTest); +TEST_REGISTER(ListFormatsTest) |