RPJosh
/
neatvnc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add API function for creating nvnc_fb from an pre-allocated buffer

dmabuf-import
Andri Yngvason 2021-09-05 00:39:35 +00:00
parent 96886e21d5
commit b75eeac03d
3 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/fb.h
View File

@ -19,6 +19,7 @@
#include <unistd.h> #include <unistd.h>
#include <stdint.h> #include <stdint.h>
#include <stdatomic.h> #include <stdatomic.h>
#include <stdbool.h>
#include "neatvnc.h" #include "neatvnc.h"
#include "common.h" #include "common.h"
@ -31,12 +32,12 @@ struct nvnc_fb {
void* release_context; void* release_context;
void* addr; void* addr;
enum nvnc_fb_flags flags; enum nvnc_fb_flags flags;
size_t size;
uint16_t width; uint16_t width;
uint16_t height; uint16_t height;
int32_t stride; int32_t stride;
uint32_t fourcc_format; uint32_t fourcc_format;
uint64_t fourcc_modifier; uint64_t fourcc_modifier;
bool is_external;
}; };
void nvnc_fb_hold(struct nvnc_fb* fb); void nvnc_fb_hold(struct nvnc_fb* fb);

2
include/neatvnc.h
View File

@ -83,6 +83,8 @@ int nvnc_enable_auth(struct nvnc* self, const char* privkey_path,
struct nvnc_fb* nvnc_fb_new(uint16_t width, uint16_t height, struct nvnc_fb* nvnc_fb_new(uint16_t width, uint16_t height,
uint32_t fourcc_format, uint16_t stride); uint32_t fourcc_format, uint16_t stride);
struct nvnc_fb* nvnc_fb_from_buffer(void* buffer, uint16_t width,
uint16_t height, uint32_t fourcc_format, int32_t stride);
void nvnc_fb_ref(struct nvnc_fb* fb); void nvnc_fb_ref(struct nvnc_fb* fb);
void nvnc_fb_unref(struct nvnc_fb* fb); void nvnc_fb_unref(struct nvnc_fb* fb);

29
src/fb.c
View File

@ -40,15 +40,11 @@ struct nvnc_fb* nvnc_fb_new(uint16_t width, uint16_t height,
fb->height = height; fb->height = height;
fb->fourcc_format = fourcc_format; fb->fourcc_format = fourcc_format;
fb->stride = stride; fb->stride = stride;
fb->size = width * stride * 4; /* Assume 4 byte format for now */
size_t size = width * stride * 4; /* Assume 4 byte format for now */
size_t alignment = MAX(4, sizeof(void*)); size_t alignment = MAX(4, sizeof(void*));
size_t aligned_size = ALIGN_UP(fb->size, alignment); size_t aligned_size = ALIGN_UP(size, alignment);
/* fb could be allocated in single allocation, but I want to reserve
* the possiblity to create an fb with a pixel buffer passed from the
* user.
*/
fb->addr = aligned_alloc(alignment, aligned_size); fb->addr = aligned_alloc(alignment, aligned_size);
if (!fb->addr) { if (!fb->addr) {
free(fb); free(fb);
@ -58,6 +54,25 @@ struct nvnc_fb* nvnc_fb_new(uint16_t width, uint16_t height,
return fb; return fb;
} }
EXPORT
struct nvnc_fb* nvnc_fb_from_buffer(void* buffer, uint16_t width, uint16_t height,
uint32_t fourcc_format, int32_t stride)
{
struct nvnc_fb* fb = calloc(1, sizeof(*fb));
if (!fb)
return NULL;
fb->ref = 1;
fb->addr = buffer;
fb->is_external = true;
fb->width = width;
fb->height = height;
fb->fourcc_format = fourcc_format;
fb->stride = stride;
return fb;
}
EXPORT EXPORT
enum nvnc_fb_flags nvnc_fb_get_flags(const struct nvnc_fb* fb) enum nvnc_fb_flags nvnc_fb_get_flags(const struct nvnc_fb* fb)
{ {
@ -112,7 +127,9 @@ static void nvnc__fb_free(struct nvnc_fb* fb)
if (cleanup) if (cleanup)
cleanup(fb->common.userdata); cleanup(fb->common.userdata);
if (!fb->is_external)
free(fb->addr); free(fb->addr);
free(fb); free(fb);
} }