Snap for 9358895 from c73dd5e712e5c23d3d91d903d0e07ebab0d19b9a to udc-release (e33802c5) · Commits · e / os / android_frameworks_native

cmds/installd/InstalldNativeService.cpp

+0 −4

Original line number	Diff line number	Diff line
		@@ -501,10 +501,6 @@ static int prepare_app_cache_dir(const std::string& parent, const char* name, mo
		}

		static bool prepare_app_profile_dir(const std::string& packageName, int32_t appId, int32_t userId) {
		if (!property_get_bool("dalvik.vm.usejitprofiles", false)) {
		return true;
		}

		int32_t uid = multiuser_get_uid(userId, appId);
		int shared_app_gid = multiuser_get_shared_gid(userId, appId);
		if (shared_app_gid == -1) {

libs/jpegrecoverymap/tests/data/jpeg_image.jpg

0 → 100644

+23.9 KiB

Loading image diff...

libs/jpegrecoverymap/tests/data/raw_p010_image.p010

0 → 100644

+2.64 MiB

File added.

No diff preview for this file type.

View file

libs/jpegrecoverymap/tests/recoverymap_test.cpp

+107 −2

Original line number	Diff line number	Diff line
		@@ -14,8 +14,19 @@
		* limitations under the License.
		*/

		#include <gtest/gtest.h>
		#include <jpegrecoverymap/recoverymap.h>
		#include <fcntl.h>
		#include <fstream>
		#include <gtest/gtest.h>
		#include <utils/Log.h>

		#define RAW_P010_IMAGE "/sdcard/Documents/raw_p010_image.p010"
		#define RAW_P010_IMAGE_WIDTH 1280
		#define RAW_P010_IMAGE_HEIGHT 720
		#define JPEG_IMAGE "/sdcard/Documents/jpeg_image.jpg"

		#define SAVE_ENCODING_RESULT true
		#define SAVE_DECODING_RESULT true

		namespace android::recoverymap {

		@@ -26,13 +37,50 @@ public:
		protected:
		virtual void SetUp();
		virtual void TearDown();

		struct jpegr_uncompressed_struct mRawP010Image;
		struct jpegr_compressed_struct mJpegImage;
		};

		RecoveryMapTest::RecoveryMapTest() {}
		RecoveryMapTest::~RecoveryMapTest() {}

		void RecoveryMapTest::SetUp() {}
		void RecoveryMapTest::TearDown() {}
		void RecoveryMapTest::TearDown() {
		free(mRawP010Image.data);
		free(mJpegImage.data);
		}

		static size_t getFileSize(int fd) {
		struct stat st;
		if (fstat(fd, &st) < 0) {
		ALOGW("%s : fstat failed", __func__);
		return 0;
		}
		return st.st_size; // bytes
		}

		static bool loadFile(const char filename[], void& result, int fileLength) {
		int fd = open(filename, O_CLOEXEC);
		if (fd < 0) {
		return false;
		}
		int length = getFileSize(fd);
		if (length == 0) {
		close(fd);
		return false;
		}
		if (fileLength != nullptr) {
		*fileLength = length;
		}
		result = malloc(length);
		if (read(fd, result, length) != static_cast<ssize_t>(length)) {
		close(fd);
		return false;
		}
		close(fd);
		return true;
		}

		TEST_F(RecoveryMapTest, build) {
		// Force all of the recovery map lib to be linked by calling all public functions.
		@@ -45,4 +93,61 @@ TEST_F(RecoveryMapTest, build) {
		recovery_map.decodeJPEGR(nullptr, nullptr, nullptr, false);
		}

		TEST_F(RecoveryMapTest, encodeFromJpegThenDecode) {
		int ret;

		// Load input files.
		if (!loadFile(RAW_P010_IMAGE, mRawP010Image.data, nullptr)) {
		FAIL() << "Load file " << RAW_P010_IMAGE << " failed";
		}
		mRawP010Image.width = RAW_P010_IMAGE_WIDTH;
		mRawP010Image.height = RAW_P010_IMAGE_HEIGHT;
		mRawP010Image.colorGamut = jpegr_color_gamut::JPEGR_COLORGAMUT_BT2100;

		if (!loadFile(JPEG_IMAGE, mJpegImage.data, &mJpegImage.length)) {
		FAIL() << "Load file " << JPEG_IMAGE << " failed";
		}
		mJpegImage.colorGamut = jpegr_color_gamut::JPEGR_COLORGAMUT_BT709;

		RecoveryMap recoveryMap;

		jpegr_compressed_struct jpegR;
		jpegR.maxLength = RAW_P010_IMAGE_WIDTH * RAW_P010_IMAGE_HEIGHT * sizeof(uint8_t);
		jpegR.data = malloc(jpegR.maxLength);
		ret = recoveryMap.encodeJPEGR(
		&mRawP010Image, &mJpegImage, jpegr_transfer_function::JPEGR_TF_HLG, &jpegR);
		if (ret != OK) {
		FAIL() << "Error code is " << ret;
		}
		if (SAVE_ENCODING_RESULT) {
		// Output image data to file
		std::string filePath = "/sdcard/Documents/encoded_from_jpeg_input.jpgr";
		std::ofstream imageFile(filePath.c_str(), std::ofstream::binary);
		if (!imageFile.is_open()) {
		ALOGE("%s: Unable to create file %s", __FUNCTION__, filePath.c_str());
		}
		imageFile.write((const char*)jpegR.data, jpegR.length);
		}

		jpegr_uncompressed_struct decodedJpegR;
		int decodedJpegRSize = RAW_P010_IMAGE_WIDTH * RAW_P010_IMAGE_HEIGHT * 4;
		decodedJpegR.data = malloc(decodedJpegRSize);
		ret = recoveryMap.decodeJPEGR(&jpegR, &decodedJpegR);
		if (ret != OK) {
		FAIL() << "Error code is " << ret;
		}
		if (SAVE_DECODING_RESULT) {
		// Output image data to file
		std::string filePath = "/sdcard/Documents/decoded_from_jpeg_input.rgb10";
		std::ofstream imageFile(filePath.c_str(), std::ofstream::binary);
		if (!imageFile.is_open()) {
		ALOGE("%s: Unable to create file %s", __FUNCTION__, filePath.c_str());
		}
		imageFile.write((const char*)decodedJpegR.data, decodedJpegRSize);
		}

		free(jpegR.data);
		free(decodedJpegR.data);
		}

		} // namespace android::recoverymap

libs/nativewindow/AHardwareBuffer.cpp

+8 −0

Original line number	Diff line number	Diff line
		@@ -702,6 +702,14 @@ uint32_t AHardwareBuffer_convertToPixelFormat(uint32_t ahardwarebuffer_format) {
		return ahardwarebuffer_format;
		}

		int32_t AHardwareBuffer_getDataSpace(AHardwareBuffer* buffer) {
		GraphicBuffer* gb = AHardwareBuffer_to_GraphicBuffer(buffer);
		auto& mapper = GraphicBufferMapper::get();
		ui::Dataspace dataspace = ui::Dataspace::UNKNOWN;
		mapper.getDataspace(gb->handle, &dataspace);
		return static_cast<int32_t>(dataspace);
		}

		uint64_t AHardwareBuffer_convertToGrallocUsageBits(uint64_t usage) {
		using android::hardware::graphics::common::V1_1::BufferUsage;
		static_assert(AHARDWAREBUFFER_USAGE_CPU_READ_NEVER == (uint64_t)BufferUsage::CPU_READ_NEVER,