Merge "Camera: Fix assorted deprecation and formatting warnings" into main (59332a5c) · Commits · e / os / android_frameworks_av

media/libmedia/include/media/RingBuffer.h

+7 −3

Original line number	Diff line number	Diff line
		@@ -44,8 +44,14 @@ public:
		/**
		* Forward iterator to this class. Implements an std:forward_iterator.
		*/
		class iterator : public std::iterator<std::forward_iterator_tag, T> {
		class iterator {
		public:
		using iterator_category = std::forward_iterator_tag;
		using value_type = T;
		using difference_type = std::ptrdiff_t;
		using pointer = T*;
		using reference = T&;

		iterator(T* ptr, size_t size, size_t pos, size_t ctr);

		iterator& operator++();
		@@ -357,5 +363,3 @@ void RingBuffer<T>::clear() {
		}; // namespace android

		#endif // ANDROID_SERVICE_UTILS_RING_BUFFER_H

services/camera/libcameraservice/CameraService.cpp

+10 −9

Original line number	Diff line number	Diff line
		@@ -513,7 +513,7 @@ void CameraService::removeStates(const std::string& cameraId) {
		void CameraService::onDeviceStatusChanged(const std::string& cameraId,
		CameraDeviceStatus newHalStatus) {
		ALOGI("%s: Status changed for cameraId=%s, newStatus=%d", __FUNCTION__,
		cameraId.c_str(), newHalStatus);
		cameraId.c_str(), eToI(newHalStatus));

		StatusInternal newStatus = mapToInternal(newHalStatus);

		@@ -537,7 +537,8 @@ void CameraService::onDeviceStatusChanged(const std::string& cameraId,
		StatusInternal oldStatus = state->getStatus();

		if (oldStatus == newStatus) {
		ALOGE("%s: State transition to the same status %#x not allowed", __FUNCTION__, newStatus);
		ALOGE("%s: State transition to the same status %#x not allowed", __FUNCTION__,
		eToI(newStatus));
		return;
		}

		@@ -580,7 +581,7 @@ void CameraService::onDeviceStatusChanged(const std::string& id,
		const std::string& physicalId,
		CameraDeviceStatus newHalStatus) {
		ALOGI("%s: Status changed for cameraId=%s, physicalCameraId=%s, newStatus=%d",
		__FUNCTION__, id.c_str(), physicalId.c_str(), newHalStatus);
		__FUNCTION__, id.c_str(), physicalId.c_str(), eToI(newHalStatus));

		StatusInternal newStatus = mapToInternal(newHalStatus);

		@@ -596,7 +597,7 @@ void CameraService::onDeviceStatusChanged(const std::string& id,
		if (logicalCameraStatus != StatusInternal::PRESENT &&
		logicalCameraStatus != StatusInternal::NOT_AVAILABLE) {
		ALOGE("%s: Physical camera id %s status %d change for an invalid logical camera state %d",
		__FUNCTION__, physicalId.c_str(), newHalStatus, logicalCameraStatus);
		__FUNCTION__, physicalId.c_str(), eToI(newHalStatus), eToI(logicalCameraStatus));
		return;
		}

		@@ -688,7 +689,7 @@ void CameraService::broadcastTorchStrengthLevel(const std::string& cameraId,
		void CameraService::onTorchStatusChangedLocked(const std::string& cameraId,
		TorchModeStatus newStatus, SystemCameraKind systemCameraKind) {
		ALOGI("%s: Torch status changed for cameraId=%s, newStatus=%d",
		__FUNCTION__, cameraId.c_str(), newStatus);
		__FUNCTION__, cameraId.c_str(), eToI(newStatus));

		TorchModeStatus status;
		status_t res = getTorchStatusLocked(cameraId, &status);
		@@ -1552,7 +1553,7 @@ int32_t CameraService::mapToInterface(TorchModeStatus status) {
		serviceStatus = ICameraServiceListener::TORCH_STATUS_AVAILABLE_ON;
		break;
		default:
		ALOGW("Unknown new flash status: %d", status);
		ALOGW("Unknown new flash status: %d", eToI(status));
		}
		return serviceStatus;
		}
		@@ -1570,7 +1571,7 @@ CameraService::StatusInternal CameraService::mapToInternal(CameraDeviceStatus st
		serviceStatus = StatusInternal::ENUMERATING;
		break;
		default:
		ALOGW("Unknown new HAL device status: %d", status);
		ALOGW("Unknown new HAL device status: %d", eToI(status));
		}
		return serviceStatus;
		}
		@@ -1594,7 +1595,7 @@ int32_t CameraService::mapToInterface(StatusInternal status) {
		serviceStatus = ICameraServiceListener::STATUS_UNKNOWN;
		break;
		default:
		ALOGW("Unknown new internal device status: %d", status);
		ALOGW("Unknown new internal device status: %d", eToI(status));
		}
		return serviceStatus;
		}
		@@ -5777,7 +5778,7 @@ void CameraService::CameraState::updateStatus(StatusInternal status,
		}

		ALOGV("%s: Status has changed for camera ID %s from %#x to %#x", __FUNCTION__,
		cameraId.c_str(), oldStatus, status);
		cameraId.c_str(), eToI(oldStatus), eToI(status));

		if (oldStatus == StatusInternal::NOT_PRESENT &&
		(status != StatusInternal::PRESENT &&

services/camera/libcameraservice/aidl/AidlUtils.cpp

+4 −3

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@
		#include <device3/Camera3StreamInterface.h>
		#include <gui/bufferqueue/1.0/H2BGraphicBufferProducer.h>
		#include <mediautils/AImageReaderUtils.h>
		#include "utils/Utils.h"

		namespace android::hardware::cameraservice::utils::conversion::aidl {

		@@ -347,8 +348,8 @@ status_t copySessionCharacteristics(const CameraMetadata& from, CameraMetadata*
		// Ensure the vendor ID are the same before attempting
		// anything else. If vendor IDs differ we cannot safely copy the characteristics.
		if (from.getVendorId() != to->getVendorId()) {
		ALOGE("%s: Incompatible CameraMetadata objects. Vendor IDs differ. From: %lu; To: %lu",
		__FUNCTION__, from.getVendorId(), to->getVendorId());
		ALOGE("%s: Incompatible CameraMetadata objects. Vendor IDs differ. From: %" PRIu64
		"; To: %" PRIu64, __FUNCTION__, from.getVendorId(), to->getVendorId());
		return BAD_VALUE;
		}

		@@ -364,7 +365,7 @@ status_t copySessionCharacteristics(const CameraMetadata& from, CameraMetadata*
		for (size_t i = 0; i < get_camera_metadata_entry_count(src); i++) {
		int ret = get_camera_metadata_ro_entry(src, i, &entry);
		if (ret != OK) {
		ALOGE("%s: Could not fetch entry at index %lu. Error: %d", __FUNCTION__, i, ret);
		ALOGE("%s: Could not fetch entry at index %zu. Error: %d", __FUNCTION__, i, ret);
		from.unlock(src);
		return BAD_VALUE;
		}

services/camera/libcameraservice/api2/HeicCompositeStream.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@
		#include "common/CameraDeviceBase.h"
		#include "utils/ExifUtils.h"
		#include "utils/SessionConfigurationUtils.h"
		#include "utils/Utils.h"
		#include "HeicEncoderInfoManager.h"
		#include "HeicCompositeStream.h"

		@@ -1464,7 +1465,7 @@ size_t HeicCompositeStream::findAppSegmentsSize(const uint8_t* appSegmentBuffer,
		const uint8_t *header = appSegmentBuffer + (maxSize - sizeof(CameraBlob));
		const CameraBlob blob = (const CameraBlob)(header);
		if (blob->blobId != CameraBlobId::JPEG_APP_SEGMENTS) {
		ALOGE("%s: Invalid EXIF blobId %d", __FUNCTION__, blob->blobId);
		ALOGE("%s: Invalid EXIF blobId %d", __FUNCTION__, eToI(blob->blobId));
		return 0;
		}

services/camera/libcameraservice/common/CameraProviderManager.cpp

+6 −5

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@

		#include "api2/HeicCompositeStream.h"
		#include "device3/ZoomRatioMapper.h"
		#include "utils/Utils.h"

		namespace android {

		@@ -92,7 +93,7 @@ const char* FrameworkTorchStatusToString(const TorchModeStatus& s) {
		case TorchModeStatus::AVAILABLE_ON:
		return "AVAILABLE_ON";
		}
		ALOGW("Unexpected HAL torch mode status code %d", s);
		ALOGW("Unexpected HAL torch mode status code %d", eToI(s));
		return "UNKNOWN_STATUS";
		}

		@@ -105,7 +106,7 @@ const char* FrameworkDeviceStatusToString(const CameraDeviceStatus& s) {
		case CameraDeviceStatus::ENUMERATING:
		return "ENUMERATING";
		}
		ALOGW("Unexpected HAL device status code %d", s);
		ALOGW("Unexpected HAL device status code %d", eToI(s));
		return "UNKNOWN_STATUS";
		}

		@@ -2279,7 +2280,7 @@ status_t CameraProviderManager::removeProvider(const std::string& provider) {
		return tryToInitializeAidlProviderLocked(removedAidlProviderName,
		providerInfo);
		default:
		ALOGE("%s Unsupported Transport %d", __FUNCTION__, providerTransport);
		ALOGE("%s Unsupported Transport %d", __FUNCTION__, eToI(providerTransport));
		}
		}
		}
		@@ -2366,7 +2367,7 @@ status_t CameraProviderManager::ProviderInfo::addDevice(
		}
		break;
		default:
		ALOGE("%s Invalid transport %d", __FUNCTION__, transport);
		ALOGE("%s Invalid transport %d", __FUNCTION__, eToI(transport));
		return BAD_VALUE;
		}

		@@ -2712,7 +2713,7 @@ void CameraProviderManager::ProviderInfo::torchModeStatusChangeInternal(
		}
		if (!known) {
		ALOGW("Camera provider %s says an unknown camera %s now has torch status %d. Curious.",
		mProviderName.c_str(), cameraDeviceName.c_str(), newStatus);
		mProviderName.c_str(), cameraDeviceName.c_str(), eToI(newStatus));
		return;
		}
		// no lock needed since listener is set up only once during