| Message ID | 20251024085130.995967-22-stefan.klug@ideasonboard.com |
|---|---|
| State | New |
| Headers | show |
| Series |
|
| Related | show |
Quoting Stefan Klug (2025-10-24 17:50:45) > From: Jacopo Mondi <jacopo.mondi@ideasonboard.com> > > We want to be able to identify them correctly. afaict the patch contents don't match this message. Paul > > Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com> > --- > include/libcamera/internal/v4l2_videodevice.h | 1 - > src/libcamera/v4l2_videodevice.cpp | 15 --------------- > 2 files changed, 16 deletions(-) > > diff --git a/include/libcamera/internal/v4l2_videodevice.h b/include/libcamera/internal/v4l2_videodevice.h > index 2d290971a0ee..a19fca1719d3 100644 > --- a/include/libcamera/internal/v4l2_videodevice.h > +++ b/include/libcamera/internal/v4l2_videodevice.h > @@ -286,7 +286,6 @@ private: > EventNotifier *fdBufferNotifier_; > > State state_; > - std::optional<unsigned int> firstFrame_; > > Timer watchdog_; > utils::Duration watchdogDuration_; > diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp > index 8ce739f4bc65..56a9f0ab546f 100644 > --- a/src/libcamera/v4l2_videodevice.cpp > +++ b/src/libcamera/v4l2_videodevice.cpp > @@ -1904,19 +1904,6 @@ FrameBuffer *V4L2VideoDevice::dequeueBuffer() > if (V4L2_TYPE_IS_OUTPUT(buf.type)) > return buffer; > > - /* > - * Detect kernel drivers which do not reset the sequence number to zero > - * on stream start. > - */ > - if (!firstFrame_.has_value()) { > - if (buf.sequence) > - LOG(V4L2, Info) > - << "Zero sequence expected for first frame (got " > - << buf.sequence << ")"; > - firstFrame_ = buf.sequence; > - } > - metadata.sequence -= firstFrame_.value(); > - > Span<const FrameBuffer::Plane> framebufferPlanes = buffer->planes(); > unsigned int numV4l2Planes = multiPlanar ? buf.length : 1; > > @@ -1993,8 +1980,6 @@ int V4L2VideoDevice::streamOn() > { > int ret; > > - firstFrame_.reset(); > - > ret = ioctl(VIDIOC_STREAMON, &bufferType_); > if (ret < 0) { > LOG(V4L2, Error) > -- > 2.48.1 >
diff --git a/include/libcamera/internal/v4l2_videodevice.h b/include/libcamera/internal/v4l2_videodevice.h index 2d290971a0ee..a19fca1719d3 100644 --- a/include/libcamera/internal/v4l2_videodevice.h +++ b/include/libcamera/internal/v4l2_videodevice.h @@ -286,7 +286,6 @@ private: EventNotifier *fdBufferNotifier_; State state_; - std::optional<unsigned int> firstFrame_; Timer watchdog_; utils::Duration watchdogDuration_; diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp index 8ce739f4bc65..56a9f0ab546f 100644 --- a/src/libcamera/v4l2_videodevice.cpp +++ b/src/libcamera/v4l2_videodevice.cpp @@ -1904,19 +1904,6 @@ FrameBuffer *V4L2VideoDevice::dequeueBuffer() if (V4L2_TYPE_IS_OUTPUT(buf.type)) return buffer; - /* - * Detect kernel drivers which do not reset the sequence number to zero - * on stream start. - */ - if (!firstFrame_.has_value()) { - if (buf.sequence) - LOG(V4L2, Info) - << "Zero sequence expected for first frame (got " - << buf.sequence << ")"; - firstFrame_ = buf.sequence; - } - metadata.sequence -= firstFrame_.value(); - Span<const FrameBuffer::Plane> framebufferPlanes = buffer->planes(); unsigned int numV4l2Planes = multiPlanar ? buf.length : 1; @@ -1993,8 +1980,6 @@ int V4L2VideoDevice::streamOn() { int ret; - firstFrame_.reset(); - ret = ioctl(VIDIOC_STREAMON, &bufferType_); if (ret < 0) { LOG(V4L2, Error)