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

Commit 0a43cf2a authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Android (Google) Code Review
Browse files

Merge "Camera: cosmetic, fix typos" into udc-dev

parents c1d00010 525b9c49

camera/ndk/include/camera/NdkCameraCaptureSession.h

+5 −5
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ typedef struct ACameraCaptureFailure { 
 *                capture request sent by application, so the address is different to what

 *                application sent but the content will match. This request will be freed by

 *                framework immediately after this callback returns.

 * @param timestamp The timestamp when the capture is started. This timestmap will match

 * @param timestamp The timestamp when the capture is started. This timestamp will match

 *                  {@link ACAMERA_SENSOR_TIMESTAMP} of the {@link ACameraMetadata} in

 *                  {@link ACameraCaptureSession_captureCallbacks#onCaptureCompleted} callback.

 */
@@ -228,7 +228,7 @@ typedef void (*ACameraCaptureSession_captureCallback_result)( 
 *                capture request sent by application, so the address is different to what

 *                application sent but the content will match. This request will be freed by

 *                framework immediately after this callback returns.

 * @param failure The {@link ACameraCaptureFailure} desribes the capture failure. The memory is

 * @param failure The {@link ACameraCaptureFailure} describes the capture failure. The memory is

 *                managed by camera framework. Do not access this pointer after this callback

 *                returns.

 */
@@ -440,7 +440,7 @@ enum { 
 * and any repeating requests are stopped (as if {@link ACameraCaptureSession_stopRepeating} was

 * called). However, any in-progress capture requests submitted to the session will be completed as

 * normal; once all captures have completed and the session has been torn down,

 * {@link ACameraCaptureSession_stateCallbacks#onClosed} callback will be called and the seesion

 * {@link ACameraCaptureSession_stateCallbacks#onClosed} callback will be called and the session

 * will be removed from memory.</p>

 *

 * <p>Closing a session is idempotent; closing more than once has no effect.</p>
@@ -527,7 +527,7 @@ camera_status_t ACameraCaptureSession_capture( 
 *

 * <p>Repeating burst requests are a simple way for an application to

 * maintain a preview or other continuous stream of frames where each

 * request is different in a predicatable way, without having to continually

 * request is different in a predictable way, without having to continually

 * submit requests through {@link ACameraCaptureSession_capture}.</p>

 *

 * <p>To stop the repeating capture, call {@link ACameraCaptureSession_stopRepeating}. Any
@@ -738,7 +738,7 @@ typedef struct ALogicalCameraCaptureFailure { 
 *                capture request sent by application, so the address is different to what

 *                application sent but the content will match. This request will be freed by

 *                framework immediately after this callback returns.

 * @param failure The {@link ALogicalCameraCaptureFailure} desribes the capture failure. The memory

 * @param failure The {@link ALogicalCameraCaptureFailure} describes the capture failure. The memory

 *                is managed by camera framework. Do not access this pointer after this callback

 *                returns.

 */

camera/ndk/include/camera/NdkCameraDevice.h

+5 −5
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ typedef void (*ACameraDevice_StateCallback)(void* context, ACameraDevice* device 
 * @param context The optional context in {@link ACameraDevice_StateCallbacks} will be

 *                passed to this callback.

 * @param device The {@link ACameraDevice} that is being disconnected.

 * @param error The error code describes the cause of this error callback. See the folowing

 * @param error The error code describes the cause of this error callback. See the following

 *              links for more detail.

 *

 * @see ERROR_CAMERA_IN_USE
@@ -447,8 +447,8 @@ camera_status_t ACaptureSessionOutputContainer_remove( 
 *   returned by {@link ACAMERA_SCALER_AVAILABLE_STREAM_CONFIGURATIONS}

 *   before creating a Surface from the SurfaceTexture with <a href=

 *   "http://developer.android.com/reference/android/view/Surface.html#Surface(android.graphics.SurfaceTexture)">

 *   Surface\#Surface(SurfaceTextrue)</a>. If the size is not set by the application, it will be set to be the

 *   smallest supported size less than 1080p, by the camera device.</li>

 *   Surface\#Surface(SurfaceTexture)</a>. If the size is not set by the application, it will be

 *   set to be the smallest supported size less than 1080p, by the camera device.</li>

 *

 * <li>For recording with <a href=

 *     "http://developer.android.com/reference/android/media/MediaCodec.html">
@@ -587,7 +587,7 @@ camera_status_t ACaptureSessionOutputContainer_remove( 
 * <tr><th>Type</th><th id="rb">Max size</th><th>Type</th><th id="rb">Max size</th><th>Type</th><th id="rb">Max size</th> </tr>

 * <tr> <td>`PRIV`</td><td id="rb">`PREVIEW`</td> <td>`PRIV`</td><td id="rb">`MAXIMUM`</td> <td colspan="2" id="rb"></td> <td>Maximum-resolution GPU processing with preview.</td> </tr>

 * <tr> <td>`PRIV`</td><td id="rb">`PREVIEW`</td> <td>`YUV `</td><td id="rb">`MAXIMUM`</td> <td colspan="2" id="rb"></td> <td>Maximum-resolution in-app processing with preview.</td> </tr>

 * <tr> <td>`YUV `</td><td id="rb">`PREVIEW`</td> <td>`YUV `</td><td id="rb">`MAXIMUM`</td> <td colspan="2" id="rb"></td> <td>Maximum-resolution two-input in-app processsing.</td> </tr>

 * <tr> <td>`YUV `</td><td id="rb">`PREVIEW`</td> <td>`YUV `</td><td id="rb">`MAXIMUM`</td> <td colspan="2" id="rb"></td> <td>Maximum-resolution two-input in-app processing.</td> </tr>

 * <tr> <td>`PRIV`</td><td id="rb">`PREVIEW`</td> <td>`PRIV`</td><td id="rb">`PREVIEW`</td> <td>`JPEG`</td><td id="rb">`MAXIMUM`</td> <td>Video recording with maximum-size video snapshot</td> </tr>

 * <tr> <td>`YUV `</td><td id="rb">`640x480`</td> <td>`PRIV`</td><td id="rb">`PREVIEW`</td> <td>`YUV `</td><td id="rb">`MAXIMUM`</td> <td>Standard video recording plus maximum-resolution in-app processing.</td> </tr>

 * <tr> <td>`YUV `</td><td id="rb">`640x480`</td> <td>`YUV `</td><td id="rb">`PREVIEW`</td> <td>`YUV `</td><td id="rb">`MAXIMUM`</td> <td>Preview plus two-input maximum-resolution in-app processing.</td> </tr>
@@ -629,7 +629,7 @@ camera_status_t ACaptureSessionOutputContainer_remove( 
 * <tr><th>Type</th><th id="rb">Max size</th><th>Type</th><th id="rb">Max size</th> </tr>

 * <tr> <td>`PRIV`</td><td id="rb">`PREVIEW`</td> <td>`PRIV`</td><td id="rb">`MAXIMUM`</td> <td>Maximum-resolution GPU processing with preview.</td> </tr>

 * <tr> <td>`PRIV`</td><td id="rb">`PREVIEW`</td> <td>`YUV `</td><td id="rb">`MAXIMUM`</td> <td>Maximum-resolution in-app processing with preview.</td> </tr>

 * <tr> <td>`YUV `</td><td id="rb">`PREVIEW`</td> <td>`YUV `</td><td id="rb">`MAXIMUM`</td> <td>Maximum-resolution two-input in-app processsing.</td> </tr>

 * <tr> <td>`YUV `</td><td id="rb">`PREVIEW`</td> <td>`YUV `</td><td id="rb">`MAXIMUM`</td> <td>Maximum-resolution two-input in-app processing.</td> </tr>

 * </table><br>

 * </p>

 *

camera/ndk/include/camera/NdkCameraError.h

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ typedef enum { 
    ACAMERA_ERROR_CAMERA_SERVICE        = ACAMERA_ERROR_BASE - 6,



    /**

     * The {@link ACameraCaptureSession} has been closed and cannnot perform any operation other

     * The {@link ACameraCaptureSession} has been closed and cannot perform any operation other

     * than {@link ACameraCaptureSession_close}.

     */

    ACAMERA_ERROR_SESSION_CLOSED        = ACAMERA_ERROR_BASE - 7,

camera/ndk/include/camera/NdkCameraManager.h

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ camera_status_t ACameraManager_unregisterAvailabilityCallback( 
 * @param manager the {@link ACameraManager} of interest.

 * @param cameraId the ID string of the camera device of interest.

 * @param characteristics the output {@link ACameraMetadata} will be filled here if the method call

 *        succeeeds.

 *        succeeds.

 *

 * @return <ul>

 *         <li>{@link ACAMERA_OK} if the method call succeeds.</li>

camera/ndk/include/camera/NdkCameraMetadata.h

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ typedef struct ACameraMetadata_const_entry { 
 * @param metadata the {@link ACameraMetadata} of interest.

 * @param tag the tag value of the camera metadata entry to be get.

 * @param entry the output {@link ACameraMetadata_const_entry} will be filled here if the method

 *        call succeeeds.

 *        call succeeds.

 *

 * @return <ul>

 *         <li>{@link ACAMERA_OK} if the method call succeeds.</li>