Skip to content

Commit 0e154f7

Browse files
committed
fix patch
1 parent 7509867 commit 0e154f7

1 file changed

Lines changed: 13 additions & 12 deletions

File tree

patches/fix-cfe-entity-names.patch

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,31 @@
11
diff --git a/src/libcamera/pipeline/rpi/pisp/pisp.cpp b/src/libcamera/pipeline/rpi/pisp/pisp.cpp
2+
index 77acd2f6..cce0cc2b 100644
23
--- a/src/libcamera/pipeline/rpi/pisp/pisp.cpp
34
+++ b/src/libcamera/pipeline/rpi/pisp/pisp.cpp
45
@@ -882,9 +882,9 @@ bool PipelineHandlerPiSP::match(DeviceEnumerator *enumerator)
5-
*/
6-
for (unsigned int i = 0; i < numCfeDevices; i++) {
7-
DeviceMatch cfe("rp1-cfe");
6+
*/
7+
for (unsigned int i = 0; i < numCfeDevices; i++) {
8+
DeviceMatch cfe("rp1-cfe");
89
- cfe.add("rp1-cfe-fe-image0");
910
- cfe.add("rp1-cfe-fe-stats");
1011
- cfe.add("rp1-cfe-fe-config");
1112
+ cfe.add("rp1-cfe-fe_image0");
1213
+ cfe.add("rp1-cfe-fe_stats");
1314
+ cfe.add("rp1-cfe-fe_config");
15+
std::shared_ptr<MediaDevice> cfeDevice = acquireMediaDevice(enumerator, cfe);
1416

15-
std::shared_ptr<MediaDevice> cfeDevice = acquireMediaDevice(enumerator, cfe);
16-
17-
@@ -1037,10 +1037,10 @@ int PipelineHandlerPiSP::platformRegister(std::unique_ptr<RPi::CameraData> &came
18-
PiSPCameraData *data = static_cast<PiSPCameraData *>(cameraData.get());
19-
int ret;
17+
if (!cfeDevice) {
18+
@@ -1072,10 +1072,10 @@ int PipelineHandlerPiSP::platformRegister(std::unique_ptr<RPi::CameraData> &came
19+
PiSPCameraData *data = static_cast<PiSPCameraData *>(cameraData.get());
20+
int ret;
2021

2122
- MediaEntity *cfeImage = cfe->getEntityByName("rp1-cfe-fe-image0");
2223
+ MediaEntity *cfeImage = cfe->getEntityByName("rp1-cfe-fe_image0");
23-
MediaEntity *cfeEmbedded = cfe->getEntityByName("rp1-cfe-csi2-ch1");
24+
MediaEntity *cfeEmbedded = cfe->getEntityByName("rp1-cfe-csi2-ch1");
2425
- MediaEntity *cfeStats = cfe->getEntityByName("rp1-cfe-fe-stats");
2526
- MediaEntity *cfeConfig = cfe->getEntityByName("rp1-cfe-fe-config");
2627
+ MediaEntity *cfeStats = cfe->getEntityByName("rp1-cfe-fe_stats");
2728
+ MediaEntity *cfeConfig = cfe->getEntityByName("rp1-cfe-fe_config");
28-
MediaEntity *ispInput = isp->getEntityByName("pispbe-input");
29-
MediaEntity *IpaPrepare = isp->getEntityByName("pispbe-config");
30-
MediaEntity *ispOutput0 = isp->getEntityByName("pispbe-output0");
29+
MediaEntity *ispInput = isp->getEntityByName("pispbe-input");
30+
MediaEntity *IpaPrepare = isp->getEntityByName("pispbe-config");
31+
MediaEntity *ispOutput0 = isp->getEntityByName("pispbe-output0");

0 commit comments

Comments
 (0)