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

Commit 4fd446f7 authored by James Dong's avatar James Dong
Browse files

Video size retrieval/configuration support in camera hal 

This is the first part of the camera hal change required for
0-memcpy of input video frames for video recording.

o removed check in setVideoSize()/getVideoSize() for impl consistency

Change-Id: I01274a62b9f9eaf32154d98f8d0bfedacf645698
parent 2b282d31

include/camera/CameraParameters.h

+31 −0
Original line number Diff line number Diff line
@@ -59,6 +59,27 @@ public: 
    void setPreviewSize(int width, int height);

    void getPreviewSize(int *width, int *height) const;

    void getSupportedPreviewSizes(Vector<Size> &sizes) const;



    // Set the dimensions in pixels to the given width and height

    // for video frames. The given width and height must be one

    // of the supported dimensions returned from

    // getSupportedVideoSizes(). Must not be called if

    // getSupportedVideoSizes() returns an empty Vector of Size.

    void setVideoSize(int width, int height);

    // Retrieve the current dimensions (width and height)

    // in pixels for video frames, which must be one of the

    // supported dimensions returned from getSupportedVideoSizes().

    // Must not be called if getSupportedVideoSizes() returns an

    // empty Vector of Size.

    void getVideoSize(int *width, int *height) const;

    // Retrieve a Vector of supported dimensions (width and height)

    // in pixels for video frames. If sizes returned from the method

    // is empty, the camera does not support calls to setVideoSize()

    // or getVideoSize(). In adddition, it also indicates that

    // the camera only has a single output, and does not have

    // separate output for video frames and preview frame.

    void getSupportedVideoSizes(Vector<Size> &sizes) const;



    void setPreviewFrameRate(int fps);

    int getPreviewFrameRate() const;

    void getPreviewFpsRange(int *min_fps, int *max_fps) const;
@@ -281,6 +302,16 @@ public: 
    // Example value: "0.95,1.9,Infinity" or "0.049,0.05,0.051". Read only.

    static const char KEY_FOCUS_DISTANCES[];



    // The current dimensions in pixels (width x height) for video frames.

    // The width and height must be one of the supported sizes retrieved

    // via KEY_SUPPORTED_VIDEO_SIZES.

    // Example value: "1280x720". Read/write.

    static const char KEY_VIDEO_SIZE[];

    // A list of the supported dimensions in pixels (width x height)

    // for video frames. See CAMERA_MSG_VIDEO_FRAME for details in

    // frameworks/base/include/camera/Camera.h.

    // Example: "176x144,1280x720". Read only.

    static const char KEY_SUPPORTED_VIDEO_SIZES[];

    // The image format for video frames. See CAMERA_MSG_VIDEO_FRAME in

    // frameworks/base/include/camera/Camera.h.

    // Example value: "yuv420sp" or PIXEL_FORMAT_XXX constants. Read only.

libs/camera/CameraParameters.cpp

+23 −0
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ const char CameraParameters::KEY_ZOOM_SUPPORTED[] = "zoom-supported"; 
const char CameraParameters::KEY_SMOOTH_ZOOM_SUPPORTED[] = "smooth-zoom-supported";

const char CameraParameters::KEY_FOCUS_DISTANCES[] = "focus-distances";

const char CameraParameters::KEY_VIDEO_FRAME_FORMAT[] = "video-frame-format";

const char CameraParameters::KEY_VIDEO_SIZE[] = "video-size";

const char CameraParameters::KEY_SUPPORTED_VIDEO_SIZES[] = "video-size-values";



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

const char CameraParameters::FOCUS_DISTANCE_INFINITY[] = "Infinity";
@@ -337,6 +339,27 @@ void CameraParameters::getSupportedPreviewSizes(Vector<Size> &sizes) const 
    parseSizesList(previewSizesStr, sizes);

}



void CameraParameters::setVideoSize(int width, int height)

{

    char str[32];

    sprintf(str, "%dx%d", width, height);

    set(KEY_VIDEO_SIZE, str);

}



void CameraParameters::getVideoSize(int *width, int *height) const

{

    *width = *height = -1;

    const char *p = get(KEY_VIDEO_SIZE);

    if (p == 0) return;

    parse_pair(p, width, height, 'x');

}



void CameraParameters::getSupportedVideoSizes(Vector<Size> &sizes) const

{

    const char *videoSizesStr = get(KEY_SUPPORTED_VIDEO_SIZES);

    parseSizesList(videoSizesStr, sizes);

}



void CameraParameters::setPreviewFrameRate(int fps)

{

    set(KEY_PREVIEW_FRAME_RATE, fps);