From 904354a23d8bc32a9e14e29c393713fda4b90d6f Mon Sep 17 00:00:00 2001 From: SeokHoon LEE Date: Mon, 21 Jan 2019 10:58:19 +0900 Subject: [PATCH] Fix misordered parameter, Height <-> Width - Change mis ordered parameter. - Add failure log for getsockopt Change-Id: I75806d83e44142430dc58a1ae0ee36bd4d45b141 Signed-off-by: SeokHoon LEE --- gst/rtsp-server/rtsp-client-wfd.c | 8 ++++++-- packaging/gst-rtsp-server.spec | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gst/rtsp-server/rtsp-client-wfd.c b/gst/rtsp-server/rtsp-client-wfd.c index 96cb419..f7ea3d1 100644 --- a/gst/rtsp-server/rtsp-client-wfd.c +++ b/gst/rtsp-server/rtsp-client-wfd.c @@ -1271,7 +1271,11 @@ tcp_retry: if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &bsize, (socklen_t)rn) < 0) { GST_ERROR_OBJECT(client, "setsockopt failed"); } else { - getsockopt(fd, SOL_SOCKET, SO_SNDBUF, &bsize, (socklen_t *)&rn); + if (getsockopt(fd, SOL_SOCKET, SO_SNDBUF, &bsize, (socklen_t *)&rn) < 0) { + char buf[256] = {0, }; + strerror_r(errno, buf, sizeof(buf)); + GST_ERROR_OBJECT(client, "getsockopt failed : [%s]", buf); + } GST_WARNING_OBJECT(client, "New Send buf size : %d\n", bsize); } @@ -2571,7 +2575,7 @@ _set_wfd_message_body (GstRTSPWFDClient * client, GstWFDMessageType msg_type, priv->direct_detected_video_codec, priv->video_native_resolution, GST_WFD_CEA_UNKNOWN, tcCEAResolution, tcVESAResolution, tcHHResolution, tcProfile, tcLevel, priv->cvLatency, - priv->cMaxWidth, priv->cMaxHeight, priv->cmin_slice_size, + priv->cMaxHeight, priv->cMaxWidth, priv->cmin_slice_size, priv->cslice_enc_params, priv->cframe_rate_control); if (wfd_res != GST_WFD_OK) { diff --git a/packaging/gst-rtsp-server.spec b/packaging/gst-rtsp-server.spec index c073b90..9c9abf9 100644 --- a/packaging/gst-rtsp-server.spec +++ b/packaging/gst-rtsp-server.spec @@ -1,7 +1,7 @@ Name: gst-rtsp-server Summary: Multimedia Framework Library Version: 1.12.2 -Release: 7 +Release: 8 Url: http://gstreamer.freedesktop.org/ Group: System/Libraries License: LGPL-2.0+ -- 2.7.4