summaryrefslogtreecommitdiff
path: root/src/v4l2/v4l2_camera_proxy.cpp
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-01-05 04:35:25 +0200
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-08-25 20:24:21 +0300
commit3bd19855459f6b58360197bc67c545a698812899 (patch)
treeeb73048267e21c6bd72cb6b5b2c1bcbad0c42850 /src/v4l2/v4l2_camera_proxy.cpp
parent852b9d0a7636fd7fa34cb424a9992642af4826b9 (diff)
v4l2: camera: Merge getStreamConfig() with open()
The V4L2CameraProxy always calls V4L2Camera::getStreamConfig() right after V4L2Camera::open(), and never afterwards. Simplify the code by returning the initial configuration from V4L2Camera::open() and removing V4L2Camera::getStreamConfig(). Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
Diffstat (limited to 'src/v4l2/v4l2_camera_proxy.cpp')
-rw-r--r--src/v4l2/v4l2_camera_proxy.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp
index 80287d8f..8ff990f6 100644
--- a/src/v4l2/v4l2_camera_proxy.cpp
+++ b/src/v4l2/v4l2_camera_proxy.cpp
@@ -63,13 +63,12 @@ int V4L2CameraProxy::open(V4L2CameraFile *file)
* with count = 0.
*/
- int ret = vcam_->open();
+ int ret = vcam_->open(&streamConfig_);
if (ret < 0) {
refcount_--;
return ret;
}
- vcam_->getStreamConfig(&streamConfig_);
setFmtFromConfig(streamConfig_);
files_.insert(file);