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

Commit ee0dd0e9 authored by Owen Lin's avatar Owen Lin Committed by Android Git Automerger
Browse files

am 110a4675: am d82f452f: Set more camera parameters initial values. 

Merge commit '110a4675bef2fe11b2d38057def74d681fe7cca5'

* commit '110a4675bef2fe11b2d38057def74d681fe7cca5':
  Set more camera parameters initial values.
parents c9ead6ef d01a27ff

camera/libcameraservice/CameraHardwareStub.cpp

+16 −15
Original line number Diff line number Diff line
@@ -47,11 +47,13 @@ void CameraHardwareStub::initDefaultParameters() 
{

    CameraParameters p;



    p.setPreviewSize(176, 144);

    p.set("preview-size-values","320x240");

    p.setPreviewSize(320, 240);

    p.setPreviewFrameRate(15);

    p.setPreviewFormat("yuv422sp");



    p.setPictureSize(kCannedJpegWidth, kCannedJpegHeight);

    p.set("picture-size-values", "320x240");

    p.setPictureSize(320, 240);

    p.setPictureFormat("jpeg");



    if (setParameters(p) != NO_ERROR) {
@@ -356,7 +358,6 @@ status_t CameraHardwareStub::setParameters(const CameraParameters& params) 
    }



    mParameters = params;



    initHeapLocked();



    return NO_ERROR;

camera/libcameraservice/CannedJpeg.h

+731 −1543

File changed.

Preview size limit exceeded, changes collapsed.