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

Commit a8e409f8 authored by Wu-cheng Li's avatar Wu-cheng Li
Browse files

Add video snapshot camera parameter. 

The API is still hidden.

bug:5187868

Change-Id: I59e1b5774ca32be049723d1a0887faa90d8884bb
parent 77d2e08a

camera/CameraParameters.cpp

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ const char CameraParameters::KEY_PREFERRED_PREVIEW_SIZE_FOR_VIDEO[] = "preferred 
const char CameraParameters::KEY_MAX_NUM_DETECTED_FACES_HW[] = "max-num-detected-faces-hw";

const char CameraParameters::KEY_MAX_NUM_DETECTED_FACES_SW[] = "max-num-detected-faces-sw";

const char CameraParameters::KEY_RECORDING_HINT[] = "recording-hint";

const char CameraParameters::KEY_VIDEO_SNAPSHOT_SUPPORTED[] = "video-snapshot-supported";



const char CameraParameters::TRUE[] = "true";

const char CameraParameters::FALSE[] = "false";

include/camera/CameraParameters.h

+19 −0
Original line number Diff line number Diff line
@@ -495,6 +495,25 @@ public: 
    // Example value: "true" or "false". Read/write.

    static const char KEY_RECORDING_HINT[];



    // Returns true if video snapshot is supported. That is, applications

    // can call Camera.takePicture during recording. Applications do not need to

    // call Camera.startPreview after taking a picture. The preview will be

    // still active. Other than that, taking a picture during recording is

    // identical to taking a picture normally. All settings and methods related

    // to takePicture work identically. Ex: KEY_PICTURE_SIZE,

    // KEY_SUPPORTED_PICTURE_SIZES, KEY_JPEG_QUALITY, KEY_ROTATION, and etc.

    // The picture will have an EXIF header. FLASH_MODE_AUTO and FLASH_MODE_ON

    // also still work, but the video will record the flash.

    //

    // Applications can set shutter callback as null to avoid the shutter

    // sound. It is also recommended to set raw picture and post view callbacks

    // to null to avoid the interrupt of preview display.

    //

    // Field-of-view of the recorded video may be different from that of the

    // captured pictures.

    // Example value: "true" or "false". Read only.

    static const char KEY_VIDEO_SNAPSHOT_SUPPORTED[];



    // Value for KEY_ZOOM_SUPPORTED or KEY_SMOOTH_ZOOM_SUPPORTED.

    static const char TRUE[];

    static const char FALSE[];

services/camera/libcameraservice/CameraService.cpp

+0 −5
Original line number Diff line number Diff line
@@ -769,11 +769,6 @@ status_t CameraService::Client::takePicture(int msgType) { 
    status_t result = checkPidAndHardware();

    if (result != NO_ERROR) return result;



    if (mHardware->recordingEnabled()) {

        LOGE("Cannot take picture during recording.");

        return INVALID_OPERATION;

    }



    if ((msgType & CAMERA_MSG_RAW_IMAGE) &&

        (msgType & CAMERA_MSG_RAW_IMAGE_NOTIFY)) {

        LOGE("CAMERA_MSG_RAW_IMAGE and CAMERA_MSG_RAW_IMAGE_NOTIFY"