From 31b5245cf2ae49736b5a8c688fd8beec7303e3bb Mon Sep 17 00:00:00 2001 From: Mathias Westerdahl Date: Thu, 16 Mar 2017 19:56:38 +0100 Subject: [PATCH] Updated to latest defoldsdk --- camera/src/camera.cpp | 5 +++-- camera/src/camera.mm | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/camera/src/camera.cpp b/camera/src/camera.cpp index 2dfd920..fe90517 100644 --- a/camera/src/camera.cpp +++ b/camera/src/camera.cpp @@ -48,7 +48,8 @@ static int StartCapture(lua_State* L) } // Increase ref count - dmScript::PushBuffer(L, g_DefoldCamera.m_VideoBuffer); + dmScript::LuaHBuffer luabuffer = {g_DefoldCamera.m_VideoBuffer, false}; + dmScript::PushBuffer(L, luabuffer); g_DefoldCamera.m_VideoBufferLuaRef = dmScript::Ref(L, LUA_REGISTRYINDEX); return 1; @@ -61,7 +62,7 @@ static int StopCapture(lua_State* L) int status = CameraPlatform_StopCapture(); if( !status ) { - luaL_error(L, "Failed to stop capture. Was it started?"); + return luaL_error(L, "Failed to stop capture. Was it started?"); } dmScript::Unref(L, LUA_REGISTRYINDEX, g_DefoldCamera.m_VideoBufferLuaRef); // We want it destroyed by the GC diff --git a/camera/src/camera.mm b/camera/src/camera.mm index dc035e5..39b5f8e 100644 --- a/camera/src/camera.mm +++ b/camera/src/camera.mm @@ -377,7 +377,7 @@ int CameraPlatform_StartCapture(dmBuffer::HBuffer* buffer, CameraType type, Capt {dmHashString64("rgb"), dmBuffer::VALUE_TYPE_UINT8, 3} }; - dmBuffer::Allocate(size, streams_decl, 1, buffer); + dmBuffer::Create(size, streams_decl, 1, buffer); g_Camera.m_VideoBuffer = *buffer; @@ -390,6 +390,9 @@ int CameraPlatform_StopCapture() { [g_Camera.m_Delegate stopCamera]; [g_Camera.m_Delegate release]; + + dmBuffer::Destroy(g_Camera.m_VideoBuffer); + g_Camera.m_VideoBuffer = 0; } return 1; }