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

Commit bc57b120 authored by Aurimas Liutikas's avatar Aurimas Liutikas
Browse files

Fix compiler warnings in Camera3 service code. 

- Removes unsed mDepth variable
- Fixes the type of count in getRawOpaqueBufferSize

Bug: 27149500
Change-Id: I7d5010cb513f9163c8bb6bf4ab427e54ee9d4963
parent 3166aa66

services/camera/libcameraservice/device3/Camera3Device.cpp

+1 −1
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ ssize_t Camera3Device::getRawOpaqueBufferSize(uint32_t width, uint32_t height) c 
    const int SIZE_OFFSET = 2;

    camera_metadata_ro_entry rawOpaqueSizes =

        mDeviceInfo.find(ANDROID_SENSOR_OPAQUE_RAW_SIZE);

    int count = rawOpaqueSizes.count;

    size_t count = rawOpaqueSizes.count;

    if (count == 0 || (count % PER_CONFIGURATION_SIZE)) {

        ALOGE("%s: Camera %d: bad opaque RAW size static metadata length(%d)!",

                __FUNCTION__, mId, count);

services/camera/libcameraservice/device3/Camera3ZslStream.cpp

+1 −2
Original line number Diff line number Diff line
@@ -115,8 +115,7 @@ Camera3ZslStream::Camera3ZslStream(int id, uint32_t width, uint32_t height, 
        Camera3OutputStream(id, CAMERA3_STREAM_BIDIRECTIONAL,

                            width, height,

                            HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED,

                            HAL_DATASPACE_UNKNOWN, CAMERA3_STREAM_ROTATION_0),

        mDepth(bufferCount) {

                            HAL_DATASPACE_UNKNOWN, CAMERA3_STREAM_ROTATION_0) {



    sp<IGraphicBufferProducer> producer;

    sp<IGraphicBufferConsumer> consumer;

services/camera/libcameraservice/device3/Camera3ZslStream.h

+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ class Camera3ZslStream : 


  private:



    int mDepth;

    // Input buffers pending to be queued into HAL

    List<sp<RingBufferConsumer::PinnedBufferItem> > mInputBufferQueue;

    sp<RingBufferConsumer>                          mProducer;