[Release version 0.2.26] Add new enum for MP3 audio codec

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

diff --git a/include/recorder.h b/include/recorder.h
index bf6c9f8..f6b566c 100644 (file)
--- a/include/recorder.h
+++ b/include/recorder.h
@@ -111,7 +111,8 @@ typedef enum {
        RECORDER_AUDIO_CODEC_AMR = 0,      /**< AMR codec */
        RECORDER_AUDIO_CODEC_AAC,          /**< AAC codec */
        RECORDER_AUDIO_CODEC_VORBIS,       /**< Vorbis codec */
-       RECORDER_AUDIO_CODEC_PCM           /**< PCM codec */
+       RECORDER_AUDIO_CODEC_PCM,          /**< PCM codec */
+       RECORDER_AUDIO_CODEC_MP3           /**< MP3 codec (Since 3.0) */
 } recorder_audio_codec_e;
 
 /**

diff --git a/packaging/capi-media-recorder.spec b/packaging/capi-media-recorder.spec
index 4315f84..30615f5 100644 (file)
--- a/packaging/capi-media-recorder.spec
+++ b/packaging/capi-media-recorder.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-recorder
 Summary:    A Recorder API
-Version:    0.2.25
+Version:    0.2.26
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/recorder.c b/src/recorder.c
index 7905cfe..b4c244d 100644 (file)
--- a/src/recorder.c
+++ b/src/recorder.c
@@ -2259,34 +2259,30 @@ int recorder_attr_set_audio_device(recorder_h recorder, recorder_audio_device_e
 
 int recorder_set_audio_encoder(recorder_h recorder, recorder_audio_codec_e codec)
 {
+       int ret = RECORDER_ERROR_NONE;
+       muse_recorder_api_e api = MUSE_RECORDER_API_SET_AUDIO_ENCODER;
+       recorder_cli_s *pc = NULL;
+       int sock_fd = 0;
+       int set_codec = (int)codec;
+
        if (recorder == NULL) {
                LOGE("NULL pointer handle");
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       if (codec != RECORDER_AUDIO_CODEC_DISABLE &&
-           (codec < RECORDER_AUDIO_CODEC_AMR || codec > RECORDER_AUDIO_CODEC_PCM)) {
-               LOGE("invalid parameter : codec %d", codec);
-               return RECORDER_ERROR_INVALID_PARAMETER;
-       }
-       int ret = RECORDER_ERROR_NONE;
-       muse_recorder_api_e api = MUSE_RECORDER_API_SET_AUDIO_ENCODER;
-       recorder_cli_s *pc = (recorder_cli_s *)recorder;
-       int sock_fd;
+
+       pc = (recorder_cli_s *)recorder;
        if (pc->cb_info == NULL) {
                LOGE("INVALID_PARAMETER(0x%08x)", RECORDER_ERROR_INVALID_PARAMETER);
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
-       sock_fd = pc->cb_info->fd;
-       int set_codec = (int)codec;
 
        LOGD("ENTER");
 
-       muse_recorder_msg_send1(api,
-                                                       sock_fd,
-                                                       pc->cb_info,
-                                                       ret,
-                                                       INT, set_codec);
+       sock_fd = pc->cb_info->fd;
+       muse_recorder_msg_send1(api, sock_fd, pc->cb_info, ret, INT, set_codec);
+
        LOGD("ret : 0x%x", ret);
+
        return ret;
 }