Skip to content

Commit

Permalink
WW41 release
Browse files Browse the repository at this point in the history
Signed-off-by: jiabinhe <jiabin.he@intel.com>
  • Loading branch information
onceforall committed Oct 11, 2024
1 parent 3644a31 commit 03cc5d5
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,7 @@ else()
set_target_properties(${CAMHAL_TARGET} PROPERTIES OUTPUT_NAME ${CAMHAL_TARGET})
endif()


#--------------------------- Install settings ---------------------------
if (NOT CAL_BUILD)
if (NOT BUILD_CAMHAL_PLUGIN)
Expand Down
1 change: 1 addition & 0 deletions src/core/CameraBuffer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ CameraBuffer::CameraBuffer(int cameraId, int usage, int memory, uint32_t size, i
num_plane = CameraUtils::getNumOfPlanes(format);
break;
default:
LOGE("Not supported Usage");
break;
}

Expand Down
5 changes: 3 additions & 2 deletions src/core/DeviceBase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -386,8 +386,9 @@ int MainDevice::onDequeueBuffer(shared_ptr<CameraBuffer> buffer) {

if (mNeedSkipFrame) return OK;

LOG2("<seq%d>@%s, field:%d, timestamp: sec=%ld, usec=%ld", buffer->getSequence(), __func__,
buffer->getField(), buffer->getTimestamp().tv_sec, buffer->getTimestamp().tv_usec);
LOG2("camera:%d, stream:%d, <seq%d>@%s, field:%d, timestamp: sec=%ld, usec=%ld", mCameraId,
buffer->getStreamId(), buffer->getSequence(), __func__, buffer->getField(),
buffer->getTimestamp().tv_sec, buffer->getTimestamp().tv_usec);

for (auto& consumer : mConsumers) {
consumer->onFrameAvailable(mPort, buffer);
Expand Down
3 changes: 1 addition & 2 deletions src/platformdata/CameraParser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2337,7 +2337,7 @@ void CameraParser::getNVMDirectory(CameraParser* profiles) {
* 1. <availableSensors value="ov8856-wf-2,ov2740-uf-0,ov2740-wf-2"/>
* The value is "'camera name'-wf/uf-'CSI port number'".
* For example: camera name is "ov8856". Sensor's sink entity name is
* "Intel IPU6 CSI-2 2" or "Intel IPU6 CSI2 2" and it is word facing.
* "Intel IPU6 CSI-2 2" or "Intel IPU6 CSI2 2" and it is world-facing.
* The value is ov8856-wf-2.
* 2. <platform value="IPU6"/> the platform value must be uppercase letter.
*
Expand Down Expand Up @@ -2368,7 +2368,6 @@ std::vector<std::string> CameraParser::getAvailableSensors(
LOG2("@%s, available usb sensor name: %s", __func__, sensor.c_str());
#endif
}

} else {
// sensors with suffix port number
std::string portNum = sensor.substr(sensor.find_last_of('-') + 1);
Expand Down

0 comments on commit 03cc5d5

Please sign in to comment.