mirror/motion
1
0
Fork 0
mirror of https://github.com/Motion-Project/motion.git synced 2026-02-02 19:11:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Adjust the use of HAVE_MMAL

Browse Source
This commit is contained in:
MrDave
2019-09-30 19:05:33 -06:00
committed by Mr-Dave
parent db2fef8eed
commit 1b217d356e
5 changed files with 163 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

231
src/mmalcam.c
View File

@@ -13,6 +13,7 @@
#include "motion.h"
#include "rotate.h"
#include "mmalcam.h"
#ifdef HAVE_MMAL
@@ -74,11 +75,11 @@ static void camera_control_callback(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buf
static void camera_buffer_callback(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer)
{
mmalcam_context_ptr mmalcam = (mmalcam_context_ptr) port->userdata;
ctx_mmalcam_ptr mmalcam = (ctx_mmalcam_ptr) port->userdata;
mmal_queue_put(mmalcam->camera_buffer_queue, buffer);
}
static void set_port_format(mmalcam_context_ptr mmalcam, MMAL_ES_FORMAT_T *format)
static void set_port_format(ctx_mmalcam_ptr mmalcam, MMAL_ES_FORMAT_T *format)
{
format->encoding = MMAL_ENCODING_OPAQUE;
format->encoding_variant = MMAL_ENCODING_I420;
@@ -90,7 +91,7 @@ static void set_port_format(mmalcam_context_ptr mmalcam, MMAL_ES_FORMAT_T *forma
format->es->video.crop.height = mmalcam->height;
}
static void set_video_port_format(mmalcam_context_ptr mmalcam, MMAL_ES_FORMAT_T *format)
static void set_video_port_format(ctx_mmalcam_ptr mmalcam, MMAL_ES_FORMAT_T *format)
{
set_port_format(mmalcam, format);
format->es->video.frame_rate.num = mmalcam->framerate;
@@ -102,7 +103,7 @@ static void set_video_port_format(mmalcam_context_ptr mmalcam, MMAL_ES_FORMAT_T
}
}
static int create_camera_component(mmalcam_context_ptr mmalcam, const char *mmalcam_name)
static int create_camera_component(ctx_mmalcam_ptr mmalcam, const char *mmalcam_name)
{
MMAL_STATUS_T status;
MMAL_COMPONENT_T *camera_component;
@@ -194,7 +195,7 @@ static int create_camera_component(mmalcam_context_ptr mmalcam, const char *mmal
return MMALCAM_ERROR;
}
static void destroy_camera_component(mmalcam_context_ptr mmalcam)
static void destroy_camera_component(ctx_mmalcam_ptr mmalcam)
{
if (mmalcam->camera_component) {
mmal_component_destroy(mmalcam->camera_component);
@@ -202,7 +203,7 @@ static void destroy_camera_component(mmalcam_context_ptr mmalcam)
}
}
static int create_camera_buffer_structures(mmalcam_context_ptr mmalcam)
static int create_camera_buffer_structures(ctx_mmalcam_ptr mmalcam)
{
mmalcam->camera_buffer_pool = mmal_pool_create(mmalcam->camera_capture_port->buffer_num,
mmalcam->camera_capture_port->buffer_size);
@@ -242,7 +243,7 @@ static int send_pooled_buffers_to_port(MMAL_POOL_T *pool, MMAL_PORT_T *port)
return MMALCAM_OK;
}
static void destroy_camera_buffer_structures(mmalcam_context_ptr mmalcam)
static void destroy_camera_buffer_structures(ctx_mmalcam_ptr mmalcam)
{
if (mmalcam->camera_buffer_queue != NULL ) {
mmal_queue_destroy(mmalcam->camera_buffer_queue);
@@ -255,6 +256,8 @@ static void destroy_camera_buffer_structures(mmalcam_context_ptr mmalcam)
}
}
#endif
/**
* mmalcam_start
*
@@ -270,65 +273,70 @@ static void destroy_camera_buffer_structures(mmalcam_context_ptr mmalcam)
* -1 on any failure
*/
int mmalcam_start(struct ctx_cam *cam)
{
mmalcam_context_ptr mmalcam;
int mmalcam_start(struct ctx_cam *cam) {
#ifdef HAVE_MMAL
ctx_mmalcam_ptr mmalcam;
cam->mmalcam = (mmalcam_context*) mymalloc(sizeof(struct mmalcam_context));
memset(cam->mmalcam, 0, sizeof(mmalcam_context));
mmalcam = cam->mmalcam;
mmalcam->cam = cam;
cam->mmalcam = (ctx_mmalcam*) mymalloc(sizeof(struct ctx_mmalcam));
memset(cam->mmalcam, 0, sizeof(ctx_mmalcam));
mmalcam = cam->mmalcam;
mmalcam->cam = cam;
MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO
,_("MMAL Camera thread starting... for camera (%s) of %d x %d at %d fps")
,cam->conf.mmalcam_name, cam->conf.width, cam->conf.height, cam->conf.framerate);
MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO
,_("MMAL Camera thread starting... for camera (%s) of %d x %d at %d fps")
,cam->conf.mmalcam_name, cam->conf.width, cam->conf.height, cam->conf.framerate);
mmalcam->camera_parameters = (RASPICAM_CAMERA_PARAMETERS*)malloc(sizeof(RASPICAM_CAMERA_PARAMETERS));
if (mmalcam->camera_parameters == NULL) {
MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO, _("camera params couldn't be allocated"));
return MMALCAM_ERROR;
}
raspicamcontrol_set_defaults(mmalcam->camera_parameters);
mmalcam->width = cam->conf.width;
mmalcam->height = cam->conf.height;
mmalcam->framerate = cam->conf.framerate;
if (cam->conf.mmalcam_control_params) {
parse_camera_control_params(cam->conf.mmalcam_control_params, mmalcam->camera_parameters);
}
cam->imgs.width = mmalcam->width;
cam->imgs.height = mmalcam->height;
cam->imgs.size_norm = (mmalcam->width * mmalcam->height * 3) / 2;
cam->imgs.motionsize = mmalcam->width * mmalcam->height;
int retval = create_camera_component(mmalcam, cam->conf.mmalcam_name);
if (retval == 0) {
retval = create_camera_buffer_structures(mmalcam);
}
if (retval == 0) {
if (mmal_port_enable(mmalcam->camera_capture_port, camera_buffer_callback)) {
MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO, _("MMAL camera capture port enabling failed"));
retval = MMALCAM_ERROR;
mmalcam->camera_parameters = (RASPICAM_CAMERA_PARAMETERS*)malloc(sizeof(RASPICAM_CAMERA_PARAMETERS));
if (mmalcam->camera_parameters == NULL) {
MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO, _("camera params couldn't be allocated"));
return MMALCAM_ERROR;
}
}
if (retval == 0) {
if (mmal_port_parameter_set_boolean(mmalcam->camera_capture_port, MMAL_PARAMETER_CAPTURE, 1)
!= MMAL_SUCCESS) {
MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO, _("MMAL camera capture start failed"));
retval = MMALCAM_ERROR;
raspicamcontrol_set_defaults(mmalcam->camera_parameters);
mmalcam->width = cam->conf.width;
mmalcam->height = cam->conf.height;
mmalcam->framerate = cam->conf.framerate;
if (cam->conf.mmalcam_control_params) {
parse_camera_control_params(cam->conf.mmalcam_control_params, mmalcam->camera_parameters);
}
}
if (retval == 0) {
retval = send_pooled_buffers_to_port(mmalcam->camera_buffer_pool, mmalcam->camera_capture_port);
}
cam->imgs.width = mmalcam->width;
cam->imgs.height = mmalcam->height;
cam->imgs.size_norm = (mmalcam->width * mmalcam->height * 3) / 2;
cam->imgs.motionsize = mmalcam->width * mmalcam->height;
return retval;
int retval = create_camera_component(mmalcam, cam->conf.mmalcam_name);
if (retval == 0) {
retval = create_camera_buffer_structures(mmalcam);
}
if (retval == 0) {
if (mmal_port_enable(mmalcam->camera_capture_port, camera_buffer_callback)) {
MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO, _("MMAL camera capture port enabling failed"));
retval = MMALCAM_ERROR;
}
}
if (retval == 0) {
if (mmal_port_parameter_set_boolean(mmalcam->camera_capture_port, MMAL_PARAMETER_CAPTURE, 1)
!= MMAL_SUCCESS) {
MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO, _("MMAL camera capture start failed"));
retval = MMALCAM_ERROR;
}
}
if (retval == 0) {
retval = send_pooled_buffers_to_port(mmalcam->camera_buffer_pool, mmalcam->camera_capture_port);
}
return retval;
#else
(void)cam;
MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO,_("MMAL Camera not available"));
return -1;
#endif
}
/**
@@ -347,24 +355,27 @@ int mmalcam_start(struct ctx_cam *cam)
* Returns: Nothing.
*
*/
void mmalcam_cleanup(struct mmalcam_context *mmalcam)
{
MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO, _("MMAL Camera cleanup"));
void mmalcam_cleanup(struct ctx_mmalcam *mmalcam) {
#ifdef HAVE_MMAL
MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO, _("MMAL Camera cleanup"));
if (mmalcam != NULL ) {
if (mmalcam->camera_component) {
check_disable_port(mmalcam->camera_capture_port);
mmal_component_disable(mmalcam->camera_component);
destroy_camera_buffer_structures(mmalcam);
destroy_camera_component(mmalcam);
if (mmalcam != NULL ) {
if (mmalcam->camera_component) {
check_disable_port(mmalcam->camera_capture_port);
mmal_component_disable(mmalcam->camera_component);
destroy_camera_buffer_structures(mmalcam);
destroy_camera_component(mmalcam);
}
if (mmalcam->camera_parameters) {
free(mmalcam->camera_parameters);
}
free(mmalcam);
}
if (mmalcam->camera_parameters) {
free(mmalcam->camera_parameters);
}
free(mmalcam);
}
#else
(void)mmalcam;
#endif
}
/**
@@ -380,47 +391,51 @@ void mmalcam_cleanup(struct mmalcam_context *mmalcam)
*
* Returns: Error code
*/
int mmalcam_next(struct ctx_cam *cam, struct image_data *img_data)
{
mmalcam_context_ptr mmalcam;
int mmalcam_next(struct ctx_cam *cam, struct ctx_image_data *img_data) {
#ifdef HAVE_MMAL
ctx_mmalcam_ptr mmalcam;
if ((!cam) || (!cam->mmalcam))
return NETCAM_FATAL_ERROR;
if ((!cam) || (!cam->mmalcam))
return NETCAM_FATAL_ERROR;
mmalcam = cam->mmalcam;
mmalcam = cam->mmalcam;
MMAL_BUFFER_HEADER_T *camera_buffer = mmal_queue_wait(mmalcam->camera_buffer_queue);
MMAL_BUFFER_HEADER_T *camera_buffer = mmal_queue_wait(mmalcam->camera_buffer_queue);
if (camera_buffer->cmd == 0 && (camera_buffer->flags & MMAL_BUFFER_HEADER_FLAG_FRAME_END)
&& camera_buffer->length >= cam->imgs.size_norm) {
mmal_buffer_header_mem_lock(camera_buffer);
memcpy(img_data->image_norm, camera_buffer->data, cam->imgs.size_norm);
mmal_buffer_header_mem_unlock(camera_buffer);
} else {
MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO
,_("cmd %d flags %08x size %d/%d at %08x, img_size=%d")
,camera_buffer->cmd, camera_buffer->flags, camera_buffer->length
,camera_buffer->alloc_size, camera_buffer->data, cam->imgs.size_norm);
}
mmal_buffer_header_release(camera_buffer);
if (mmalcam->camera_capture_port->is_enabled) {
MMAL_STATUS_T status;
MMAL_BUFFER_HEADER_T *new_buffer = mmal_queue_get(mmalcam->camera_buffer_pool->queue);
if (new_buffer) {
status = mmal_port_send_buffer(mmalcam->camera_capture_port, new_buffer);
if (camera_buffer->cmd == 0 && (camera_buffer->flags & MMAL_BUFFER_HEADER_FLAG_FRAME_END)
&& camera_buffer->length >= cam->imgs.size_norm) {
mmal_buffer_header_mem_lock(camera_buffer);
memcpy(img_data->image_norm, camera_buffer->data, cam->imgs.size_norm);
mmal_buffer_header_mem_unlock(camera_buffer);
} else {
MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO
,_("cmd %d flags %08x size %d/%d at %08x, img_size=%d")
,camera_buffer->cmd, camera_buffer->flags, camera_buffer->length
,camera_buffer->alloc_size, camera_buffer->data, cam->imgs.size_norm);
}
if (!new_buffer || status != MMAL_SUCCESS)
MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO
,_("Unable to return a buffer to the camera video port"));
}
mmal_buffer_header_release(camera_buffer);
rotate_map(cam,img_data);
if (mmalcam->camera_capture_port->is_enabled) {
MMAL_STATUS_T status;
MMAL_BUFFER_HEADER_T *new_buffer = mmal_queue_get(mmalcam->camera_buffer_pool->queue);
return 0;
if (new_buffer) {
status = mmal_port_send_buffer(mmalcam->camera_capture_port, new_buffer);
}
if (!new_buffer || status != MMAL_SUCCESS)
MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO
,_("Unable to return a buffer to the camera video port"));
}
rotate_map(cam,img_data);
return 0;
#else
(void)cam;
(void)img_data;
return -1;
#endif
}
#endif

