Snap for 9088299 from c25c6ed7ad6b5feb1a4483dbaf9751665d0d30ee to tm-qpr1-release (11bf3048) · Commits · e / os / android_frameworks_av

media/libstagefright/FrameDecoder.cpp

+8 −5

Original line number	Diff line number	Diff line
		@@ -86,11 +86,14 @@ sp<IMemory> allocVideoFrame(const sp<MetaData>& trackMeta,
		displayHeight = height;
		}

		if (allocRotated && (rotationAngle == 90 \|\| rotationAngle == 270)) {
		int32_t tmp;
		tmp = width; width = height; height = tmp;
		tmp = displayWidth; displayWidth = displayHeight; displayHeight = tmp;
		tmp = tileWidth; tileWidth = tileHeight; tileHeight = tmp;
		if (allocRotated) {
		if (rotationAngle == 90 \|\| rotationAngle == 270) {
		// swap width and height for 90 & 270 degrees rotation
		std::swap(width, height);
		std::swap(displayWidth, displayHeight);
		std::swap(tileWidth, tileHeight);
		}
		// Rotation is already applied.
		rotationAngle = 0;
		}

services/audiopolicy/service/SpatializerPoseController.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ namespace {
		constexpr float kMaxTranslationalVelocity = 2;

		// This is how fast, in rad/s, we allow rotation angle to shift during rate-limiting.
		constexpr float kMaxRotationalVelocity = 8;
		constexpr float kMaxRotationalVelocity = 0.8f;

		// This is how far into the future we predict the head pose, using linear extrapolation based on
		// twist (velocity). It should be set to a value that matches the characteristic durations of moving

services/camera/libcameraservice/device3/Camera3Device.cpp

+23 −17

Original line number	Diff line number	Diff line
		@@ -2679,7 +2679,7 @@ void Camera3Device::setErrorStateLockedV(const char *fmt, va_list args) {
		status_t Camera3Device::registerInFlight(uint32_t frameNumber,
		int32_t numBuffers, CaptureResultExtras resultExtras, bool hasInput,
		bool hasAppCallback, nsecs_t minExpectedDuration, nsecs_t maxExpectedDuration,
		const std::set<std::set<String8>>& physicalCameraIds,
		bool isFixedFps, const std::set<std::set<String8>>& physicalCameraIds,
		bool isStillCapture, bool isZslCapture, bool rotateAndCropAuto,
		const std::set<std::string>& cameraIdsWithZoom,
		const SurfaceMap& outputSurfaces, nsecs_t requestTimeNs) {
		@@ -2688,7 +2688,7 @@ status_t Camera3Device::registerInFlight(uint32_t frameNumber,

		ssize_t res;
		res = mInFlightMap.add(frameNumber, InFlightRequest(numBuffers, resultExtras, hasInput,
		hasAppCallback, minExpectedDuration, maxExpectedDuration, physicalCameraIds,
		hasAppCallback, minExpectedDuration, maxExpectedDuration, isFixedFps, physicalCameraIds,
		isStillCapture, isZslCapture, rotateAndCropAuto, cameraIdsWithZoom, requestTimeNs,
		outputSurfaces));
		if (res < 0) return res;
		@@ -3248,16 +3248,18 @@ bool Camera3Device::RequestThread::sendRequestsBatch() {
		return true;
		}

		std::pair<nsecs_t, nsecs_t> Camera3Device::RequestThread::calculateExpectedDurationRange(
		Camera3Device::RequestThread::ExpectedDurationInfo
		Camera3Device::RequestThread::calculateExpectedDurationRange(
		const camera_metadata_t *request) {
		std::pair<nsecs_t, nsecs_t> expectedRange(
		ExpectedDurationInfo expectedDurationInfo = {
		InFlightRequest::kDefaultMinExpectedDuration,
		InFlightRequest::kDefaultMaxExpectedDuration);
		InFlightRequest::kDefaultMaxExpectedDuration,
		/isFixedFps/false};
		camera_metadata_ro_entry_t e = camera_metadata_ro_entry_t();
		find_camera_metadata_ro_entry(request,
		ANDROID_CONTROL_AE_MODE,
		&e);
		if (e.count == 0) return expectedRange;
		if (e.count == 0) return expectedDurationInfo;

		switch (e.data.u8[0]) {
		case ANDROID_CONTROL_AE_MODE_OFF:
		@@ -3265,29 +3267,32 @@ std::pair<nsecs_t, nsecs_t> Camera3Device::RequestThread::calculateExpectedDurat
		ANDROID_SENSOR_EXPOSURE_TIME,
		&e);
		if (e.count > 0) {
		expectedRange.first = e.data.i64[0];
		expectedRange.second = expectedRange.first;
		expectedDurationInfo.minDuration = e.data.i64[0];
		expectedDurationInfo.maxDuration = expectedDurationInfo.minDuration;
		}
		find_camera_metadata_ro_entry(request,
		ANDROID_SENSOR_FRAME_DURATION,
		&e);
		if (e.count > 0) {
		expectedRange.first = std::max(e.data.i64[0], expectedRange.first);
		expectedRange.second = expectedRange.first;
		expectedDurationInfo.minDuration =
		std::max(e.data.i64[0], expectedDurationInfo.minDuration);
		expectedDurationInfo.maxDuration = expectedDurationInfo.minDuration;
		}
		expectedDurationInfo.isFixedFps = false;
		break;
		default:
		find_camera_metadata_ro_entry(request,
		ANDROID_CONTROL_AE_TARGET_FPS_RANGE,
		&e);
		if (e.count > 1) {
		expectedRange.first = 1e9 / e.data.i32[1];
		expectedRange.second = 1e9 / e.data.i32[0];
		expectedDurationInfo.minDuration = 1e9 / e.data.i32[1];
		expectedDurationInfo.maxDuration = 1e9 / e.data.i32[0];
		}
		expectedDurationInfo.isFixedFps = (e.data.i32[1] == e.data.i32[0]);
		break;
		}

		return expectedRange;
		return expectedDurationInfo;
		}

		bool Camera3Device::RequestThread::skipHFRTargetFPSUpdate(int32_t tag,
		@@ -3902,13 +3907,14 @@ status_t Camera3Device::RequestThread::prepareHalRequests() {
		isZslCapture = true;
		}
		}
		auto expectedDurationRange = calculateExpectedDurationRange(settings);
		auto expectedDurationInfo = calculateExpectedDurationRange(settings);
		res = parent->registerInFlight(halRequest->frame_number,
		totalNumBuffers, captureRequest->mResultExtras,
		/hasInput/halRequest->input_buffer != NULL,
		hasCallback,
		/min/expectedDurationRange.first,
		/max/expectedDurationRange.second,
		expectedDurationInfo.minDuration,
		expectedDurationInfo.maxDuration,
		expectedDurationInfo.isFixedFps,
		requestedPhysicalCameras, isStillCapture, isZslCapture,
		captureRequest->mRotateAndCropAuto, mPrevCameraIdsWithZoom,
		(mUseHalBufManager) ? uniqueSurfaceIdMap :

services/camera/libcameraservice/device3/Camera3Device.h

+11 −3

Original line number	Diff line number	Diff line
		@@ -967,8 +967,13 @@ class Camera3Device :
		// send request in mNextRequests to HAL in a batch. Return true = sucssess
		bool sendRequestsBatch();

		// Calculate the expected (minimum, maximum) duration range for a request
		std::pair<nsecs_t, nsecs_t> calculateExpectedDurationRange(
		// Calculate the expected (minimum, maximum, isFixedFps) duration info for a request
		struct ExpectedDurationInfo {
		nsecs_t minDuration;
		nsecs_t maxDuration;
		bool isFixedFps;
		};
		ExpectedDurationInfo calculateExpectedDurationRange(
		const camera_metadata_t *request);

		// Check and update latest session parameters based on the current request settings.
		@@ -1087,7 +1092,7 @@ class Camera3Device :
		status_t registerInFlight(uint32_t frameNumber,
		int32_t numBuffers, CaptureResultExtras resultExtras, bool hasInput,
		bool callback, nsecs_t minExpectedDuration, nsecs_t maxExpectedDuration,
		const std::set<std::set<String8>>& physicalCameraIds,
		bool isFixedFps, const std::set<std::set<String8>>& physicalCameraIds,
		bool isStillCapture, bool isZslCapture, bool rotateAndCropAuto,
		const std::set<std::string>& cameraIdsWithZoom, const SurfaceMap& outputSurfaces,
		nsecs_t requestTimeNs);
		@@ -1339,6 +1344,9 @@ class Camera3Device :

		// The current minimum expected frame duration based on AE_TARGET_FPS_RANGE
		nsecs_t mMinExpectedDuration = 0;
		// Whether the camera device runs at fixed frame rate based on AE_MODE and
		// AE_TARGET_FPS_RANGE
		bool mIsFixedFps = false;

		// Injection camera related methods.
		class Camera3DeviceInjectionMethods : public virtual RefBase {

services/camera/libcameraservice/device3/Camera3FakeStream.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -100,7 +100,7 @@ class Camera3FakeStream :

		virtual status_t setBatchSize(size_t batchSize) override;

		virtual void onMinDurationChanged(nsecs_t /duration/) {}
		virtual void onMinDurationChanged(nsecs_t /duration/, bool /fixedFps/) {}
		protected:

		/**