Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1857f8d authored by Avichal Rakesh's avatar Avichal Rakesh
Browse files

Migrate reference external HAL implementation to AIDL 

Android T migrated the HAL interface to AIDL, but the reference HAL
was never updated to use AIDL. This CL migrates the reference
HAL implementation for external cameras to use AIDL as well. The
external HAL uses V4L2 standard to expose USB cameras to the
cameraserver.

The reference HAL implementation for internal camera was dropped
because it is not possible to write a generic HAL that works with some
large percentage of internal cameras.

Bug: 219974678
Test: Existing CTS tests pass with external camera connected.
Change-Id: I35f3dc32c16670eca7735a4ac00fed3daf36aa65
parent 1f5dec26

camera/common/1.0/default/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ cc_library_static { 
        "VendorTagDescriptor.cpp",

        "HandleImporter.cpp",

        "Exif.cpp",

        "SimpleThread.cpp",

    ],

    cflags: [

        "-Werror",

camera/common/1.0/default/SimpleThread.cpp

0 → 100644
+65 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include "SimpleThread.h"



namespace android {

namespace hardware {

namespace camera {

namespace common {

namespace helper {



SimpleThread::SimpleThread() : mDone(true), mThread() {}

SimpleThread::~SimpleThread() {

    // Safe to call requestExitAndWait() from the destructor because requestExitAndWait() ensures

    // that the thread is joinable before joining on it. This is different from how

    // android::Thread worked.

    requestExitAndWait();

}



void SimpleThread::run() {

    requestExitAndWait();  // Exit current execution, if any.



    // start thread

    mDone.store(false, std::memory_order_release);

    mThread = std::thread(&SimpleThread::runLoop, this);

}



void SimpleThread::requestExitAndWait() {

    // Signal thread to stop

    mDone.store(true, std::memory_order_release);



    // Wait for thread to exit if needed. This should happen in no more than one iteration of

    // threadLoop

    if (mThread.joinable()) {

        mThread.join();

    }

    mThread = std::thread();

}



void SimpleThread::runLoop() {

    while (!exitPending()) {

        if (!threadLoop()) {

            break;

        }

    }

}



}  // namespace helper

}  // namespace common

}  // namespace camera

}  // namespace hardware

}  // namespace android
 
 No newline at end of file

camera/common/1.0/default/include/SimpleThread.h

0 → 100644
+64 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef HARDWARE_INTERFACES_CAMERA_COMMON_SIMPLETHREAD_H_

#define HARDWARE_INTERFACES_CAMERA_COMMON_SIMPLETHREAD_H_



#include <thread>



namespace android {

namespace hardware {

namespace camera {

namespace common {

namespace helper {



// A simple looper based on std::thread.

class SimpleThread {

  public:

    SimpleThread();

    virtual ~SimpleThread();



    // Explicit call to start execution of the thread. No thread is created before this function

    // is called.

    virtual void run() final;

    virtual void requestExitAndWait() final;



  protected:

    // Main logic of the thread. This function is called repeatedly until it returns false.

    // Thread execution stops if this function returns false.

    virtual bool threadLoop() = 0;



    // Returns true if the thread execution should stop. Should be used by threadLoop to check if

    // the thread has been requested to exit.

    virtual inline bool exitPending() final { return mDone.load(std::memory_order_acquire); }



  private:

    // Wraps threadLoop in a simple while loop that allows safe exit

    virtual void runLoop() final;



    // Flag to signal end of thread execution. This flag is checked before every iteration

    // of threadLoop.

    std::atomic_bool mDone;

    std::thread mThread;

};



}  // namespace helper

}  // namespace common

}  // namespace camera

}  // namespace hardware

}  // namespace android



#endif  // HARDWARE_INTERFACES_CAMERA_COMMON_SIMPLETHREAD_H_

camera/device/default/Android.bp

0 → 100644
+71 −0
Original line number Diff line number Diff line 
//

// Copyright (C) 2020 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.

//



package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "hardware_interfaces_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["hardware_interfaces_license"],

}



cc_library_shared {

    name: "camera.device-external-impl",

    defaults: ["hidl_defaults"],

    proprietary: true,

    srcs: [

        "ExternalCameraDevice.cpp",

        "ExternalCameraDeviceSession.cpp",

        "ExternalCameraOfflineSession.cpp",

        "ExternalCameraUtils.cpp",

        "convert.cpp",

    ],

    shared_libs: [

        "android.hardware.camera.common-V1-ndk",

        "android.hardware.camera.device-V1-ndk",

        "android.hardware.graphics.allocator-V1-ndk",

        "android.hardware.graphics.common-V4-ndk",

        "android.hardware.graphics.mapper@2.0",

        "android.hardware.graphics.mapper@3.0",

        "android.hardware.graphics.mapper@4.0",

        "android.hidl.allocator@1.0",

        "android.hidl.memory@1.0",

        "libbinder_ndk",

        "libcamera_metadata",

        "libcutils",

        "libexif",

        "libfmq",

        "libgralloctypes",

        "libhardware",

        "libhidlbase",

        "libhidlmemory",

        "libjpeg",

        "liblog",

        "libsync",

        "libtinyxml2",

        "libutils",

        "libyuv",

    ],

    static_libs: [

        "android.hardware.camera.common@1.0-helper",

        "libaidlcommonsupport",

    ],

    header_libs: [

        "media_plugin_headers",

    ],

    export_include_dirs: ["."],

}

camera/device/default/ExternalCameraDevice.cpp

0 → 100644
+1001 −0

File added.

Preview size limit exceeded, changes collapsed.