25
src/mmalcam.h
View File

@@ -11,24 +11,25 @@
#ifndef MMALCAM_H_
#define MMALCAM_H_
typedef struct mmalcam_context *mmalcam_context_ptr;
typedef struct ctx_mmalcam *ctx_mmalcam_ptr;
typedef struct mmalcam_context {
typedef struct ctx_mmalcam {
struct ctx_cam *cam; /* pointer to parent motion
context structure */
int width;
int height;
int framerate;
#ifdef HAVE_MMAL
struct MMAL_COMPONENT_T *camera_component;
struct MMAL_PORT_T *camera_capture_port;
struct MMAL_POOL_T *camera_buffer_pool;
struct MMAL_QUEUE_T *camera_buffer_queue;
struct raspicam_camera_parameters_s *camera_parameters;
#endif
} ctx_mmalcam;
struct MMAL_COMPONENT_T *camera_component;
struct MMAL_PORT_T *camera_capture_port;
struct MMAL_POOL_T *camera_buffer_pool;
struct MMAL_QUEUE_T *camera_buffer_queue;
struct raspicam_camera_parameters_s *camera_parameters;
} mmalcam_context;
int mmalcam_start (struct context *);
int mmalcam_next (struct context *, struct image_data *img_data);
void mmalcam_cleanup (struct mmalcam_context *);
int mmalcam_start (struct ctx_cam *cam);
int mmalcam_next (struct ctx_cam *cam, struct ctx_image_data *img_data);
void mmalcam_cleanup (struct ctx_mmalcam *mmalcam);
#endif /* MMALCAM_H_ */

