From a0fa4401b2b206edbce0255a1fbb954861aec774 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=B8=85?= <yangshuai67@huawei.com>
Date: Mon, 16 Aug 2021 06:30:30 +0000
Subject: [PATCH 1/2] Signed-off-by: mamingshuai <mamingshuai1@huawei.com>

---
 cameraApp/cameraApp/src/main/cpp/camera_manager.cpp   | 2 +-
 launcher/launcher/src/main/cpp/main_ability_slice.cpp | 2 +-
 media/camera_sample.cpp                               | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/cameraApp/cameraApp/src/main/cpp/camera_manager.cpp b/cameraApp/cameraApp/src/main/cpp/camera_manager.cpp
index e7a79fa..0dc5308 100755
--- a/cameraApp/cameraApp/src/main/cpp/camera_manager.cpp
+++ b/cameraApp/cameraApp/src/main/cpp/camera_manager.cpp
@@ -617,7 +617,7 @@ int SampleCameraManager::SampleCameraCreate()
     list<string> camList = camKit->GetCameraIds();
     for (auto &cam : camList) {
         camId = cam;
-  	    break;
+        break;
     }
 
     if (camId.empty()) {
diff --git a/launcher/launcher/src/main/cpp/main_ability_slice.cpp b/launcher/launcher/src/main/cpp/main_ability_slice.cpp
index f2e5376..2ee787e 100755
--- a/launcher/launcher/src/main/cpp/main_ability_slice.cpp
+++ b/launcher/launcher/src/main/cpp/main_ability_slice.cpp
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <stdio.h>
+#include <cstdio>
 #include <common/screen.h>
 #include <components/ui_label.h>
 #include <components/ui_label_button.h>
diff --git a/media/camera_sample.cpp b/media/camera_sample.cpp
index 4f1a09f..dd2b35c 100755
--- a/media/camera_sample.cpp
+++ b/media/camera_sample.cpp
@@ -85,8 +85,7 @@ Recorder *SampleCreateRecorder()
     int32_t audioSourceId = 0;
     int32_t width = 1920;
     int32_t height = 1080;
-    VideoCodecFormat encoder;
-    encoder = HEVC;
+    VideoCodecFormat encoder = HEVC;
     width = 1920;
     height = 1080;
     Recorder *recorder = new Recorder();
-- 
Gitee


From 636c49635f2791ee6d23ec0f10382e42578b46a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=B8=85?= <yangshuai67@huawei.com>
Date: Mon, 16 Aug 2021 06:34:18 +0000
Subject: [PATCH 2/2] Signed-off-by: mamingshuai <mamingshuai1@huawei.com>

---
 media/camera_sample.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/media/camera_sample.cpp b/media/camera_sample.cpp
index dd2b35c..e19c545 100755
--- a/media/camera_sample.cpp
+++ b/media/camera_sample.cpp
@@ -86,8 +86,6 @@ Recorder *SampleCreateRecorder()
     int32_t width = 1920;
     int32_t height = 1080;
     VideoCodecFormat encoder = HEVC;
-    width = 1920;
-    height = 1080;
     Recorder *recorder = new Recorder();
     if ((ret = recorder->SetVideoSource(source, sourceId)) != SUCCESS) {
         cout << "SetVideoSource failed." << ret << endl;
-- 
Gitee