Merge "Camera: Add debug code to dump JPEG images" (b7c71956) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/CameraService.cpp

+34 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@
		#include <algorithm>
		#include <climits>
		#include <stdio.h>
		#include <cstdlib>
		#include <cstring>
		#include <ctime>
		#include <string>
		@@ -1694,6 +1695,8 @@ Status CameraService::connectHelper(const sp<CALLBACK>& cameraCb, const String8&
		// Otherwise, add client to active clients list
		finishConnectLocked(client, partial);
		}

		client->setImageDumpMask(mImageDumpMask);
		} // lock is destroyed, allow further connect calls

		// Important: release the mutex here so the client can call back into the service from its
		@@ -3880,6 +3883,10 @@ status_t CameraService::shellCommand(int in, int out, int err, const Vector<Stri
		return handleSetRotateAndCrop(args);
		} else if (args.size() >= 1 && args[0] == String16("get-rotate-and-crop")) {
		return handleGetRotateAndCrop(out);
		} else if (args.size() >= 2 && args[0] == String16("set-image-dump-mask")) {
		return handleSetImageDumpMask(args);
		} else if (args.size() >= 1 && args[0] == String16("get-image-dump-mask")) {
		return handleGetImageDumpMask(out);
		} else if (args.size() == 1 && args[0] == String16("help")) {
		printHelp(out);
		return NO_ERROR;
		@@ -3979,6 +3986,30 @@ status_t CameraService::handleGetRotateAndCrop(int out) {
		return dprintf(out, "rotateAndCrop override: %d\n", mOverrideRotateAndCropMode);
		}

		status_t CameraService::handleSetImageDumpMask(const Vector<String16>& args) {
		char *endPtr;
		errno = 0;
		String8 maskString8 = String8(args[1]);
		long maskValue = strtol(maskString8.c_str(), &endPtr, 10);

		if (errno != 0) return BAD_VALUE;
		if (endPtr != maskString8.c_str() + maskString8.size()) return BAD_VALUE;
		if (maskValue < 0 \|\| maskValue > 1) return BAD_VALUE;

		Mutex::Autolock lock(mServiceLock);

		mImageDumpMask = maskValue;

		return OK;
		}

		status_t CameraService::handleGetImageDumpMask(int out) {
		Mutex::Autolock lock(mServiceLock);

		return dprintf(out, "Image dump mask: %d\n", mImageDumpMask);
		}


		status_t CameraService::printHelp(int out) {
		return dprintf(out, "Camera service commands:\n"
		" get-uid-state <PACKAGE> [--user USER_ID] gets the uid state\n"
		@@ -3987,6 +4018,9 @@ status_t CameraService::printHelp(int out) {
		" set-rotate-and-crop <ROTATION> overrides the rotate-and-crop value for AUTO backcompat\n"
		" Valid values 0=0 deg, 1=90 deg, 2=180 deg, 3=270 deg, 4=No override\n"
		" get-rotate-and-crop returns the current override rotate-and-crop value\n"
		" set-image-dump-mask <MASK> specifies the formats to be saved to disk\n"
		" Valid values 0=OFF, 1=ON for JPEG\n"
		" get-image-dump-mask returns the current image-dump-mask value\n"
		" help print this message\n");
		}

services/camera/libcameraservice/CameraService.h

+11 −0

Original line number	Diff line number	Diff line
		@@ -398,6 +398,8 @@ public:
		// Check what API level is used for this client. This is used to determine which
		// superclass this can be cast to.
		virtual bool canCastToApiClient(apiLevel level) const;

		void setImageDumpMask(int /mask/) { }
		protected:
		// Initialized in constructor

		@@ -1036,6 +1038,12 @@ private:
		// Get the rotate-and-crop AUTO override behavior
		status_t handleGetRotateAndCrop(int out);

		// Set the mask for image dump to disk
		status_t handleSetImageDumpMask(const Vector<String16>& args);

		// Get the mask for image dump to disk
		status_t handleGetImageDumpMask(int out);

		// Prints the shell command help
		status_t printHelp(int out);

		@@ -1077,6 +1085,9 @@ private:

		// Current override rotate-and-crop mode
		uint8_t mOverrideRotateAndCropMode = ANDROID_SCALER_ROTATE_AND_CROP_AUTO;

		// Current image dump mask
		uint8_t mImageDumpMask = 0;
		};

		} // namespace android

services/camera/libcameraservice/api2/CameraDeviceClient.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -206,6 +206,7 @@ public:
		virtual void notifyRequestQueueEmpty();
		virtual void notifyRepeatingRequestError(long lastFrameNumber);

		void setImageDumpMask(int mask) { if (mDevice != nullptr) mDevice->setImageDumpMask(mask); }
		/**
		* Interface used by independent components of CameraDeviceClient.
		*/

services/camera/libcameraservice/common/CameraDeviceBase.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -367,6 +367,14 @@ class CameraDeviceBase : public virtual FrameProducer {
		* Get the status tracker of the camera device
		*/
		virtual wp<camera3::StatusTracker> getStatusTracker() = 0;

		/**
		* Set bitmask for image dump flag
		*/
		void setImageDumpMask(int mask) { mImageDumpMask = mask; }

		protected:
		bool mImageDumpMask = 0;
		};

		}; // namespace android

services/camera/libcameraservice/device3/Camera3Device.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -1456,6 +1456,8 @@ status_t Camera3Device::createStream(const std::vector<sp<Surface>>& consumers,

		newStream->setBufferManager(mBufferManager);

		newStream->setImageDumpMask(mImageDumpMask);

		res = mOutputStreams.add(mNextStreamId, newStream);
		if (res < 0) {
		SET_ERR_L("Can't add new stream to set: %s (%d)", strerror(-res), res);