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

Commit f2f38ba7 authored by Jayant Chowdhary's avatar Jayant Chowdhary Committed by Android (Google) Code Review
Browse files

Merge changes from topic "cameraserver-hidl-impl" 

* changes:
  cameraserver: Implement HIDL ICameraDeviceUser and ICameraDeviceCallbacks.
  cameraserver: Implement AIDL wrapper class for HIDL ICameraServiceListener.
  cameraserver: Implement HIDL ICameraService skeleton.
parents f8274c19 0c94727f

camera/VendorTagDescriptor.cpp

+4 −0
Original line number Diff line number Diff line
@@ -315,6 +315,10 @@ status_t VendorTagDescriptor::lookupTag(const String8& name, const String8& sect 
    return OK;

}



ssize_t VendorTagDescriptor::getSectionIndex(uint32_t tag) const {

    return mTagToSectionMap.valueFor(tag);

}



void VendorTagDescriptor::dump(int fd, int verbosity, int indentation) const {



    size_t size = mTagToNameMap.size();

camera/camera2/OutputConfiguration.cpp

+6 −0
Original line number Diff line number Diff line
@@ -175,6 +175,12 @@ OutputConfiguration::OutputConfiguration(sp<IGraphicBufferProducer>& gbp, int ro 
    mIsShared = isShared;

}



OutputConfiguration::OutputConfiguration(

        const std::vector<sp<IGraphicBufferProducer>>& gbps,

    int rotation, int surfaceSetID,  int surfaceType, int width, int height, bool isShared)

  : mGbps(gbps), mRotation(rotation), mSurfaceSetID(surfaceSetID), mSurfaceType(surfaceType),

    mWidth(width), mHeight(height), mIsDeferred(false), mIsShared(isShared) { }



status_t OutputConfiguration::writeToParcel(android::Parcel* parcel) const {



    if (parcel == nullptr) return BAD_VALUE;

camera/cameraserver/Android.bp

0 → 100644
+46 −0
Original line number Diff line number Diff line 
// Copyright 2018 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.



cc_binary {

    name: "cameraserver",



    srcs: ["main_cameraserver.cpp"],



    shared_libs: [

        "libcameraservice",

        "liblog",

        "libutils",

        "libui",

        "libgui",

        "libbinder",

        "libhidltransport",

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

        "android.hardware.camera.provider@2.4",

        "android.hardware.camera.device@1.0",

        "android.hardware.camera.device@3.2",

    ],

    compile_multilib: "32",

    cflags: [

        "-Wall",

        "-Wextra",

        "-Werror",

        "-Wno-unused-parameter",

    ],



    init_rc: ["cameraserver.rc"],



    vintf_fragments: [

        "manifest_android.frameworks.cameraservice.service@2.0.xml",

    ],

}

camera/cameraserver/Android.mk

deleted100644 → 0
+0 −42
Original line number Diff line number Diff line 
# Copyright 2015 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.



LOCAL_PATH:= $(call my-dir)



include $(CLEAR_VARS)



LOCAL_SRC_FILES:= \

	main_cameraserver.cpp



LOCAL_SHARED_LIBRARIES := \

	libcameraservice \

	liblog \

	libutils \

	libui \

	libgui \

	libbinder \

	libhidltransport \

	android.hardware.camera.common@1.0 \

	android.hardware.camera.provider@2.4 \

	android.hardware.camera.device@1.0 \

	android.hardware.camera.device@3.2



LOCAL_MODULE:= cameraserver

LOCAL_32_BIT_ONLY := true



LOCAL_CFLAGS += -Wall -Wextra -Werror -Wno-unused-parameter



LOCAL_INIT_RC := cameraserver.rc



include $(BUILD_EXECUTABLE)

camera/cameraserver/main_cameraserver.cpp

+3 −2
Original line number Diff line number Diff line
@@ -26,8 +26,9 @@ int main(int argc __unused, char** argv __unused) 
{

    signal(SIGPIPE, SIG_IGN);



    // Set 3 threads for HIDL calls

    hardware::configureRpcThreadpool(3, /*willjoin*/ false);

    // Set 5 threads for HIDL calls. Now cameraserver will serve HIDL calls in

    // addition to consuming them from the Camera HAL as well.

    hardware::configureRpcThreadpool(5, /*willjoin*/ false);



    sp<ProcessState> proc(ProcessState::self());

    sp<IServiceManager> sm = defaultServiceManager();