camera/ext.manifest

@@ -1,10 +1,18 @@
 name: "Camera"
 
 platforms:
-  osx:
+  x86_64-osx:
+    context:
+        frameworks: ["AVFoundation", "CoreMedia"]
+        
+  x86-osx:
     context:
         frameworks: ["AVFoundation", "CoreMedia"]
 
-  ios:
+  arm64-ios:
+    context:
+        frameworks: ["AVFoundation", "CoreMedia", "UIKit"]
+
+  armv7-ios:
     context:
         frameworks: ["AVFoundation", "CoreMedia", "UIKit"]

camera/manifests/android/build.gradle

@@ -1,7 +1,3 @@
-repositories {
-  mavenCentral()
-}
-
 dependencies {
-	implementation 'androidx.core:core:1.2.0'
+	compile 'androidx.core:core:1.2.0'
 }

camera/src/android/AndroidCamera.java

@@ -45,7 +45,7 @@ public class AndroidCamera extends Fragment
 	private boolean newFrame;
 	private int position;
 	private int quality;
-	private Camera.Size previewSize;
+	private Camera.Size size;
 
 	private static Context context;
 
@@ -132,43 +132,26 @@ public class AndroidCamera extends Fragment
 
 		Camera.Parameters params = camera.getParameters();
 
-		List<Camera.Size> previewSizes = params.getSupportedPreviewSizes();
+		List<Camera.Size> sizes = params.getSupportedPreviewSizes();
-		List<String> focusModes = params.getSupportedFocusModes();
-		List<Camera.Size> pictureSizes = params.getSupportedPictureSizes();
-		List<Integer> supportedFormats = params.getSupportedPictureFormats();
-
-		Camera.Size pictureSize;
 		switch(this.quality)
 		{
 			case CAPTURE_QUALITY_HIGH:
-				this.previewSize = previewSizes.get(previewSizes.size() - 1);
+				this.size = sizes.get(sizes.size() - 1);
-				pictureSize = pictureSizes.get(previewSizes.size() - 1);
 				break;
 			case CAPTURE_QUALITY_LOW:
-				this.previewSize = previewSizes.get(0);
+				this.size = sizes.get(0);
-				pictureSize = pictureSizes.get(0);
 				break;
 			case CAPTURE_QUALITY_MEDIUM:
 			default:
-				this.previewSize = previewSizes.get((int)Math.ceil(previewSizes.size() / 2));
+				this.size = sizes.get((int)Math.ceil(sizes.size() / 2));
-				pictureSize = pictureSizes.get((int)Math.ceil(previewSizes.size() / 2));
 				break;
 		}
 
-		if (focusModes.contains(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE))
+		params.setPreviewSize(this.size.width, this.size.height);
-		{
+		params.setPictureSize(this.size.width, this.size.height);
-			params.setFocusMode(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE);
+		params.setPictureFormat(PixelFormat.JPEG);
-		}
+		params.setJpegQuality(90);
-
+		params.setFocusMode(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE);
-		params.setPreviewSize(this.previewSize.width, this.previewSize.height);
-		params.setPictureSize(pictureSize.width, pictureSize.height);
-
-		if (supportedFormats.contains(PixelFormat.JPEG))
-		{
-			params.setPictureFormat(PixelFormat.JPEG);
-			params.setJpegQuality(90);
-		}
-
 		camera.setParameters(params);
 
 		final Activity activity = (Activity)context;
@@ -183,7 +166,7 @@ public class AndroidCamera extends Fragment
 				if(rotation == Surface.ROTATION_180 || rotation == Surface.ROTATION_270)
 				flip = true;
 
-				int[] pixels = convertYUV420_NV21toARGB8888(data, AndroidCamera.this.previewSize.width, AndroidCamera.this.previewSize.height, flip);
+				int[] pixels = convertYUV420_NV21toARGB8888(data, AndroidCamera.this.size.width, AndroidCamera.this.size.height, flip);
 				frameUpdate(pixels);
 			}
 		});
