Partydeck/Camera-Extension
3
0
Fork 0
mirror of https://github.com/defold/extension-camera synced 2025-06-27 18:37:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

More cleanup

Browse Source
This commit is contained in:
Björn Ritzl 2020-07-16 11:49:37 +02:00
parent 0954735da0
commit 9af33a8ed2
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
camera/src/camera_android.cpp
View File

@ -19,7 +19,6 @@ static CameraType g_Type;
static CaptureQuality g_Quality; static CaptureQuality g_Quality;
static dmBuffer::HBuffer* g_Buffer = 0; static dmBuffer::HBuffer* g_Buffer = 0;
static dmBuffer::HBuffer g_VideoBuffer = 0;
static JNIEnv* Attach() static JNIEnv* Attach()
@ -77,35 +76,23 @@ JNIEXPORT void JNICALL Java_com_defold_android_camera_AndroidCamera_queueMessage
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_captureStarted(JNIEnv * env, jobject jobj, jint width, jint height)
{ {
// As default behavior, we want portrait mode
if (width > height) {
uint32_t tmp = width;
width = height;
height = tmp;
}
g_Width = (uint32_t)width; g_Width = (uint32_t)width;
g_Height = (uint32_t)height; g_Height = (uint32_t)height;
if (g_Data)
{
delete g_Data;
}
uint32_t size = g_Width * g_Height; uint32_t size = g_Width * g_Height;
delete g_Data;
g_Data = new jint[size]; g_Data = new jint[size];
dmBuffer::StreamDeclaration streams_decl[] = { dmBuffer::StreamDeclaration streams_decl[] = {
{dmHashString64("rgb"), dmBuffer::VALUE_TYPE_UINT8, 3} {dmHashString64("rgb"), dmBuffer::VALUE_TYPE_UINT8, 3}
}; };
dmBuffer::Create(size, streams_decl, 1, g_Buffer); dmBuffer::Create(size, streams_decl, 1, g_Buffer);
g_VideoBuffer = *g_Buffer;
} }
void CameraPlatform_GetCameraInfo(CameraInfo& outparams) void CameraPlatform_GetCameraInfo(CameraInfo& outparams)
{ {
outparams.m_Width = g_Width; outparams.m_Width = (g_Width > g_Height) ? g_Height : g_Width;
outparams.m_Height = g_Height; outparams.m_Height = (g_Width > g_Height) ? g_Width : g_Height;
outparams.m_Type = g_Type; outparams.m_Type = g_Type;
} }
@ -199,13 +186,12 @@ void CameraPlatform_UpdateCapture()
{ {
if(g_FrameLock) if(g_FrameLock)
{ {
// the video buffer is in landscape mode int width = g_Width;
int width = g_Height; int height = g_Height;
int height = g_Width;
int numChannels = 4; int numChannels = 4;
uint8_t* out; uint8_t* out;
uint32_t outsize; uint32_t outsize;
dmBuffer::GetBytes(g_VideoBuffer, (void**)&out, &outsize); dmBuffer::GetBytes(*g_Buffer, (void**)&out, &outsize);
uint32_t* data = (uint32_t*)g_Data; uint32_t* data = (uint32_t*)g_Data;
for( int y = 0; y < height; ++y) for( int y = 0; y < height; ++y)