Change flag for some attributes
[platform/core/multimedia/libmm-camcorder.git] / src / mm_camcorder_attribute.c
index 70b608a..8f162b7 100644 (file)
@@ -37,6 +37,7 @@
 #define MMCAMCORDER_DEFAULT_CAMERA_HEIGHT       480
 #define MMCAMCORDER_DEFAULT_ENCODED_PREVIEW_BITRATE (1024*1024*10)
 #define MMCAMCORDER_DEFAULT_ENCODED_PREVIEW_GOP_INTERVAL 1000
+#define MMCAMCORDER_DEFAULT_REPLAY_GAIN_REFERENCE_LEVEL  89.0
 
 /*---------------------------------------------------------------------------------------
 |    GLOBAL VARIABLE DEFINITIONS for internal                                          |
@@ -71,7 +72,6 @@ static int readonly_attributes[] = {
 static bool __mmcamcorder_set_capture_resolution(MMHandleType handle, int width, int height);
 static int  __mmcamcorder_set_conf_to_valid_info(MMHandleType handle);
 static int  __mmcamcorder_release_conf_valid_info(MMHandleType handle);
-static bool __mmcamcorder_attrs_is_supported(MMHandleType handle, int idx);
 static int  __mmcamcorder_check_valid_pair(MMHandleType handle, char **err_attr_name, const char *attribute_name, va_list var_args);
 
 /*=======================================================================
@@ -81,15 +81,16 @@ static int  __mmcamcorder_check_valid_pair(MMHandleType handle, char **err_attr_
 |    GLOBAL FUNCTION DEFINITIONS:                                      |
 -----------------------------------------------------------------------*/
 MMHandleType
-_mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
+_mmcamcorder_alloc_attribute(MMHandleType handle)
 {
        _mmcam_dbg_log("");
 
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
-       MMHandleType attrs = 0;
-       mmf_attrs_construct_info_t *attrs_const_info = NULL;
+       MMHandleType attrs = NULL;
+       MMAttrsConstructInfo *attrs_const_info;
        unsigned int attr_count = 0;
        unsigned int idx;
+       int ret = MM_ERROR_NONE;
 
        static int depth[] = {MM_CAMCORDER_AUDIO_FORMAT_PCM_U8, MM_CAMCORDER_AUDIO_FORMAT_PCM_S16_LE};
        static int flip_list[] = { MM_FLIP_NONE };
@@ -114,9 +115,9 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
        /* Create attribute constructor */
        _mmcam_dbg_log("start");
 
-       /* alloc 'mmf_attrs_construct_info_t' */
+       /* alloc 'MMAttrsConstructInfo' */
        attr_count = MM_CAM_ATTRIBUTE_NUM;
-       attrs_const_info = malloc(attr_count * sizeof(mmf_attrs_construct_info_t));
+       attrs_const_info = malloc(attr_count * sizeof(MMAttrsConstructInfo));
        if (!attrs_const_info) {
                _mmcam_dbg_err("Fail to alloc constructor.");
                return 0;
@@ -137,7 +138,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_MODE,                        /* ID */
                        "mode",                             /* Name */
-                       MMF_VALUE_TYPE_INT,                 /* Type */
+                       MM_ATTRS_TYPE_INT,                 /* Type */
                        MM_ATTRS_FLAG_RW,                   /* Flag */
                        {(void*)MM_CAMCORDER_MODE_VIDEO_CAPTURE},     /* Default value */
                        MM_ATTRS_VALID_TYPE_INT_RANGE,      /* Validity type */
@@ -148,7 +149,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_AUDIO_DEVICE,
                        "audio-device",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)MM_AUDIO_DEVICE_MIC},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -159,7 +160,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_DEVICE_COUNT,
                        "camera-device-count",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)MM_VIDEO_DEVICE_NUM},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -170,7 +171,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_AUDIO_ENCODER,
                        "audio-encoder",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)MM_AUDIO_CODEC_AMR},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -181,7 +182,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_VIDEO_ENCODER,
                        "video-encoder",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)MM_VIDEO_CODEC_MPEG4},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -192,7 +193,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_IMAGE_ENCODER,
                        "image-encoder",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)MM_IMAGE_CODEC_JPEG},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -203,7 +204,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_FILE_FORMAT,
                        "file-format",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)MM_FILE_FORMAT_MP4},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -214,9 +215,9 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_DEVICE_NAME,
                        "camera-device-name",
-                       MMF_VALUE_TYPE_STRING,
+                       MM_ATTRS_TYPE_STRING,
                        MM_ATTRS_FLAG_RW,
-                       {(void*)NULL},
+                       {NULL},
                        MM_ATTRS_VALID_TYPE_NONE,
                        {0},
                        {0},
@@ -225,7 +226,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_AUDIO_SAMPLERATE,
                        "audio-samplerate",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)8000},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -236,7 +237,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_AUDIO_FORMAT,
                        "audio-format",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)MM_CAMCORDER_AUDIO_FORMAT_PCM_S16_LE},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -248,7 +249,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_AUDIO_CHANNEL,
                        "audio-channel",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)2},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -259,9 +260,9 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_AUDIO_VOLUME,
                        "audio-volume",
-                       MMF_VALUE_TYPE_DOUBLE,
+                       MM_ATTRS_TYPE_DOUBLE,
                        MM_ATTRS_FLAG_RW,
-                       {(void*)1},
+                       {.value_double = 1.0},
                        MM_ATTRS_VALID_TYPE_DOUBLE_RANGE,
                        {.double_min = 0.0},
                        {.double_max = 10.0},
@@ -270,7 +271,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_AUDIO_INPUT_ROUTE,
                        "audio-input-route",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)MM_AUDIOROUTE_USE_EXTERNAL_SETTING},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -281,7 +282,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_FILTER_SCENE_MODE,
                        "filter-scene-mode",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -292,7 +293,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_FILTER_BRIGHTNESS,
                        "filter-brightness",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)1},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -303,7 +304,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_FILTER_CONTRAST,
                        "filter-contrast",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -314,7 +315,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_FILTER_WB,
                        "filter-wb",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -325,7 +326,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_FILTER_COLOR_TONE,
                        "filter-color-tone",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -336,7 +337,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_FILTER_SATURATION,
                        "filter-saturation",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -347,7 +348,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_FILTER_HUE,
                        "filter-hue",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -359,7 +360,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_FILTER_SHARPNESS,
                        "filter-sharpness",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -370,7 +371,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_FORMAT,
                        "camera-format",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)MM_PIXEL_FORMAT_YUYV},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -381,9 +382,9 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_RECORDING_MOTION_RATE,
                        "camera-recording-motion-rate",
-                       MMF_VALUE_TYPE_DOUBLE,
+                       MM_ATTRS_TYPE_DOUBLE,
                        MM_ATTRS_FLAG_RW,
-                       {(void*)1},
+                       {.value_double = 1.0},
                        MM_ATTRS_VALID_TYPE_DOUBLE_RANGE,
                        {.double_min = 0.0},
                        {.double_max = _MMCAMCORDER_MAX_DOUBLE},
@@ -392,7 +393,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_FPS,
                        "camera-fps",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)30},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -403,7 +404,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_WIDTH,
                        "camera-width",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)MMCAMCORDER_DEFAULT_CAMERA_WIDTH},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -414,7 +415,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_HEIGHT,
                        "camera-height",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)MMCAMCORDER_DEFAULT_CAMERA_HEIGHT},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -425,7 +426,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_DIGITAL_ZOOM,
                        "camera-digital-zoom",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)10},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -436,7 +437,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_OPTICAL_ZOOM,
                        "camera-optical-zoom",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -447,7 +448,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_FOCUS_MODE,
                        "camera-focus-mode",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)MM_CAMCORDER_FOCUS_MODE_NONE},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -458,7 +459,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_AF_SCAN_RANGE,
                        "camera-af-scan-range",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -470,7 +471,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_EXPOSURE_MODE,
                        "camera-exposure-mode",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -481,7 +482,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_EXPOSURE_VALUE,
                        "camera-exposure-value",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -492,7 +493,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_F_NUMBER,
                        "camera-f-number",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -503,7 +504,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_SHUTTER_SPEED,
                        "camera-shutter-speed",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -514,7 +515,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_ISO,
                        "camera-iso",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -525,7 +526,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_WDR,
                        "camera-wdr",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -536,7 +537,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_ANTI_HANDSHAKE,
                        "camera-anti-handshake",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -547,7 +548,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_FPS_AUTO,
                        "camera-fps-auto",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)FALSE},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -558,7 +559,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_DELAY_ATTR_SETTING,
                        "camera-delay-attr-setting",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)FALSE},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -569,7 +570,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_AUDIO_ENCODER_BITRATE,
                        "audio-encoder-bitrate",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -581,7 +582,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_VIDEO_ENCODER_BITRATE,
                        "video-encoder-bitrate",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -592,7 +593,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_IMAGE_ENCODER_QUALITY,
                        "image-encoder-quality",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)95},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -603,7 +604,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAPTURE_FORMAT,
                        "capture-format",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)MM_PIXEL_FORMAT_ENCODED},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -614,7 +615,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAPTURE_WIDTH,
                        "capture-width",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)1600},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -625,7 +626,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAPTURE_HEIGHT,
                        "capture-height",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)1200},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -636,7 +637,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAPTURE_COUNT,
                        "capture-count",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)1},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -647,7 +648,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAPTURE_INTERVAL,
                        "capture-interval",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -658,7 +659,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAPTURE_BREAK_CONTINUOUS_SHOT,
                        "capture-break-cont-shot",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)FALSE},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -669,9 +670,9 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_DISPLAY_HANDLE,
                        "display-handle",
-                       MMF_VALUE_TYPE_DATA,
+                       MM_ATTRS_TYPE_DATA,
                        MM_ATTRS_FLAG_RW,
-                       {(void*)NULL},
+                       {NULL},
                        MM_ATTRS_VALID_TYPE_NONE,
                        {0},
                        {0},
