Export MM_CAMCORDER_EXTRA_PREVIEW_STREAM_MAX

[Version] 0.10.280
[Issue Type] Update

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

diff --git a/packaging/libmm-camcorder.spec b/packaging/libmm-camcorder.spec
index b70f6ca..e6cf93b 100755 (executable)
--- a/packaging/libmm-camcorder.spec
+++ b/packaging/libmm-camcorder.spec
@@ -1,6 +1,6 @@
 Name:       libmm-camcorder
 Summary:    Camera and recorder library
-Version:    0.10.279
+Version:    0.10.280
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0

diff --git a/src/include/mm_camcorder.h b/src/include/mm_camcorder.h
index 31d2127..1570931 100644 (file)
--- a/src/include/mm_camcorder.h
+++ b/src/include/mm_camcorder.h
@@ -606,6 +606,7 @@ extern "C" {
 /*=======================================================================================
 | GLOBAL DEFINITIONS AND DECLARATIONS FOR CAMCORDER                                    |
 ========================================================================================*/
+#define MM_CAMCORDER_EXTRA_PREVIEW_STREAM_MAX   10          /**< The maximum number of extra preview stream */
 
 /*=======================================================================================
 | MACRO DEFINITIONS                                                                    |

diff --git a/src/include/mm_camcorder_internal.h b/src/include/mm_camcorder_internal.h
index 3ee6c54..09d4d4e 100644 (file)
--- a/src/include/mm_camcorder_internal.h
+++ b/src/include/mm_camcorder_internal.h
@@ -485,7 +485,7 @@ do { \
 #define MM_CAMCORDER_STROBE_MODE_NUM           8       /**< Number of strobe mode type */
 #define MM_CAMCORDER_STROBE_CONTROL_NUM                3       /**< Number of strobe control type */
 #define MM_CAMCORDER_DETECT_MODE_NUM           2       /**< Number of detect mode type */
-#define MM_CAMCORDER_EXTRA_PREVIEW_STREAM_NUM  10      /**< Number of extra preview stream */
+
 
 /*=======================================================================================
 | ENUM DEFINITIONS                                                                     |
@@ -704,8 +704,8 @@ typedef struct {
 typedef struct {
        gboolean is_supported;
        MMCamcorderExtraPreviewMode mode;
-       int camera_id[MM_CAMCORDER_EXTRA_PREVIEW_STREAM_NUM];
-       _MMCamcorderExtraPreviewFormat format[MM_CAMCORDER_EXTRA_PREVIEW_STREAM_NUM];
+       int camera_id[MM_CAMCORDER_EXTRA_PREVIEW_STREAM_MAX];
+       _MMCamcorderExtraPreviewFormat format[MM_CAMCORDER_EXTRA_PREVIEW_STREAM_MAX];
 } _MMCamcorderExtraPreview;
 
 /**

diff --git a/src/mm_camcorder_stillshot.c b/src/mm_camcorder_stillshot.c
index 73fafe5..9fd4391 100644 (file)
--- a/src/mm_camcorder_stillshot.c
+++ b/src/mm_camcorder_stillshot.c
@@ -316,7 +316,7 @@ static int __mmcamcorder_extra_preview_mode_init_camera_control(mmf_camcorder_t
 
        MMCAM_LOG_INFO("connect extra preview stream signal and enable extra preview");
 
-       for (i = 0 ; i < MM_CAMCORDER_EXTRA_PREVIEW_STREAM_NUM ; i++) {
+       for (i = 0 ; i < MM_CAMCORDER_EXTRA_PREVIEW_STREAM_MAX ; i++) {
                e_fmt = &hcamcorder->extra_preview.format[i];
 
                if (e_fmt->need_to_set_format) {
@@ -3294,7 +3294,7 @@ int _mmcamcorder_set_extra_preview_device_type(MMHandleType handle, int stream_i
        mmf_return_val_if_fail(hcamcorder->extra_preview.is_supported, MM_ERROR_CAMCORDER_NOT_SUPPORTED);
        mmf_return_val_if_fail(hcamcorder->extra_preview.mode == MM_CAMCORDER_EXTRA_PREVIEW_MODE_PIPELINE_ELEMENT,
                MM_ERROR_CAMCORDER_NOT_SUPPORTED);
-       mmf_return_val_if_fail(stream_id >= 0 && stream_id < MM_CAMCORDER_EXTRA_PREVIEW_STREAM_NUM,
+       mmf_return_val_if_fail(stream_id >= 0 && stream_id < MM_CAMCORDER_EXTRA_PREVIEW_STREAM_MAX,
                MM_ERROR_CAMCORDER_INVALID_ARGUMENT);
        mmf_return_val_if_fail(device_type > MM_VIDEO_DEVICE_NONE && device_type < MM_VIDEO_DEVICE_NUM
                , MM_ERROR_CAMCORDER_INVALID_ARGUMENT);
@@ -3327,7 +3327,7 @@ int _mmcamcorder_set_extra_preview_stream_format(MMHandleType handle, int stream
 
        mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_INVALID_ARGUMENT);
        mmf_return_val_if_fail(hcamcorder->extra_preview.is_supported, MM_ERROR_CAMCORDER_NOT_SUPPORTED);
-       mmf_return_val_if_fail(stream_id >= 0 && stream_id < MM_CAMCORDER_EXTRA_PREVIEW_STREAM_NUM,
+       mmf_return_val_if_fail(stream_id >= 0 && stream_id < MM_CAMCORDER_EXTRA_PREVIEW_STREAM_MAX,
                MM_ERROR_CAMCORDER_INVALID_ARGUMENT);
        mmf_return_val_if_fail(pixel_format > MM_PIXEL_FORMAT_INVALID && pixel_format < MM_PIXEL_FORMAT_NUM,
                MM_ERROR_CAMCORDER_INVALID_ARGUMENT);
@@ -3417,7 +3417,7 @@ int _mmcamcorder_set_extra_preview_bitrate(MMHandleType handle, int stream_id, i
 
        mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_INVALID_ARGUMENT);
        mmf_return_val_if_fail(hcamcorder->extra_preview.is_supported, MM_ERROR_CAMCORDER_NOT_SUPPORTED);
-       mmf_return_val_if_fail(stream_id >= 0 && stream_id < MM_CAMCORDER_EXTRA_PREVIEW_STREAM_NUM,
+       mmf_return_val_if_fail(stream_id >= 0 && stream_id < MM_CAMCORDER_EXTRA_PREVIEW_STREAM_MAX,
                MM_ERROR_CAMCORDER_INVALID_ARGUMENT);
        mmf_return_val_if_fail(bitrate > 0, MM_ERROR_CAMCORDER_INVALID_ARGUMENT);
 
@@ -3455,7 +3455,7 @@ int _mmcamcorder_get_extra_preview_bitrate(MMHandleType handle, int stream_id, i
 
        mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_INVALID_ARGUMENT);
        mmf_return_val_if_fail(hcamcorder->extra_preview.is_supported, MM_ERROR_CAMCORDER_NOT_SUPPORTED);
-       mmf_return_val_if_fail(stream_id >= 0 && stream_id < MM_CAMCORDER_EXTRA_PREVIEW_STREAM_NUM,
+       mmf_return_val_if_fail(stream_id >= 0 && stream_id < MM_CAMCORDER_EXTRA_PREVIEW_STREAM_MAX,
                MM_ERROR_CAMCORDER_INVALID_ARGUMENT);
        mmf_return_val_if_fail(bitrate, MM_ERROR_CAMCORDER_INVALID_ARGUMENT);
 
@@ -3492,7 +3492,7 @@ int _mmcamcorder_set_extra_preview_gop_interval(MMHandleType handle, int stream_
 
        mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_INVALID_ARGUMENT);
        mmf_return_val_if_fail(hcamcorder->extra_preview.is_supported, MM_ERROR_CAMCORDER_NOT_SUPPORTED);
-       mmf_return_val_if_fail(stream_id >= 0 && stream_id < MM_CAMCORDER_EXTRA_PREVIEW_STREAM_NUM,
+       mmf_return_val_if_fail(stream_id >= 0 && stream_id < MM_CAMCORDER_EXTRA_PREVIEW_STREAM_MAX,
                MM_ERROR_CAMCORDER_INVALID_ARGUMENT);
 
        mm_camcorder_get_state(handle, &current_state);
@@ -3529,7 +3529,7 @@ int _mmcamcorder_get_extra_preview_gop_interval(MMHandleType handle, int stream_
 
        mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_INVALID_ARGUMENT);
        mmf_return_val_if_fail(hcamcorder->extra_preview.is_supported, MM_ERROR_CAMCORDER_NOT_SUPPORTED);
-       mmf_return_val_if_fail(stream_id >= 0 && stream_id < MM_CAMCORDER_EXTRA_PREVIEW_STREAM_NUM,
+       mmf_return_val_if_fail(stream_id >= 0 && stream_id < MM_CAMCORDER_EXTRA_PREVIEW_STREAM_MAX,
                MM_ERROR_CAMCORDER_INVALID_ARGUMENT);
        mmf_return_val_if_fail(interval, MM_ERROR_CAMCORDER_INVALID_ARGUMENT);