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

Commit c9f90fa3 authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Android (Google) Code Review
Browse files

Merge "cameraserver: fix minor typo"

parents 50798844 67de9c87

services/camera/libcameraservice/api2/CameraDeviceClient.cpp

+3 −3
Original line number Diff line number Diff line
@@ -956,14 +956,14 @@ binder::Status CameraDeviceClient::createStream( 
    std::vector<int> surfaceIds;

    bool isDepthCompositeStream =

            camera3::DepthCompositeStream::isDepthCompositeStream(surfaces[0]);

    bool isHeicCompisiteStream = camera3::HeicCompositeStream::isHeicCompositeStream(surfaces[0]);

    bool isHeicCompositeStream = camera3::HeicCompositeStream::isHeicCompositeStream(surfaces[0]);

    bool isJpegRCompositeStream =

        camera3::JpegRCompositeStream::isJpegRCompositeStream(surfaces[0]);

    if (isDepthCompositeStream || isHeicCompisiteStream || isJpegRCompositeStream) {

    if (isDepthCompositeStream || isHeicCompositeStream || isJpegRCompositeStream) {

        sp<CompositeStream> compositeStream;

        if (isDepthCompositeStream) {

            compositeStream = new camera3::DepthCompositeStream(mDevice, getRemoteCallback());

        } else if (isHeicCompisiteStream) {

        } else if (isHeicCompositeStream) {

            compositeStream = new camera3::HeicCompositeStream(mDevice, getRemoteCallback());

        } else {

            compositeStream = new camera3::JpegRCompositeStream(mDevice, getRemoteCallback());