Added Encoding/Decoding of audio stream.

Change-Id: I28441e5dab20bbf6f712463f1cc29b5088a04011
Signed-off-by: Vyacheslav Valkovoy <v.valkovoy@samsung.com>

diff --git a/include/media_streamer_util.h b/include/media_streamer_util.h
index b3e898d96f5844368fc932040500ba1f1ce76441..99010a9949f93a6b7f44470fc36fc06d0b45f393 100644 (file)
--- a/include/media_streamer_util.h
+++ b/include/media_streamer_util.h
@@ -133,6 +133,7 @@ typedef struct {
 #define DEFAULT_GENERATE_DOT                FALSE
 #define DEFAULT_USE_DECODEBIN               FALSE
 #define DEFAULT_QUEUE                       "queue"
+#define DEFAULT_FILTER                      "capsfilter"
 #define DEFAULT_TYPEFIND                    "typefind"
 #define DEFAULT_DECODEBIN                   "decodebin"
 #define DEFAULT_AUDIO_SOURCE                "alsasrc"
@@ -165,13 +166,15 @@ typedef struct {
 #define DEFAULT_VIDEO_RTPDEPAY              "rtph263depay"
 
 /* audio format defaults */
-#define DEFAULT_AUDIO_PARSER                "aacparse"
-#define DEFAULT_AUDIO_RTPPAY                "rtpL16pay"
-#define DEFAULT_AUDIO_RTPDEPAY              "rtpL16depay"
+#define DEFAULT_AUDIO_ENCODER               "amrnbenc"
+#define DEFAULT_AUDIO_DECODER               "amrnbdec"
+#define DEFAULT_AUDIO_PARSER                "amrparse"
+#define DEFAULT_AUDIO_RTPPAY                "rtpamrpay"
+#define DEFAULT_AUDIO_RTPDEPAY              "rtpamrdepay"
 
 #define DEFAULT_AUDIO "S16LE"
-#define MEDIA_STREAMER_DEFAULT_CAMERA_FORMAT "video/x-raw,width=1280,height=720"
-#define MEDIA_STREAMER_DEFAULT_AUDIO_FORMAT "audio/x-raw,channels=1,rate=44100,format="DEFAULT_AUDIO
+#define MEDIA_STREAMER_DEFAULT_CAMERA_FORMAT "video/x-raw,format=I420,width=1280,height=720"
+#define MEDIA_STREAMER_DEFAULT_AUDIO_FORMAT "audio/x-raw,channels=1,rate=8000,format="DEFAULT_AUDIO
 #define MEDIA_STREAMER_DEFAULT_ENCODER_FORMAT(format) "video/x-"format",stream-format=byte-stream"
 
 #define MS_ELEMENT_IS_OUTPUT(el) g_strrstr(el, "out")

diff --git a/src/media_streamer_gst.c b/src/media_streamer_gst.c
index e71a4bc1019bb0522b9cfadb9163ad0da808f929..deef712a8b7ebdec9fa39929e41fac2f3e908303 100755 (executable)
--- a/src/media_streamer_gst.c
+++ b/src/media_streamer_gst.c
@@ -21,6 +21,7 @@
                gst_pad_unlink(pad, peer) : \
                gst_pad_unlink(peer, pad)
 #define H264_PARSER_CONFIG_INTERVAL 5
+#define H264_ENCODER_ZEROLATENCY 0x00000004
 
 void __ms_generate_dots(GstElement *bin, gchar *name_tag)
 {
@@ -764,7 +765,7 @@ static void __decodebin_nomore_pads_streamer(GstElement * decodebin, media_strea
                } else if (MS_ELEMENT_IS_AUDIO(new_pad_type)) {
                        found_element = __ms_combine_next_element(found_element, new_pad, ms_streamer->topology_bin, NULL, NULL, DEFAULT_QUEUE);
                        found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->topology_bin, MEDIA_STREAMER_BIN_KLASS, "audio_encoder", NULL);
-                       found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->topology_bin, MEDIA_STREAMER_PAYLOADER_KLASS, NULL, DEFAULT_AUDIO_RTPPAY);
+                       found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->topology_bin, MEDIA_STREAMER_PAYLOADER_KLASS, NULL, NULL);
                        found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->topology_bin, MEDIA_STREAMER_BIN_KLASS, "rtp_container", NULL);
                } else if (MS_ELEMENT_IS_TEXT(new_pad_type)) {
                        found_element = __ms_combine_next_element(found_element, new_pad, ms_streamer->topology_bin, MEDIA_STREAMER_OVERLAY_KLASS, NULL, DEFAULT_TEXT_OVERLAY);
@@ -890,7 +891,7 @@ static gboolean __ms_sink_bin_prepare(media_streamer_s * ms_streamer, GstPad * s
                        previous_element = __ms_combine_next_element(previous_element, NULL, ms_streamer->sink_bin, MEDIA_STREAMER_SINK_KLASS, NULL, NULL);
                }
        } else if (MS_ELEMENT_IS_AUDIO(src_pad_type)) {
-               previous_element = __ms_combine_next_element(previous_element, NULL, ms_streamer->topology_bin, MEDIA_STREAMER_CONVERTER_KLASS, NULL, DEFAULT_AUDIO_CONVERT);
+               previous_element = __ms_combine_next_element(previous_element, NULL, ms_streamer->topology_bin, MEDIA_STREAMER_DECODER_KLASS, NULL, NULL);
                previous_element = __ms_combine_next_element(previous_element, NULL, ms_streamer->sink_bin, MEDIA_STREAMER_QUEUE_KLASS, NULL, DEFAULT_QUEUE);
                previous_element = __ms_combine_next_element(previous_element, NULL, ms_streamer->sink_bin, MEDIA_STREAMER_SINK_KLASS, NULL, NULL);
        } else {
@@ -983,33 +984,35 @@ GstElement *__ms_video_encoder_element_create(dictionary * dict, media_format_mi
 
        GstElement *video_scale = __ms_element_create(DEFAULT_VIDEO_SCALE, NULL);
        GstElement *video_convert = __ms_element_create(DEFAULT_VIDEO_CONVERT, NULL);
-       GstElement *video_rate = __ms_element_create(DEFAULT_VIDEO_RATE, NULL);
 
        format_prefix = g_strdup_printf("%s:encoder", __ms_convert_mime_to_string(mime));
        plugin_name = __ms_ini_get_string(dict, format_prefix, DEFAULT_VIDEO_ENCODER);
        GstElement *encoder_elem = __ms_element_create(plugin_name, NULL);
+
        MS_SAFE_FREE(format_prefix);
        MS_SAFE_FREE(plugin_name);
 
        format_prefix = g_strdup_printf("%s:parser", __ms_convert_mime_to_string(mime));
        plugin_name = __ms_ini_get_string(dict, format_prefix, DEFAULT_VIDEO_PARSER);
        GstElement *encoder_parser = __ms_element_create(plugin_name, NULL);
+
        MS_SAFE_FREE(format_prefix);
        MS_SAFE_FREE(plugin_name);
 
        gboolean gst_ret = FALSE;
        GstElement *encoder_bin = gst_bin_new("video_encoder");
-       GstElement *filter = __ms_element_create("capsfilter", NULL);
-       ms_retvm_if(!video_convert || !video_rate || !video_scale || !filter || !encoder_elem || !encoder_bin || !encoder_parser, (GstElement *) NULL, "Error: creating elements for video encoder bin");
-
-       format_prefix = g_strdup_printf(MEDIA_STREAMER_DEFAULT_ENCODER_FORMAT("%s"), __ms_convert_mime_to_string(mime));
-       GstCaps *videoCaps = gst_caps_from_string(format_prefix);
-       g_object_set(G_OBJECT(filter), "caps", videoCaps, NULL);
-       MS_SAFE_FREE(format_prefix);
-       gst_caps_unref(videoCaps);
+       ms_retvm_if(!video_convert || !video_scale || !encoder_elem || !encoder_bin || !encoder_parser, (GstElement *) NULL, "Error: creating elements for video encoder bin");
+
+       if (mime == MEDIA_FORMAT_H264_SP) {
+               g_object_set(GST_OBJECT(encoder_parser), "config-interval", H264_PARSER_CONFIG_INTERVAL, NULL);
+               g_object_set(G_OBJECT(encoder_elem), "tune",  H264_ENCODER_ZEROLATENCY, NULL);
+               g_object_set(G_OBJECT(encoder_elem), "byte-stream", TRUE, NULL);
+               g_object_set(G_OBJECT(encoder_elem), "bitrate", 3000, NULL);
+               g_object_set(G_OBJECT(encoder_elem), "threads", 2, NULL);
+       }
 
-       gst_bin_add_many(GST_BIN(encoder_bin), video_convert, video_scale, video_rate, encoder_elem, filter, encoder_parser, NULL);
-       gst_ret = gst_element_link_many(video_convert, video_scale, video_rate, encoder_elem, filter, encoder_parser, NULL);
+       gst_bin_add_many(GST_BIN(encoder_bin), video_convert, video_scale, encoder_elem, encoder_parser, NULL);
+       gst_ret = gst_element_link_many(video_convert, video_scale, encoder_elem, encoder_parser, NULL);
        if (gst_ret != TRUE) {
                ms_error("Failed to link elements into encoder_bin");
                MS_SAFE_UNREF(encoder_bin);
@@ -1088,21 +1091,22 @@ GstElement *__ms_audio_encoder_element_create(void)
        GstElement *audio_resample = __ms_element_create("audioresample", NULL);
        GstElement *audio_filter = __ms_element_create("capsfilter", NULL);
        GstElement *audio_postenc_convert = __ms_element_create("audioconvert", NULL);
+       GstElement *audio_encoder = __ms_element_create(DEFAULT_AUDIO_ENCODER, NULL);
        GstElement *audio_enc_bin = gst_bin_new("audio_encoder");
-       ms_retvm_if(!audio_convert || !audio_postenc_convert || !audio_filter || !audio_enc_bin, (GstElement *) NULL, "Error: creating elements for encoder bin");
+       ms_retvm_if(!audio_convert || !audio_postenc_convert || !audio_filter || !audio_encoder || !audio_enc_bin, (GstElement *) NULL, "Error: creating elements for encoder bin");
 
        GstCaps *audioCaps = gst_caps_from_string(MEDIA_STREAMER_DEFAULT_AUDIO_FORMAT);
        g_object_set(G_OBJECT(audio_filter), "caps", audioCaps, NULL);
        gst_caps_unref(audioCaps);
 
-       gst_bin_add_many(GST_BIN(audio_enc_bin), audio_convert, audio_postenc_convert, audio_filter, audio_resample, NULL);
-       gst_ret = gst_element_link_many(audio_convert, audio_resample, audio_filter, audio_postenc_convert, NULL);
+       gst_bin_add_many(GST_BIN(audio_enc_bin), audio_convert, audio_postenc_convert, audio_filter, audio_resample, audio_encoder, NULL);
+       gst_ret = gst_element_link_many(audio_convert, audio_resample, audio_filter, audio_postenc_convert, audio_encoder, NULL);
        if (gst_ret != TRUE) {
                ms_error("Failed to link elements into decoder_bin");
                MS_SAFE_UNREF(audio_enc_bin);
        }
 
-       __ms_add_ghostpad(audio_postenc_convert, "src", audio_enc_bin, "src");
+       __ms_add_ghostpad(audio_encoder, "src", audio_enc_bin, "src");
        __ms_add_ghostpad(audio_convert, "sink", audio_enc_bin, "sink");
 
        return audio_enc_bin;
@@ -1206,9 +1210,9 @@ gboolean __ms_rtp_element_prepare(media_streamer_node_s *ms_node)
                ret = ret && gst_element_link_pads(rtpbin, "send_rtcp_src_0", rtcp_el, "sink");
 
                g_object_set_property(G_OBJECT(rtp_el), MEDIA_STREAMER_PARAM_PORT, val);
-               g_object_set(GST_OBJECT(rtp_el), "sync", FALSE, NULL);
                g_object_set(GST_OBJECT(rtp_el), MEDIA_STREAMER_PARAM_HOST, host, NULL);
                g_object_set(G_OBJECT(rtcp_el), MEDIA_STREAMER_PARAM_PORT, (g_value_get_int(val) + 1), NULL);
+               g_object_set(GST_OBJECT(rtcp_el), "sync", FALSE, NULL);
                g_object_set(GST_OBJECT(rtcp_el), "async", FALSE, NULL);
                g_object_set(GST_OBJECT(rtcp_el), MEDIA_STREAMER_PARAM_HOST, host, NULL);
        }
@@ -1230,9 +1234,9 @@ gboolean __ms_rtp_element_prepare(media_streamer_node_s *ms_node)
                ret = ret && gst_element_link_pads(rtpbin, "send_rtcp_src_1", rtcp_el, "sink");
 
                g_object_set_property(G_OBJECT(rtp_el), MEDIA_STREAMER_PARAM_PORT, val);
-               g_object_set(GST_OBJECT(rtp_el), "sync", FALSE, NULL);
                g_object_set(GST_OBJECT(rtp_el), MEDIA_STREAMER_PARAM_HOST, host, NULL);
                g_object_set(G_OBJECT(rtcp_el), MEDIA_STREAMER_PARAM_PORT, (g_value_get_int(val) + 1), NULL);
+               g_object_set(GST_OBJECT(rtcp_el), "sync", FALSE, NULL);
                g_object_set(GST_OBJECT(rtcp_el), "async", FALSE, NULL);
                g_object_set(GST_OBJECT(rtcp_el), MEDIA_STREAMER_PARAM_HOST, host, NULL);
        }

diff --git a/src/media_streamer_node.c b/src/media_streamer_node.c
index b928f1546c68e5c9a099689e63b6ac5deb0bf162..29e6d7f455057a797fbf3f7bae22f003abc58298 100755 (executable)
--- a/src/media_streamer_node.c
+++ b/src/media_streamer_node.c
@@ -151,7 +151,7 @@ int __ms_node_create(media_streamer_node_s *node, media_format_h in_fmt, media_f
                node->gst_element = __ms_element_create(plugin_name, NULL);
                break;
        case MEDIA_STREAMER_NODE_TYPE_FILTER:
-               node->gst_element = __ms_element_create("capsfilter", NULL);
+               node->gst_element = __ms_element_create(DEFAULT_FILTER, NULL);
                break;
        case MEDIA_STREAMER_NODE_TYPE_VIDEO_PAY:
                format_prefix = g_strdup_printf("%s:rtppay", __ms_convert_mime_to_string(mime));
@@ -180,14 +180,17 @@ int __ms_node_create(media_streamer_node_s *node, media_format_h in_fmt, media_f
        case MEDIA_STREAMER_NODE_TYPE_AUDIO_ENCODER:
                node->gst_element = __ms_audio_encoder_element_create();
                break;
+       case MEDIA_STREAMER_NODE_TYPE_AUDIO_DECODER:
+               node->gst_element = __ms_element_create(DEFAULT_AUDIO_DECODER, NULL);
+               break;
        case MEDIA_STREAMER_NODE_TYPE_VIDEO_CONVERTER:
-               node->gst_element = __ms_element_create("videoconvert", NULL);
+               node->gst_element = __ms_element_create(DEFAULT_VIDEO_CONVERT, NULL);
                break;
        case MEDIA_STREAMER_NODE_TYPE_AUDIO_CONVERTER:
-               node->gst_element = __ms_element_create("audioconvert", NULL);
+               node->gst_element = __ms_element_create(DEFAULT_AUDIO_CONVERT, NULL);
                break;
        case MEDIA_STREAMER_NODE_TYPE_AUDIO_RESAMPLE:
-               node->gst_element = __ms_element_create("audioresample", NULL);
+               node->gst_element = __ms_element_create(DEFAULT_AUDIO_RESAMPLE, NULL);
                break;
        default:
                ms_error("Error: invalid node Type [%d]", node->type);
@@ -484,16 +487,18 @@ static void _src_node_prepare(const GValue *item, gpointer user_data)
                }
 
                if (MS_ELEMENT_IS_VIDEO(new_pad_type) || MS_ELEMENT_IS_IMAGE(new_pad_type)) {
-                       found_element = __ms_combine_next_element(src_element, src_pad, ms_streamer->topology_bin, MEDIA_STREAMER_QUEUE_KLASS, NULL, DEFAULT_QUEUE);
+                       found_element = __ms_combine_next_element(src_element, src_pad, ms_streamer->topology_bin, NULL, NULL, DEFAULT_FILTER);
+                       GstCaps *videoCaps = gst_caps_from_string(MEDIA_STREAMER_DEFAULT_CAMERA_FORMAT);
+                       g_object_set(G_OBJECT(found_element), "caps", videoCaps,NULL);
+                       gst_caps_unref(videoCaps);
                        found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->topology_bin, MEDIA_STREAMER_BIN_KLASS, "video_encoder", NULL);
                        found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->topology_bin, MEDIA_STREAMER_PAYLOADER_KLASS, NULL, NULL);
                        found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->topology_bin, MEDIA_STREAMER_BIN_KLASS, "rtp_container", NULL);
                }
 
                if (MS_ELEMENT_IS_AUDIO(new_pad_type)) {
-                       found_element = __ms_combine_next_element(src_element, src_pad, ms_streamer->topology_bin, MEDIA_STREAMER_QUEUE_KLASS, NULL, DEFAULT_QUEUE);
-                       found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->topology_bin, MEDIA_STREAMER_BIN_KLASS, "audio_encoder", NULL);
-                       found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->topology_bin, MEDIA_STREAMER_PAYLOADER_KLASS, NULL, DEFAULT_AUDIO_RTPPAY);
+                       found_element = __ms_combine_next_element(src_element, src_pad, ms_streamer->topology_bin, MEDIA_STREAMER_BIN_KLASS, "audio_encoder", NULL);
+                       found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->topology_bin, MEDIA_STREAMER_PAYLOADER_KLASS, NULL, NULL);
                        found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->topology_bin, MEDIA_STREAMER_BIN_KLASS, "rtp_container", NULL);
                }
                __ms_generate_dots(ms_streamer->pipeline, "after_connecting_rtp");
