From ab82e07a29f07d30225ee18df17f6ecf6b0faf44 Mon Sep 17 00:00:00 2001 From: SeokHoon Lee Date: Tue, 13 Dec 2016 10:45:58 +0900 Subject: [PATCH] Delete unreached code and fix coding rule [Version] 0.2.214 [Profile] Common [Issue Type] coding rule [Dependency module] N/A [Test] [M(T) - Boot=(OK), sdb=(OK), Home=(OK), Touch=(OK), Version=tizen-mobile_20161212-2] Signed-off-by: SeokHoon Lee Change-Id: I93c21708ccb970222a6648170c0495a3b565e9ab --- packaging/libmm-wfd.spec | 6 +++++- src/mm_wfd_sink_priv.c | 17 ++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/packaging/libmm-wfd.spec b/packaging/libmm-wfd.spec index edd96cb..8300d77 100644 --- a/packaging/libmm-wfd.spec +++ b/packaging/libmm-wfd.spec @@ -1,6 +1,6 @@ Name: libmm-wfd Summary: Multimedia Framework Wifi-Display Library -Version: 0.2.213 +Version: 0.2.214 Release: 0 Group: System/Libraries License: Apache-2.0 @@ -22,13 +22,17 @@ BuildRequires: pkgconfig(libtbm) BuildRequires: pkgconfig(libtzplatform-config) BuildRequires: pkgconfig(capi-system-info) BuildRoot: %{_tmppath}/%{name}-%{version}-build + %description +A Wfd library in Tizen native API %package devel Summary: Multimedia Framework Wifi-Display Library (DEV) Group: Development/Libraries Requires: %{name} = %{version}-%{release} + %description devel +Development related files for a wfd library in Tizen native API %package factory Summary: Multimedia Framework Wifi-Display Library (Factory) diff --git a/src/mm_wfd_sink_priv.c b/src/mm_wfd_sink_priv.c index 35a96c1..10918fb 100644 --- a/src/mm_wfd_sink_priv.c +++ b/src/mm_wfd_sink_priv.c @@ -672,7 +672,7 @@ int __mm_wfd_sink_activate_video_stream(mm_wfd_sink_t *wfd_sink) if (gst_pad_is_linked(srcpad)) { wfd_sink_debug("%s is already linked", - GST_ELEMENT_NAME(GST_PAD_PARENT(sinkpad)), GST_PAD_NAME(sinkpad)); + GST_ELEMENT_NAME(GST_PAD_PARENT(srcpad)), GST_PAD_NAME(srcpad)); goto done; } @@ -3031,15 +3031,11 @@ static int __mm_wfd_sink_create_pipeline(mm_wfd_sink_t *wfd_sink) CREATE_ERROR: wfd_sink_error("ERROR : releasing pipeline"); - if (element_bucket) + if (element_bucket) { g_list_free(element_bucket); - element_bucket = NULL; - - /* finished */ - if (bus) { - gst_object_unref(GST_OBJECT(bus)); - bus = NULL; + element_bucket = NULL; } + /* release element which are not added to bin */ for (i = 1; i < WFD_SINK_M_NUM; i++) { /* NOTE : skip pipeline */ if (mainbin != NULL && mainbin[i].gst) { @@ -4028,11 +4024,10 @@ static int __mm_wfd_sink_prepare_videosink(mm_wfd_sink_t *wfd_sink, GstElement * } wfd_sink_debug("set video param : surface_id %d", wl_surface_id); - if(USE_EXTERNAL_WL_DISPLAY_HANDLE) { + if (USE_EXTERNAL_WL_DISPLAY_HANDLE) { gst_video_overlay_set_window_handle(GST_VIDEO_OVERLAY(video_sink), wl_surface_id); - } - else { + } else { gst_video_overlay_set_wl_window_wl_surface_id(GST_VIDEO_OVERLAY(video_sink), wl_surface_id); } -- 2.7.4