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

Commit 93461a31 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Fix file references in comments" into ics

parents 5d28b01b 9ae457c0

include/camera/CameraParameters.h

+5 −5
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ public: 
    // Example value: "(10500,26623),(15000,26623),(30000,30000)"

    static const char KEY_SUPPORTED_PREVIEW_FPS_RANGE[];

    // The image format for preview frames. See CAMERA_MSG_PREVIEW_FRAME in

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

    // system/core/include/system/camera.h.

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

    static const char KEY_PREVIEW_FORMAT[];

    // Supported image formats for preview frames.
@@ -147,7 +147,7 @@ public: 
    // Example value: "2048x1536,1024x768". Read only.

    static const char KEY_SUPPORTED_PICTURE_SIZES[];

    // The image format for captured pictures. See CAMERA_MSG_COMPRESSED_IMAGE

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

    // in system/core/include/system/camera.h.

    // Example value: "jpeg" or PIXEL_FORMAT_XXX constants. Read/write.

    static const char KEY_PICTURE_FORMAT[];

    // Supported image formats for captured pictures.
@@ -408,7 +408,7 @@ public: 
    // value is "true". It is not supported if the value is not "true" or the

    // key does not exist.

    // See CAMERA_CMD_START_SMOOTH_ZOOM, CAMERA_CMD_STOP_SMOOTH_ZOOM, and

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

    // CAMERA_MSG_ZOOM in system/core/include/system/camera.h.

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

    static const char KEY_SMOOTH_ZOOM_SUPPORTED[];
@@ -442,7 +442,7 @@ public: 
    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.

    // system/core/include/system/camera.h.

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

    static const char KEY_SUPPORTED_VIDEO_SIZES[];
@@ -471,7 +471,7 @@ public: 
    static const char KEY_PREFERRED_PREVIEW_SIZE_FOR_VIDEO[];



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

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

    // system/core/include/system/camera.h.

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

    static const char KEY_VIDEO_FRAME_FORMAT[];