openharmony/applications_sample_camera
1
0
Fork 0
mirror of https://github.com/openharmony/applications_sample_camera.git synced 2026-07-21 00:25:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

!36 修改camera问题

Browse Source 
Merge pull request !36 from harmony_zhangjian/master
This commit is contained in:
openharmony_ci
2021-08-05 01:39:57 +00:00
committed by Gitee
parent 7caed8177c ad2f36f0a6
commit afc6cd4ece
3 changed files with 6 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cameraApp/cameraApp/src/main/cpp/camera_ability_slice.cpp
-2
View File
@@ -503,9 +503,7 @@ void CameraAbilitySlice::OnStart(const Want &want)
SetHead();
SetBottom();
#ifndef __LINUX__
scroll->Add(bttnLeft);
#endif
scroll->Add(bttnMidle);
scroll->Add(bttnRight);
scroll->Add(bttnRecord);
cameraApp/cameraApp/src/main/cpp/camera_manager.cpp
+3 -11
View File
@@ -455,7 +455,7 @@ void SampleCameraStateMng::StartRecord(Surface *mSurface)
}
}
Surface *surface = (recorder_->GetSurface(0)).get();
auto surface = recorder_->GetSurface(0);
if (surface == nullptr) {
return;
}
@@ -597,16 +597,8 @@ int SampleCameraManager::SampleCameraCreate()
list<string> camList = camKit->GetCameraIds();
for (auto &cam : camList) {
cout << "camera name:" << cam << endl;
const CameraAbility *ability = camKit->GetCameraAbility(cam);
/* find camera which fits user's ability */
list<CameraPicSize> sizeList = ability->GetSupportedSizes(0);
for (auto &pic : sizeList) {
if (pic.width == PIC_WIDTH && pic.height == PIC_HEIGHT) {
camId = cam;
break;
}
}
camId = cam;
break;
}
if (camId.empty()) {
media/camera_sample.cpp
+3 -12
View File
@@ -255,7 +255,7 @@ public:
return;
}
FrameConfig *fc = new FrameConfig(FRAME_CONFIG_RECORD);
Surface *surface = (recorder_->GetSurface(0)).get();
auto surface = recorder_->GetSurface(0);
surface->SetWidthAndHeight(1920, 1080);
surface->SetQueueSize(3);
surface->SetSize(1024 * 1024);
@@ -300,7 +300,6 @@ public:
cout << "camera start preview failed. ret=" << ret << endl;
return;
}
delete surface;
previewState_ = STATE_RUNNING;
cout << "camera start preview succeed." << endl;
}
@@ -372,16 +371,8 @@ int main()
list<string> camList = camKit->GetCameraIds();
string camId;
for (auto &cam : camList) {
cout << "camera name:" << cam << endl;
const CameraAbility *ability = camKit->GetCameraAbility(cam);
/* find camera which fits user's ability */
list<CameraPicSize> sizeList = ability->GetSupportedSizes(0);
for (auto &pic : sizeList) {
if (pic.width == 1920 && pic.height == 1080) {
camId = cam;
break;
}
}
camId = cam;
break;
}
if (camId.empty()) {