@@ -821,7 +826,7 @@ int __ms_node_set_pad_format(media_streamer_node_s *node, const char *pad_name,
                if (!strcmp(pad_name, MS_RTP_PAD_VIDEO_IN"_rtp")) {
                        ret = media_format_get_video_info(fmt, &mime, NULL, NULL, NULL, NULL);
                        if (MEDIA_FORMAT_ERROR_NONE == ret) {
-                               rtp_caps_str = g_strdup_printf("application/x-rtp,media=video,clock-rate=90000,encoding-name=%s", __ms_convert_mime_to_rtp_format(mime));
+                               rtp_caps_str = g_strdup_printf("application/x-rtp,media=(string)video,clock-rate=(int)90000,encoding-name=%s", __ms_convert_mime_to_rtp_format(mime));
                                param_s param = {MEDIA_STREAMER_PARAM_VIDEO_IN_FORMAT, MEDIA_STREAMER_PARAM_VIDEO_IN_FORMAT};
                                ret = __ms_node_set_param_value(node, &param, rtp_caps_str);
                        }
@@ -829,7 +834,7 @@ int __ms_node_set_pad_format(media_streamer_node_s *node, const char *pad_name,
                        int audio_channels, audio_samplerate;
                        ret = media_format_get_audio_info(fmt, &mime, &audio_channels, &audio_samplerate, NULL, NULL);
                        if (MEDIA_FORMAT_ERROR_NONE == ret) {
-                               rtp_caps_str = g_strdup_printf("application/x-rtp,media=audio,clock-rate=%d,encoding-name=%s,channels=%d,payload=96", audio_samplerate, __ms_convert_mime_to_rtp_format(mime), audio_channels);
+                               rtp_caps_str = g_strdup_printf("application/x-rtp,media=(string)audio,clock-rate=(int)8000,encoding-name=(string)AMR,encoding-params=(string)1,octet-align=(string)1");
                                param_s param = {MEDIA_STREAMER_PARAM_AUDIO_IN_FORMAT, MEDIA_STREAMER_PARAM_AUDIO_IN_FORMAT};
                                ret = __ms_node_set_param_value(node, &param, rtp_caps_str);
                        }