1. Fix lock up issue when video recording in audio date check function

2. add prefix for system info API

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

diff --git a/packaging/libmm-camcorder.spec b/packaging/libmm-camcorder.spec
index 47d1c811f0120ff4f00e7125b45ca76fbb1251c5..3c04e7c8a1a8a4b1d69d3757e854c1309a2049ee 100644 (file)
--- a/packaging/libmm-camcorder.spec
+++ b/packaging/libmm-camcorder.spec
@@ -1,6 +1,6 @@
 Name:       libmm-camcorder
 Summary:    Camera and recorder library
-Version:    0.9.2
+Version:    0.9.3
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0

diff --git a/src/mm_camcorder_internal.c b/src/mm_camcorder_internal.c
index f59ce70b9f630c0e1e8e54f864d6cc3fa3fc0945..7936cdfe7eabea50fa0e43fa496a92b6f13e90c8 100644 (file)
--- a/src/mm_camcorder_internal.c
+++ b/src/mm_camcorder_internal.c
@@ -344,7 +344,7 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info)
        _mmcam_dbg_log("current shutter sound policy : %d", hcamcorder->shutter_sound_policy);
 
        /* get model name */
-       sys_info_ret = system_info_get_platform_string("tizen.org/system/model_name", &hcamcorder->model_name);
+       sys_info_ret = system_info_get_platform_string("http://tizen.org/system/model_name", &hcamcorder->model_name);
        if (hcamcorder->model_name) {
                _mmcam_dbg_log("model name [%s], sys_info_ret 0x%x", hcamcorder->model_name, sys_info_ret);
        } else {
@@ -352,7 +352,7 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info)
        }
 
        /* get software version */
-       sys_info_ret = system_info_get_platform_string("tizen.org/system/build.string", &hcamcorder->software_version);
+       sys_info_ret = system_info_get_platform_string("http://tizen.org/system/build.string", &hcamcorder->software_version);
        if (hcamcorder->software_version) {
                _mmcam_dbg_log("software version [%s], sys_info_ret 0x%d", hcamcorder->software_version, sys_info_ret);
        } else {

diff --git a/src/mm_camcorder_videorec.c b/src/mm_camcorder_videorec.c
index c360f05c02e0442156e6e6449e53719dc2e231d0..0bbac47ab2eb69f991b5fe3918a4a6f3e0406011 100644 (file)
--- a/src/mm_camcorder_videorec.c
+++ b/src/mm_camcorder_videorec.c
@@ -1278,6 +1278,7 @@ static GstPadProbeReturn __mmcamcorder_audio_dataprobe_check(GstPad *pad, GstPad
        if (videoinfo->audio_frame_count == 0) {
                videoinfo->filesize += buffer_size;
                videoinfo->audio_frame_count++;
+               pthread_mutex_unlock(&(videoinfo->size_check_lock));
                return GST_PAD_PROBE_OK;
        }
 

diff --git a/test/mm_camcorder_testsuite.c b/test/mm_camcorder_testsuite.c
index 1bfdca99bd8e563b42e7740c7c22acfa3feb8b76..07d695172b34dac2636519a1ccb11acee97a2d86 100644 (file)
--- a/test/mm_camcorder_testsuite.c
+++ b/test/mm_camcorder_testsuite.c
@@ -155,8 +155,8 @@ static GTimer *timer = NULL;
 #define IMAGE_CAPTURE_THUMBNAIL_PATH    TARGET_FILENAME_PATH"thumbnail.jpg"
 #define IMAGE_CAPTURE_SCREENNAIL_PATH   TARGET_FILENAME_PATH"screennail.yuv"
 #define IMAGE_CAPTURE_EXIF_PATH         TARGET_FILENAME_PATH"exif.raw"
-#define TARGET_FILENAME_VIDEO           TARGET_FILENAME_PATH"test_rec_video.3gp"
-#define TARGET_FILENAME_AUDIO           TARGET_FILENAME_PATH"test_rec_audio.amr"
+#define TARGET_FILENAME_VIDEO           TARGET_FILENAME_PATH"test_rec_video.mp4"
+#define TARGET_FILENAME_AUDIO           TARGET_FILENAME_PATH"test_rec_audio.m4a"
 #define CAPTURE_FILENAME_LEN            256
 
 #define AUDIO_SOURCE_SAMPLERATE_AAC     44100
@@ -2140,7 +2140,7 @@ static gboolean init(int type)
                                                   MMCAM_AUDIO_ENCODER, MM_AUDIO_CODEC_AAC,
                                                   MMCAM_VIDEO_ENCODER, MM_VIDEO_CODEC_MPEG4,
                                                   MMCAM_VIDEO_ENCODER_BITRATE, VIDEO_ENCODE_BITRATE,
-                                                  MMCAM_FILE_FORMAT, MM_FILE_FORMAT_3GP,
+                                                  MMCAM_FILE_FORMAT, MM_FILE_FORMAT_MP4,
                                                   MMCAM_CAMERA_FPS, SRC_VIDEO_FRAME_RATE_30,
                                                   MMCAM_CAMERA_FPS_AUTO, 0,
                                                   MMCAM_CAMERA_ROTATION, MM_VIDEO_INPUT_ROTATION_NONE,
@@ -2179,7 +2179,7 @@ static gboolean init(int type)
                                                   MMCAM_AUDIO_CHANNEL, AUDIO_SOURCE_CHANNEL_AAC,
                                                   MMCAM_TARGET_FILENAME, TARGET_FILENAME_AUDIO, size,
                                                   MMCAM_TARGET_TIME_LIMIT, 360000,
-                                                  MMCAM_AUDIO_ENCODER_BITRATE, 12200,
+                                                  MMCAM_AUDIO_ENCODER_BITRATE, 128000,
                                                   MMCAM_TARGET_MAX_SIZE, 300,
                                                   NULL);