Merge "Let the media recording framework release the Camera object when it is the owner" (0f4e81df) · Commits · e / os / android_frameworks_base

media/libstagefright/CameraSource.cpp

+35 −15

Original line number	Original line	Diff line number	Diff line
	@@ -179,9 +179,6 @@ status_t CameraSource::isCameraAvailable(
	if (camera == 0) {		if (camera == 0) {
	mCamera = Camera::connect(cameraId);		mCamera = Camera::connect(cameraId);
	if (mCamera == 0) return -EBUSY;		if (mCamera == 0) return -EBUSY;
	// If proxy is not passed in by applications, still use the proxy of
	// our own Camera to simplify the code.
	mCameraRecordingProxy = mCamera->getRecordingProxy();
	mCameraFlags &= ~FLAGS_HOT_CAMERA;		mCameraFlags &= ~FLAGS_HOT_CAMERA;
	} else {		} else {
	// We get the proxy from Camera, not ICamera. We need to get the proxy		// We get the proxy from Camera, not ICamera. We need to get the proxy
	@@ -192,12 +189,12 @@ status_t CameraSource::isCameraAvailable(
	if (mCamera == 0) return -EBUSY;		if (mCamera == 0) return -EBUSY;
	mCameraRecordingProxy = proxy;		mCameraRecordingProxy = proxy;
	mCameraFlags \|= FLAGS_HOT_CAMERA;		mCameraFlags \|= FLAGS_HOT_CAMERA;
	}

	mCamera->lock();
	mDeathNotifier = new DeathNotifier();		mDeathNotifier = new DeathNotifier();
	// isBinderAlive needs linkToDeath to work.		// isBinderAlive needs linkToDeath to work.
	mCameraRecordingProxy->asBinder()->linkToDeath(mDeathNotifier);		mCameraRecordingProxy->asBinder()->linkToDeath(mDeathNotifier);
			}

			mCamera->lock();

	return OK;		return OK;
	}		}
	@@ -292,7 +289,7 @@ status_t CameraSource::configureCamera(
	CameraParameters* params,		CameraParameters* params,
	int32_t width, int32_t height,		int32_t width, int32_t height,
	int32_t frameRate) {		int32_t frameRate) {
			LOGV("configureCamera");
	Vector<Size> sizes;		Vector<Size> sizes;
	bool isSetVideoSizeSupportedByCamera = true;		bool isSetVideoSizeSupportedByCamera = true;
	getSupportedVideoSizes(*params, &isSetVideoSizeSupportedByCamera, sizes);		getSupportedVideoSizes(*params, &isSetVideoSizeSupportedByCamera, sizes);
	@@ -368,6 +365,7 @@ status_t CameraSource::checkVideoSize(
	const CameraParameters& params,		const CameraParameters& params,
	int32_t width, int32_t height) {		int32_t width, int32_t height) {

			LOGV("checkVideoSize");
	// The actual video size is the same as the preview size		// The actual video size is the same as the preview size
	// if the camera hal does not support separate video and		// if the camera hal does not support separate video and
	// preview output. In this case, we retrieve the video		// preview output. In this case, we retrieve the video
	@@ -419,6 +417,7 @@ status_t CameraSource::checkFrameRate(
	const CameraParameters& params,		const CameraParameters& params,
	int32_t frameRate) {		int32_t frameRate) {

			LOGV("checkFrameRate");
	int32_t frameRateActual = params.getPreviewFrameRate();		int32_t frameRateActual = params.getPreviewFrameRate();
	if (frameRateActual < 0) {		if (frameRateActual < 0) {
	LOGE("Failed to retrieve preview frame rate (%d)", frameRateActual);		LOGE("Failed to retrieve preview frame rate (%d)", frameRateActual);
	@@ -464,6 +463,7 @@ status_t CameraSource::init(
	int32_t frameRate,		int32_t frameRate,
	bool storeMetaDataInVideoBuffers) {		bool storeMetaDataInVideoBuffers) {

			LOGV("init");
	status_t err = OK;		status_t err = OK;
	int64_t token = IPCThreadState::self()->clearCallingIdentity();		int64_t token = IPCThreadState::self()->clearCallingIdentity();
	err = initWithCameraAccess(camera, proxy, cameraId,		err = initWithCameraAccess(camera, proxy, cameraId,
	@@ -480,6 +480,7 @@ status_t CameraSource::initWithCameraAccess(
	Size videoSize,		Size videoSize,
	int32_t frameRate,		int32_t frameRate,
	bool storeMetaDataInVideoBuffers) {		bool storeMetaDataInVideoBuffers) {
			LOGV("initWithCameraAccess");
	status_t err = OK;		status_t err = OK;

	if ((err = isCameraAvailable(camera, proxy, cameraId)) != OK) {		if ((err = isCameraAvailable(camera, proxy, cameraId)) != OK) {
	@@ -552,17 +553,25 @@ CameraSource::~CameraSource() {
	}		}

	void CameraSource::startCameraRecording() {		void CameraSource::startCameraRecording() {
			LOGV("startCameraRecording");
	// Reset the identity to the current thread because media server owns the		// Reset the identity to the current thread because media server owns the
	// camera and recording is started by the applications. The applications		// camera and recording is started by the applications. The applications
	// will connect to the camera in ICameraRecordingProxy::startRecording.		// will connect to the camera in ICameraRecordingProxy::startRecording.
	int64_t token = IPCThreadState::self()->clearCallingIdentity();		int64_t token = IPCThreadState::self()->clearCallingIdentity();
			if (mCameraFlags & FLAGS_HOT_CAMERA) {
	mCamera->unlock();		mCamera->unlock();
	mCamera.clear();		mCamera.clear();
	IPCThreadState::self()->restoreCallingIdentity(token);
	CHECK_EQ(OK, mCameraRecordingProxy->startRecording(new ProxyListener(this)));		CHECK_EQ(OK, mCameraRecordingProxy->startRecording(new ProxyListener(this)));
			} else {
			mCamera->setListener(new CameraSourceListener(this));
			mCamera->startRecording();
			CHECK(mCamera->recordingEnabled());
			}
			IPCThreadState::self()->restoreCallingIdentity(token);
	}		}

	status_t CameraSource::start(MetaData *meta) {		status_t CameraSource::start(MetaData *meta) {
			LOGV("start");
	CHECK(!mStarted);		CHECK(!mStarted);
	if (mInitCheck != OK) {		if (mInitCheck != OK) {
	LOGE("CameraSource is not initialized yet");		LOGE("CameraSource is not initialized yet");
	@@ -588,7 +597,13 @@ status_t CameraSource::start(MetaData *meta) {
	}		}

	void CameraSource::stopCameraRecording() {		void CameraSource::stopCameraRecording() {
			LOGV("stopCameraRecording");
			if (mCameraFlags & FLAGS_HOT_CAMERA) {
	mCameraRecordingProxy->stopRecording();		mCameraRecordingProxy->stopRecording();
			} else {
			mCamera->setListener(NULL);
			mCamera->stopRecording();
			}
	}		}

	void CameraSource::releaseCamera() {		void CameraSource::releaseCamera() {
	@@ -599,11 +614,10 @@ void CameraSource::releaseCamera() {
	LOGV("Camera was cold when we started, stopping preview");		LOGV("Camera was cold when we started, stopping preview");
	mCamera->stopPreview();		mCamera->stopPreview();
	mCamera->disconnect();		mCamera->disconnect();
	} else {
	// Unlock the camera so the application can lock it back.
	mCamera->unlock();
	}		}
			mCamera->unlock();
	mCamera.clear();		mCamera.clear();
			mCamera = 0;
	IPCThreadState::self()->restoreCallingIdentity(token);		IPCThreadState::self()->restoreCallingIdentity(token);
	}		}
	if (mCameraRecordingProxy != 0) {		if (mCameraRecordingProxy != 0) {
	@@ -646,8 +660,13 @@ status_t CameraSource::stop() {
	}		}

	void CameraSource::releaseRecordingFrame(const sp<IMemory>& frame) {		void CameraSource::releaseRecordingFrame(const sp<IMemory>& frame) {
			LOGV("releaseRecordingFrame");
	if (mCameraRecordingProxy != NULL) {		if (mCameraRecordingProxy != NULL) {
	mCameraRecordingProxy->releaseRecordingFrame(frame);		mCameraRecordingProxy->releaseRecordingFrame(frame);
			} else {
			int64_t token = IPCThreadState::self()->clearCallingIdentity();
			mCamera->releaseRecordingFrame(frame);
			IPCThreadState::self()->restoreCallingIdentity(token);
	}		}
	}		}

	@@ -707,7 +726,8 @@ status_t CameraSource::read(
	while (mStarted && mFramesReceived.empty()) {		while (mStarted && mFramesReceived.empty()) {
	if (NO_ERROR !=		if (NO_ERROR !=
	mFrameAvailableCondition.waitRelative(mLock, 1000000000LL)) {		mFrameAvailableCondition.waitRelative(mLock, 1000000000LL)) {
	if (!mCameraRecordingProxy->asBinder()->isBinderAlive()) {		if (mCameraRecordingProxy != 0 &&
			!mCameraRecordingProxy->asBinder()->isBinderAlive()) {
	LOGW("camera recording proxy is gone");		LOGW("camera recording proxy is gone");
	return ERROR_END_OF_STREAM;		return ERROR_END_OF_STREAM;
	}		}