@@ -680,7 +681,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_DISPLAY_DEVICE,
                        "display-device",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)MM_DISPLAY_DEVICE_MAINLCD},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -692,7 +693,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_DISPLAY_SURFACE,
                        "display-surface",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)MM_DISPLAY_SURFACE_OVERLAY},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -703,7 +704,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_DISPLAY_RECT_X,
                        "display-rect-x",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -714,7 +715,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_DISPLAY_RECT_Y,
                        "display-rect-y",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -725,7 +726,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_DISPLAY_RECT_WIDTH,
                        "display-rect-width",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -736,7 +737,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_DISPLAY_RECT_HEIGHT,
                        "display-rect-height",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -747,7 +748,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_DISPLAY_SOURCE_X,
                        "display-src-x",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -758,7 +759,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_DISPLAY_SOURCE_Y,
                        "display-src-y",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -769,7 +770,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_DISPLAY_SOURCE_WIDTH,
                        "display-src-width",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -780,7 +781,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_DISPLAY_SOURCE_HEIGHT,
                        "display-src-height",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -791,7 +792,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_DISPLAY_ROTATION,
                        "display-rotation",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)MM_DISPLAY_ROTATION_NONE},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -803,7 +804,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_DISPLAY_VISIBLE,
                        "display-visible",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)1},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -814,7 +815,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_DISPLAY_SCALE,
                        "display-scale",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -825,7 +826,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_DISPLAY_GEOMETRY_METHOD,
                        "display-geometry-method",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -836,9 +837,9 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_TARGET_FILENAME,
                        "target-filename",
-                       MMF_VALUE_TYPE_STRING,
+                       MM_ATTRS_TYPE_STRING,
                        MM_ATTRS_FLAG_RW,
-                       {(void*)NULL},
+                       {NULL},
                        MM_ATTRS_VALID_TYPE_NONE,
                        {0},
                        {0},
@@ -847,7 +848,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_TARGET_MAX_SIZE,
                        "target-max-size",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -858,7 +859,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_TARGET_TIME_LIMIT,
                        "target-time-limit",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -869,7 +870,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_TAG_ENABLE,
                        "tag-enable",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -880,9 +881,9 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_TAG_IMAGE_DESCRIPTION,
                        "tag-image-description",
-                       MMF_VALUE_TYPE_STRING,
+                       MM_ATTRS_TYPE_STRING,
                        MM_ATTRS_FLAG_RW,
-                       {(void*)NULL},
+                       {NULL},
                        MM_ATTRS_VALID_TYPE_NONE,
                        {0},
                        {0},
@@ -891,7 +892,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_TAG_ORIENTATION,
                        "tag-orientation",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)1},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -902,9 +903,9 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_TAG_SOFTWARE,
                        "tag-software",
-                       MMF_VALUE_TYPE_STRING,
+                       MM_ATTRS_TYPE_STRING,
                        MM_ATTRS_FLAG_RW,
-                       {(void*)NULL},
+                       {NULL},
                        MM_ATTRS_VALID_TYPE_NONE,
                        {0},
                        {0},
@@ -914,9 +915,9 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_TAG_LATITUDE,
                        "tag-latitude",
-                       MMF_VALUE_TYPE_DOUBLE,
+                       MM_ATTRS_TYPE_DOUBLE,
                        MM_ATTRS_FLAG_RW,
-                       {(void*)0},
+                       {.value_double = 0.0},
                        MM_ATTRS_VALID_TYPE_DOUBLE_RANGE,
                        {.double_min = -360.0},
                        {.double_max = 360.0},
@@ -925,9 +926,9 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_TAG_LONGITUDE,
                        "tag-longitude",
-                       MMF_VALUE_TYPE_DOUBLE,
+                       MM_ATTRS_TYPE_DOUBLE,
                        MM_ATTRS_FLAG_RW,
-                       {(void*)0},
+                       {.value_double = 0.0},
                        MM_ATTRS_VALID_TYPE_DOUBLE_RANGE,
                        {.double_min = -360.0},
                        {.double_max = 360.0},
@@ -936,9 +937,9 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_TAG_ALTITUDE,
                        "tag-altitude",
-                       MMF_VALUE_TYPE_DOUBLE,
+                       MM_ATTRS_TYPE_DOUBLE,
                        MM_ATTRS_FLAG_RW,
-                       {(void*)0},
+                       {.value_double = 0.0},
                        MM_ATTRS_VALID_TYPE_DOUBLE_RANGE,
                        {.double_min = -999999.0},
                        {.double_max = 999999.0},
@@ -947,7 +948,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_STROBE_CONTROL,
                        "strobe-control",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -958,7 +959,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_STROBE_CAPABILITIES,
                        "strobe-capabilities",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -969,7 +970,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_STROBE_MODE,
                        "strobe-mode",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -980,7 +981,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_DETECT_MODE,
                        "detect-mode",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -991,7 +992,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_DETECT_NUMBER,
                        "detect-number",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -1002,7 +1003,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_DETECT_FOCUS_SELECT,
                        "detect-focus-select",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -1013,7 +1014,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_DETECT_SELECT_NUMBER,
                        "detect-select-number",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -1025,7 +1026,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_DETECT_STATUS,
                        "detect-status",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -1036,7 +1037,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAPTURE_ZERO_SYSTEMLAG,
                        "capture-zero-systemlag",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)FALSE},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -1047,7 +1048,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_AF_TOUCH_X,
                        "camera-af-touch-x",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -1058,7 +1059,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_AF_TOUCH_Y,
                        "camera-af-touch-y",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -1069,7 +1070,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_AF_TOUCH_WIDTH,
                        "camera-af-touch-width",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -1080,7 +1081,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_AF_TOUCH_HEIGHT,
                        "camera-af-touch-height",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -1091,9 +1092,9 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_FOCAL_LENGTH,
                        "camera-focal-length",
-                       MMF_VALUE_TYPE_DOUBLE,
+                       MM_ATTRS_TYPE_DOUBLE,
                        MM_ATTRS_FLAG_RW,
-                       {(void*)0},
+                       {.value_double = 0.0},
                        MM_ATTRS_VALID_TYPE_DOUBLE_RANGE,
                        {.double_min = 0.0},
                        {.double_max = 1000.0},
@@ -1102,7 +1103,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_RECOMMEND_PREVIEW_FORMAT_FOR_CAPTURE,
                        "recommend-preview-format-for-capture",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)MM_PIXEL_FORMAT_YUYV},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -1113,7 +1114,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_RECOMMEND_PREVIEW_FORMAT_FOR_RECORDING,
                        "recommend-preview-format-for-recording",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)MM_PIXEL_FORMAT_NV12},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -1124,7 +1125,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_TAG_GPS_ENABLE,
                        "tag-gps-enable",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)FALSE},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -1136,9 +1137,9 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_TAG_GPS_TIME_STAMP,
                        "tag-gps-time-stamp",
-                       MMF_VALUE_TYPE_DOUBLE,
+                       MM_ATTRS_TYPE_DOUBLE,
                        MM_ATTRS_FLAG_RW,
-                       {(void*)0},
+                       {.value_double = 0.0},
                        MM_ATTRS_VALID_TYPE_NONE,
                        {0},
                        {0},
@@ -1147,9 +1148,9 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_TAG_GPS_DATE_STAMP,
                        "tag-gps-date-stamp",
-                       MMF_VALUE_TYPE_STRING,
+                       MM_ATTRS_TYPE_STRING,
                        MM_ATTRS_FLAG_RW,
-                       {(void*)NULL},
+                       {NULL},
                        MM_ATTRS_VALID_TYPE_NONE,
                        {0},
                        {0},
@@ -1158,9 +1159,9 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_TAG_GPS_PROCESSING_METHOD,
                        "tag-gps-processing-method",
-                       MMF_VALUE_TYPE_STRING,
+                       MM_ATTRS_TYPE_STRING,
                        MM_ATTRS_FLAG_RW,
-                       {(void*)NULL},
+                       {NULL},
                        MM_ATTRS_VALID_TYPE_NONE,
                        {0},
                        {0},
@@ -1169,7 +1170,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_ROTATION,
                        "camera-rotation",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)MM_VIDEO_INPUT_ROTATION_NONE},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -1180,9 +1181,9 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAPTURED_SCREENNAIL,
                        "captured-screennail",
-                       MMF_VALUE_TYPE_DATA,
-                       MM_ATTRS_FLAG_READABLE,
-                       {(void*)NULL},
+                       MM_ATTRS_TYPE_DATA,
+                       MM_ATTRS_FLAG_RW,
+                       {NULL},
                        MM_ATTRS_VALID_TYPE_NONE,
                        {0},
                        {0},
@@ -1191,7 +1192,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAPTURE_SOUND_ENABLE,
                        "capture-sound-enable",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)TRUE},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -1202,7 +1203,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_RECOMMEND_DISPLAY_ROTATION,
                        "recommend-display-rotation",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)MM_DISPLAY_ROTATION_270},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -1213,7 +1214,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_FLIP,
                        "camera-flip",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)MM_FLIP_NONE},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -1224,7 +1225,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_HDR_CAPTURE,
                        "camera-hdr-capture",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)FALSE},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -1235,7 +1236,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_DISPLAY_MODE,
                        "display-mode",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)MM_DISPLAY_MODE_DEFAULT},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -1247,7 +1248,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_AUDIO_DISABLE,
                        "audio-disable",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)FALSE},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -1258,7 +1259,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_RECOMMEND_CAMERA_WIDTH,
                        "recommend-camera-width",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)MMCAMCORDER_DEFAULT_CAMERA_WIDTH},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -1269,7 +1270,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_RECOMMEND_CAMERA_HEIGHT,
                        "recommend-camera-height",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)MMCAMCORDER_DEFAULT_CAMERA_HEIGHT},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -1280,9 +1281,9 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAPTURED_EXIF_RAW_DATA,
                        "captured-exif-raw-data",
-                       MMF_VALUE_TYPE_DATA,
-                       MM_ATTRS_FLAG_READABLE,
-                       {(void*)NULL},
+                       MM_ATTRS_TYPE_DATA,
+                       MM_ATTRS_FLAG_RW,
+                       {NULL},
                        MM_ATTRS_VALID_TYPE_NONE,
                        {0},
                        {0},
@@ -1291,9 +1292,9 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_DISPLAY_EVAS_SURFACE_SINK,
                        "display-evas-surface-sink",
-                       MMF_VALUE_TYPE_STRING,
-                       MM_ATTRS_FLAG_READABLE,
-                       {(void*)NULL},
+                       MM_ATTRS_TYPE_STRING,
+                       MM_ATTRS_FLAG_RW,
+                       {NULL},
                        MM_ATTRS_VALID_TYPE_NONE,
                        {0},
                        {0},
