xymp
/
TermApp
3
0
Fork 0
Code Issues Pull Requests 4 Packages Projects Releases Wiki Activity

常规拍照也曝光多张，挑最后一张上传

Browse Source
PtzNew
Matthew 3 months ago
parent d939b8089e
commit 7624c2b249
2 changed files with 145 additions and 108 deletions
Show Stats Download Patch File Download Diff File

65
app/src/main/cpp/camera2/ndkcamera.cpp
Unescape Escape View File

@ -216,7 +216,7 @@ NdkCamera::NdkCamera(int32_t width, int32_t height, const NdkCamera::CAMERA_PARA
mResult = { 0 };
mLdr = ~0;
mFinalLdr = 0;
mFinalBurstCaptures = m_params.burstRawCapture == 0 ? 1 : m_params.burstCaptures;
mFinalBurstCaptures = m_params.burstRawCapture == 0 ? m_params.burstCaptures : m_params.burstCaptures;
if (mFinalBurstCaptures == 0)
{
mFinalBurstCaptures = 1;
@ -1216,11 +1216,15 @@ void NdkCamera::onImageAvailable(AImageReader* reader)
else
{
uint32_t burstCaptures = getBurstCaptures();
uint64_t ts = GetMicroTimeStamp();
size_t expectedTimes = mCaptureRequests.size() - 1;
if (burstCaptures == 0)
{
burstCaptures = 1;
}
if (burstCaptures == 1)
if (m_params.burstRawCapture == 0)
{
while (1)
{
mstatus = AImageReader_acquireNextImage(reader, &image);
if (mstatus != AMEDIA_OK)
@ -1233,14 +1237,13 @@ void NdkCamera::onImageAvailable(AImageReader* reader)
XYLOG(XYLOG_SEVERITY_ERROR, "Capture AImageReader_acquireNextImage error: %d", mstatus);
}
}
return;
break;
}
unsigned long long ts = GetMicroTimeStamp();
int32_t format;
mstatus = AImage_getFormat(image, &format);
cv::Mat frame;
if (format == AIMAGE_FORMAT_YUV_420_888)
{
int32_t width;
@ -1276,7 +1279,7 @@ void NdkCamera::onImageAvailable(AImageReader* reader)
{
// already nv21
ConvertYUV21ToMat(y_data, width, height, mWidth, mHeight, camera_orientation,
camera_facing == ACAMERA_LENS_FACING_FRONT, m_params.orientation, mOneFrame);
camera_facing == ACAMERA_LENS_FACING_FRONT, m_params.orientation, frame);
}
else
{
@ -1314,7 +1317,7 @@ void NdkCamera::onImageAvailable(AImageReader* reader)
}
ConvertYUV21ToMat(nv21, width, height,mWidth, mHeight, camera_orientation,
camera_facing == ACAMERA_LENS_FACING_FRONT, m_params.orientation, mOneFrame);
camera_facing == ACAMERA_LENS_FACING_FRONT, m_params.orientation, frame);
delete[] nv21;
}
@ -1323,14 +1326,16 @@ void NdkCamera::onImageAvailable(AImageReader* reader)
AImage_delete(image);
std::shared_ptr<ACameraMetadata> result;
bool captureCompleted = false;
bool captureDispatchable = false;
m_locker.lock();
if (!mCaptureResults.empty())
if (!frame.empty())
{
mOneFrame.push_back(frame);
}
if (mCaptureResults.size() == expectedTimes && mOneFrame.size() == expectedTimes)
{
captureCompleted = true;
result = mCaptureResults[0];
}
if (captureCompleted && !mCaptureDispatched)
{
@ -1343,7 +1348,10 @@ void NdkCamera::onImageAvailable(AImageReader* reader)
{
XYLOG(XYLOG_SEVERITY_INFO,"onOneCapture from onImageAvailable");
camera_status_t status = ACameraCaptureSession_stopRepeating(capture_session);
onOneCapture(mCharacteristics, result, mFinalLdr, ts - m_startTime, mOneFrame);
FireOneCapture(ts);
// onOneCapture(mCharacteristics, result, mFinalLdr, ts - m_startTime, mOneFrame);
break;
}
}
}
else
@ -1375,7 +1383,6 @@ void NdkCamera::onImageAvailable(AImageReader* reader)
bool captureCompleted = false;
bool captureDispatchable = false;
size_t expectedTimes = mCaptureRequests.size() - 1;
m_locker.lock();
captureCompleted = mCaptureResults.size() >= expectedTimes && mCaptureFrames.size() >= expectedTimes;
if (captureCompleted && !mCaptureDispatched)
@ -1808,11 +1815,11 @@ void NdkCamera::onCaptureCompleted(ACameraCaptureSession* session, ACaptureReque
size_t expectedTimes = mCaptureRequests.size() - 1;
std::shared_ptr<ACameraMetadata> captureResult(pCopy, ACameraMetadata_free);
if (expectedTimes == 1)
if (m_params.burstRawCapture == 0)
{
m_locker.lock();
mCaptureResults.push_back(captureResult);
captureCompleted = !mOneFrame.empty();
captureCompleted = mCaptureFrames.size() >= expectedTimes && mCaptureResults.size() >= expectedTimes;
if (captureCompleted && !mCaptureDispatched)
{
mCaptureDispatched = true;
@ -1824,7 +1831,8 @@ void NdkCamera::onCaptureCompleted(ACameraCaptureSession* session, ACaptureReque
{
XYLOG(XYLOG_SEVERITY_INFO,"onOneCapture from onCaptureCompleted");
camera_status_t status = ACameraCaptureSession_stopRepeating(capture_session);
onOneCapture(mCharacteristics, captureResult, mFinalLdr, ts - m_startTime, mOneFrame);
FireOneCapture(ts);
}
}
else
@ -1848,6 +1856,33 @@ void NdkCamera::onCaptureCompleted(ACameraCaptureSession* session, ACaptureReque
}
}
void NdkCamera::FireOneCapture(uint64_t ts)
{
#ifdef OUTPUT_DBG_INFO
if (mWidth == 1920 && mOneFrame.size() > 1)
{
std::string dt = FormatLocalDateTime("%d%02d%02d%02d%02d%02d", ts / 1000);
std::vector<int> params;
params.push_back(cv::IMWRITE_JPEG_QUALITY);
params.push_back(50);
for (auto it = mOneFrame.cbegin(); it != mOneFrame.cend(); ++it)
{
std::string fileName = "/sdcard/com.xypower.mpapp/tmp/" + dt;
size_t idx = std::distance(mOneFrame.cbegin(), it);
std::shared_ptr<ACameraMetadata> result = mCaptureResults[idx];
CAPTURE_RESULT captureResult = { 0 };
EnumCameraResult(result.get(), captureResult);
fileName += "_" + mCameraId + "_" + std::to_string(captureResult.aeState) + "_" + std::to_string(idx) + ".jpg";
cv::imwrite(fileName, *it, params);
}
}
#endif
onOneCapture(mCharacteristics, mCaptureResults.back(), mFinalLdr, ts - m_startTime, mOneFrame.back());
}
void NdkCamera::FireBurstCapture()
{
camera_status_t status = ACameraCaptureSession_stopRepeating(capture_session);

6
app/src/main/cpp/camera2/ndkcamera.h
Unescape Escape View File

@ -183,6 +183,7 @@ public:
void CopyPreviewRequest(ACaptureRequest* request, const ACameraMetadata* previewResult);
void FireBurstCapture();
void FireOneCapture(uint64_t ts);
uint32_t GetLdr() const
{
@ -239,7 +240,7 @@ protected:
bool mCaptureDispatched;
CAPTURE_RESULT mResult;
unsigned long long m_startTime;
uint64_t m_startTime;
protected:
@ -278,7 +279,8 @@ protected:
int32_t mFinalOutputFormat;
std::vector<std::shared_ptr<AImage> > mCaptureFrames;
cv::Mat mOneFrame;
// cv::Mat mOneFrame;
std::vector<cv::Mat> mOneFrame;
std::vector<std::vector<uint8_t> > mRawFrames;
// AImageReader* image_reader;

Write Preview
Loading…
Cancel
Save