| Message ID | 20200813223722.4050835-6-niklas.soderlund@ragnatech.se |
|---|---|
| State | Accepted |
| Headers | show |
| Series |
|
| Related | show |
Hi Niklas, Thank you for the patch. On Fri, Aug 14, 2020 at 12:37:20AM +0200, Niklas Söderlund wrote: > Set the sensor model property from the model reported in the media > graph. > > Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> > Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > --- > * Changes since v1 > - Ensure model string only contains ASCII characters. > --- > src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp > index b12083a7a74dae54..a55049c5179bd78e 100644 > --- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp > +++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp > @@ -14,6 +14,7 @@ > #include <libcamera/camera.h> > #include <libcamera/control_ids.h> > #include <libcamera/controls.h> > +#include <libcamera/property_ids.h> > #include <libcamera/request.h> > #include <libcamera/stream.h> > > @@ -500,6 +501,9 @@ int UVCCameraData::init(MediaDevice *media) > > video_->bufferReady.connect(this, &UVCCameraData::bufferReady); > > + /* Initialize the camera properties. */ > + properties_.set(properties::Model, utils::toAscii(media->model())); > + Similary to 3/7, the implementation is fine, but 1/7 needs to be finalized before acking this. > /* Initialise the supported controls. */ > ControlInfoMap::Map ctrls; >
diff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp index b12083a7a74dae54..a55049c5179bd78e 100644 --- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp +++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp @@ -14,6 +14,7 @@ #include <libcamera/camera.h> #include <libcamera/control_ids.h> #include <libcamera/controls.h> +#include <libcamera/property_ids.h> #include <libcamera/request.h> #include <libcamera/stream.h> @@ -500,6 +501,9 @@ int UVCCameraData::init(MediaDevice *media) video_->bufferReady.connect(this, &UVCCameraData::bufferReady); + /* Initialize the camera properties. */ + properties_.set(properties::Model, utils::toAscii(media->model())); + /* Initialise the supported controls. */ ControlInfoMap::Map ctrls;