Enabled 3gp(h264+amr) support to muxer

Change-Id: Id860f79a342f0e75c77575fec9b3a394a190d805
Signed-off-by: Mahesh Kondiparthi <kd.mahesh@samsung.com>

diff --git a/test/mediamuxer_test.c b/test/mediamuxer_test.c
index f2654920b5460884969005830104ef8b37a30a0e..3153b624544ef164537a45e806be69562d1a56c0 100644 (file)
--- a/test/mediamuxer_test.c
+++ b/test/mediamuxer_test.c
@@ -145,7 +145,8 @@ int test_mediamuxer_set_data_sink()
        if (strncmp(data_sink, "11", 2) == 0 || strncmp(data_sink, "12", 2) == 0 || strncmp(data_sink, "13", 2) == 0) {
                op_uri = "MuxTest.mp4";
                ret = mediamuxer_set_data_sink(myMuxer, op_uri, MEDIAMUXER_CONTAINER_FORMAT_MP4);
-       } else if (strncmp(data_sink, "21", 2) == 0 || strncmp(data_sink, "22", 2) == 0 || strncmp(data_sink, "23", 2) == 0) {
+       } else if (strncmp(data_sink, "21", 2) == 0 || strncmp(data_sink, "22", 2) == 0 || strncmp(data_sink, "23", 2) == 0
+                || strncmp(data_sink, "24", 2) == 0) {
                op_uri = "MuxTest.3gp";
                ret = mediamuxer_set_data_sink(myMuxer, op_uri, MEDIAMUXER_CONTAINER_FORMAT_3GP);
        } else if (strncmp(data_sink, "31", 2) == 0) {
@@ -190,10 +191,10 @@ int test_mediamuxer_add_track_video()
        }  else if (strncmp(data_sink, "13", 2) == 0) {
                if (media_format_set_video_mime(media_format, MEDIA_FORMAT_MPEG4_SP) == MEDIA_FORMAT_ERROR_INVALID_OPERATION)
                        g_print("Problem during media_format_set_audio_mime operation\n");
-       } else if (strncmp(data_sink, "21", 2) == 0) {
+       } else if (strncmp(data_sink, "21", 2) == 0 || strncmp(data_sink, "23", 2) == 0) {
                if (media_format_set_video_mime(media_format, MEDIA_FORMAT_H264_SP) == MEDIA_FORMAT_ERROR_INVALID_OPERATION)
                        g_print("Problem during media_format_set_audio_mime operation\n");
-       } else if (strncmp(data_sink, "22", 2) == 0 || strncmp(data_sink, "23", 2) == 0) {
+       } else if (strncmp(data_sink, "22", 2) == 0 || strncmp(data_sink, "24", 2) == 0) {
                if (media_format_set_video_mime(media_format, MEDIA_FORMAT_H263) == MEDIA_FORMAT_ERROR_INVALID_OPERATION)
                        g_print("Problem during media_format_set_audio_mime operation\n");
        } else if (strncmp(data_sink, "31", 2) == 0
@@ -239,7 +240,7 @@ int test_mediamuxer_add_track_audio()
        } else if (strncmp(data_sink, "21", 2) == 0 || strncmp(data_sink, "22", 2) == 0) {
                if (media_format_set_audio_mime(media_format_a, MEDIA_FORMAT_AAC_LC) == MEDIA_FORMAT_ERROR_INVALID_OPERATION)
                        g_print("Problem during media_format_set_audio_mime operation, for AAC in 3GP\n");
-       } else if (strncmp(data_sink, "23", 2) == 0) {
+       } else if (strncmp(data_sink, "23", 2) == 0 || strncmp(data_sink, "24", 2) == 0) {
                if (media_format_set_audio_mime(media_format_a, MEDIA_FORMAT_AMR_NB) == MEDIA_FORMAT_ERROR_INVALID_OPERATION)
                        g_print("Problem during media_format_set_audio_mime operation for AMR_NB in 3GP\n");
        } else if (strncmp(data_sink, "31", 2) == 0) {
@@ -477,8 +478,8 @@ static void displaymenu(void)
                }
        } else if (g_menu_state == CURRENT_STATUS_DATA_SINK) {
                g_print("*** input the datasink container format:\n");
-               g_print("(11) mp4 (h264+AAC) (12) mp4(h263+AAC) (13) mp4(mpeg4+AAC) \
-                       \n(21) 3gp (h264+AAC) (22) 3gp (h263+AAC) (23) 3gp (h263+AMR) \
+               g_print("(11) mp4 (h264+AAC) (12) mp4 (h263+AAC) (13) mp4 (mpeg4+AAC) \
+                       \n(21) 3gp (h264+AAC) (22) 3gp (h263+AAC) (23) 3gp (h264+AMR) (23) 3gp (h263+AMR) \
                        \n(31) wav \
                        \n(41) amr-nb (42) amr-wb \n");
        } else if (g_menu_state == CURRENT_STATUS_RAW_VIDEO_FILENAME) {

diff --git a/test/mediamuxer_test_gst.c b/test/mediamuxer_test_gst.c
index a43d12ba89baca4feb01b9a5516957a8e2f6d9b4..7192815772e66948283f3538c48ca87bc0d7059a 100644 (file)
--- a/test/mediamuxer_test_gst.c
+++ b/test/mediamuxer_test_gst.c
@@ -126,7 +126,8 @@ static void __audio_app_sink_callback(GstElement *sink, CustomData *data)
                                        return;
                                }
                        } else if (g_str_has_prefix(new_pad_type_aud, "audio/AMR")
-                               && (strncmp(data_sink, "23", 2) == 0 || strncmp(data_sink, "41", 2) == 0)) {
+                               && (strncmp(data_sink, "23", 2) == 0 || strncmp(data_sink, "24", 2) == 0
+                                       || strncmp(data_sink, "41", 2) == 0)) {
                                g_print("For amr-nb, setting encoded media type as MEDIA_FORMAT_AMR_NB\n");
                                if (media_format_set_audio_mime(audfmt, MEDIA_FORMAT_AMR_NB)) {
                                        g_print("media_format_set_audio_mime failed\n");
@@ -260,7 +261,8 @@ static void __video_app_sink_callback(GstElement *sink, CustomData *data)
 
                        /* check if the mime selected during set_data_sink is matching with the mime of the file inputted.*/
                        if (g_str_has_prefix(new_pad_type_vid, "video/x-h264")
-                               && (strncmp(data_sink, "11", 2) == 0  || strncmp(data_sink, "21", 2) == 0 )) {
+                               && (strncmp(data_sink, "11", 2) == 0
+                                       || strncmp(data_sink, "21", 2) == 0 || strncmp(data_sink, "23", 2) == 0)) {
                                if (media_format_set_video_mime(vidfmt, MEDIA_FORMAT_H264_SP)) {
                                        g_print("media_format_set_video_mime to H264_SP failed\n");
                                        return;
@@ -273,7 +275,7 @@ static void __video_app_sink_callback(GstElement *sink, CustomData *data)
                                        return;
                                }
                        } else if (g_str_has_prefix(new_pad_type_vid, "video/x-h263")
-                               && (strncmp(data_sink, "12", 2) == 0 || strncmp(data_sink, "22", 2) == 0 || strncmp(data_sink, "23", 2) == 0)) {
+                               && (strncmp(data_sink, "12", 2) == 0 || strncmp(data_sink, "22", 2) == 0 || strncmp(data_sink, "24", 2) == 0)) {
                                g_print("For h263, setting encoded media type as MEDIA_FORMAT_H263\n");
                                if (media_format_set_video_mime(vidfmt, MEDIA_FORMAT_H263)) {
                                        g_print("media_format_set_vidio_mime failed\n");