From ad2f36f0a6fe3d92ae4d07d99d989fa9a49baaaa Mon Sep 17 00:00:00 2001
From: z00421080 <zhangjian112@huawei.com>
Date: Sat, 31 Jul 2021 04:51:50 -0700
Subject: [PATCH] IssueNo:#I40K06 Description:media servicing architecture
 Sig:multimedia Feature or Bgfix:Feature Binary Source:No

Signed-off-by: z00421080 <zhangjian112@huawei.com>
---
 .../src/main/cpp/camera_ability_slice.cpp         |  2 --
 .../cameraApp/src/main/cpp/camera_manager.cpp     | 14 +++-----------
 media/camera_sample.cpp                           | 15 +++------------
 3 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/cameraApp/cameraApp/src/main/cpp/camera_ability_slice.cpp b/cameraApp/cameraApp/src/main/cpp/camera_ability_slice.cpp
index f3e8f90..89d556f 100755
--- a/cameraApp/cameraApp/src/main/cpp/camera_ability_slice.cpp
+++ b/cameraApp/cameraApp/src/main/cpp/camera_ability_slice.cpp
@@ -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);
diff --git a/cameraApp/cameraApp/src/main/cpp/camera_manager.cpp b/cameraApp/cameraApp/src/main/cpp/camera_manager.cpp
index f61383e..88af737 100755
--- a/cameraApp/cameraApp/src/main/cpp/camera_manager.cpp
+++ b/cameraApp/cameraApp/src/main/cpp/camera_manager.cpp
@@ -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()) {
diff --git a/media/camera_sample.cpp b/media/camera_sample.cpp
index 770d148..6db6991 100755
--- a/media/camera_sample.cpp
+++ b/media/camera_sample.cpp
@@ -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()) {
-- 
Gitee