Added new function to Platform::Android::Bitmap

Summary: The new function allows to convert a bitmap to a Frame.

Reviewed By: enpe

Differential Revision:
D75725203

Privacy Context Container: L1293349

fbshipit-source-id: d79605d308b03afc2d594240d6ccfec35b599e56

Author: janherlingmeta

impl/ocean/platform/android/Bitmap.cpp

@@ -18,6 +18,57 @@ namespace Platform
 namespace Android
 {
 
+Frame Bitmap::toFrame(JNIEnv* env, jobject bitmap, const bool copyData)
+{
+	ocean_assert(env != nullptr && bitmap != nullptr);
+	if (env == nullptr || bitmap == nullptr)
+	{
+		return Frame();
+	}
+
+	AndroidBitmapInfo bitmapInfo;
+	if (AndroidBitmap_getInfo(env, bitmap, &bitmapInfo) < 0)
+	{
+		return Frame();
+	}
+
+	ocean_assert(bitmapInfo.format == ANDROID_BITMAP_FORMAT_RGBA_8888);
+	if (bitmapInfo.format != ANDROID_BITMAP_FORMAT_RGBA_8888)
+	{
+		return Frame();
+	}
+
+	const unsigned int width = bitmapInfo.width;
+	const unsigned int height = bitmapInfo.height;
+	const unsigned int strideBytes = bitmapInfo.stride;
+
+	unsigned int paddingElements = 0u;
+	if (!Frame::strideBytes2paddingElements(FrameType::FORMAT_RGBA32, width, strideBytes, paddingElements))
+	{
+		return Frame();
+	}
+
+	void* pixelData = nullptr;
+
+	if (AndroidBitmap_lockPixels(env, bitmap, &pixelData) < 0)
+	{
+		ocean_assert(false && "Could not lock the pixel data!");
+		return Frame();
+	}
+
+	const Frame::CopyMode copyMode = copyData ? Frame::CM_COPY_REMOVE_PADDING_LAYOUT : Frame::CM_USE_KEEP_LAYOUT;
+
+	Frame frame(FrameType(width, height, FrameType::FORMAT_RGBA32, FrameType::ORIGIN_UPPER_LEFT), pixelData, copyMode, paddingElements);
+
+	if (AndroidBitmap_unlockPixels(env, bitmap) < 0)
+	{
+		ocean_assert(false && "Could not unlock the pixel data!");
+		return Frame();
+	}
+
+	return frame;
+}
+
 FrameType::PixelFormat Bitmap::translateFormat(const AndroidBitmapFormat format)
 {
 	switch (format)

impl/ocean/platform/android/Bitmap.h

@@ -44,6 +44,16 @@ class OCEAN_PLATFORM_ANDROID_EXPORT Bitmap
 		 * @return The corresponding Android bitmap format, ANDROID_BITMAP_FORMAT_NONE if unknown
 		 */
 		static AndroidBitmapFormat translateFormat(const FrameType::PixelFormat pixelFormat);
+
+		/**
+		 * Converts an Android bitmap to an Ocean frame.
+		 * The Android bitmap must have format ANDROID_BITMAP_FORMAT_RGBA_8888.
+		 * @param env The JNI environment, must be valid
+		 * @param bitmap The Android bitmap to convert, must be valid
+		 * @param copyData True, to copy the bitmap data; False, to use the bitmap data directly
+		 * @return The resulting Ocean frame, an invalid frame if the conversion failed
+		 */
+		static Frame toFrame(JNIEnv* env, jobject bitmap, const bool copyData = true);
 };
 
 }