@@ -196,7 +179,7 @@ public class AndroidCamera extends Fragment
 		{
 		}
 
-		captureStarted(this.previewSize.width, this.previewSize.height);
+		captureStarted(this.size.width, this.size.height);
 		camera.startPreview();
 		queueMessage(CAMERA_STARTED);
 	}

camera/src/camera.cpp

@@ -7,6 +7,7 @@
 #define MODULE_NAME "camera"
 
 // Defold SDK
+#define DLIB_LOG_DOMAIN LIB_NAME
 #include <dmsdk/sdk.h>
 
 #if defined(DM_PLATFORM_IOS) || defined(DM_PLATFORM_OSX) || defined(DM_PLATFORM_ANDROID)
@@ -47,30 +48,21 @@ void Camera_QueueMessage(CameraMessage message)
 
 static void Camera_ProcessQueue()
 {
-    if (g_DefoldCamera.m_MessageQueue.Empty())
+    DM_MUTEX_SCOPED_LOCK(g_DefoldCamera.m_Mutex);
-    {
-        return;
-    }
 
-    dmArray<CameraMessage> tmp;
+    for (uint32_t i = 0; i != g_DefoldCamera.m_MessageQueue.Size(); ++i)
-    {
-        DM_MUTEX_SCOPED_LOCK(g_DefoldCamera.m_Mutex);
-        tmp.Swap(g_DefoldCamera.m_MessageQueue);
-    }
-
-    for (uint32_t i = 0; i != tmp.Size(); ++i)
     {
         lua_State* L = dmScript::GetCallbackLuaContext(g_DefoldCamera.m_Callback);
         if (!dmScript::SetupCallback(g_DefoldCamera.m_Callback))
         {
             break;
         }
-        CameraMessage message = tmp[i];
+        CameraMessage message = g_DefoldCamera.m_MessageQueue[i];
 
         if (message == CAMERA_STARTED)
         {
             // Increase ref count
-            dmScript::LuaHBuffer luabuffer(g_DefoldCamera.m_VideoBuffer, dmScript::OWNER_C);
+            dmScript::LuaHBuffer luabuffer = {g_DefoldCamera.m_VideoBuffer, false};
             dmScript::PushBuffer(L, luabuffer);
             g_DefoldCamera.m_VideoBufferLuaRef = dmScript::Ref(L, LUA_REGISTRYINDEX);
         }
@@ -88,6 +80,7 @@ static void Camera_ProcessQueue()
         }
         dmScript::TeardownCallback(g_DefoldCamera.m_Callback);
     }
+    g_DefoldCamera.m_MessageQueue.SetSize(0);
 }
 
 static void Camera_DestroyCallback()

camera/src/camera_android.cpp

@@ -3,7 +3,6 @@
 #if defined(DM_PLATFORM_ANDROID)
 
 #include "camera_private.h"
-#include <dmsdk/dlib/android.h>
 
 static jclass		g_CameraClass = 0;
 static jobject		g_CameraObject = 0;
@@ -21,20 +20,53 @@ static CaptureQuality g_Quality;
 
 static dmBuffer::HBuffer* g_Buffer = 0;
 