@@ -1302,7 +1303,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_DISPLAY_EVAS_DO_SCALING,
                        "display-evas-do-scaling",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)TRUE},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -1313,7 +1314,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_FACING_DIRECTION,
                        "camera-facing-direction",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)MM_CAMCORDER_CAMERA_FACING_DIRECTION_REAR},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -1324,7 +1325,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_DISPLAY_FLIP,
                        "display-flip",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)MM_FLIP_NONE},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -1335,7 +1336,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_VIDEO_STABILIZATION,
                        "camera-video-stabilization",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)MM_CAMCORDER_VIDEO_STABILIZATION_OFF},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -1346,7 +1347,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_TAG_VIDEO_ORIENTATION,
                        "tag-video-orientation",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)MM_CAMCORDER_TAG_VIDEO_ORT_NONE},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -1358,7 +1359,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_PAN_MECHA,
                        "camera-pan-mecha",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -1369,7 +1370,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_PAN_ELEC,
                        "camera-pan-elec",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -1380,7 +1381,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_TILT_MECHA,
                        "camera-tilt-mecha",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -1391,7 +1392,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_TILT_ELEC,
                        "camera-tilt-elec",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -1402,7 +1403,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_CAMERA_PTZ_TYPE,
                        "camera-ptz-type",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -1413,7 +1414,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_VIDEO_WIDTH,
                        "video-width",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -1424,7 +1425,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_VIDEO_HEIGHT,
                        "video-height",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_ARRAY,
@@ -1435,7 +1436,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_SUPPORT_ZSL_CAPTURE,
                        "support-zsl-capture",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)FALSE},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -1446,7 +1447,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_SUPPORT_ZERO_COPY_FORMAT,
                        "support-zero-copy-format",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)FALSE},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -1457,7 +1458,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_SUPPORT_MEDIA_PACKET_PREVIEW_CB,
                        "support-media-packet-preview-cb",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)FALSE},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -1469,7 +1470,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_ENCODED_PREVIEW_BITRATE,
                        "encoded-preview-bitrate",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)MMCAMCORDER_DEFAULT_ENCODED_PREVIEW_BITRATE},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -1480,7 +1481,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_ENCODED_PREVIEW_GOP_INTERVAL,
                        "encoded-preview-gop-interval",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)MMCAMCORDER_DEFAULT_ENCODED_PREVIEW_GOP_INTERVAL},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -1491,7 +1492,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_RECORDER_TAG_ENABLE,
                        "recorder-tag-enable",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)FALSE},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -1502,31 +1503,31 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_DISPLAY_SOCKET_PATH,
                        "display-socket-path",
-                       MMF_VALUE_TYPE_STRING,
+                       MM_ATTRS_TYPE_STRING,
                        MM_ATTRS_FLAG_RW,
-                       {(void*)NULL},
+                       {NULL},
                        MM_ATTRS_VALID_TYPE_NONE,
                        {0},
                        {0},
                        NULL,
                },
                {
-                       MM_CAM_PID_FOR_SOUND_FOCUS,
-                       "pid-for-sound-focus",
-                       MMF_VALUE_TYPE_INT,
+                       MM_CAM_CLIENT_PID,
+                       "client-pid",
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)0},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
                        {.int_min = 0},
                        {.int_max = _MMCAMCORDER_MAX_INT},
-                       _mmcamcorder_commit_pid_for_sound_focus,
+                       NULL,
                },
                {
                        MM_CAM_ROOT_DIRECTORY,
                        "root-directory",
-                       MMF_VALUE_TYPE_STRING,
+                       MM_ATTRS_TYPE_STRING,
                        MM_ATTRS_FLAG_RW,
-                       {(void*)NULL},
+                       {NULL},
                        MM_ATTRS_VALID_TYPE_NONE,
                        {0},
                        {0},
@@ -1535,7 +1536,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_SOUND_STREAM_INDEX,
                        "sound-stream-index",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)-1},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -1546,9 +1547,9 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_SOUND_STREAM_TYPE,
                        "sound-stream-type",
-                       MMF_VALUE_TYPE_STRING,
+                       MM_ATTRS_TYPE_STRING,
                        MM_ATTRS_FLAG_RW,
-                       {(void*)NULL},
+                       {NULL},
                        MM_ATTRS_VALID_TYPE_NONE,
                        {0},
                        {0},
@@ -1557,7 +1558,7 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_DISPLAY_REUSE_HINT,
                        "display-reuse-hint",
-                       MMF_VALUE_TYPE_INT,
+                       MM_ATTRS_TYPE_INT,
                        MM_ATTRS_FLAG_RW,
                        {(void*)FALSE},
                        MM_ATTRS_VALID_TYPE_INT_RANGE,
@@ -1568,9 +1569,9 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_DISPLAY_REUSE_ELEMENT,
                        "display-reuse-element",
-                       MMF_VALUE_TYPE_DATA,
+                       MM_ATTRS_TYPE_DATA,
                        MM_ATTRS_FLAG_RW,
-                       {(void*)NULL},
+                       {NULL},
                        MM_ATTRS_VALID_TYPE_NONE,
                        {0},
                        {0},
@@ -1579,13 +1580,35 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
                {
                        MM_CAM_GDBUS_CONNECTION,
                        "gdbus-connection",
-                       MMF_VALUE_TYPE_DATA,
+                       MM_ATTRS_TYPE_DATA,
                        MM_ATTRS_FLAG_RW,
-                       {(void*)NULL},
+                       {NULL},
                        MM_ATTRS_VALID_TYPE_NONE,
                        {0},
                        {0},
                        NULL,
+               },
+               {
+                       MM_CAM_AUDIO_REPLAY_GAIN_ENABLE,
+                       "audio-replay-gain-enable",
+                       MM_ATTRS_TYPE_INT,
+                       MM_ATTRS_FLAG_RW,
+                       {(void*)FALSE},
+                       MM_ATTRS_VALID_TYPE_INT_RANGE,
+                       {.int_min = 0},
+                       {.int_max = 1},
+                       _mmcamcorder_commit_audio_replay_gain,
+               },
+               {
+                       MM_CAM_AUDIO_REPLAY_GAIN_REFERENCE_LEVEL,
+                       "audio-replay-gain-reference-level",
+                       MM_ATTRS_TYPE_DOUBLE,
+                       MM_ATTRS_FLAG_RW,
+                       {.value_double = MMCAMCORDER_DEFAULT_REPLAY_GAIN_REFERENCE_LEVEL},
+                       MM_ATTRS_VALID_TYPE_DOUBLE_RANGE,
+                       {.double_min = 0.0},
+                       {.double_max = 150.0},
+                       _mmcamcorder_commit_audio_replay_gain,
                }
        };
 
@@ -1611,16 +1634,17 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
        /* Camcorder Attributes */
        _mmcam_dbg_log("Create Camcorder Attributes[%p, %d]", attrs_const_info, attr_count);
 
-       attrs = mmf_attrs_new_from_data("Camcorder_Attributes",
-               attrs_const_info,
+       ret = mm_attrs_new(attrs_const_info,
                attr_count,
+               "Camcorder_Attributes",
                _mmcamcorder_commit_camcorder_attrs,
-               (void *)handle);
+               (void *)handle,
+               &attrs);
 
        free(attrs_const_info);
        attrs_const_info = NULL;
 
