Merge "Remove the lock/unlock workaround from CameraService" into kraken (3a0b37a0) · Commits · e / os / android_frameworks_base

camera/libcameraservice/CameraService.cpp

+1 −4

Original line number	Diff line number	Diff line
		@@ -371,10 +371,7 @@ CameraService::Client::~Client() {
		status_t CameraService::Client::checkPid() const {
		int callingPid = getCallingPid();
		if (callingPid == mClientPid) return NO_ERROR;
		if (callingPid == getpid()) {
		LOGW("FIXME: use camera from mediaserver without permission.");
		return NO_ERROR;
		}

		LOGW("attempt to use a locked camera from a different process"
		" (old pid %d, new pid %d)", mClientPid, callingPid);
		return EBUSY;

media/libmediaplayerservice/StagefrightRecorder.cpp

+17 −8

Original line number	Diff line number	Diff line
		@@ -114,25 +114,27 @@ status_t StagefrightRecorder::setVideoFrameRate(int frames_per_second) {
		}

		status_t StagefrightRecorder::setCamera(const sp<ICamera> &camera) {
		LOGV("setCamera: pid %d pid %d", IPCThreadState::self()->getCallingPid(), getpid());
		LOGV("setCamera");
		if (camera == 0) {
		LOGE("camera is NULL");
		return UNKNOWN_ERROR;
		}

		mFlags &= ~ FLAGS_SET_CAMERA \| FLAGS_HOT_CAMERA;
		int64_t token = IPCThreadState::self()->clearCallingIdentity();
		mFlags &= ~FLAGS_HOT_CAMERA;
		mCamera = Camera::create(camera);
		if (mCamera == 0) {
		LOGE("Unable to connect to camera");
		IPCThreadState::self()->restoreCallingIdentity(token);
		return UNKNOWN_ERROR;
		}

		LOGV("Connected to camera");
		mFlags \|= FLAGS_SET_CAMERA;
		if (mCamera->previewEnabled()) {
		LOGV("camera is hot");
		mFlags \|= FLAGS_HOT_CAMERA;
		}
		IPCThreadState::self()->restoreCallingIdentity(token);

		return OK;
		}
		@@ -584,7 +586,12 @@ status_t StagefrightRecorder::startMPEG4Recording() {
		}
		if (mVideoSource == VIDEO_SOURCE_DEFAULT
		\|\| mVideoSource == VIDEO_SOURCE_CAMERA) {
		CHECK(mCamera != NULL);

		int64_t token = IPCThreadState::self()->clearCallingIdentity();
		if (mCamera == 0) {
		mCamera = Camera::connect(0);
		mCamera->lock();
		}

		// Set the actual video recording frame size
		CameraParameters params(mCamera->getParameters());
		@@ -601,6 +608,7 @@ status_t StagefrightRecorder::startMPEG4Recording() {
		frameHeight < 0 \|\| frameHeight != mVideoHeight) {
		LOGE("Failed to set the video frame size to %dx%d",
		mVideoWidth, mVideoHeight);
		IPCThreadState::self()->restoreCallingIdentity(token);
		return UNKNOWN_ERROR;
		}

		@@ -612,6 +620,7 @@ status_t StagefrightRecorder::startMPEG4Recording() {
		}

		CHECK_EQ(OK, mCamera->setPreviewDisplay(mPreviewSurface));
		IPCThreadState::self()->restoreCallingIdentity(token);

		sp<CameraSource> cameraSource =
		CameraSource::CreateFromCamera(mCamera);
		@@ -698,14 +707,14 @@ status_t StagefrightRecorder::close() {
		stop();

		if (mCamera != 0) {
		int64_t token = IPCThreadState::self()->clearCallingIdentity();
		if ((mFlags & FLAGS_HOT_CAMERA) == 0) {
		LOGV("Camera was cold when we started, stopping preview");
		mCamera->stopPreview();
		}
		if (mFlags & FLAGS_SET_CAMERA) {
		LOGV("Unlocking camera");
		mCamera->unlock();
		}
		mCamera = NULL;
		IPCThreadState::self()->restoreCallingIdentity(token);
		mFlags = 0;
		}
		return OK;

media/libstagefright/CameraSource.cpp

+17 −3

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@
		#include <utils/Log.h>

		#include <OMX_Component.h>

		#include <binder/IPCThreadState.h>
		#include <media/stagefright/CameraSource.h>
		#include <media/stagefright/MediaDebug.h>
		#include <media/stagefright/MediaDefs.h>
		@@ -125,7 +125,11 @@ CameraSource::CameraSource(const sp<Camera> &camera)
		mNumFramesDropped(0),
		mCollectStats(false),
		mStarted(false) {

		int64_t token = IPCThreadState::self()->clearCallingIdentity();
		String8 s = mCamera->getParameters();
		IPCThreadState::self()->restoreCallingIdentity(token);

		printf("params: \"%s\"\n", s.string());

		int32_t width, height, stride, sliceHeight;
		@@ -166,8 +170,11 @@ status_t CameraSource::start(MetaData *) {
		&& (!strcmp(value, "1") \|\| !strcasecmp(value, "true"))) {
		mCollectStats = true;
		}

		int64_t token = IPCThreadState::self()->clearCallingIdentity();
		mCamera->setListener(new CameraSourceListener(this));
		CHECK_EQ(OK, mCamera->startRecording());
		IPCThreadState::self()->restoreCallingIdentity(token);

		mStarted = true;
		return OK;
		@@ -179,16 +186,17 @@ status_t CameraSource::stop() {
		mStarted = false;
		mFrameAvailableCondition.signal();

		int64_t token = IPCThreadState::self()->clearCallingIdentity();
		mCamera->setListener(NULL);
		mCamera->stopRecording();

		releaseQueuedFrames();

		while (!mFramesBeingEncoded.empty()) {
		LOGI("Waiting for outstanding frames being encoded: %d",
		mFramesBeingEncoded.size());
		mFrameCompleteCondition.wait(mLock);
		}
		mCamera = NULL;
		IPCThreadState::self()->restoreCallingIdentity(token);

		if (mCollectStats) {
		LOGI("Frames received/encoded/dropped: %d/%d/%d in %lld us",
		@@ -219,7 +227,11 @@ void CameraSource::signalBufferReturned(MediaBuffer *buffer) {
		for (List<sp<IMemory> >::iterator it = mFramesBeingEncoded.begin();
		it != mFramesBeingEncoded.end(); ++it) {
		if ((*it)->pointer() == buffer->data()) {

		int64_t token = IPCThreadState::self()->clearCallingIdentity();
		mCamera->releaseRecordingFrame((*it));
		IPCThreadState::self()->restoreCallingIdentity(token);

		mFramesBeingEncoded.erase(it);
		++mNumFramesEncoded;
		buffer->setObserver(0);
		@@ -273,7 +285,9 @@ void CameraSource::dataCallbackTimestamp(int64_t timestampUs,
		LOGV("dataCallbackTimestamp: timestamp %lld us", timestampUs);
		Mutex::Autolock autoLock(mLock);
		if (!mStarted) {
		int64_t token = IPCThreadState::self()->clearCallingIdentity();
		mCamera->releaseRecordingFrame(data);
		IPCThreadState::self()->restoreCallingIdentity(token);
		++mNumFramesReceived;
		++mNumFramesDropped;
		return;