[Release version 0.2.24] Check state before set video encoder

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

diff --git a/legacy/src/legacy_recorder.c b/legacy/src/legacy_recorder.c
index 3218202..cf648a9 100644 (file)
--- a/legacy/src/legacy_recorder.c
+++ b/legacy/src/legacy_recorder.c
@@ -829,16 +829,18 @@ int legacy_recorder_set_video_resolution(recorder_h recorder, int width, int hei
 {
        int ret = MM_ERROR_NONE;
        recorder_s *handle = (recorder_s*)recorder;
-       recorder_state_e state;
+       recorder_state_e state = RECORDER_STATE_NONE;
 
        if (handle == NULL) {
                LOGE("NULL pointer handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
+
        if (handle->camera_device_count == 0) {
                LOGE("RECORDER_ERROR_NOT_SUPPORTED");
                return RECORDER_ERROR_NOT_SUPPORTED;
        }
+
        legacy_recorder_get_state(recorder, &state);
        if (state > RECORDER_STATE_READY) {
                LOGE("RECORDER_ERROR_INVALID_STATE (state:%d)", state);
@@ -1505,6 +1507,7 @@ int legacy_recorder_set_video_encoder(recorder_h recorder, recorder_video_codec_
                MM_VIDEO_CODEC_THEORA    /* RECORDER_VIDEO_CODEC_THEORA */
        };
        recorder_s *handle = (recorder_s *)recorder;
+       recorder_state_e state = RECORDER_STATE_NONE;
 
        if (handle == NULL) {
                LOGE("handle is NULL");
@@ -1521,6 +1524,12 @@ int legacy_recorder_set_video_encoder(recorder_h recorder, recorder_video_codec_
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
 
+       legacy_recorder_get_state(recorder, &state);
+       if (state > RECORDER_STATE_READY) {
+               LOGE("RECORDER_ERROR_INVALID_STATE (state:%d)", state);
+               return RECORDER_ERROR_INVALID_STATE;
+       }
+
        ret = mm_camcorder_set_attributes(handle->mm_handle, NULL,
                MMCAM_VIDEO_ENCODER, video_table[codec],
                NULL);

diff --git a/packaging/mmsvc-recorder.spec b/packaging/mmsvc-recorder.spec
index 6a014cd..578716c 100644 (file)
--- a/packaging/mmsvc-recorder.spec
+++ b/packaging/mmsvc-recorder.spec
@@ -1,6 +1,6 @@
 Name:       mmsvc-recorder
 Summary:    A Recorder module for muse server
-Version:    0.2.23
+Version:    0.2.24
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0