summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2019-04-14 21:26:07 +0300
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2019-04-18 18:13:16 +0300
commit05b0e5ed531553ad20c4c787de3c337425e6b907 (patch)
tree8b4bcabdd60d5cdf162cce99bc729d7d8cfcc89e /test
parentd97cafdf3c60afb75fa38d8b2f17b816c934ad9d (diff)
libcamera: v4l2_subdevice: Add method to retrieve the media entity
Add a method to retrieve the media entity associated with a subdevice. The entityName() and deviceNode() methods are not needed anymore as they can be accessed through the media entity, remove them. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'test')
-rw-r--r--test/v4l2_subdevice/list_formats.cpp6
-rw-r--r--test/v4l2_subdevice/v4l2_subdevice_test.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/test/v4l2_subdevice/list_formats.cpp b/test/v4l2_subdevice/list_formats.cpp
index 09dec9ab..18dd8761 100644
--- a/test/v4l2_subdevice/list_formats.cpp
+++ b/test/v4l2_subdevice/list_formats.cpp
@@ -52,7 +52,7 @@ int ListFormatsTest::run()
formats = scaler_->formats(0);
if (formats.empty()) {
cerr << "Failed to list formats on pad 0 of subdevice "
- << scaler_->entityName() << endl;
+ << scaler_->entity()->name() << endl;
return TestFail;
}
for (auto it = formats.begin(); it != formats.end(); ++it)
@@ -61,7 +61,7 @@ int ListFormatsTest::run()
formats = scaler_->formats(1);
if (formats.empty()) {
cerr << "Failed to list formats on pad 1 of subdevice "
- << scaler_->entityName() << endl;
+ << scaler_->entity()->name() << endl;
return TestFail;
}
for (auto it = formats.begin(); it != formats.end(); ++it)
@@ -71,7 +71,7 @@ int ListFormatsTest::run()
formats = scaler_->formats(2);
if (!formats.empty()) {
cerr << "Listing formats on non-existing pad 2 of subdevice "
- << scaler_->entityName()
+ << scaler_->entity()->name()
<< " should return an empty format list" << endl;
return TestFail;
}
diff --git a/test/v4l2_subdevice/v4l2_subdevice_test.cpp b/test/v4l2_subdevice/v4l2_subdevice_test.cpp
index 06582969..dfcf779a 100644
--- a/test/v4l2_subdevice/v4l2_subdevice_test.cpp
+++ b/test/v4l2_subdevice/v4l2_subdevice_test.cpp
@@ -66,7 +66,7 @@ int V4L2SubdeviceTest::init()
ret = scaler_->open();
if (ret) {
cerr << "Unable to open video subdevice "
- << scaler_->deviceNode() << endl;
+ << scaler_->entity()->deviceNode() << endl;
media_->release();
return TestSkip;
}