Support MJPEG format and update camera_preview_data_s

[Version] 0.3.28
[Profile] Common
[Issue Type] Update

Change-Id: Ia2da39ca9e5e775085067a195c374b5511b877ba
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/legacy/include/legacy_camera.h b/legacy/include/legacy_camera.h
index c7d5a07..a89de94 100644 (file)
--- a/legacy/include/legacy_camera.h
+++ b/legacy/include/legacy_camera.h
@@ -117,7 +117,8 @@ typedef enum {
        CAMERA_PIXEL_FORMAT_ARGB,           /**< ARGB pixel format */
        CAMERA_PIXEL_FORMAT_JPEG,           /**< Encoded pixel format */
        CAMERA_PIXEL_FORMAT_H264 = 15,      /**< Encoded pixel format : H264 (Since 3.0) */
-       CAMERA_PIXEL_FORMAT_INVZ            /**< Depth pixel format : INVZ (Since 5.0) */
+       CAMERA_PIXEL_FORMAT_INVZ,           /**< Depth pixel format : INVZ (Since 5.0) */
+       CAMERA_PIXEL_FORMAT_MJPEG           /**< Encoded pixel format : Motion JPEG for preview (Since 6.0) */
 } camera_pixel_format_e;
 
 /**
@@ -255,6 +256,7 @@ typedef struct {
                struct {
                        unsigned char *data;    /**< The encoded data pointer */
                        unsigned int size;              /**< The size of encoded data */
+                       bool is_delta_frame;    /**< The flag whether it's delta frame or not (Since 6.0) */
                } encoded_plane;                        /**< encoded plane frame data */
 
                struct {

diff --git a/legacy/src/legacy_camera.c b/legacy/src/legacy_camera.c
index 7997764..0583f92 100644 (file)
--- a/legacy/src/legacy_camera.c
+++ b/legacy/src/legacy_camera.c
@@ -1556,7 +1556,7 @@ int legacy_camera_set_capture_format(camera_h camera, camera_pixel_format_e form
                return CAMERA_ERROR_INVALID_PARAMETER;
        }
 
-       if (format < CAMERA_PIXEL_FORMAT_NV12 || format > CAMERA_PIXEL_FORMAT_INVZ ||
+       if (format < CAMERA_PIXEL_FORMAT_NV12 || format > CAMERA_PIXEL_FORMAT_MJPEG ||
                (format > CAMERA_PIXEL_FORMAT_JPEG && format < CAMERA_PIXEL_FORMAT_H264)) {
                LOGE("invalid preview format %d", format);
                return CAMERA_ERROR_INVALID_PARAMETER;
@@ -1580,7 +1580,7 @@ int legacy_camera_set_preview_format(camera_h camera, camera_pixel_format_e form
                return CAMERA_ERROR_INVALID_PARAMETER;
        }
 
-       if (format < CAMERA_PIXEL_FORMAT_NV12 || format > CAMERA_PIXEL_FORMAT_INVZ ||
+       if (format < CAMERA_PIXEL_FORMAT_NV12 || format > CAMERA_PIXEL_FORMAT_MJPEG ||
                (format > CAMERA_PIXEL_FORMAT_JPEG && format < CAMERA_PIXEL_FORMAT_H264)) {
                LOGE("invalid preview format %d", format);
                return CAMERA_ERROR_INVALID_PARAMETER;

diff --git a/packaging/mmsvc-camera.spec b/packaging/mmsvc-camera.spec
index 4631b98..eeb44b7 100644 (file)
--- a/packaging/mmsvc-camera.spec
+++ b/packaging/mmsvc-camera.spec
@@ -1,6 +1,6 @@
 Name:       mmsvc-camera
 Summary:    A Camera module for muse server
-Version:    0.3.27
+Version:    0.3.28
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0