#include <camera.h>
#include <mm_types.h>
+#include <mm_camcorder.h>
#include <tbm_surface_internal.h>
#ifdef __cplusplus
* @{
*/
-#ifdef BUFFER_MAX_PLANE_NUM
-#undef BUFFER_MAX_PLANE_NUM
-#endif /* BUFFER_MAX_PLANE_NUM */
-
-#define BUFFER_MAX_PLANE_NUM 4
#define CAMERA_DEVICE_MAX ((CAMERA_DEVICE_CAMERA9 + 1) * 2)
#define DEVICE_NAME_MAX_LENGTH 64
#define DEVICE_ID_MAX_LENGTH 64
-typedef struct _camera_stream_data_s {
- union {
- struct {
- unsigned char *yuv;
- unsigned int length_yuv;
- } yuv420, yuv422;
- struct {
- unsigned char *y;
- unsigned int length_y;
- unsigned char *uv;
- unsigned int length_uv;
- } yuv420sp;
- struct {
- unsigned char *y;
- unsigned int length_y;
- unsigned char *u;
- unsigned int length_u;
- unsigned char *v;
- unsigned int length_v;
- } yuv420p, yuv422p;
- struct {
- unsigned char *data;
- unsigned int length_data;
- int is_delta_frame;
- } encoded, depth, rgb;
- } data; /**< pointer of captured stream */
- int data_type; /**< data type */
- unsigned int length_total; /**< total length of stream buffer (in byte)*/
- unsigned int num_planes; /**< number of planes */
- MMPixelFormatType format; /**< image format */
- int width; /**< width of video buffer */
- int height; /**< height of video buffer */
- unsigned int timestamp; /**< timestamp of stream buffer (msec)*/
- void *bo[BUFFER_MAX_PLANE_NUM]; /**< TBM buffer object */
- void *internal_buffer; /**< Internal buffer pointer */
- int stride[BUFFER_MAX_PLANE_NUM]; /**< Stride of each plane */
- int elevation[BUFFER_MAX_PLANE_NUM]; /**< Elevation of each plane */
- int extra_stream_id; /**< ID of extra preview stream */
- int focus_state; /**< Focus state */
- int facing_direction; /**< Facing direction */
- int flip; /**< Flip */
- int rotation; /**< Rotation */
-} camera_stream_data_s;
-
typedef enum {
CAMERA_DEVICE_TYPE_BUILTIN = 0, /**< Built-in camera */
* @param[in] data_bo_handle The bo handle of data
* @param[out] frame The frame which will be filled
*/
-void camera_create_preview_frame(camera_stream_data_s *stream, int num_buffer_fd,
+void camera_create_preview_frame(MMCamcorderVideoStreamDataType *stream, int num_buffer_fd,
tbm_bo_handle *buffer_bo_handle, tbm_bo_handle *data_bo_handle, camera_preview_data_s *frame);
/**
#include <string.h>
#include <mm.h>
#include <mm_types.h>
+#include <mm_camcorder.h>
#include <muse_camera_msg.h>
#include <camera_private.h>
#include <muse_client.h>
static bool __camera_import_tbm_fd(tbm_bufmgr bufmgr, int fd, tbm_bo *bo, tbm_bo_handle *bo_handle);
static void __camera_release_imported_bo(tbm_bo *bo);
-static int __camera_media_packet_create(camera_cb_info_s *cb_info, camera_stream_data_s *stream,
+static int __camera_media_packet_create(camera_cb_info_s *cb_info, MMCamcorderVideoStreamDataType *stream,
camera_media_packet_data *mp_data, media_packet_h *packet);
static int __camera_media_packet_data_create(int ret_fd, int *tfd, int num_buffer_fd, tbm_bo bo,
tbm_bo *buffer_bo, tbm_bo data_bo, camera_media_packet_data **mp_data);
camera_msg_param param;
camera_preview_data_s frame;
- camera_stream_data_s *stream = NULL;
+ MMCamcorderVideoStreamDataType *stream = NULL;
camera_media_packet_data *mp_data = NULL;
media_packet_h pkt = NULL;
buf_pos = (unsigned char *)bo_handle.ptr;
/* get stream info */
- stream = (camera_stream_data_s *)buf_pos;
+ stream = (MMCamcorderVideoStreamDataType *)buf_pos;
for (i = 0 ; i < num_buffer_fd ; i++) {
/* import buffer bo and get virtual address */
g_free(mp_data);
}
-static int __camera_media_packet_create(camera_cb_info_s *cb_info, camera_stream_data_s *stream,
- camera_media_packet_data *mp_data, media_packet_h *packet)
+
+static tbm_surface_h __camera_get_tbm_surface(MMCamcorderVideoStreamDataType *stream, camera_media_packet_data *mp_data)
{
- media_packet_h pkt = NULL;
- bool make_pkt_fmt = false;
- tbm_surface_h tsurf = NULL;
- tbm_surface_info_s tsurf_info;
- media_format_mimetype_e mimetype = MEDIA_FORMAT_NV12;
- uint32_t bo_format = 0;
- int ret = 0;
int i = 0;
+ int ret = CAMERA_ERROR_NONE;
int num_buffer_fd = 0;
- int pkt_fmt_width = 0;
- int pkt_fmt_height = 0;
+ uint32_t bo_format = 0;
tbm_bo *buffer_bo = NULL;
- media_format_mimetype_e pkt_fmt_mimetype = MEDIA_FORMAT_NV12;
+ tbm_surface_info_s tsurf_info;
- if (cb_info == NULL || stream == NULL || mp_data == NULL || packet == NULL) {
- CAM_LOG_ERROR("invalid parameter - cb_info:%p, stream:%p, mp_data:%p, packet:%p",
- cb_info, stream, mp_data, packet);
- return CAMERA_ERROR_INVALID_PARAMETER;
+ if (!stream || !mp_data) {
+ CAM_LOG_ERROR("NULL param [%p,%p]", stream, mp_data);
+ return NULL;
}
- memset(&tsurf_info, 0x0, sizeof(tbm_surface_info_s));
-
buffer_bo = mp_data->buffer_bo;
num_buffer_fd = mp_data->num_buffer_fd;
- /* create tbm surface */
+ memset(&tsurf_info, 0x0, sizeof(tbm_surface_info_s));
+
for (i = 0 ; i < BUFFER_MAX_PLANE_NUM ; i++)
tsurf_info.planes[i].stride = stream->stride[i];
- /* get tbm surface format */
ret = _camera_get_tbm_surface_format(stream->format, &bo_format);
- ret |= _camera_get_media_packet_mimetype(stream->format, &mimetype);
if (ret != CAMERA_ERROR_NONE)
- return ret;
+ return NULL;
tsurf_info.width = stream->width;
tsurf_info.height = stream->height;
//LCOV_EXCL_STOP
}
- tsurf = tbm_surface_internal_create_with_bos(&tsurf_info, buffer_bo, num_buffer_fd);
+ return tbm_surface_internal_create_with_bos(&tsurf_info, buffer_bo, num_buffer_fd);
} else if (mp_data->data_bo) {
//LCOV_EXCL_START
switch (bo_format) {
break;
}
- tsurf = tbm_surface_internal_create_with_bos(&tsurf_info, &mp_data->data_bo, 1);
+ return tbm_surface_internal_create_with_bos(&tsurf_info, &mp_data->data_bo, 1);
//LCOV_EXCL_STOP
}
- if (!tsurf) {
- CAM_LOG_ERROR("tbm surface failed. %dx%d, format %d, num_buffer_fd %d, data_bo %p",
- stream->width, stream->height, stream->format, num_buffer_fd, mp_data->data_bo);
- return CAMERA_ERROR_INVALID_OPERATION;
+ CAM_LOG_ERROR("should not be reached here");
+
+ return NULL;
+}
+
+
+static int __camera_media_packet_create(camera_cb_info_s *cb_info, MMCamcorderVideoStreamDataType *stream,
+ camera_media_packet_data *mp_data, media_packet_h *packet)
+{
+ media_packet_h pkt = NULL;
+ bool make_pkt_fmt = false;
+ tbm_surface_h tsurf = NULL;
+ media_format_mimetype_e mimetype = MEDIA_FORMAT_NV12;
+ int ret = 0;
+ int pkt_fmt_width = 0;
+ int pkt_fmt_height = 0;
+ media_format_mimetype_e pkt_fmt_mimetype = MEDIA_FORMAT_NV12;
+
+ if (cb_info == NULL || stream == NULL || mp_data == NULL || packet == NULL) {
+ CAM_LOG_ERROR("invalid parameter - cb_info:%p, stream:%p, mp_data:%p, packet:%p",
+ cb_info, stream, mp_data, packet);
+ return CAMERA_ERROR_INVALID_PARAMETER;
+ }
+
+ ret = _camera_get_media_packet_mimetype(stream->format, &mimetype);
+ if (ret != CAMERA_ERROR_NONE)
+ return ret;
+
+ switch (stream->data_type) {
+ case MM_CAM_STREAM_DATA_ENCODED:
+ /* TODO */
+ break;
+ case MM_CAM_STREAM_DATA_DEPTH:
+ /* TODO */
+ break;
+ case MM_CAM_STREAM_DATA_RGB:
+ break;
+ default: /* YUV */
+ tsurf = __camera_get_tbm_surface(stream, mp_data);
+ if (!tsurf) {
+ CAM_LOG_ERROR("tbm surface failed. %dx%d, format %d, num_buffer_fd %d, data_bo %p",
+ stream->width, stream->height, stream->format, mp_data->num_buffer_fd, mp_data->data_bo);
+ return CAMERA_ERROR_INVALID_OPERATION;
+ }
+ break;
}
/* check media packet format */
projects / platform / core / api / camera.git / commitdiff