summaryrefslogtreecommitdiff
path: root/src/libcamera/pipeline/rkisp1/rkisp1.cpp
diff options
context:
space:
mode:
authorNiklas Söderlund <niklas.soderlund@ragnatech.se>2020-10-27 15:57:44 +0100
committerNiklas Söderlund <niklas.soderlund@ragnatech.se>2021-01-29 15:35:28 +0100
commit2b57d712a28674eb03ce1e1549b90c7d59eccc6c (patch)
treea49c56f26b7637ed14cf93eec93390240f43bf99 /src/libcamera/pipeline/rkisp1/rkisp1.cpp
parentea8b576a8ca06b46f3caffb280ca84d952952e53 (diff)
libcamera: pipeline: rkisp1: Remove Timeline
There are no users left of the Timeline and there is no longer a need to keep emulating a start of exposure event as the CSI-2 resciver reports it. Remove the Timeline helper and what's left of it's integration in the pipeline. There is no functional change as nothing i the pipeline uses the Timeline. Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'src/libcamera/pipeline/rkisp1/rkisp1.cpp')
-rw-r--r--src/libcamera/pipeline/rkisp1/rkisp1.cpp45
1 files changed, 0 insertions, 45 deletions
diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
index ab555cf2..58ae8f98 100644
--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp
+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
@@ -34,7 +34,6 @@
#include "libcamera/internal/v4l2_videodevice.h"
#include "rkisp1_path.h"
-#include "timeline.h"
namespace libcamera {
@@ -43,12 +42,6 @@ LOG_DEFINE_CATEGORY(RkISP1)
class PipelineHandlerRkISP1;
class RkISP1CameraData;
-enum RkISP1ActionType {
- SetSensor,
- SOE,
- QueueBuffers,
-};
-
struct RkISP1FrameInfo {
unsigned int frame;
Request *request;
@@ -81,41 +74,6 @@ private:
std::map<unsigned int, RkISP1FrameInfo *> frameInfo_;
};
-class RkISP1Timeline : public Timeline
-{
-public:
- RkISP1Timeline()
- : Timeline()
- {
- setDelay(SetSensor, -1, 5);
- setDelay(SOE, 0, -1);
- setDelay(QueueBuffers, -1, 10);
- }
-
- void bufferReady(FrameBuffer *buffer)
- {
- /*
- * Calculate SOE by taking the end of DMA set by the kernel and applying
- * the time offsets provideprovided by the IPA to find the best estimate
- * of SOE.
- */
-
- ASSERT(frameOffset(SOE) == 0);
-
- utils::time_point soe = std::chrono::time_point<utils::clock>()
- + std::chrono::nanoseconds(buffer->metadata().timestamp)
- + timeOffset(SOE);
-
- notifyStartOfExposure(buffer->metadata().sequence, soe);
- }
-
- void setDelay(unsigned int type, int frame, int msdelay)
- {
- utils::duration delay = std::chrono::milliseconds(msdelay);
- setRawDelay(type, frame, delay);
- }
-};
-
class RkISP1CameraData : public CameraData
{
public:
@@ -135,7 +93,6 @@ public:
unsigned int frame_;
std::vector<IPABuffer> ipaBuffers_;
RkISP1Frames frameInfo_;
- RkISP1Timeline timeline_;
RkISP1MainPath *mainPath_;
RkISP1SelfPath *selfPath_;
@@ -874,8 +831,6 @@ void PipelineHandlerRkISP1::stop(Camera *camera)
data->ipa_->stop();
- data->timeline_.reset();
-
data->frameInfo_.clear();
freeBuffers(camera);