Remove set property of S/W H264 encoder and fix a bug in the condition of the if...

- There is not S/W H264 encoder in libav.
- The condition of if statement is a bug, it can never be true.

[Issue Type] Bug fix
[Version] 0.1.120

Change-Id: I92872e249f827ea80b251438f0db49effb0eb6ca
Signed-off-by: Hyunil <hyunil46.park@samsung.com>

diff --git a/packaging/capi-media-streamer.spec b/packaging/capi-media-streamer.spec
index 006d47d1533ad7298e5b2e09d3deb082f3df97be..00775439f9356374f7af6aafb0c88eefb02e7ef0 100644 (file)
--- a/packaging/capi-media-streamer.spec
+++ b/packaging/capi-media-streamer.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-streamer
 Summary:    A Media Streamer API
-Version:    0.1.119
+Version:    0.1.120
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/media_streamer_gst.c b/src/media_streamer_gst.c
index b706958b1df95970b877b623706f244e3629060d..ad593033c641d245ef74521f98674532e153dd50 100644 (file)
--- a/src/media_streamer_gst.c
+++ b/src/media_streamer_gst.c
@@ -1455,15 +1455,6 @@ static GstElement *__ms_video_encoder_element_create(node_plug_s *plug_info)
                if (!encoder_parser)
                        goto ERROR;
 
-               /* Settings if H264 format is set*/
-               if (encoder_type == 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);
-               }
-
                /* Adding elements to bin Video Encoder */
                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);

diff --git a/src/media_streamer_node.c b/src/media_streamer_node.c
index 8d4b1755aa9c11427e94f9ec6d710cb7a72dec1a..fda9041fb14b9093bd17c026c5cbbe5184584258 100644 (file)
--- a/src/media_streamer_node.c
+++ b/src/media_streamer_node.c
@@ -1971,7 +1971,7 @@ int ms_webrtc_node_check_link_condition(media_streamer_node_s *node, const char
                return MEDIA_STREAMER_ERROR_INVALID_OPERATION;
        }
 
-       if (!strcmp(direction, WEBRTC_RTP_TRANSCEIVER_DIRECTION_RECVONLY) &&
+       if (!strcmp(direction, WEBRTC_RTP_TRANSCEIVER_DIRECTION_RECVONLY) ||
                !strcmp(direction, WEBRTC_RTP_TRANSCEIVER_DIRECTION_INACTIVE)) {
                ms_error("Could not link to [%s] in %s", sink_pad_name, direction);
                return MEDIA_STREAMER_ERROR_INVALID_OPERATION;