Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-18 01:45:10 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

libcamera: pipeline_handler: Move CameraData members to Camera::Private

Browse source 
With pipeline handlers now being able to subclass Camera::Private, start
the migration from CameraData to Camera::Private by moving the members
of the base CameraData class. The controlInfo_, properties_ and pipe_
members are duplicated for now, to allow migrating pipeline handlers one
by one.

The Camera::Private class is now properly documented, don't exclude it
from documentation generation.

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>
This commit is contained in:
Laurent Pinchart 2021-07-23 03:41:56 +03:00
parent 32b8832e38
commit bcab244b1f
6 changed files with 89 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/libcamera/internal/pipeline_handler.h
View file

@ -7,7 +7,6 @@
#ifndef __LIBCAMERA_INTERNAL_PIPELINE_HANDLER_H__
#define __LIBCAMERA_INTERNAL_PIPELINE_HANDLER_H__
#include <list>
#include <map>
#include <memory>
#include <set>
@ -39,18 +38,15 @@ class CameraData
{
public:
explicit CameraData(PipelineHandler *pipe)
: pipe_(pipe), requestSequence_(0)
: pipe_(pipe)
{
}
virtual ~CameraData() = default;
PipelineHandler *pipe_;
std::list<Request *> queuedRequests_;
ControlInfoMap controlInfo_;
ControlList properties_;
uint32_t requestSequence_;
private:
LIBCAMERA_DISABLE_COPY(CameraData)
};