From a49101d8f8773cb378f788a270cd87877dba4c3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=B8=85?= <yangshuai67@huawei.com>
Date: Fri, 3 Sep 2021 02:16:06 +0000
Subject: [PATCH] Signed-off-by: yangshuai<yangshuai67@huawei.com>

---
 .../cameraApp/src/main/cpp/camera_manager.cpp | 41 ++++++++-----------
 media/camera_sample.cpp                       | 10 +++--
 2 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/cameraApp/cameraApp/src/main/cpp/camera_manager.cpp b/cameraApp/cameraApp/src/main/cpp/camera_manager.cpp
index 8950236..d8545d7 100755
--- a/cameraApp/cameraApp/src/main/cpp/camera_manager.cpp
+++ b/cameraApp/cameraApp/src/main/cpp/camera_manager.cpp
@@ -557,15 +557,9 @@ bool SampleCameraStateMng::IsCaptureOver(void)
     return fsCb_.IsFinish();
 }
 
-void SampleCameraStateMng::SetPause()
-{
+void SampleCameraStateMng::SetPause() { }
 
-}
-
-void SampleCameraStateMng::SetResume(Surface *mSurface)
-{
-
-}
+void SampleCameraStateMng::SetResume(Surface *mSurface) { }
 
 void SampleCameraStateMng::SetStop(int s)
 {
@@ -664,69 +658,68 @@ int SampleCameraManager::SampleCameraStart(Surface *surface)
     if (CamStateMng == NULL)
         return -1;
     CamStateMng->StartPreview(surface);
-
     return 0;
 }
 
 int SampleCameraManager::SampleCameraStop(void)
 {
-    if (CamStateMng == nullptr)
+    if (CamStateMng == nullptr) {
         return -1;
-
+    }
     CamStateMng->SetStop(1);
-
     return 0;
 }
 
 int SampleCameraManager::SampleCameraCaptrue(int type)
 {
-    if (CamStateMng == NULL)
+    if (CamStateMng == NULL) {
         return -1;
-
+    }
     CamStateMng->Capture(type);
-
     return 0;
 }
 
 int SampleCameraManager::SampleCameraStartRecord(Surface *surface)
 {
-    if (CamStateMng == NULL)
+    if (CamStateMng == NULL) {
         return -1;
+    }
     CamStateMng->StartRecord(surface);
-
     return 0;
 }
 
 int SampleCameraManager::SampleCameraPauseRecord(void)
 {
-    if (CamStateMng == NULL)
+    if (CamStateMng == NULL) {
         return -1;
+    }
     CamStateMng->SetPause();
-
     return 0;
 }
 
 int SampleCameraManager::SampleCameraResumeRecord(Surface *mSurface)
 {
-    if (CamStateMng == NULL)
+    if (CamStateMng == NULL) {
         return -1;
+    }
     CamStateMng->SetResume(mSurface);
-
     return 0;
 }
 
 int SampleCameraManager::SampleCameraStopRecord(void)
 {
-    if (CamStateMng == NULL)
+    if (CamStateMng == NULL) {
         return -1;
+    }
     CamStateMng->SetStop(0);
-
+    
     return 0;
 }
 bool SampleCameraManager::SampleCameraGetRecord(void)
 {
-    if (CamStateMng == NULL)
+    if (CamStateMng == NULL) {
         return false;
+    }
     return CamStateMng->RecordState();
 }
 
diff --git a/media/camera_sample.cpp b/media/camera_sample.cpp
index 3689ffa..ea08df6 100755
--- a/media/camera_sample.cpp
+++ b/media/camera_sample.cpp
@@ -259,9 +259,13 @@ public:
         }
         FrameConfig *fc = new FrameConfig(FRAME_CONFIG_RECORD);
         auto surface = recorder_->GetSurface(0);
-        surface->SetWidthAndHeight(1920, 1080);
-        surface->SetQueueSize(3);
-        surface->SetSize(1024 * 1024);
+        int width = 1920;
+        int height = 1080;
+        surface->SetWidthAndHeight(width, height);
+        int queueSize = 3;
+        surface->SetQueueSize(queueSize);
+        int size = 1024 * 1024;
+        surface->SetSize(size);
         fc->AddSurface(*surface);
         ret = cam_->TriggerLoopingCapture(*fc);
         if (ret != 0) {
-- 
GitLab