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

Commit ef659d88 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Camera: Set default values of HEIF gainmap fields" into main

parents a596d2d2 7a299085

services/camera/libcameraservice/api2/HeicCompositeStream.cpp

+32 −24
Original line number Diff line number Diff line
@@ -60,18 +60,26 @@ namespace android { 
namespace camera3 {



HeicCompositeStream::HeicCompositeStream(sp<CameraDeviceBase> device,

        wp<hardware::camera2::ICameraDeviceCallbacks> cb) :

        CompositeStream(device, cb),

                                         wp<hardware::camera2::ICameraDeviceCallbacks> cb)

    : CompositeStream(device, cb),

      mUseHeic(false),

      mNumOutputTiles(1),

      mNumGainmapOutputTiles(1),

      mOutputWidth(0),

      mOutputHeight(0),

      mGainmapOutputWidth(0),

      mGainmapOutputHeight(0),

      mMaxHeicBufferSize(0),

      mGridWidth(HeicEncoderInfoManager::kGridWidth),

      mGridHeight(HeicEncoderInfoManager::kGridHeight),

      mGainmapGridWidth(HeicEncoderInfoManager::kGridWidth),

      mGainmapGridHeight(HeicEncoderInfoManager::kGridHeight),

      mGridRows(1),

      mGridCols(1),

      mGainmapGridRows(1),

      mGainmapGridCols(1),

      mUseGrid(false),

      mGainmapUseGrid(false),

      mAppSegmentStreamId(-1),

      mAppSegmentSurfaceId(-1),

      mMainImageStreamId(-1),

services/camera/libcameraservice/api2/HeicCompositeStream.h

+17 −5
Original line number Diff line number Diff line
@@ -197,11 +197,23 @@ private: 
        std::unique_ptr<uint8_t[]> gainmapChroma;

        std::vector<uint8_t> isoGainmapMetadata;



        InputFrame() : orientation(0), quality(kDefaultJpegQuality), error(false),

                       exifError(false), timestamp(-1), requestId(-1), fenceFd(-1),

                       fileFd(-1), trackIndex(-1), anb(nullptr), appSegmentWritten(false),

                       pendingOutputTiles(0), gainmapPendingOutputTiles(0),

                       codecInputCounter(0), gainmapCodecInputCounter(0) { }

        InputFrame()

            : orientation(0),

              quality(kDefaultJpegQuality),

              error(false),

              exifError(false),

              timestamp(-1),

              requestId(-1),

              fenceFd(-1),

              fileFd(-1),

              trackIndex(-1),

              gainmapTrackIndex(-1),

              anb(nullptr),

              appSegmentWritten(false),

              pendingOutputTiles(0),

              gainmapPendingOutputTiles(0),

              codecInputCounter(0),

              gainmapCodecInputCounter(0) {}

    };



    void compilePendingInputLocked();