+
+static JNIEnv* Attach()
+{
+  JNIEnv* env;
+  JavaVM* vm = dmGraphics::GetNativeAndroidJavaVM();
+  vm->AttachCurrentThread(&env, NULL);
+  return env;
+}
+
+static bool Detach(JNIEnv* env)
+{
+  bool exception = (bool) env->ExceptionCheck();
+  env->ExceptionClear();
+  JavaVM* vm = dmGraphics::GetNativeAndroidJavaVM();
+  vm->DetachCurrentThread();
+  return !exception;
+}
+
+static jclass GetClass(JNIEnv* env, const char* classname)
+{
+    jclass activity_class = env->FindClass("android/app/NativeActivity");
+    jmethodID get_class_loader = env->GetMethodID(activity_class,"getClassLoader", "()Ljava/lang/ClassLoader;");
+    jobject cls = env->CallObjectMethod(dmGraphics::GetNativeAndroidActivity(), get_class_loader);
+    jclass class_loader = env->FindClass("java/lang/ClassLoader");
+    jmethodID find_class = env->GetMethodID(class_loader, "loadClass", "(Ljava/lang/String;)Ljava/lang/Class;");
+
+    jstring str_class_name = env->NewStringUTF(classname);
+    jclass outcls = (jclass)env->CallObjectMethod(cls, find_class, str_class_name);
+    env->DeleteLocalRef(str_class_name);
+    return outcls;
+}
+
+
 extern "C"
 {
-    JNIEXPORT void JNICALL Java_com_defold_android_camera_AndroidCamera_frameUpdate(JNIEnv * env, jobject jobj, jintArray data);
+	JNIEXPORT void JNICALL Java_com_defold_android_camera_AndroidCamera_frameUpdate(JNIEnv * env, jobject jobj, jintArray data);
     JNIEXPORT void JNICALL Java_com_defold_android_camera_AndroidCamera_queueMessage(JNIEnv * env, jobject jobj, jint message);
     JNIEXPORT void JNICALL Java_com_defold_android_camera_AndroidCamera_captureStarted(JNIEnv * env, jobject jobj, jint width, jint height);
 }
 
 JNIEXPORT void JNICALL Java_com_defold_android_camera_AndroidCamera_frameUpdate(JNIEnv * env, jobject jobj, jintArray data)
 {
-    if(!g_FrameLock)
+	if(!g_FrameLock)
-    {
+	{
-        env->GetIntArrayRegion(data, 0, g_Width * g_Height, g_Data);
+		env->GetIntArrayRegion(data, 0, g_Width * g_Height, g_Data);
-        g_FrameLock = true;
+		g_FrameLock = true;
-    }
+	}
 }
 
 JNIEXPORT void JNICALL Java_com_defold_android_camera_AndroidCamera_queueMessage(JNIEnv * env, jobject jobj, jint message)
@@ -66,15 +98,19 @@ void CameraPlatform_GetCameraInfo(CameraInfo& outparams)
 
 int CameraPlatform_Initialize()
 {
-    dmAndroid::ThreadAttacher threadAttacher;
+    JNIEnv* env = Attach();
-    JNIEnv* env = threadAttacher.GetEnv();
+    if(!env)
+    {
+        return false;
+    }
 
     // get the AndroidCamera class
-    jclass tmp = dmAndroid::LoadClass(env, "com.defold.android.camera/AndroidCamera");
+    jclass tmp = GetClass(env, "com.defold.android.camera/AndroidCamera");
     g_CameraClass = (jclass)env->NewGlobalRef(tmp);
     if(!g_CameraClass)
     {
         dmLogError("Could not find class 'com.defold.android.camera/AndroidCamera'.");
+        Detach(env);
         return false;
     }
 
@@ -83,6 +119,7 @@ int CameraPlatform_Initialize()
     if(!g_GetCameraMethodId)
     {
         dmLogError("Could not get static method 'getCamera'.");
+        Detach(env);
         return false;
     }
 
@@ -91,6 +128,7 @@ int CameraPlatform_Initialize()
     if(!g_CameraObject)
     {
         dmLogError("Could not create instance.");
+        Detach(env);
         return false;
     }
 
@@ -99,15 +137,18 @@ int CameraPlatform_Initialize()
     if(!g_StartPreviewMethodId)
     {
         dmLogError("Could not get startPreview() method.");
+        Detach(env);
         return false;
     }
     g_StopPreviewMethodId = env->GetMethodID(g_CameraClass, "stopPreview", "()V");
     if(!g_StopPreviewMethodId)
     {
         dmLogError("Could not get stopPreview() method.");
+        Detach(env);
         return false;
     }
 
+    Detach(env);
     return true;
 }
 
