openharmony/distributed_camera
1
0
Fork 0
mirror of https://github.com/openharmony/distributed_camera.git synced 2026-08-26 18:46:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

!73 YUV拍照代码适配

Browse Source 
Merge pull request !73 from chen0088/master
This commit is contained in:
openharmony_ci
2022-04-27 03:23:35 +00:00
committed by Gitee
parent 9ca1f3d7bd fdae577c0c
commit 75a3d00b2a
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
camera_hdf/hdi_impl/src/dstream_operator/dstream_operator.cpp
+16 -5
View File
@@ -601,10 +601,13 @@ void DStreamOperator::ConvertStreamInfo(std::shared_ptr<StreamInfo> &srcInfo, st
dstInfo->dataspace_ = srcInfo->datasapce_;
dstInfo->encodeType_ = (DCEncodeType)srcInfo->encodeType_;
if ((srcInfo->intent_ == STILL_CAPTURE) || (srcInfo->intent_ == POST_VIEW) ||
(dstInfo->encodeType_ == ENCODE_TYPE_JPEG)) {
if ((srcInfo->intent_ == STILL_CAPTURE) || (srcInfo->intent_ == POST_VIEW)) {
dstInfo->type_ = DCStreamType::SNAPSHOT_FRAME;
dstInfo->format_ = OHOS_CAMERA_FORMAT_JPEG;
if (dstInfo->encodeType_ == ENCODE_TYPE_JPEG) {
dstInfo->format_ = OHOS_CAMERA_FORMAT_JPEG;
} else if (dstInfo->encodeType_ == ENCODE_TYPE_NULL) {
dstInfo->format_ = OHOS_CAMERA_FORMAT_YCRCB_420_SP;
}
} else {
dstInfo->type_ = DCStreamType::CONTINUOUS_FRAME;
dstInfo->format_ =
@@ -706,7 +709,11 @@ void DStreamOperator::ChooseSuitableFormat(std::vector<std::shared_ptr<DCStreamI
if (dcSupportedFormatMap_.count(DCSceneType::PHOTO) > 0) {
captureInfo->format_ = dcSupportedFormatMap_[DCSceneType::PHOTO].at(0);
} else {
captureInfo->format_ = OHOS_CAMERA_FORMAT_JPEG;
if ((streamInfo.at(0))->encodeType_ == DCEncodeType::ENCODE_TYPE_JPEG) {
captureInfo->format_ = OHOS_CAMERA_FORMAT_JPEG;
} else {
captureInfo->format_ = OHOS_CAMERA_FORMAT_YCRCB_420_SP;
}
}
}
}
@@ -760,7 +767,11 @@ void DStreamOperator::ChooseSuitableEncodeType(std::vector<std::shared_ptr<DCStr
captureInfo->encodeType_ = DCEncodeType::ENCODE_TYPE_NULL;
}
} else {
captureInfo->encodeType_ = DCEncodeType::ENCODE_TYPE_JPEG;
if ((streamInfo.at(0))->encodeType_ == DCEncodeType::ENCODE_TYPE_JPEG) {
captureInfo->encodeType_ = DCEncodeType::ENCODE_TYPE_JPEG;
} else {
captureInfo->encodeType_ = DCEncodeType::ENCODE_TYPE_NULL;
}
}
}