Merge "Always use ABitmap_compressWithGainmap in screencap" into main (0e68e023) · Commits · e / os / android_frameworks_base

cmds/screencap/screencap.cpp

+9 −24

Original line number	Diff line number	Diff line
		@@ -217,30 +217,15 @@ status_t saveImage(const char* fn, std::optional<AndroidBitmapCompressFormat> fo
		info.height = buffer->getHeight();
		info.stride = buffer->getStride() * bytesPerPixel(buffer->getPixelFormat());

		int bitmapResult;

		if (gainmapBase) {
		bitmapResult =
		int bitmapResult =
		ABitmap_compressWithGainmap(&info, static_cast<ADataSpace>(dataspace), base,
		gainmapBase, captureResults.hdrSdrRatio, *format,
		100, &fd,
		[](void* fdPtr, const void* data,
		size_t size) -> bool {
		int bytesWritten =
		write(static_cast<int>(fdPtr), data,
		size);
		return bytesWritten == size;
		});
		} else {
		bitmapResult =
		AndroidBitmap_compress(&info, static_cast<int32_t>(dataspace), base, *format,
		100, &fd,
		gainmapBase, captureResults.hdrSdrRatio, *format, 100,
		&fd,
		[](void* fdPtr, const void* data, size_t size) -> bool {
		int bytesWritten =
		write(static_cast<int>(fdPtr), data, size);
		int bytesWritten = write(static_cast<int>(fdPtr),
		data, size);
		return bytesWritten == size;
		});
		}

		if (bitmapResult != ANDROID_BITMAP_RESULT_SUCCESS) {
		fprintf(stderr, "Failed to compress (error code: %d)\n", bitmapResult);