[Release version 0.10.31] Fix bug - could not set audio device in video recording...

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

diff --git a/packaging/libmm-camcorder.spec b/packaging/libmm-camcorder.spec
index 119a034..fb7673d 100644 (file)
--- a/packaging/libmm-camcorder.spec
+++ b/packaging/libmm-camcorder.spec
@@ -2,7 +2,7 @@
 
 Name:       libmm-camcorder
 Summary:    Camera and recorder library
-Version:    0.10.30
+Version:    0.10.31
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0

diff --git a/src/include/mm_camcorder_platform.h b/src/include/mm_camcorder_platform.h
index d74c8cf..fdb1f87 100644 (file)
--- a/src/include/mm_camcorder_platform.h
+++ b/src/include/mm_camcorder_platform.h
@@ -187,7 +187,8 @@ typedef enum {
 typedef enum {
        MM_CAMCONVERT_CATEGORY_CAMERA  = 1 << 0,
        MM_CAMCONVERT_CATEGORY_DISPLAY = 1 << 1,
-       MM_CAMCONVERT_CATEGORY_AUDIO   = 1 << 2
+       MM_CAMCONVERT_CATEGORY_AUDIO   = 1 << 2,
+       MM_CAMCONVERT_CATEGORY_ALL = MM_CAMCONVERT_CATEGORY_CAMERA | MM_CAMCONVERT_CATEGORY_DISPLAY | MM_CAMCONVERT_CATEGORY_AUDIO
 } MMCamConvertingCategory;
 
 /*=======================================================================================

diff --git a/src/mm_camcorder_audiorec.c b/src/mm_camcorder_audiorec.c
index 19fceb3..8362140 100644 (file)
--- a/src/mm_camcorder_audiorec.c
+++ b/src/mm_camcorder_audiorec.c
@@ -1049,7 +1049,6 @@ static gboolean __mmcamcorder_audio_add_metadata_info_m4a(MMHandleType handle)
        gint64 udta_pos = 0;
        // supporting audio geo tag for mobile
        int gps_enable = 0;
-       char *err_name = NULL;
        gdouble longitude = 0;
        gdouble latitude = 0;
        gdouble altitude = 0;
@@ -1069,12 +1068,12 @@ static gboolean __mmcamcorder_audio_add_metadata_info_m4a(MMHandleType handle)
        mmf_return_val_if_fail(sc->info_audio, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
 
        info = sc->info_audio;
-       mm_camcorder_get_attributes(handle, &err_name,
+       mm_camcorder_get_attributes(handle, NULL,
                                    MMCAM_TAG_GPS_ENABLE, &gps_enable,
                                    NULL);
 
        if (gps_enable) {
-               mm_camcorder_get_attributes(handle, &err_name,
+               mm_camcorder_get_attributes(handle, NULL,
                                            MMCAM_TAG_LATITUDE, &latitude,
                                            MMCAM_TAG_LONGITUDE, &longitude,
                                            MMCAM_TAG_ALTITUDE, &altitude,
@@ -1091,10 +1090,6 @@ static gboolean __mmcamcorder_audio_add_metadata_info_m4a(MMHandleType handle)
        if (f == NULL) {
                strerror_r(errno, err_msg, 128);
                _mmcam_dbg_err("file open failed [%s]", err_msg);
-               if (err_name) {
-                       free(err_name);
-                       err_name = NULL;
-               }
                return FALSE;
        }
 
@@ -1184,27 +1179,16 @@ static gboolean __mmcamcorder_audio_add_metadata_info_m4a(MMHandleType handle)
        }
 
        fclose(f);
-       if (err_name) {
-               free(err_name);
-               err_name = NULL;
-       }
+
        return TRUE;
 
 fail:
        fclose(f);
-       if (err_name) {
-               free(err_name);
-               err_name = NULL;
-       }
        return FALSE;
 
 ftell_fail:
        _mmcam_dbg_err("ftell() returns negative value.");
        fclose(f);
-       if (err_name) {
-               free(err_name);
-               err_name = NULL;
-       }
        return FALSE;
 }
 

diff --git a/src/mm_camcorder_internal.c b/src/mm_camcorder_internal.c
index 990f8d4..8b1892b 100644 (file)
--- a/src/mm_camcorder_internal.c
+++ b/src/mm_camcorder_internal.c
@@ -327,7 +327,7 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info)
                                goto _ERR_DEFAULT_VALUE_INIT;
                        }
 
-                       ret = _mmcamcorder_init_attr_from_configure((MMHandleType)hcamcorder, MM_CAMCONVERT_CATEGORY_CAMERA|MM_CAMCONVERT_CATEGORY_DISPLAY);
+                       ret = _mmcamcorder_init_attr_from_configure((MMHandleType)hcamcorder, MM_CAMCONVERT_CATEGORY_ALL);
                        if (ret != MM_ERROR_NONE) {
                                _mmcam_dbg_warn("converting table initialize error!!");
                                ret = MM_ERROR_CAMCORDER_INTERNAL;