10
src/motion.c
View File

@@ -771,12 +771,10 @@ static int init_camera_type(struct ctx_cam *cam){
cam->camera_type = CAMERA_TYPE_UNKNOWN;
#ifdef HAVE_MMAL
if (cam->conf.mmalcam_name) {
cam->camera_type = CAMERA_TYPE_MMAL;
return 0;
}
#endif // HAVE_MMAL
if (cam->conf.mmalcam_name) {
cam->camera_type = CAMERA_TYPE_MMAL;
return 0;
}
if (cam->conf.netcam_url) {
if ((strncmp(cam->conf.netcam_url,"mjpeg",5) == 0) ||

10
src/motion.h
View File

@@ -14,6 +14,7 @@
struct ctx_images;
struct ctx_image_data;
struct ctx_dbse;
struct ctx_mmalcam;
#include "config.h"
@@ -66,11 +67,6 @@ struct ctx_dbse;
#include "netcam.h"
#include "movie.h"
#ifdef HAVE_MMAL
#include "mmalcam.h"
#endif
int nls_enabled;
#ifdef HAVE_GETTEXT
@@ -360,9 +356,7 @@ struct ctx_cam {
enum CAMERA_TYPE camera_type;
#ifdef HAVE_MMAL
struct mmalcam_context *mmalcam;
#endif
struct ctx_mmalcam *mmalcam;
struct ctx_netcam *netcam; /* this structure contains the context for normal RTSP connection */
struct ctx_netcam *netcam_high; /* this structure contains the context for high resolution RTSP connection */

47
src/video_common.c
View File

@@ -13,6 +13,7 @@
#include "video_common.h"
#include "video_v4l2.h"
#include "jpegutils.h"
#include "mmalcam.h"
typedef unsigned char uint8_t;
typedef unsigned short int uint16_t;
@@ -647,14 +648,12 @@ void vid_mutex_destroy(void)
void vid_close(struct ctx_cam *cam) {
#ifdef HAVE_MMAL
if (cam->mmalcam) {
MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO,_("calling mmalcam_cleanup"));
mmalcam_cleanup(cam->mmalcam);
cam->mmalcam = NULL;
return;
}
#endif
if (cam->mmalcam) {
MOTION_LOG(INF, TYPE_VIDEO, NO_ERRNO,_("calling mmalcam_cleanup"));
mmalcam_cleanup(cam->mmalcam);
cam->mmalcam = NULL;
return;
}
if (cam->netcam) {
/* This also cleans up high resolution */
@@ -699,18 +698,16 @@ void vid_close(struct ctx_cam *cam) {
int vid_start(struct ctx_cam *cam) {
int dev = -1;
#ifdef HAVE_MMAL
if (cam->camera_type == CAMERA_TYPE_MMAL) {
MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO,_("Opening MMAL cam"));
dev = mmalcam_start(cam);
if (dev < 0) {
mmalcam_cleanup(cam->mmalcam);
cam->mmalcam = NULL;
MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO,_("MMAL cam failed to open"));
}
return dev;
if (cam->camera_type == CAMERA_TYPE_MMAL) {
MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO,_("Opening MMAL cam"));
dev = mmalcam_start(cam);
if (dev < 0) {
mmalcam_cleanup(cam->mmalcam);
cam->mmalcam = NULL;
MOTION_LOG(ERR, TYPE_VIDEO, NO_ERRNO,_("MMAL cam failed to open"));
}
#endif
return dev;
}
if (cam->camera_type == CAMERA_TYPE_NETCAM) {
MOTION_LOG(NTC, TYPE_VIDEO, NO_ERRNO,_("Opening Netcam"));
@@ -759,14 +756,12 @@ int vid_start(struct ctx_cam *cam) {
*/
int vid_next(struct ctx_cam *cam, struct ctx_image_data *img_data){
#ifdef HAVE_MMAL
if (cam->camera_type == CAMERA_TYPE_MMAL) {
if (cam->mmalcam == NULL) {
return NETCAM_GENERAL_ERROR;
}
return mmalcam_next(cam, img_data);
if (cam->camera_type == CAMERA_TYPE_MMAL) {
if (cam->mmalcam == NULL) {
return NETCAM_GENERAL_ERROR;
}
#endif
return mmalcam_next(cam, img_data);
}
if (cam->camera_type == CAMERA_TYPE_NETCAM) {
if (cam->video_dev == -1)