@@ -123,9 +164,9 @@ void CameraPlatform_StartCapture(dmBuffer::HBuffer* buffer, CameraType type, Cap
     g_Type = type;
     g_Quality = quality;
 
-    dmAndroid::ThreadAttacher threadAttacher;
+    JNIEnv* env = Attach();
-    JNIEnv* env = threadAttacher.GetEnv();
+	env->CallVoidMethod(g_CameraObject, g_StartPreviewMethodId);
-    env->CallVoidMethod(g_CameraObject, g_StartPreviewMethodId);
+	Detach(env);
 }
 
 void CameraPlatform_StopCapture()
@@ -136,15 +177,15 @@ void CameraPlatform_StopCapture()
         return;
     }
 
-    dmAndroid::ThreadAttacher threadAttacher;
+    JNIEnv* env = Attach();
-    JNIEnv* env = threadAttacher.GetEnv();
     env->CallVoidMethod(g_CameraObject, g_StopPreviewMethodId);
+    Detach(env);
 }
 
 void CameraPlatform_UpdateCapture()
 {
-    if(g_FrameLock)
+	if(g_FrameLock)
-    {
+	{
         int width = g_Width;
         int height = g_Height;
         int numChannels = 4;
@@ -168,8 +209,8 @@ void CameraPlatform_UpdateCapture()
                 out[index+2] = (argb>>16)&0xFF;	// B
             }
         }
-        g_FrameLock = false;
+		g_FrameLock = false;
-    }
+	}
 }
 
 #endif // DM_PLATFORM_ANDROID

docs/index.md