-       if (attrs == 0) {
+       if (ret != MM_ERROR_NONE) {
                _mmcam_dbg_err("Fail to alloc attribute handle");
                free(hcamcorder->cam_attrs_const_info);
                hcamcorder->cam_attrs_const_info = NULL;
@@ -1630,41 +1654,45 @@ _mmcamcorder_alloc_attribute(MMHandleType handle, MMCamPreset *info)
        __mmcamcorder_set_conf_to_valid_info(handle);
 
        for (idx = 0; idx < attr_count; idx++) {
-/*             _mmcam_dbg_log("Valid type [%s:%d, %d, %d]", cam_attrs_const_info[idx].name, cam_attrs_const_info[idx].validity_type
-                       , cam_attrs_const_info[idx].validity_value1, cam_attrs_const_info[idx].validity_value2);
+               mm_cam_attr_construct_info *attr_info = &hcamcorder->cam_attrs_const_info[idx];
+
+/*
+               _mmcam_dbg_log("Valid type [%s:%d, %d, %d]",
+                       attr_info->name, attr_info->validity_type,
+                       attr_info->validity_value1, attr_info->validity_value2);
 */
-               mmf_attrs_set_valid_type(attrs, idx, hcamcorder->cam_attrs_const_info[idx].validity_type);
+               mm_attrs_set_valid_type(attrs, idx, attr_info->validity_type);
 
-               switch (hcamcorder->cam_attrs_const_info[idx].validity_type) {
+               switch (attr_info->validity_type) {
                case MM_ATTRS_VALID_TYPE_INT_ARRAY:
-                       if (hcamcorder->cam_attrs_const_info[idx].validity_value_1.int_array &&
-                           hcamcorder->cam_attrs_const_info[idx].validity_value_2.count > 0) {
-                               mmf_attrs_set_valid_array(attrs, idx,
-                                       (const int *)(hcamcorder->cam_attrs_const_info[idx].validity_value_1.int_array),
-                                       hcamcorder->cam_attrs_const_info[idx].validity_value_2.count,
-                                       hcamcorder->cam_attrs_const_info[idx].default_value.value_int);
+                       if (attr_info->validity_value_1.int_array &&
+                           attr_info->validity_value_2.count > 0) {
+                               mm_attrs_set_valid_array(attrs, idx,
+                                       (const int *)(attr_info->validity_value_1.int_array),
+                                       attr_info->validity_value_2.count,
+                                       attr_info->default_value.value_int);
                        }
                        break;
                case MM_ATTRS_VALID_TYPE_INT_RANGE:
-                       mmf_attrs_set_valid_range(attrs, idx,
-                               hcamcorder->cam_attrs_const_info[idx].validity_value_1.int_min,
-                               hcamcorder->cam_attrs_const_info[idx].validity_value_2.int_max,
-                               hcamcorder->cam_attrs_const_info[idx].default_value.value_int);
+                       mm_attrs_set_valid_range(attrs, idx,
+                               attr_info->validity_value_1.int_min,
+                               attr_info->validity_value_2.int_max,
+                               attr_info->default_value.value_int);
                        break;
                case MM_ATTRS_VALID_TYPE_DOUBLE_ARRAY:
-                       if (hcamcorder->cam_attrs_const_info[idx].validity_value_1.double_array &&
-                           hcamcorder->cam_attrs_const_info[idx].validity_value_2.count > 0) {
-                               mmf_attrs_set_valid_double_array(attrs, idx,
-                                       (const double *)(hcamcorder->cam_attrs_const_info[idx].validity_value_1.double_array),
-                                       hcamcorder->cam_attrs_const_info[idx].validity_value_2.count,
-                                       hcamcorder->cam_attrs_const_info[idx].default_value.value_double);
+                       if (attr_info->validity_value_1.double_array &&
+                           attr_info->validity_value_2.count > 0) {
+                               mm_attrs_set_valid_double_array(attrs, idx,
+                                       (const double *)(attr_info->validity_value_1.double_array),
+                                       attr_info->validity_value_2.count,
+                                       attr_info->default_value.value_double);
                        }
                        break;
                case MM_ATTRS_VALID_TYPE_DOUBLE_RANGE:
-                       mmf_attrs_set_valid_double_range(attrs, idx,
-                               hcamcorder->cam_attrs_const_info[idx].validity_value_1.double_min,
-                               hcamcorder->cam_attrs_const_info[idx].validity_value_2.double_max,
-                               hcamcorder->cam_attrs_const_info[idx].default_value.value_double);
+                       mm_attrs_set_valid_double_range(attrs, idx,
+                               attr_info->validity_value_1.double_min,
+                               attr_info->validity_value_2.double_max,
+                               attr_info->default_value.value_double);
                        break;
                case MM_ATTRS_VALID_TYPE_NONE:
                        break;
@@ -1694,7 +1722,7 @@ _mmcamcorder_dealloc_attribute(MMHandleType handle, MMHandleType attrs)
        _mmcam_dbg_log("");
 
        if (attrs) {
-               mmf_attrs_free(attrs);
+               mm_attrs_free(attrs);
                _mmcam_dbg_log("released attribute");
        }
 
@@ -1703,6 +1731,8 @@ _mmcamcorder_dealloc_attribute(MMHandleType handle, MMHandleType attrs)
                hcamcorder->cam_attrs_const_info = NULL;
                _mmcam_dbg_log("released attribute info");
        }
+
+       return;
 }
 
 
@@ -1729,11 +1759,12 @@ _mmcamcorder_set_attributes(MMHandleType handle, char **err_attr_name, const cha
 {
        MMHandleType attrs = 0;
        int ret = MM_ERROR_NONE;
+       int err_index = 0;
+       char *tmp_err_attr_name = NULL;
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
        va_list var_args_copy;
 
        mmf_return_val_if_fail(handle, MM_ERROR_CAMCORDER_INVALID_ARGUMENT);
-       /*mmf_return_val_if_fail(err_attr_name, MM_ERROR_CAMCORDER_INVALID_ARGUMENT);*/
 
        if (!_MMCAMCORDER_TRYLOCK_CMD(handle)) {
                _mmcam_dbg_err("Another command is running.");
@@ -1745,16 +1776,16 @@ _mmcamcorder_set_attributes(MMHandleType handle, char **err_attr_name, const cha
 
        attrs = MMF_CAMCORDER_ATTRS(handle);
        if (attrs) {
-               ret = __mmcamcorder_check_valid_pair(handle, err_attr_name, attribute_name, var_args);
+               ret = __mmcamcorder_check_valid_pair(handle, &tmp_err_attr_name, attribute_name, var_args);
        } else {
-               _mmcam_dbg_err("handle 0x%x, attrs is NULL, attr name [%s]", handle, attribute_name);
+               _mmcam_dbg_err("handle %p, attrs is NULL, attr name [%s]", handle, attribute_name);
                ret = MM_ERROR_CAMCORDER_NOT_INITIALIZED;
        }
 
        if (ret == MM_ERROR_NONE) {
                hcamcorder->error_code = MM_ERROR_NONE;
                /* In 64bit environment, unexpected result is returned if var_args is used again. */
-               ret = mm_attrs_set_valist(attrs, err_attr_name, attribute_name, var_args_copy);
+               ret = mm_attrs_set_valist(attrs, &tmp_err_attr_name, attribute_name, var_args_copy);
        }
 
        va_end(var_args_copy);
@@ -1762,8 +1793,17 @@ _mmcamcorder_set_attributes(MMHandleType handle, char **err_attr_name, const cha
        _MMCAMCORDER_UNLOCK_CMD(handle);
 
        if (ret != MM_ERROR_NONE) {
+               if (ret == MM_ERROR_COMMON_OUT_OF_RANGE) {
+                       if (mm_attrs_get_index(attrs, tmp_err_attr_name, &err_index) == MM_ERROR_NONE &&
+                               _mmcamcorder_check_supported_attribute(handle, err_index)) {
+                               _mmcam_dbg_err("[%s] is supported, but value is invalid",
+                                       tmp_err_attr_name ? tmp_err_attr_name : "NULL");
+                               ret = MM_ERROR_CAMCORDER_INVALID_ARGUMENT;
+                       }
+               }
+
                if (hcamcorder->error_code != MM_ERROR_NONE) {
-                       _mmcam_dbg_err("error_code is not NONE. origin 0x%x, modified 0x%x", ret, hcamcorder->error_code);
+                       _mmcam_dbg_err("error_code is set. ret 0x%x -> modified 0x%x", ret, hcamcorder->error_code);
                        ret = hcamcorder->error_code;
                        hcamcorder->error_code = MM_ERROR_NONE;
                }
@@ -1771,6 +1811,16 @@ _mmcamcorder_set_attributes(MMHandleType handle, char **err_attr_name, const cha
                _mmcam_dbg_err("failed error code 0x%x - handle %p", ret, (mmf_camcorder_t *)handle);
        }
 
+       if (tmp_err_attr_name) {
+               if (!err_attr_name) {
+                       _mmcam_dbg_err("set attribute[%s] error, but err name is NULL", tmp_err_attr_name);
+                       free(tmp_err_attr_name);
+                       tmp_err_attr_name = NULL;
+               } else {
+                       *err_attr_name = tmp_err_attr_name;
+               }
+       }
+
        return ret;
 }
 
@@ -1831,7 +1881,7 @@ _mmcamcorder_get_attribute_info(MMHandleType handle, const char *attr_name, MMCa
 
 
 bool
-_mmcamcorder_commit_camcorder_attrs(int attr_idx, const char *attr_name, const mmf_value_t *value, void *commit_param)
+_mmcamcorder_commit_camcorder_attrs(int attr_idx, const char *attr_name, const MMAttrsValue *value, void *commit_param)
 {
        bool bret = FALSE;
        mmf_camcorder_t *hcamcorder = NULL;
@@ -1939,7 +1989,7 @@ int __mmcamcorder_release_conf_valid_info(MMHandleType handle)
 }
 
 
-bool _mmcamcorder_commit_capture_width(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_capture_width(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        MMHandleType attr = 0;
        int current_state = MM_CAMCORDER_STATE_NONE;
@@ -1976,7 +2026,7 @@ bool _mmcamcorder_commit_capture_width(MMHandleType handle, int attr_idx, const
 }
 
 
-bool _mmcamcorder_commit_capture_height(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_capture_height(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        int current_state = MM_CAMCORDER_STATE_NONE;
 
@@ -1997,13 +2047,14 @@ bool _mmcamcorder_commit_capture_height(MMHandleType handle, int attr_idx, const
 }
 
 
-bool _mmcamcorder_commit_capture_break_cont_shot(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_capture_break_cont_shot(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        int current_state = 0;
        int ivalue = 0;
        const char *videosrc_name = NULL;
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
        _MMCamcorderSubContext *sc = NULL;
+       _MMCamcorderImageInfo *info = NULL;
        GstCameraControl *control = NULL;
        type_element *VideosrcElement = NULL;
 
@@ -2022,7 +2073,18 @@ bool _mmcamcorder_commit_capture_break_cont_shot(MMHandleType handle, int attr_i
        if (!sc)
                return TRUE;
 
+       info = sc->info_image;
+       if (!info) {
+               _mmcam_dbg_err("info image is NULL");
+               return FALSE;
+       }
+
        if (ivalue && current_state == MM_CAMCORDER_STATE_CAPTURING) {
+               if (info->capture_send_count > 0) {
+                       info->capturing = FALSE;
+                       _mmcam_dbg_warn("capturing -> FALSE and skip capture callback since now");
+               }
+
                if (!GST_IS_CAMERA_CONTROL(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst)) {
                        _mmcam_dbg_warn("Can't cast Video source into camera control.");
                        return TRUE;
@@ -2043,7 +2105,7 @@ bool _mmcamcorder_commit_capture_break_cont_shot(MMHandleType handle, int attr_i
 }
 
 
-bool _mmcamcorder_commit_capture_count(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_capture_count(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        int mode = MM_CAMCORDER_MODE_VIDEO_CAPTURE;
        int current_state = MM_CAMCORDER_STATE_NONE;
@@ -2067,7 +2129,7 @@ bool _mmcamcorder_commit_capture_count(MMHandleType handle, int attr_idx, const
 }
 
 
-bool _mmcamcorder_commit_capture_sound_enable(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_capture_sound_enable(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
 
@@ -2087,7 +2149,7 @@ bool _mmcamcorder_commit_capture_sound_enable(MMHandleType handle, int attr_idx,
 }
 
 
-bool _mmcamcorder_commit_audio_volume(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_audio_volume(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        int current_state = MM_CAMCORDER_STATE_NONE;
        _MMCamcorderSubContext *sc = NULL;
@@ -2126,7 +2188,7 @@ bool _mmcamcorder_commit_audio_volume(MMHandleType handle, int attr_idx, const m
 }
 
 
-bool _mmcamcorder_commit_camera_format(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_camera_format(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
        int current_state = MM_CAMCORDER_STATE_NONE;
@@ -2144,7 +2206,7 @@ bool _mmcamcorder_commit_camera_format(MMHandleType handle, int attr_idx, const
 }
 
 
-bool _mmcamcorder_commit_camera_fps(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_camera_fps(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
        MMCamAttrsInfo fps_info;
@@ -2195,7 +2257,7 @@ bool _mmcamcorder_commit_camera_fps(MMHandleType handle, int attr_idx, const mmf
 }
 
 
-bool _mmcamcorder_commit_camera_recording_motion_rate(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_camera_recording_motion_rate(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        int current_state = MM_CAMCORDER_STATE_NONE;
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
@@ -2231,7 +2293,7 @@ bool _mmcamcorder_commit_camera_recording_motion_rate(MMHandleType handle, int a
 }
 
 
-bool _mmcamcorder_commit_camera_width(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_camera_width(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        MMHandleType attr = 0;
        int current_state = MM_CAMCORDER_STATE_NONE;
@@ -2327,7 +2389,7 @@ bool _mmcamcorder_commit_camera_width(MMHandleType handle, int attr_idx, const m
 }
 
 
-bool _mmcamcorder_commit_camera_height(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_camera_height(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        int ret = 0;
        int current_state = MM_CAMCORDER_STATE_NONE;
@@ -2422,7 +2484,7 @@ bool _mmcamcorder_commit_camera_height(MMHandleType handle, int attr_idx, const
 }
 
 
-bool _mmcamcorder_commit_video_size(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_video_size(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        int current_state = MM_CAMCORDER_STATE_NONE;
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
@@ -2442,7 +2504,7 @@ bool _mmcamcorder_commit_video_size(MMHandleType handle, int attr_idx, const mmf
 }
 
 
-bool _mmcamcorder_commit_camera_zoom(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_camera_zoom(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
        _MMCamcorderSubContext *sc = NULL;
@@ -2505,7 +2567,7 @@ bool _mmcamcorder_commit_camera_zoom(MMHandleType handle, int attr_idx, const mm
 }
 
 
-bool _mmcamcorder_commit_camera_ptz_type(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_camera_ptz_type(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
        _MMCamcorderSubContext *sc = NULL;
@@ -2563,16 +2625,14 @@ bool _mmcamcorder_commit_camera_ptz_type(MMHandleType handle, int attr_idx, cons
                        }
                }
 
-               if (item == NULL) {
-                       _mmcam_dbg_warn("failed to find tilt control channel");
-               }
+               _mmcam_dbg_warn("failed to find tilt control channel");
        }
 
        return FALSE;
 }
 
 
-bool _mmcamcorder_commit_camera_pan(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_camera_pan(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
        _MMCamcorderSubContext *sc = NULL;
@@ -2630,16 +2690,14 @@ bool _mmcamcorder_commit_camera_pan(MMHandleType handle, int attr_idx, const mmf
                        }
                }
 
-               if (item == NULL) {
-                       _mmcam_dbg_warn("failed to find pan control channel");
-               }
+               _mmcam_dbg_warn("failed to find pan control channel");
        }
 
        return FALSE;
 }
 
 
-bool _mmcamcorder_commit_camera_tilt(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_camera_tilt(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
        _MMCamcorderSubContext *sc = NULL;
@@ -2697,16 +2755,14 @@ bool _mmcamcorder_commit_camera_tilt(MMHandleType handle, int attr_idx, const mm
                        }
                }
 
-               if (item == NULL) {
-                       _mmcam_dbg_warn("failed to find tilt control channel");
-               }
+               _mmcam_dbg_warn("failed to find tilt control channel");
        }
 
        return FALSE;
 }
 
 
-bool _mmcamcorder_commit_camera_focus_mode(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_camera_focus_mode(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        MMHandleType attr = 0;
        int current_state = MM_CAMCORDER_STATE_NONE;
@@ -2791,7 +2847,7 @@ bool _mmcamcorder_commit_camera_focus_mode(MMHandleType handle, int attr_idx, co
 }
 
 
-bool _mmcamcorder_commit_camera_af_scan_range(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_camera_af_scan_range(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
        _MMCamcorderSubContext *sc = NULL;
@@ -2869,7 +2925,7 @@ bool _mmcamcorder_commit_camera_af_scan_range(MMHandleType handle, int attr_idx,
 }
 
 
-bool _mmcamcorder_commit_camera_af_touch_area(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_camera_af_touch_area(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
        _MMCamcorderSubContext *sc = NULL;
@@ -3067,7 +3123,7 @@ bool _mmcamcorder_commit_camera_af_touch_area(MMHandleType handle, int attr_idx,
 }
 
 
-bool _mmcamcorder_commit_camera_capture_mode(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_camera_capture_mode(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        GstCameraControl *control = NULL;
        int ivalue = 0;
@@ -3168,7 +3224,7 @@ bool _mmcamcorder_commit_camera_capture_mode(MMHandleType handle, int attr_idx,
 }
 
 
-bool _mmcamcorder_commit_camera_wdr(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_camera_wdr(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        GstCameraControl *control = NULL;
        int mslVal = 0;
@@ -3239,7 +3295,7 @@ bool _mmcamcorder_commit_camera_wdr(MMHandleType handle, int attr_idx, const mmf
 }
 
 
-bool _mmcamcorder_commit_camera_anti_handshake(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_camera_anti_handshake(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        int current_state = MM_CAMCORDER_STATE_NONE;
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
@@ -3266,7 +3322,7 @@ bool _mmcamcorder_commit_camera_anti_handshake(MMHandleType handle, int attr_idx
 }
 
 
-bool _mmcamcorder_commit_encoder_bitrate(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_encoder_bitrate(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        int audio_enc = 0;
        int bitrate = 0;
@@ -3305,7 +3361,7 @@ bool _mmcamcorder_commit_encoder_bitrate(MMHandleType handle, int attr_idx, cons
 }
 
 
-bool _mmcamcorder_commit_camera_video_stabilization(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_camera_video_stabilization(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        int current_state = MM_CAMCORDER_STATE_NONE;
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
@@ -3326,7 +3382,7 @@ bool _mmcamcorder_commit_camera_video_stabilization(MMHandleType handle, int att
 }
 
 
-bool _mmcamcorder_commit_camera_rotate(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_camera_rotate(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        int current_state = MM_CAMCORDER_STATE_NONE;
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
@@ -3347,7 +3403,7 @@ bool _mmcamcorder_commit_camera_rotate(MMHandleType handle, int attr_idx, const
 }
 
 
-bool _mmcamcorder_commit_image_encoder_quality(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_image_encoder_quality(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        int current_state = MM_CAMCORDER_STATE_NONE;
 
@@ -3387,113 +3443,23 @@ bool _mmcamcorder_commit_image_encoder_quality(MMHandleType handle, int attr_idx
 }
 
 
-bool _mmcamcorder_commit_target_filename(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_target_filename(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
-       int ret = MM_ERROR_NONE;
-       int size = 0;
-       const char *filename = NULL;
-       _MMCamcorderSubContext *sc = NULL;
-       GstElement *encode_link = NULL;
-       GstElement *encode_sink = NULL;
-       GstElement *encode_pipeline = NULL;
-
        mmf_return_val_if_fail(handle && value, FALSE);
 
-       sc = MMF_CAMCORDER_SUBCONTEXT(handle);
-       if (!sc)
-               return TRUE;
-
        /* get string */
-       filename = mmf_value_get_string(value, &size);
-       if (filename == NULL) {
+       if (!value->value.s_val) {
                _mmcam_dbg_err("NULL filename");
                return FALSE;
        }
 
-       if (sc->info_video) {
-               SAFE_G_FREE(sc->info_video->filename);
-               sc->info_video->filename = g_strdup(filename);
-               if (sc->info_video->filename == NULL) {
-                       _mmcam_dbg_err("failed to strdup filename [%s]", filename);
-                       return FALSE;
-               }
-       }
-
-       if (sc->encode_element && sc->encode_element[_MMCAMCORDER_ENCSINK_SINK].gst) {
-               encode_sink = sc->encode_element[_MMCAMCORDER_ENCSINK_SINK].gst;
-               encode_pipeline = sc->encode_element[_MMCAMCORDER_ENCODE_MAIN_PIPE].gst;
-
-               _mmcam_dbg_log("file location set.[%s], current encode sink [%s]",
-                       filename, GST_OBJECT_NAME(gst_element_get_factory(encode_sink)));
-
-               /* check whether it's filesink or not */
-               if (strncmp(GST_OBJECT_NAME(gst_element_get_factory(encode_sink)), "filesink", strlen("filesink"))) {
-                       _mmcam_dbg_log("remove current sink and create filesink");
-
-                       /* remove fakesink and create/add filesink to encode pipeline */
-                       /* set NULL state */
-                       ret = _mmcamcorder_gst_set_state(handle, encode_sink, GST_STATE_NULL);
-                       if (ret != MM_ERROR_NONE) {
-                               _mmcam_dbg_err("failed to set NULL encoder sink");
-                               return FALSE;
-                       }
-
-                       /* remove encode sink - pads will be unlinked automatically in remove function */
-                       if (!gst_bin_remove(GST_BIN(encode_pipeline), encode_sink)) {
-                               _mmcam_dbg_err("failed to remove encode sink from pipeline");
-                               return FALSE;
-                       }
-
-                       _mmcam_dbg_log("remove done");
-
-                       /* create filesink */
-                       encode_sink = gst_element_factory_make("filesink", NULL);
-                       if (!encode_sink) {
-                               _mmcam_dbg_err("filesink creation failed");
-                               return FALSE;
-                       }
-
-                       sc->encode_element[_MMCAMCORDER_ENCSINK_SINK].gst = encode_sink;
-
-                       /* set release notification callback */
-                       g_object_weak_ref(G_OBJECT(encode_sink), (GWeakNotify)_mmcamcorder_element_release_noti, sc);
-
-                       /* add to pipeline */
-                       if (!gst_bin_add(GST_BIN(encode_pipeline), encode_sink)) {
-                               _mmcam_dbg_err("failed to add filesink to encode pipeline");
-                               gst_object_unref(encode_sink);
-                               return FALSE;
-                       }
-
-                       /* link filesink */
-                       if (sc->encode_element[_MMCAMCORDER_ENCSINK_MUX].gst) {
-                               /* mux element is used */
-                               _mmcam_dbg_log("Link mux to encode_sink");
-                               encode_link = sc->encode_element[_MMCAMCORDER_ENCSINK_MUX].gst;
-                       } else {
-                               /* no mux element */
-                               _mmcam_dbg_log("Link audio encoder to encode_sink");
-                               encode_link = sc->encode_element[_MMCAMCORDER_ENCSINK_AENC].gst;
-                       }
-
-                       if (!_MM_GST_ELEMENT_LINK(encode_link, encode_sink)) {
-                               _mmcam_dbg_err("Link FAILED");
-                               return FALSE;
-                       }
-
-                       _mmcam_dbg_log("Link OK");
-               }
-
-               MMCAMCORDER_G_OBJECT_SET_POINTER(encode_sink, "location", filename);
-       } else {
-               _mmcam_dbg_log("element is not created yet. [%s] will be set later...", filename);
-       }
+       _mmcam_dbg_log("set filename [%s]", value->value.s_val);
 
        return TRUE;
 }
 
 
-bool _mmcamcorder_commit_recording_max_limit(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_recording_max_limit(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        int current_state = MM_CAMCORDER_STATE_NONE;
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
@@ -3511,7 +3477,7 @@ bool _mmcamcorder_commit_recording_max_limit(MMHandleType handle, int attr_idx,
 }
 
 
-bool _mmcamcorder_commit_filter(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_filter(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        GstColorBalance *balance = NULL;
        GstColorBalanceChannel *Colorchannel = NULL;
@@ -3644,7 +3610,7 @@ bool _mmcamcorder_commit_filter(MMHandleType handle, int attr_idx, const mmf_val
 }
 
 
-bool _mmcamcorder_commit_filter_scene_mode(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_filter_scene_mode(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        int mslVal = 0;
        int newVal = 0;
@@ -3707,11 +3673,11 @@ bool _mmcamcorder_commit_filter_scene_mode(MMHandleType handle, int attr_idx, co
                                        MM_CAM_FILTER_COLOR_TONE,
                                        MM_CAM_CAMERA_EXPOSURE_MODE
                                };
-                               mmf_attrs_t *attr = (mmf_attrs_t *)MMF_CAMCORDER_ATTRS(handle);
+                               MMHandleType attrs = MMF_CAMCORDER_ATTRS(handle);
 
                                for (i = 0 ; i < ARRAY_SIZE(attr_idxs) ; i++) {
-                                       if (__mmcamcorder_attrs_is_supported((MMHandleType)attr, attr_idxs[i]))
-                                               mmf_attribute_set_modified(&(attr->items[attr_idxs[i]]));
+                                       if (_mmcamcorder_check_supported_attribute(handle, attr_idxs[i]))
+                                               mm_attrs_set_modified(attrs, attr_idxs[i]);
                                }
                        }
 
@@ -3727,7 +3693,7 @@ bool _mmcamcorder_commit_filter_scene_mode(MMHandleType handle, int attr_idx, co
 }
 
 
-bool _mmcamcorder_commit_filter_flip(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_filter_flip(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        mmf_return_val_if_fail(handle && value, FALSE);
 
@@ -3737,7 +3703,7 @@ bool _mmcamcorder_commit_filter_flip(MMHandleType handle, int attr_idx, const mm
 }
 
 
-bool _mmcamcorder_commit_audio_input_route(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_audio_input_route(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        mmf_return_val_if_fail(handle && value, FALSE);
 
@@ -3747,7 +3713,7 @@ bool _mmcamcorder_commit_audio_input_route(MMHandleType handle, int attr_idx, co
 }
 
 
-bool _mmcamcorder_commit_audio_disable(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_audio_disable(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        int current_state = MM_CAMCORDER_STATE_NONE;
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
@@ -3766,7 +3732,7 @@ bool _mmcamcorder_commit_audio_disable(MMHandleType handle, int attr_idx, const
 }
 
 
-bool _mmcamcorder_commit_display_handle(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_display_handle(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        int current_state = MM_CAMCORDER_STATE_NONE;
        const char *videosink_name = NULL;
@@ -3804,19 +3770,14 @@ bool _mmcamcorder_commit_display_handle(MMHandleType handle, int attr_idx, const
                _mmcam_dbg_log("Commit : videosinkname[%s]", videosink_name);
 
                if (!strcmp(videosink_name, "xvimagesink") || !strcmp(videosink_name, "ximagesink")) {
-                       _mmcam_dbg_log("Commit : Set XID[%x]", *(int*)(p_handle));
-                       gst_video_overlay_set_window_handle(GST_VIDEO_OVERLAY(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst), *(int*)(p_handle));
+                       _mmcam_dbg_log("Commit : Set XID[%x]", *(int *)(p_handle));
+                       gst_video_overlay_set_window_handle(GST_VIDEO_OVERLAY(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst), *(int *)(p_handle));
                } else if (!strcmp(videosink_name, "evasimagesink") || !strcmp(videosink_name, "evaspixmapsink")) {
                        _mmcam_dbg_log("Commit : Set evas object [%p]", p_handle);
                        MMCAMCORDER_G_OBJECT_SET_POINTER(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst, "evas-object", p_handle);
-               } else if (!strcmp(videosink_name, "waylandsink")) {
-                       MMCamWaylandInfo *wl_info = (MMCamWaylandInfo *)p_handle;
-
-                       _mmcam_dbg_log("wayland global surface id : %d", wl_info->global_surface_id);
-
-                       gst_video_overlay_set_wl_window_wl_surface_id(GST_VIDEO_OVERLAY(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst), (guintptr)wl_info->global_surface_id);
-                       gst_video_overlay_set_render_rectangle(GST_VIDEO_OVERLAY(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst),
-                               wl_info->window_x, wl_info->window_y, wl_info->window_width, wl_info->window_height);
+               } else if (!strcmp(videosink_name, "tizenwlsink")) {
+                       _mmcam_dbg_log("wayland global surface id : %d", *(int *)(p_handle));
+                       gst_video_overlay_set_wl_window_wl_surface_id(GST_VIDEO_OVERLAY(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst), (guintptr)*(int *)(p_handle));
                } else {
                        _mmcam_dbg_warn("Commit : Nothing to commit with this element[%s]", videosink_name);
                        return FALSE;
@@ -3830,7 +3791,7 @@ bool _mmcamcorder_commit_display_handle(MMHandleType handle, int attr_idx, const
 }
 
 
-bool _mmcamcorder_commit_display_mode(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_display_mode(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        int current_state = MM_CAMCORDER_STATE_NONE;
        const char *videosink_name = NULL;
@@ -3863,7 +3824,7 @@ bool _mmcamcorder_commit_display_mode(MMHandleType handle, int attr_idx, const m
 
        _mmcam_dbg_log("Commit : videosinkname[%s]", videosink_name);
 
-       if (!strcmp(videosink_name, "xvimagesink") || !strcmp(videosink_name, "waylandsink")) {
+       if (!strcmp(videosink_name, "xvimagesink") || !strcmp(videosink_name, "tizenwlsink")) {
                _mmcam_dbg_log("Commit : display mode [%d]", value->value.i_val);
                MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst, "display-mode", value->value.i_val);
        } else {
@@ -3874,7 +3835,7 @@ bool _mmcamcorder_commit_display_mode(MMHandleType handle, int attr_idx, const m
 }
 
 
-bool _mmcamcorder_commit_display_rotation(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_display_rotation(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        int current_state = MM_CAMCORDER_STATE_NONE;
 
@@ -3899,7 +3860,7 @@ bool _mmcamcorder_commit_display_rotation(MMHandleType handle, int attr_idx, con
 }
 
 
-bool _mmcamcorder_commit_display_flip(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_display_flip(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        int current_state = MM_CAMCORDER_STATE_NONE;
 
@@ -3924,7 +3885,7 @@ bool _mmcamcorder_commit_display_flip(MMHandleType handle, int attr_idx, const m
 }
 
 
-bool _mmcamcorder_commit_display_visible(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_display_visible(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        int current_state = MM_CAMCORDER_STATE_NONE;
        const char *videosink_name = NULL;
@@ -3956,7 +3917,7 @@ bool _mmcamcorder_commit_display_visible(MMHandleType handle, int attr_idx, cons
                return FALSE;
        }
 
-       if (!strcmp(videosink_name, "xvimagesink") || !strcmp(videosink_name, "waylandsink") ||
+       if (!strcmp(videosink_name, "xvimagesink") || !strcmp(videosink_name, "tizenwlsink") ||
                !strcmp(videosink_name, "evaspixmapsink") || !strcmp(videosink_name, "evasimagesink")) {
                MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst, "visible", value->value.i_val);
                _mmcam_dbg_log("Set visible [%d] done.", value->value.i_val);
@@ -3968,7 +3929,7 @@ bool _mmcamcorder_commit_display_visible(MMHandleType handle, int attr_idx, cons
 }
 
 
-bool _mmcamcorder_commit_display_geometry_method(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_display_geometry_method(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        int method = 0;
        int current_state = MM_CAMCORDER_STATE_NONE;
@@ -4001,7 +3962,7 @@ bool _mmcamcorder_commit_display_geometry_method(MMHandleType handle, int attr_i
                return FALSE;
        }
 
-       if (!strcmp(videosink_name, "xvimagesink") || !strcmp(videosink_name, "waylandsink") ||
+       if (!strcmp(videosink_name, "xvimagesink") || !strcmp(videosink_name, "tizenwlsink") ||
            !strcmp(videosink_name, "evaspixmapsink") || !strcmp(videosink_name, "evasimagesink")) {
                method = value->value.i_val;
                MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst, "display-geometry-method", method);
@@ -4013,10 +3974,9 @@ bool _mmcamcorder_commit_display_geometry_method(MMHandleType handle, int attr_i
 }
 
 
-bool _mmcamcorder_commit_display_rect(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_display_rect(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        int current_state = MM_CAMCORDER_STATE_NONE;
-       int method = 0;
        int ret = MM_ERROR_NONE;
        const char *videosink_name = NULL;
 
@@ -4040,15 +4000,6 @@ bool _mmcamcorder_commit_display_rect(MMHandleType handle, int attr_idx, const m
 
        sc = MMF_CAMCORDER_SUBCONTEXT(handle);
 
-       /* check current method */
-       mm_camcorder_get_attributes(handle, NULL,
-               MMCAM_DISPLAY_GEOMETRY_METHOD, &method,
-               NULL);
-       if (method != MM_DISPLAY_METHOD_CUSTOM_ROI) {
-               _mmcam_dbg_log("current method[%d] is not supported rect", method);
-               return FALSE;
-       }
-
        /* Get videosink name */
        _mmcamcorder_conf_get_value_element_name(sc->VideosinkElement, &videosink_name);
        if (videosink_name == NULL) {
@@ -4056,7 +4007,7 @@ bool _mmcamcorder_commit_display_rect(MMHandleType handle, int attr_idx, const m
                return FALSE;
        }
 
-       if (!strcmp(videosink_name, "xvimagesink") || !strcmp(videosink_name, "waylandsink") ||
+       if (!strcmp(videosink_name, "xvimagesink") || !strcmp(videosink_name, "tizenwlsink") ||
            !strcmp(videosink_name, "evaspixmapsink")) {
                int rect_x = 0;
                int rect_y = 0;
@@ -4110,11 +4061,11 @@ bool _mmcamcorder_commit_display_rect(MMHandleType handle, int attr_idx, const m
                if (!(flags & MM_ATTRS_FLAG_MODIFIED)) {
                        _mmcam_dbg_log("RECT(x,y,w,h) = (%d,%d,%d,%d)", rect_x, rect_y, rect_width, rect_height);
 
-                       if (!strcmp(videosink_name, "waylandsink")) {
-                           ret = gst_video_overlay_set_render_rectangle(GST_VIDEO_OVERLAY(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst),
+                       if (!strcmp(videosink_name, "tizenwlsink")) {
+                           ret = gst_video_overlay_set_display_roi_area(GST_VIDEO_OVERLAY(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst),
                                        rect_x, rect_y, rect_width, rect_height);
                                if (!ret) {
-                                       _mmcam_dbg_err("FAILED : could not set render rectangle.");
+                                       _mmcam_dbg_err("FAILED : could not set display roi area.");
                                        return FALSE;
                                }
                        } else {
@@ -4134,7 +4085,7 @@ bool _mmcamcorder_commit_display_rect(MMHandleType handle, int attr_idx, const m
 }
 
 
-bool _mmcamcorder_commit_display_scale(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_display_scale(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        int zoom = 0;
        int current_state = MM_CAMCORDER_STATE_NONE;
@@ -4169,7 +4120,7 @@ bool _mmcamcorder_commit_display_scale(MMHandleType handle, int attr_idx, const
        }
 
        zoom = value->value.i_val;
-       if (!strcmp(videosink_name, "xvimagesink") || !strcmp(videosink_name, "waylandsink")) {
+       if (!strcmp(videosink_name, "xvimagesink") || !strcmp(videosink_name, "tizenwlsink")) {
                vs_element = sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst;
 
                MMCAMCORDER_G_OBJECT_SET(vs_element, "zoom", (float)(zoom + 1));
@@ -4183,7 +4134,7 @@ bool _mmcamcorder_commit_display_scale(MMHandleType handle, int attr_idx, const
 }
 
 
-bool _mmcamcorder_commit_display_evas_do_scaling(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_display_evas_do_scaling(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        int current_state = MM_CAMCORDER_STATE_NONE;
        int do_scaling = 0;
@@ -4229,7 +4180,7 @@ bool _mmcamcorder_commit_display_evas_do_scaling(MMHandleType handle, int attr_i
 }
 
 
-bool _mmcamcorder_commit_strobe(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_strobe(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        bool bret = FALSE;
        _MMCamcorderSubContext *sc = NULL;
@@ -4340,7 +4291,7 @@ bool _mmcamcorder_commit_strobe(MMHandleType handle, int attr_idx, const mmf_val
 }
 
 
-bool _mmcamcorder_commit_camera_flip(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_camera_flip(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        int ret = 0;
        int current_state = MM_CAMCORDER_STATE_NONE;
@@ -4369,7 +4320,7 @@ bool _mmcamcorder_commit_camera_flip(MMHandleType handle, int attr_idx, const mm
 }
 
 
-bool _mmcamcorder_commit_camera_hdr_capture(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_camera_hdr_capture(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        int set_hdr_mode = MM_CAMCORDER_HDR_OFF;
        int current_state = MM_CAMCORDER_STATE_NONE;
@@ -4442,7 +4393,7 @@ bool _mmcamcorder_commit_camera_hdr_capture(MMHandleType handle, int attr_idx, c
 }
 
 
-bool _mmcamcorder_commit_detect(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_detect(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        bool bret = FALSE;
        _MMCamcorderSubContext *sc = NULL;
@@ -4531,7 +4482,7 @@ bool _mmcamcorder_commit_detect(MMHandleType handle, int attr_idx, const mmf_val
 }
 
 
-bool _mmcamcorder_commit_encoded_preview_bitrate(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_encoded_preview_bitrate(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        int current_state = MM_CAMCORDER_STATE_NONE;
        int preview_format = MM_PIXEL_FORMAT_NV12;
@@ -4558,7 +4509,7 @@ bool _mmcamcorder_commit_encoded_preview_bitrate(MMHandleType handle, int attr_i
 }
 
 
-bool _mmcamcorder_commit_encoded_preview_gop_interval(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_encoded_preview_gop_interval(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        int current_state = MM_CAMCORDER_STATE_NONE;
        int preview_format = MM_PIXEL_FORMAT_NV12;
@@ -4585,90 +4536,7 @@ bool _mmcamcorder_commit_encoded_preview_gop_interval(MMHandleType handle, int a
 }
 
 
-bool _mmcamcorder_commit_pid_for_sound_focus(MMHandleType handle, int attr_idx, const mmf_value_t *value)
-{
-       int new_pid = 0;
-       int ret = 0;
-       int current_state = MM_CAMCORDER_STATE_NONE;
-       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
-
-       mmf_return_val_if_fail(hcamcorder && value, FALSE);
-
-       /* state check */
-       current_state = _mmcamcorder_get_state(handle);
-       if (current_state > MM_CAMCORDER_STATE_NULL) {
-               _mmcam_dbg_log("invalid state %d", current_state);
-               hcamcorder->error_code = MM_ERROR_CAMCORDER_INVALID_STATE;
-               return FALSE;
-       }
-
-       new_pid = value->value.i_val;
-
-       _mmcam_dbg_warn("Commit : pid %d, current focus id %d, subscribe id %u",
-               new_pid, hcamcorder->sound_focus_id, hcamcorder->sound_focus_subscribe_id);
-
-       /* unregister sound focus and unsubscribe sound signal before set new one */
-       if (hcamcorder->sound_focus_id > 0) {
-               mm_sound_unregister_focus(hcamcorder->sound_focus_id);
-               _mmcam_dbg_log("unregister sound focus done");
-               hcamcorder->sound_focus_id = 0;
-       }
-
-       if (hcamcorder->sound_focus_subscribe_id > 0) {
-               mm_sound_unsubscribe_signal(hcamcorder->sound_focus_subscribe_id);
-               _mmcam_dbg_log("unsubscribe sound signal done");
-               hcamcorder->sound_focus_subscribe_id = 0;
-       }
-
-       ret = _mm_session_util_read_information(new_pid, &hcamcorder->session_type, &hcamcorder->session_flags);
-       if (ret == MM_ERROR_NONE) {
-               if (hcamcorder->session_type == MM_SESSION_TYPE_REPLACED_BY_STREAM) {
-                       hcamcorder->sound_focus_register = FALSE;
-                       _mmcam_dbg_warn("no need to use sound focus internally");
-               } else {
-                       ret = mm_sound_focus_get_id(&hcamcorder->sound_focus_id);
-                       if (ret != MM_ERROR_NONE) {
-                               _mmcam_dbg_err("mm_sound_focus_get_id failed");
-                               hcamcorder->error_code = MM_ERROR_POLICY_BLOCKED;
-                               return FALSE;
-                       }
-
-                       ret = mm_sound_register_focus_for_session(hcamcorder->sound_focus_id,
-                               new_pid, "media", _mmcamcorder_sound_focus_cb, hcamcorder);
-                       if (ret != MM_ERROR_NONE) {
-                               _mmcam_dbg_err("mm_sound_register_focus_for_session failed 0x%x", ret);
-                               hcamcorder->sound_focus_id = 0;
-                               hcamcorder->error_code = MM_ERROR_POLICY_BLOCKED;
-                               return FALSE;
-                       }
-
-                       hcamcorder->sound_focus_register = TRUE;
-
-                       _mmcam_dbg_log("mm_sound_register_focus_for_session done - id %d, session type %d, flags 0x%x",
-                               hcamcorder->sound_focus_id, hcamcorder->session_type, hcamcorder->session_flags);
-               }
-       } else {
-               hcamcorder->session_type = 0;
-               hcamcorder->session_flags = 0;
-               hcamcorder->sound_focus_register = TRUE;
-
-               _mmcam_dbg_warn("read session info failed. sound focus watch cb will be set.");
-
-               ret = mm_sound_subscribe_signal_for_daemon(MM_SOUND_SIGNAL_RELEASE_INTERNAL_FOCUS,
-                       new_pid, &hcamcorder->sound_focus_subscribe_id,
-                       (mm_sound_signal_callback)_mmcamcorder_sound_signal_callback, (void*)hcamcorder);
-               if (ret != MM_ERROR_NONE) {
-                       _mmcam_dbg_err("subscribe sound signal failed [0x%x]", ret);
-                       hcamcorder->error_code = MM_ERROR_POLICY_BLOCKED;
-                       return FALSE;
-               }
-       }
-
-       return TRUE;
-}
-
-
-bool _mmcamcorder_commit_sound_stream_info(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_sound_stream_info(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        int stream_index = 0;
        char *stream_type = NULL;
@@ -4690,9 +4558,6 @@ bool _mmcamcorder_commit_sound_stream_info(MMHandleType handle, int attr_idx, co
                return FALSE;
        }
 
-       /* unset watch callback if existed */
-       _mmcamcorder_sound_signal_callback(MM_SOUND_SIGNAL_RELEASE_INTERNAL_FOCUS, 1, (void *)handle);
-
        sc = MMF_CAMCORDER_SUBCONTEXT(handle);
        if (!sc || !sc->encode_element ||
            !sc->encode_element[_MMCAMCORDER_AUDIOSRC_SRC].gst) {
@@ -4706,7 +4571,7 @@ bool _mmcamcorder_commit_sound_stream_info(MMHandleType handle, int attr_idx, co
 }
 
 
-bool _mmcamcorder_commit_tag(MMHandleType handle, int attr_idx, const mmf_value_t *value)
+bool _mmcamcorder_commit_tag(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
        int current_state = MM_CAMCORDER_STATE_NONE;
@@ -4723,30 +4588,53 @@ bool _mmcamcorder_commit_tag(MMHandleType handle, int attr_idx, const mmf_value_
        return TRUE;
 }
 
-
-static bool __mmcamcorder_attrs_is_supported(MMHandleType handle, int idx)
+bool _mmcamcorder_commit_audio_replay_gain(MMHandleType handle, int attr_idx, const MMAttrsValue *value)
 {
-       mmf_attrs_t *attr = (mmf_attrs_t*)handle;
-       int flag;
+       mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
+
+       mmf_return_val_if_fail(hcamcorder && value, FALSE);
+
+       if (attr_idx == MM_CAM_AUDIO_REPLAY_GAIN_ENABLE) {
+               /* Replay gain enable */
+               int current_state = MM_CAMCORDER_STATE_NONE;
+               int audio_disable = FALSE;
 
-       if (mm_attrs_get_flags(handle, idx, &flag) == MM_ERROR_NONE) {
-               if (flag == MM_ATTRS_FLAG_NONE)
+               current_state = _mmcamcorder_get_state(handle);
+               if (current_state >= MM_CAMCORDER_STATE_RECORDING) {
+                       _mmcam_dbg_err("Can not set replay gain enable [state : %d]", current_state);
+                       hcamcorder->error_code = MM_ERROR_CAMCORDER_INVALID_STATE;
                        return FALSE;
-       } else {
-               return FALSE;
-       }
+               }
+
+               mm_camcorder_get_attributes(handle, NULL,
+                       MMCAM_AUDIO_DISABLE, &audio_disable,
+                       NULL);
 
-       if (attr->items[idx].value_spec.type == MM_ATTRS_VALID_TYPE_INT_RANGE) {
-               int min, max;
-               mm_attrs_get_valid_range((MMHandleType)attr, idx, &min, &max);
-               if (max < min)
+               if (audio_disable) {
+                       _mmcam_dbg_err("audio is disabled");
+                       hcamcorder->error_code = MM_ERROR_CAMCORDER_INVALID_CONDITION;
                        return FALSE;
-       } else if (attr->items[idx].value_spec.type == MM_ATTRS_VALID_TYPE_INT_ARRAY) {
-               int count;
-               int *array;
-               mm_attrs_get_valid_array((MMHandleType)attr, idx, &count, &array);
-               if (count == 0)
+               }
+
+               _mmcam_dbg_log("set replay gain enable : %d", value->value.i_val);
+       } else if (attr_idx == MM_CAM_AUDIO_REPLAY_GAIN_REFERENCE_LEVEL) {
+               /* Replay gain reference level */
+               int replay_gain_enable = FALSE;
+
+               mm_camcorder_get_attributes(handle, NULL,
+                       MMCAM_AUDIO_REPLAY_GAIN_ENABLE, &replay_gain_enable,
+                       NULL);
+
+               if (replay_gain_enable == FALSE) {
+                       _mmcam_dbg_err("replay gain is disabled");
+                       hcamcorder->error_code = MM_ERROR_CAMCORDER_INVALID_CONDITION;
                        return FALSE;
+               }
+
+               _mmcam_dbg_log("set reference level for replay gain : %lf dB", value->value.d_val);
+       } else {
+               _mmcam_dbg_err("unknown attribute id %d", attr_idx);
+               return FALSE;
        }
 
        return TRUE;
@@ -4756,7 +4644,7 @@ static bool __mmcamcorder_attrs_is_supported(MMHandleType handle, int idx)
 bool _mmcamcorder_set_attribute_to_camsensor(MMHandleType handle)
 {
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
-       mmf_attrs_t *attr = NULL;
+       MMHandleType attrs;
 
        int scene_mode = MM_CAMCORDER_SCENE_MODE_NORMAL;
 
@@ -4785,39 +4673,37 @@ bool _mmcamcorder_set_attribute_to_camsensor(MMHandleType handle)
 
        _mmcam_dbg_log("commit some attributes again");
 
-       attr = (mmf_attrs_t *)MMF_CAMCORDER_ATTRS(handle);
-       if (attr == NULL) {
+       attrs = MMF_CAMCORDER_ATTRS(handle);
+       if (attrs == NULL) {
                _mmcam_dbg_err("Get attribute handle failed.");
                return FALSE;
-       } else {
-               /* Get Scene mode */
-               mm_camcorder_get_attributes(handle, NULL, MMCAM_FILTER_SCENE_MODE, &scene_mode, NULL);
+       }
 
-               _mmcam_dbg_log("attribute count(%d)", attr->count);
+       /* Get Scene mode */
+       mm_camcorder_get_attributes(handle, NULL, MMCAM_FILTER_SCENE_MODE, &scene_mode, NULL);
 
-               for (i = 0 ; i < ARRAY_SIZE(attr_idxs_default) ; i++) {
-                       if (__mmcamcorder_attrs_is_supported((MMHandleType)attr, attr_idxs_default[i]))
-                               mmf_attribute_set_modified(&(attr->items[attr_idxs_default[i]]));
-               }
+       for (i = 0 ; i < ARRAY_SIZE(attr_idxs_default) ; i++) {
+               if (_mmcamcorder_check_supported_attribute(handle, attr_idxs_default[i]))
+                       mm_attrs_set_modified(attrs, attr_idxs_default[i]);
+       }
 
-               /* Set extra if scene mode is NORMAL */
-               if (scene_mode == MM_CAMCORDER_SCENE_MODE_NORMAL) {
-                       for (i = 0 ; i < ARRAY_SIZE(attr_idxs_extra) ; i++) {
-                               if (__mmcamcorder_attrs_is_supported((MMHandleType)attr, attr_idxs_extra[i]))
-                                       mmf_attribute_set_modified(&(attr->items[attr_idxs_extra[i]]));
-                       }
-               } else {
-                       /* Set scene mode if scene mode is NOT NORMAL */
-                       if (__mmcamcorder_attrs_is_supported((MMHandleType)attr, MM_CAM_FILTER_SCENE_MODE))
-                               mmf_attribute_set_modified(&(attr->items[MM_CAM_FILTER_SCENE_MODE]));
+       /* Set extra if scene mode is NORMAL */
+       if (scene_mode == MM_CAMCORDER_SCENE_MODE_NORMAL) {
+               for (i = 0 ; i < ARRAY_SIZE(attr_idxs_extra) ; i++) {
+                       if (_mmcamcorder_check_supported_attribute(handle, attr_idxs_extra[i]))
+                               mm_attrs_set_modified(attrs, attr_idxs_extra[i]);
                }
-
-               if (mmf_attrs_commit((MMHandleType)attr) == -1)
-                       ret = FALSE;
-               else
-                       ret = TRUE;
+       } else {
+               /* Set scene mode if scene mode is NOT NORMAL */
+               if (_mmcamcorder_check_supported_attribute(handle, MM_CAM_FILTER_SCENE_MODE))
+                       mm_attrs_set_modified(attrs, MM_CAM_FILTER_SCENE_MODE);
        }
 
+       if (mm_attrs_commit_all(attrs) == -1)
+               ret = FALSE;
+       else
+               ret = TRUE;
+
        _mmcam_dbg_log("Done.");
 
        return ret;
@@ -4827,8 +4713,7 @@ bool _mmcamcorder_set_attribute_to_camsensor(MMHandleType handle)
 bool _mmcamcorder_set_attribute_to_camsensor2(MMHandleType handle)
 {
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
-       mmf_attrs_t *attr = NULL;
-
+       MMHandleType attrs;
        unsigned int i = 0;
        int ret = TRUE;
        int attr_idxs[] = {
@@ -4839,24 +4724,22 @@ bool _mmcamcorder_set_attribute_to_camsensor2(MMHandleType handle)
 
        _mmcam_dbg_log("commit some attribute again[2]");
 
-       attr = (mmf_attrs_t *)MMF_CAMCORDER_ATTRS(handle);
-       if (attr == NULL) {
+       attrs = MMF_CAMCORDER_ATTRS(handle);
+       if (attrs == NULL) {
                _mmcam_dbg_err("Get attribute handle failed.");
                return FALSE;
-       } else {
-               _mmcam_dbg_log("attribute count(%d)", attr->count);
-
-               for (i = 0 ; i < ARRAY_SIZE(attr_idxs) ; i++) {
-                       if (__mmcamcorder_attrs_is_supported((MMHandleType)attr, attr_idxs[i]))
-                               mmf_attribute_set_modified(&(attr->items[attr_idxs[i]]));
-               }
+       }
 
-               if (mmf_attrs_commit((MMHandleType)attr) == -1)
-                       ret = FALSE;
-               else
-                       ret = TRUE;
+       for (i = 0 ; i < ARRAY_SIZE(attr_idxs) ; i++) {
+               if (_mmcamcorder_check_supported_attribute(handle, attr_idxs[i]))
+                       mm_attrs_set_modified(attrs, attr_idxs[i]);
        }
 
+       if (mm_attrs_commit_all(attrs) == -1)
+               ret = FALSE;
+       else
+               ret = TRUE;
+
        _mmcam_dbg_log("Done.");
 
        return ret;
@@ -4866,15 +4749,15 @@ bool _mmcamcorder_set_attribute_to_camsensor2(MMHandleType handle)
 int _mmcamcorder_lock_readonly_attributes(MMHandleType handle)
 {
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
+       MMHandleType attrs;
        int table_size = 0;
        int i = 0;
-       mmf_attrs_t *attr = NULL;
        int nerror = MM_ERROR_NONE;
 
        mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_INVALID_ARGUMENT);
 
-       attr = (mmf_attrs_t*) MMF_CAMCORDER_ATTRS(handle);
-       mmf_return_val_if_fail(attr, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
+       attrs = MMF_CAMCORDER_ATTRS(handle);
+       mmf_return_val_if_fail(attrs, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
 
        _mmcam_dbg_log("");
 
@@ -4883,7 +4766,7 @@ int _mmcamcorder_lock_readonly_attributes(MMHandleType handle)
        for (i = 0; i < table_size; i++) {
                int sCategory = readonly_attributes[i];
 
-               mmf_attribute_set_readonly(&(attr->items[sCategory]));
+               mm_attrs_set_readonly(attrs, sCategory);
        }
 
        return nerror;
@@ -4893,16 +4776,16 @@ int _mmcamcorder_lock_readonly_attributes(MMHandleType handle)
 int _mmcamcorder_set_disabled_attributes(MMHandleType handle)
 {
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
+       MMHandleType attrs;
        int i = 0;
-       mmf_attrs_t *attr = NULL;
        type_string_array * disabled_attr = NULL;
        int cnt_str = 0;
        int nerror = MM_ERROR_NONE ;
 
        mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_INVALID_ARGUMENT);
 
-       attr = (mmf_attrs_t*) MMF_CAMCORDER_ATTRS(handle);
-       mmf_return_val_if_fail(attr, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
+       attrs = MMF_CAMCORDER_ATTRS(handle);
+       mmf_return_val_if_fail(attrs, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
 
        _mmcam_dbg_log("");
 
@@ -4916,10 +4799,10 @@ int _mmcamcorder_set_disabled_attributes(MMHandleType handle)
                for (i = 0; i < cnt_str; i++) {
                        int idx = 0;
                        _mmcam_dbg_log("[%d]%s", i, disabled_attr->value[i]);
-                       nerror = mm_attrs_get_index((MMHandleType)attr, disabled_attr->value[i], &idx);
+                       nerror = mm_attrs_get_index(attrs, disabled_attr->value[i], &idx);
 
                        if (nerror == MM_ERROR_NONE)
-                               mmf_attribute_set_disabled(&(attr->items[idx]));
+                               mm_attrs_set_disabled(attrs, idx);
                        else
                                _mmcam_dbg_warn("No ATTR named %s[%d]", disabled_attr->value[i], i);
                }
@@ -5167,21 +5050,21 @@ bool _mmcamcorder_check_supported_attribute(MMHandleType handle, int attr_index)
                /*
                _mmcam_dbg_log("int array count %d", info.int_array.count);
                */
-               if (info.int_array.count <= 1)
+               if (info.int_array.count < 1)
                        return FALSE;
                break;
        case MM_ATTRS_VALID_TYPE_INT_RANGE:
                /*
                _mmcam_dbg_log("int range min %d, max %d",info.int_range.min, info.int_range.max);
                */
-               if (info.int_range.min >= info.int_range.max)
+               if (info.int_range.min > info.int_range.max)
                        return FALSE;
                break;
        case MM_ATTRS_VALID_TYPE_DOUBLE_ARRAY:
                /*
                _mmcam_dbg_log("double array count %d", info.double_array.count);
                */
-               if (info.double_array.count <= 1)
+               if (info.double_array.count < 1)
                        return FALSE;
                break;
        case MM_ATTRS_VALID_TYPE_DOUBLE_RANGE: