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

Commit 25e60f13 authored by Yin-Chia Yeh's avatar Yin-Chia Yeh Committed by Android (Google) Code Review
Browse files

Merge changes from topics 'cam-ndk-hidden-enum', 'cam-ndk-enum-dco',... 

Merge changes from topics 'cam-ndk-hidden-enum', 'cam-ndk-enum-dco', 'cam-ndk-hidden-keys' into nyc-dev

* changes:
  CameraNDK: hide some capabilities in NDK
  CameraNDK: add metadata enum value documents
  CameraNDK: hide more NDK metadata tags
parents 49d9f9a0 eca6c439

camera/ndk/impl/ACameraDevice.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1239,8 +1239,8 @@ CameraDevice::ServiceCallback::onResultReceived( 
    }



    CameraMetadata metadataCopy = metadata;

    // Copied from java implmentation. Why do we need this?

    metadataCopy.update(ANDROID_LENS_INFO_SHADING_MAP_SIZE, dev->mShadingMapSize, /*data_count*/2);

    metadataCopy.update(ANDROID_SYNC_FRAME_NUMBER, &frameNumber, /*data_count*/1);



    auto it = dev->mSequenceCallbackMap.find(sequenceId);

    if (it != dev->mSequenceCallbackMap.end()) {

camera/ndk/impl/ACameraMetadata.cpp

+0 −3
Original line number Diff line number Diff line
@@ -294,7 +294,6 @@ ACameraMetadata::isCaptureRequestTag(const uint32_t tag) { 
        case ACAMERA_LENS_FOCUS_DISTANCE:

        case ACAMERA_LENS_OPTICAL_STABILIZATION_MODE:

        case ACAMERA_NOISE_REDUCTION_MODE:

        case ACAMERA_REQUEST_ID:

        case ACAMERA_SCALER_CROP_REGION:

        case ACAMERA_SENSOR_EXPOSURE_TIME:

        case ACAMERA_SENSOR_FRAME_DURATION:
@@ -311,9 +310,7 @@ ACameraMetadata::isCaptureRequestTag(const uint32_t tag) { 
        case ACAMERA_TONEMAP_MODE:

        case ACAMERA_TONEMAP_GAMMA:

        case ACAMERA_TONEMAP_PRESET_CURVE:

        case ACAMERA_LED_TRANSMIT:

        case ACAMERA_BLACK_LEVEL_LOCK:

        case ACAMERA_REPROCESS_EFFECTIVE_EXPOSURE_FACTOR:

            return true;

        default:

            return false;

include/camera/ndk/NdkCameraMetadataTags.h

+1830 −72

File changed.

Preview size limit exceeded, changes collapsed.