@@ -16,10 +16,37 @@ https://github.com/defold/extension-camera/archive/master.zip
 We recommend using a link to a zip file of a [specific release](https://github.com/defold/extension-camera/releases).
 
 
+## Configuration
+The extension can be configured by adding the following fields to game.project:
+
+```
+[adinfo]
+tracking_usage_description = We would like to show you relevant ads.
+register_for_attribution = 1
+```
+
+### tracking_usage_description
+
+Before requesting advertising info and status on iOS 14 the application must request user authorization to access app-related data for tracking the user or the device. This is done automatically when `adinfo.get()` is called. The string set in `adinfo.tracking_usage_description` will be shown to the user.
+
+Apple documentation: https://developer.apple.com/documentation/apptrackingtransparency?language=objc
+
+### register_for_attribution
+
+The extension can automatically register the application for ad network attribution using `SkAdNetwork` and the `registerAppForAdNetworkAttribution()` function. Enable this functionality by setting `adinfo.register_for_attribution` to 1 in game.project.
+
+Apple documentation: https://developer.apple.com/documentation/storekit/skadnetwork
+
+
 ## Example
 
-Refer to the [example project](https://github.com/defold/extension-camera/blob/master/main/main.script).
+```lua
-
+function init(self)
+    adinfo.get(function(self, info)
+      print(info.ad_ident, info.ad_tracking_enabled)
+    end)
+end
+```
 
 ## FAQ
 
@@ -34,4 +61,7 @@ tccutil reset Camera
 
 ## Source code
 
-The source code is available on [GitHub](https://github.com/defold/extension-camera)
+The source code is available on [GitHub](https://github.com/defold/extension-adinfo)
+
+
+## API reference

main/default.font

@@ -1,8 +0,0 @@
-font: "/builtins/fonts/vera_mo_bd.ttf"
-material: "/builtins/fonts/font-df.material"
-size: 14
-antialias: 1
-alpha: 1.0
-shadow_alpha: 0.0
-shadow_blur: 0
-output_format: TYPE_DISTANCE_FIELD

main/main.collection

@@ -16,19 +16,14 @@ embedded_instances {
   "    z: 0.0\n"
   "    w: 1.0\n"
   "  }\n"
-  "  property_decls {\n"
-  "  }\n"
   "}\n"
   "embedded_components {\n"
   "  id: \"sprite\"\n"
   "  type: \"sprite\"\n"
-  "  data: \"default_animation: \\\"logo\\\"\\n"
+  "  data: \"tile_set: \\\"/main/camera.atlas\\\"\\n"
+  "default_animation: \\\"logo\\\"\\n"
   "material: \\\"/builtins/materials/sprite.material\\\"\\n"
   "blend_mode: BLEND_MODE_ALPHA\\n"
-  "textures {\\n"
-  "  sampler: \\\"texture_sampler\\\"\\n"
-  "  texture: \\\"/main/camera.atlas\\\"\\n"
-  "}\\n"
   "\"\n"
   "  position {\n"
   "    x: 0.0\n"
@@ -65,13 +60,10 @@ embedded_instances {
   data: "embedded_components {\n"
   "  id: \"sprite\"\n"
   "  type: \"sprite\"\n"
-  "  data: \"default_animation: \\\"logo\\\"\\n"
+  "  data: \"tile_set: \\\"/main/logo.atlas\\\"\\n"
+  "default_animation: \\\"logo\\\"\\n"
   "material: \\\"/builtins/materials/sprite.material\\\"\\n"
   "blend_mode: BLEND_MODE_ALPHA\\n"
-  "textures {\\n"
-  "  sampler: \\\"texture_sampler\\\"\\n"
-  "  texture: \\\"/main/logo.atlas\\\"\\n"
-  "}\\n"
   "\"\n"
   "  position {\n"
   "    x: 0.0\n"
@@ -94,6 +86,12 @@ embedded_instances {
   "  z: 0.0\\n"
   "  w: 0.0\\n"
   "}\\n"
+  "scale {\\n"
+  "  x: 1.0\\n"
+  "  y: 1.0\\n"
+  "  z: 1.0\\n"
+  "  w: 0.0\\n"
+  "}\\n"
   "color {\\n"
   "  x: 1.0\\n"
   "  y: 1.0\\n"
@@ -118,8 +116,8 @@ embedded_instances {
   "blend_mode: BLEND_MODE_ALPHA\\n"
   "line_break: false\\n"
   "text: \\\"Space/Touch to toggle capture\\\"\\n"
-  "font: \\\"/main/default.font\\\"\\n"
+  "font: \\\"/builtins/fonts/system_font.font\\\"\\n"
-  "material: \\\"/builtins/fonts/label-df.material\\\"\\n"
+  "material: \\\"/builtins/fonts/label.material\\\"\\n"
   "\"\n"
   "  position {\n"
   "    x: 90.0\n"
@@ -142,6 +140,12 @@ embedded_instances {
   "  z: 0.0\\n"
   "  w: 0.0\\n"
   "}\\n"
+  "scale {\\n"
+  "  x: 1.0\\n"
+  "  y: 1.0\\n"
+  "  z: 1.0\\n"
+  "  w: 0.0\\n"
+  "}\\n"
   "color {\\n"
   "  x: 1.0\\n"
   "  y: 1.0\\n"
@@ -168,8 +172,8 @@ embedded_instances {
   "text: \\\"label\\\\n"
   "\\\"\\n"
   "  \\\"\\\"\\n"
-  "font: \\\"/main/default.font\\\"\\n"
+  "font: \\\"/builtins/fonts/system_font.font\\\"\\n"
-  "material: \\\"/builtins/fonts/label-df.material\\\"\\n"
+  "material: \\\"/builtins/fonts/label.material\\\"\\n"
   "\"\n"
   "  position {\n"
   "    x: 90.0\n"

main/main.script

@@ -3,6 +3,7 @@ local function stop_capture(self)
     if self.cameraframe == nil then
         return
     end
+
     self.cameraframe = nil
     camera.stop_capture()
 
@@ -23,7 +24,7 @@ local function start_capture(self)
         type = camera.CAMERA_TYPE_BACK
         quality = camera.CAPTURE_QUALITY_MEDIUM
     end
-    
+
     camera.start_capture(type, quality, function(self, status)
         if status == camera.CAMERA_STARTED then
             self.cameraframe = camera.get_frame()