[Release version 0.2.13] Add MPEG2-TransportStream file format

Change-Id: Iae0fc430d5a7770b65532693aa995c1fbf5f0c3e
Signed-off-by: Haesu Gwon <haesu.gwon@samsung.com>

diff --git a/legacy/include/legacy_recorder.h b/legacy/include/legacy_recorder.h
index 5b8876d9044e971253721ca8ea68e7cdf5d3f412..f0c5ac1b160e733f6b3629abfba0407296ee3d6e 100644 (file)
--- a/legacy/include/legacy_recorder.h
+++ b/legacy/include/legacy_recorder.h
@@ -101,6 +101,7 @@ typedef enum
        RECORDER_FILE_FORMAT_ADTS,   /**< ADTS file format */
        RECORDER_FILE_FORMAT_WAV,    /**< WAV file format */
        RECORDER_FILE_FORMAT_OGG,    /**< OGG file format */
+       RECORDER_FILE_FORMAT_M2TS    /**< MPEG2-TransportStream file format */
 } recorder_file_format_e;
 
 /**

diff --git a/legacy/src/legacy_recorder.c b/legacy/src/legacy_recorder.c
index babf0725fadabbfb5a5906187f9c1556c60a07b2..8e36a5ce4bc118d00120c29a9b293d8a3783faee 100644 (file)
--- a/legacy/src/legacy_recorder.c
+++ b/legacy/src/legacy_recorder.c
@@ -1007,15 +1007,16 @@ int legacy_recorder_get_filename(recorder_h recorder,  char **filename)
 
 int legacy_recorder_set_file_format(recorder_h recorder, recorder_file_format_e format)
 {
-       int format_table[6] = { MM_FILE_FORMAT_3GP, /* RECORDER_FILE_FORMAT_3GP */
+       int format_table[7] = { MM_FILE_FORMAT_3GP, /* RECORDER_FILE_FORMAT_3GP */
                                MM_FILE_FORMAT_MP4, /* RECORDER_FILE_FORMAT_MP4 */
                                MM_FILE_FORMAT_AMR, /* RECORDER_FILE_FORMAT_AMR */
                                MM_FILE_FORMAT_AAC, /* RECORDER_FILE_FORMAT_ADTS */
                                MM_FILE_FORMAT_WAV, /* RECORDER_FILE_FORMAT_WAV */
-                               MM_FILE_FORMAT_OGG  /* RECORDER_FILE_FORMAT_OGG */
+                               MM_FILE_FORMAT_OGG,  /* RECORDER_FILE_FORMAT_OGG */
+                               MM_FILE_FORMAT_M2TS /* RECORDER_FILE_FORMAT_M2TS */
        };
 
-       if (format < RECORDER_FILE_FORMAT_3GP || format > RECORDER_FILE_FORMAT_OGG) {
+       if (format < RECORDER_FILE_FORMAT_3GP || format > RECORDER_FILE_FORMAT_M2TS) {
                LOGE("invalid format %d", format);
                return RECORDER_ERROR_INVALID_PARAMETER;
        }
@@ -1063,6 +1064,9 @@ int legacy_recorder_get_file_format(recorder_h recorder, recorder_file_format_e
                case MM_FILE_FORMAT_OGG:
                        *format = RECORDER_FILE_FORMAT_OGG;
                        break;
+               case MM_FILE_FORMAT_M2TS:
+                       *format = RECORDER_FILE_FORMAT_M2TS;
+                       break;
                default :
                        ret = MM_ERROR_CAMCORDER_INTERNAL;
                        break;
@@ -1337,6 +1341,9 @@ int legacy_recorder_foreach_supported_file_format(recorder_h recorder, recorder_
                case MM_FILE_FORMAT_WAV:
                        format = RECORDER_FILE_FORMAT_WAV;
                        break;
+               case MM_FILE_FORMAT_M2TS:
+                       format = RECORDER_FILE_FORMAT_M2TS;
+                       break;
                default :
                        format = -1;
                        break;

diff --git a/packaging/mmsvc-recorder.spec b/packaging/mmsvc-recorder.spec
index eef4ce2c82618e44c7532a38b01cb72658c6dd47..81fd6c7ad5963c2ee6440913d34955098e82ea6b 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.12
+Version:    0.2.13
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0