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

Commit a078a607 authored by Xin Li's avatar Xin Li
Browse files

Merge RQ2A.210305.007 

Bug: 180401296
Merged-In: Ib1d821a873e8aa0a2251792842de9b57cd80d87e
Change-Id: I70064218030c4a6b5a15d24716a105b11c3132d8
parents edc1fff4 74ba7b84

apex/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ apex_defaults { 
                "libmpeg2extractor",

                "liboggextractor",

                "libwavextractor",

                // JNI

                "libmediaparser-jni"

            ],

        },

    },

apex/manifest_codec.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "com.android.media.swcodec",

  "version": 300900700,

  "version": 300000000,

  "requireNativeLibs": [

    ":sphal"

  ]

camera/CameraMetadata.cpp

+5 −0
Original line number Diff line number Diff line
@@ -169,6 +169,11 @@ bool CameraMetadata::isEmpty() const { 
    return entryCount() == 0;

}



size_t CameraMetadata::bufferSize() const {

    return (mBuffer == NULL) ? 0 :

            get_camera_metadata_size(mBuffer);

}



status_t CameraMetadata::sort() {

    if (mLocked) {

        ALOGE("%s: CameraMetadata is locked", __FUNCTION__);

camera/include/camera/CameraMetadata.h

+5 −0
Original line number Diff line number Diff line
@@ -127,6 +127,11 @@ class CameraMetadata: public Parcelable { 
     */

    bool isEmpty() const;



    /**

     * Return the allocated camera metadata buffer size in bytes.

     */

    size_t bufferSize() const;



    /**

     * Sort metadata buffer for faster find

     */

camera/ndk/include/camera/NdkCameraMetadataTags.h

+7 −2
Original line number Diff line number Diff line
@@ -1955,7 +1955,10 @@ typedef enum acamera_metadata_tag { 
     * explicitly set ACAMERA_CONTROL_ZOOM_RATIO, its value defaults to 1.0.</p>

     * <p>One limitation of controlling zoom using zoomRatio is that the ACAMERA_SCALER_CROP_REGION

     * must only be used for letterboxing or pillarboxing of the sensor active array, and no

     * FREEFORM cropping can be used with ACAMERA_CONTROL_ZOOM_RATIO other than 1.0.</p>

     * FREEFORM cropping can be used with ACAMERA_CONTROL_ZOOM_RATIO other than 1.0. If

     * ACAMERA_CONTROL_ZOOM_RATIO is not 1.0, and ACAMERA_SCALER_CROP_REGION is set to be

     * windowboxing, the camera framework will override the ACAMERA_SCALER_CROP_REGION to be

     * the active array.</p>

     *

     * @see ACAMERA_CONTROL_AE_REGIONS

     * @see ACAMERA_CONTROL_ZOOM_RATIO
@@ -3649,7 +3652,9 @@ typedef enum acamera_metadata_tag { 
     * </ol>

     * </li>

     * <li>Setting ACAMERA_CONTROL_ZOOM_RATIO to values different than 1.0 and

     * ACAMERA_SCALER_CROP_REGION to be windowboxing at the same time is undefined behavior.</li>

     * ACAMERA_SCALER_CROP_REGION to be windowboxing at the same time are not supported. In this

     * case, the camera framework will override the ACAMERA_SCALER_CROP_REGION to be the active

     * array.</li>

     * </ul>

     * <p>LEGACY capability devices will only support CENTER_ONLY cropping.</p>

     *