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

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

diff --git a/legacy/include/legacy_recorder.h b/legacy/include/legacy_recorder.h
index 382ce0f..7239e7e 100644 (file)
--- a/legacy/include/legacy_recorder.h
+++ b/legacy/include/legacy_recorder.h
@@ -114,7 +114,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/legacy/src/legacy_recorder.c b/legacy/src/legacy_recorder.c
index fe34a9d..5b08257 100644 (file)
--- a/legacy/src/legacy_recorder.c
+++ b/legacy/src/legacy_recorder.c
@@ -1418,10 +1418,12 @@ int legacy_recorder_attr_set_audio_device(recorder_h recorder, recorder_audio_de
 int legacy_recorder_set_audio_encoder(recorder_h recorder, recorder_audio_codec_e codec)
 {
        recorder_s *handle = (recorder_s *)recorder;
-       int audio_table[4] = { MM_AUDIO_CODEC_AMR,      /* RECORDER_AUDIO_CODEC_AMR */
-                              MM_AUDIO_CODEC_AAC,      /* RECORDER_AUDIO_CODEC_AAC */
-                              MM_AUDIO_CODEC_VORBIS,   /* RECORDER_AUDIO_CODEC_VORBIS */
-                              MM_AUDIO_CODEC_WAVE      /* RECORDER_AUDIO_CODEC_PCM */
+       int audio_table[5] = {
+               MM_AUDIO_CODEC_AMR,     /* RECORDER_AUDIO_CODEC_AMR */
+               MM_AUDIO_CODEC_AAC,     /* RECORDER_AUDIO_CODEC_AAC */
+               MM_AUDIO_CODEC_VORBIS,  /* RECORDER_AUDIO_CODEC_VORBIS */
+               MM_AUDIO_CODEC_WAVE,    /* RECORDER_AUDIO_CODEC_PCM */
+               MM_AUDIO_CODEC_MP3      /* RECORDER_AUDIO_CODEC_MP3 */
        };
 
        if (recorder == NULL) {
@@ -1429,8 +1431,7 @@ int legacy_recorder_set_audio_encoder(recorder_h recorder, recorder_audio_codec_
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
 
-       if (codec != RECORDER_AUDIO_CODEC_DISABLE &&
-           (codec < RECORDER_AUDIO_CODEC_AMR || codec > RECORDER_AUDIO_CODEC_PCM)) {
+       if (codec < RECORDER_AUDIO_CODEC_DISABLE || codec > RECORDER_AUDIO_CODEC_MP3) {
                LOGE("invalid parameter : codec %d", codec);
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
@@ -1440,7 +1441,8 @@ int legacy_recorder_set_audio_encoder(recorder_h recorder, recorder_audio_codec_
                return RECORDER_ERROR_NOT_SUPPORTED;
        }
 
-       return _recorder_check_and_set_attribute(recorder, MMCAM_AUDIO_ENCODER, codec == RECORDER_AUDIO_CODEC_DISABLE ? RECORDER_AUDIO_CODEC_DISABLE : audio_table[codec]);
+       return _recorder_check_and_set_attribute(recorder, MMCAM_AUDIO_ENCODER,
+               codec == RECORDER_AUDIO_CODEC_DISABLE ? RECORDER_AUDIO_CODEC_DISABLE : audio_table[codec]);
 }
 
 

diff --git a/packaging/mmsvc-recorder.spec b/packaging/mmsvc-recorder.spec
index a6849d0..af31b7c 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.17
+Version:    0.2.18
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0