platform/upstream/gst-plugins-tizen.git
5 years agoRemove g_strdup for mem leakage 38/195938/3
SeokHoon LEE [Thu, 20 Dec 2018 01:02:19 +0000 (10:02 +0900)]
Remove g_strdup for mem leakage

- add const parameter of gst_wfd_message_set_coupled_sink

Change-Id: I7b8274816299e27646ef3774d03f69bd10e02a01
Signed-off-by: SeokHoon LEE <andy.shlee@samsung.com>
5 years agoMerge "pdpushsrc: remove unused plugin" into tizen accepted/tizen/unified/20181207.061513 submit/tizen/20181206.101556
eunhae choi [Thu, 6 Dec 2018 09:14:57 +0000 (09:14 +0000)]
Merge "pdpushsrc: remove unused plugin" into tizen

5 years agopdpushsrc: remove unused plugin 01/194601/1
Eunhae Choi [Thu, 6 Dec 2018 06:31:13 +0000 (15:31 +0900)]
pdpushsrc: remove unused plugin

Change-Id: I9ecdb73086863f03bedf6514276d77aa34828b16

5 years agoMerge "Add 'coupled-sink-ip' property on gstwfdsrc plugin." into tizen
SeokHoon LEE [Mon, 3 Dec 2018 08:42:28 +0000 (08:42 +0000)]
Merge "Add 'coupled-sink-ip' property on gstwfdsrc plugin." into tizen

5 years agoAdd 'coupled-sink-ip' property on gstwfdsrc plugin. 25/192125/14
Hyunsoo Park [Tue, 30 Oct 2018 06:01:54 +0000 (15:01 +0900)]
Add 'coupled-sink-ip' property on gstwfdsrc plugin.

It is step on developing Secondary Sink.
For making rtsp message and negotiating,
it is made.

Change-Id: I5cbf31acec4161e6e4872af0f3268848f2d7915c
Signed-off-by: Hyunsoo Park <hance.park@samsung.com>
5 years agoaudioeq: Adding initial structure for unittest 23/194223/2 accepted/tizen/unified/20181204.063734 submit/tizen/20181203.074443
Gilbok Lee [Fri, 30 Nov 2018 05:57:10 +0000 (14:57 +0900)]
audioeq: Adding initial structure for unittest

Change-Id: If9684c7a2a9b26cd1b410550dd322f33356fb8f3

5 years agoMerge "add unittest for video360" into tizen
Sejun Park [Fri, 30 Nov 2018 02:31:32 +0000 (02:31 +0000)]
Merge "add unittest for video360" into tizen

5 years agotizenwlsink: Add unittest 93/194093/4
Hyunil [Thu, 29 Nov 2018 03:43:45 +0000 (12:43 +0900)]
tizenwlsink: Add unittest

Change-Id: I026f0c0bf23f2b81f7f516ed3613399e9841a7b7
Signed-off-by: Hyunil <hyunil46.park@samsung.com>
5 years agoadd unittest for video360 20/194120/1
Sejun Park [Thu, 29 Nov 2018 07:31:42 +0000 (16:31 +0900)]
add unittest for video360

Change-Id: I09de3e8370d5476dc00313dee65693f54b17f108

5 years agoMerge "destroy EGLImage object after rendering" into tizen
Sejun Park [Tue, 27 Nov 2018 07:47:31 +0000 (07:47 +0000)]
Merge "destroy EGLImage object after rendering" into tizen

5 years agodestroy EGLImage object after rendering 36/193836/3
Sejun Park [Tue, 27 Nov 2018 02:36:41 +0000 (11:36 +0900)]
destroy EGLImage object after rendering

- The egl image must be destroyed after rendering,
  but eglDestroyImage() calling is missed in standard format rendering.

Change-Id: I2ee08f87564b8c0c2fe035b35953435ee72f4c8d

5 years agoAdding initial structure for unittest 67/193767/2
SeokHoon LEE [Mon, 26 Nov 2018 07:32:33 +0000 (16:32 +0900)]
Adding initial structure for unittest

Change-Id: Ib8b8b1681b824b39ab54aeafd95b6fbae24faebe
Signed-off-by: SeokHoon LEE <andy.shlee@samsung.com>
6 years agotizenwlsink : fix flush buffer finalize issue 34/193434/1 accepted/tizen/unified/20181123.165007 submit/tizen/20181121.005919
Hyunil [Tue, 20 Nov 2018 10:42:52 +0000 (19:42 +0900)]
tizenwlsink : fix flush buffer finalize issue

Change-Id: If94b1ee655a5f4a9c8b1e39547c9f2093fb00f65
Signed-off-by: Hyunil <hyunil46.park@samsung.com>
6 years agoremove build warning 87/190587/2 accepted/tizen/5.0/unified/20181102.025200 accepted/tizen/unified/20181005.012359 submit/tizen/20181004.053133 submit/tizen_5.0/20181101.000006
Sejun Park [Thu, 4 Oct 2018 04:25:49 +0000 (13:25 +0900)]
remove build warning

Change-Id: Ia859e1074778e493e5bfa1b8680f33360430c5c2

6 years ago[tizenipc] Change zero copy buffer handling 95/188895/11
Jeongmo Yang [Tue, 11 Sep 2018 10:55:24 +0000 (19:55 +0900)]
[tizenipc] Change zero copy buffer handling

[Version] 1.0.0-60
[Profile] Common
[Issue Type] Update
[Dependency module] N/A

Change-Id: Ia58644a4d9ca0b34157a93841e1b90e4b98fd263
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
6 years agopdpushsrc: fix svace issue 53/190353/1 accepted/tizen/unified/20181002.093246 submit/tizen/20181001.073938
Eunhae Choi [Mon, 1 Oct 2018 07:32:01 +0000 (16:32 +0900)]
pdpushsrc: fix svace issue

Change-Id: I13c966cc1dcfaa01fd8e8dce06bf6d8fbacc5f00

6 years agotizenwlsink: fix typo 21/189221/1
Hyunil [Fri, 14 Sep 2018 09:37:35 +0000 (18:37 +0900)]
tizenwlsink: fix typo

Change-Id: I230e0a995ffd7aaa0c21cf53619d617f5bd090ac
Signed-off-by: Hyunil <hyunil46.park@samsung.com>
6 years agotizenwlsink: Exclude gst_query_add_allocation_meta() if use_tbm is set 97/188997/2 accepted/tizen/unified/20180914.073124 submit/tizen/20180913.044709
Hyunil [Wed, 12 Sep 2018 09:29:41 +0000 (18:29 +0900)]
tizenwlsink: Exclude gst_query_add_allocation_meta() if use_tbm is set

Change-Id: I3de400328f522126b44acd506a57e17eb43ab621
Signed-off-by: Hyunil <hyunil46.park@samsung.com>
6 years agotizenwlsink: fix bug about setting flush_request 14/188414/2 accepted/tizen/unified/20180906.054549 submit/tizen/20180905.082859
Hyunil [Wed, 5 Sep 2018 01:53:47 +0000 (10:53 +0900)]
tizenwlsink: fix bug about setting flush_request

Change-Id: I52eb3634796166d34923f2c8c7ab081e53d86914
Signed-off-by: Hyunil <hyunil46.park@samsung.com>
6 years agotizenwlsink: Remove MMVideoBuffer and Make wl_buffer directly with tbm_surface from... 67/177467/16 accepted/tizen/unified/20180903.062529 submit/tizen/20180831.043334 submit/tizen/20180831.080817
Hyunil [Mon, 30 Apr 2018 08:12:20 +0000 (17:12 +0900)]
tizenwlsink: Remove MMVideoBuffer and Make wl_buffer directly with tbm_surface from tizen-memory

Change-Id: Iba2a08dbc37858377c7041ebd76f81c8814521b4
Signed-off-by: Hyunil <hyunil46.park@samsung.com>
6 years agoMerge "Uncover MMVideoBuffer in 'waylandsrc'." into tizen
SeokHoon Lee [Fri, 31 Aug 2018 04:38:33 +0000 (04:38 +0000)]
Merge "Uncover MMVideoBuffer in 'waylandsrc'." into tizen

6 years agoMerge "Apply tizen allocator to video360 plugin" into tizen
Sejun Park [Wed, 29 Aug 2018 07:19:17 +0000 (07:19 +0000)]
Merge "Apply tizen allocator to video360 plugin" into tizen

6 years agoUncover MMVideoBuffer in 'waylandsrc'. 21/183821/8
SeokHoon Lee [Wed, 11 Jul 2018 08:23:30 +0000 (17:23 +0900)]
Uncover MMVideoBuffer in 'waylandsrc'.

After this patch, without MMVideoBuffer, TBM is sended by GstBuffer.

Signed-off-by: SeokHoon Lee <andy.shlee@samsung.com>
Change-Id: I26782f1fe835f8e962fa52be1e8ea844c75ed99f

6 years agoAdd set_video_source_roi_area interface 33/187633/2
Hyunil [Mon, 27 Aug 2018 05:12:49 +0000 (14:12 +0900)]
Add set_video_source_roi_area interface

Change-Id: I7cd2e0dcaf4a6c6c362320f24619050144294def
Signed-off-by: Hyunil <hyunil46.park@samsung.com>
6 years agotizenwlsink: Add property for scaling video source coordinate 55/187555/7
Hyunil [Fri, 24 Aug 2018 04:44:27 +0000 (13:44 +0900)]
tizenwlsink: Add property for scaling video source coordinate

Change-Id: I715f3afb818c5ba7807fdfc46a2406291837332e
Signed-off-by: Hyunil <hyunil46.park@samsung.com>
6 years agoRemove render_rectangle interface 71/187171/1
Hyunil, Park [Mon, 20 Aug 2018 10:31:13 +0000 (19:31 +0900)]
Remove render_rectangle interface

Change-Id: I78dbe7d95262dcb4bfc2d92c5980c7e6cb37dede
Signed-off-by: Hyunil, Park <hyunil46.park@samsung.com>
6 years agoApply tizen allocator to video360 plugin 55/186855/3
Sejun Park [Thu, 16 Aug 2018 04:40:00 +0000 (13:40 +0900)]
Apply tizen allocator to video360 plugin

Change-Id: Ie449b4f5ca6570f5dbc9b9c792a8fd007c2b20f4

6 years ago[tizencamerasrc] Update color balance functions 12/186412/1 accepted/tizen/unified/20180813.061357 submit/tizen/20180810.054355
Jeongmo Yang [Thu, 9 Aug 2018 10:29:16 +0000 (19:29 +0900)]
[tizencamerasrc] Update color balance functions

[Version] 1.0.0-58
[Profile] Common
[Issue Type] Update
[Dependency module] N/A

Change-Id: Ia8d807ea1b495d2aebc5ea304a1b56bcdb15c0aa
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
6 years agotizenwlsink: Support gst_tizen_wl_sink_set_roi_area() newly instead of gst_tizen_wl_s... 51/185851/2 accepted/tizen/unified/20180810.062917 submit/tizen/20180808.000507 submit/tizen/20180808.090607 submit/tizen/20180808.235143 submit/tizen/20180809.081201
Hyunil [Fri, 3 Aug 2018 04:08:18 +0000 (13:08 +0900)]
tizenwlsink: Support gst_tizen_wl_sink_set_roi_area() newly instead of gst_tizen_wl_sink_set_render_rectangle()

Change-Id: I817b558352134c3aa90a447e8cffc696b509f080
Signed-off-by: Hyunil <hyunil46.park@samsung.com>
6 years agotizenwlsink: Add remove callback func to wayland registry listener 31/185531/1
Hyunil [Tue, 31 Jul 2018 09:21:50 +0000 (18:21 +0900)]
tizenwlsink: Add remove callback func to wayland registry listener

Change-Id: I6fa9ca405fc206792ebbd45096672ab2adc1901b
Signed-off-by: Hyunil <hyunil46.park@samsung.com>
6 years agoPrepare input I420 image to render video360 frame 84/180584/3 accepted/tizen/unified/20180802.134841 submit/tizen/20180731.025518
Vladislav Andresov [Thu, 31 May 2018 04:59:32 +0000 (07:59 +0300)]
Prepare input I420 image to render video360 frame

Change-Id: I3a69e88584fa1b997e8d3402df250ff0150a0508
Signed-off-by: Vladislav Andresov <v.andresov@partner.samsung.com>
6 years ago[tizencamerasrc] Apply changed parameter for camera_get_command 07/180607/1
Jeongmo Yang [Thu, 31 May 2018 06:46:49 +0000 (15:46 +0900)]
[tizencamerasrc] Apply changed parameter for camera_get_command

[Version] 1.0.0-58
[Profile] Common
[Issue Type] Update
[Dependency module] mm-hal-interface

Change-Id: I85602ce333fb0fdf47cc93e724b79394599bc823
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
6 years agotizenwlsink: Remove unreachable code 55/178255/1 accepted/tizen/unified/20180510.070759 submit/tizen/20180509.045804
Hyunil [Wed, 9 May 2018 04:52:17 +0000 (13:52 +0900)]
tizenwlsink: Remove unreachable code

Change-Id: I7fcd4ce04a346fc31bdbfd1e1cbc078aa40ea5af
Signed-off-by: Hyunil <hyunil46.park@samsung.com>
6 years agotizenwlsink: wlbuffer point check for mapping sub surface (fix coverity issue) 12/177712/1 accepted/tizen/unified/20180504.162619 submit/tizen/20180503.065531
Hyunil [Thu, 3 May 2018 06:28:49 +0000 (15:28 +0900)]
tizenwlsink: wlbuffer point check for mapping sub surface (fix coverity issue)

Change-Id: I40aac6a686da3dd36de77c9bb1c6228320434035
Signed-off-by: Hyunil <hyunil46.park@samsung.com>
6 years agoChange malloc to g_malloc 59/177159/8 accepted/tizen/unified/20180502.071211 submit/tizen/20180502.021759
SeokHoon Lee [Thu, 26 Apr 2018 04:10:37 +0000 (13:10 +0900)]
Change malloc to g_malloc

- malloc has changed to g_malloc
- add null check routine

Signed-off-by: SeokHoon Lee <andy.shlee@samsung.com>
Change-Id: Idb2eea4312092f519e35be167a9292d5ae462b1f

6 years ago[tizencamerasrc] Update build settings 36/177236/1
Jeongmo Yang [Thu, 26 Apr 2018 09:05:33 +0000 (18:05 +0900)]
[tizencamerasrc] Update build settings

- Remove camera_hal_interface.* sources from tizencamerasrc
- Change build requirement
- Remove unused dependency

[Version] 1.0.0-57
[Profile] Common
[Issue Type] Update
[Dependency module] mm-hal-interface

Change-Id: I36b4492b96e0342a4d581803ccba91fe8b07063a
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
6 years agotizenwlsink : remove unused code 01/176301/3
Hyunil [Wed, 18 Apr 2018 07:46:03 +0000 (16:46 +0900)]
tizenwlsink : remove unused code

Change-Id: I33bc6f8aed675ccae39990b37922d5dbe517ed00
Signed-off-by: Hyunil <hyunil46.park@samsung.com>
6 years ago[tizencamerasrc] Bug fix and update code 84/176284/4
Jeongmo Yang [Wed, 18 Apr 2018 05:32:13 +0000 (14:32 +0900)]
[tizencamerasrc] Bug fix and update code

[Version] 1.0.0-56
[Profile] Common
[Issue Type] Bug fix
[Dependency module] N/A

Change-Id: I74283e73e46aed06e8f138678cc01838a4ad07b9
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
6 years agoAdd build option for security issues 78/176378/2 accepted/tizen/unified/20180420.081810 submit/tizen/20180419.035601
Gilbok Lee [Thu, 19 Apr 2018 02:27:38 +0000 (11:27 +0900)]
Add build option for security issues

Change-Id: I1b33f3daa27b7d81ea24798e45e47992cf9ecb80

6 years agoChange enum for camera pixel format 08/175108/1
Jeongmo Yang [Mon, 9 Apr 2018 02:05:00 +0000 (11:05 +0900)]
Change enum for camera pixel format

- CAMERA_PIXEL_FORMAT_ENCODED_JPEG -> CAMERA_PIXEL_FORMAT_JPEG

[Version] 1.0.0-55
[Profile] Common
[Issue Type] Update
[Dependency module] mm-hal-interface

Change-Id: I7c749dcd8ac9eac46a2c6cb2217f08e04b3665fa
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
6 years agoAdd tizencamerasrc plugin, but disabled now. 72/174372/6
Jeongmo Yang [Fri, 30 Mar 2018 08:54:45 +0000 (17:54 +0900)]
Add tizencamerasrc plugin, but disabled now.

- It's a reference plugin to use tizen camera HAL interface.

[Version] 1.0.0-54
[Profile] Common
[Issue Type] Add
[Dependency module] N/A

Change-Id: Ia572295a8819b136de7a30af4c54b3148e0aae1a
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
6 years agotizenwlsink: Change ROI mode behavior for player and camera ROI precondition 52/174452/1 accepted/tizen/unified/20180404.063337 submit/tizen/20180403.040903
Hyunil [Mon, 2 Apr 2018 07:30:24 +0000 (16:30 +0900)]
tizenwlsink: Change ROI mode behavior for player and camera ROI precondition

Change-Id: Ic68169a0b19035b87b779ec0a40e2471f4bd7a42
Signed-off-by: Hyunil <hyunil46.park@samsung.com>
6 years agotizenwlsink: Add necessary new code from upgraded gstreamer 1.12 07/173407/8 accepted/tizen/unified/20180327.055740 submit/tizen/20180326.045620
Hyunil [Wed, 21 Mar 2018 08:06:43 +0000 (17:06 +0900)]
tizenwlsink: Add necessary new code from upgraded gstreamer 1.12

Replace render_frame() to show_frame()
Add GstVideoMeta, gst_video_frame_map(), gst_tizen_wl_sink_create_pool(),
gst_wl_display_check_format_for_shm(), gst_wl_display_check_format_for_tbm() and some minor change

Change-Id: Id593fc9c1faf46096053ea28361a42c9baefe9e6
Signed-off-by: Hyunil <hyunil46.park@samsung.com>
6 years agotizenwlsink : Remove code about camera TCT which check g_objcet_new return value 93/172293/1 submit/tizen/20180313.070928
Hyunil [Tue, 13 Mar 2018 06:26:24 +0000 (15:26 +0900)]
tizenwlsink : Remove code about camera TCT which check g_objcet_new return value

Change-Id: Ibdab93543d89f3bdb8b70d64acf6681f3bcdbe18
Signed-off-by: Hyunil <hyunil46.park@samsung.com>
6 years agofixed issue when setting/getting properties 19/170319/2 accepted/tizen/unified/20180223.162223 submit/tizen/20180223.052213 submit/tizen/20180313.061156
Sejun Park [Mon, 19 Feb 2018 05:14:44 +0000 (14:14 +0900)]
fixed issue when setting/getting properties

Change-Id: I00dac338dd68a19438bb2ac6377d7811cda17b94

6 years agotizenwlsink : GST_TYPE_WL_DISPLAY type init for camera TCT 52/169452/2 submit/tizen/20180207.054743 submit/tizen/20180207.063706
Hyunil [Wed, 7 Feb 2018 02:26:34 +0000 (11:26 +0900)]
tizenwlsink : GST_TYPE_WL_DISPLAY type init for camera TCT

Change-Id: I59ed41e3465da4fd52e176cff1f9e9ca5d6ec2a8
Signed-off-by: Hyunil <hyunil46.park@samsung.com>
6 years agoMerge "tizenwlsink : Check non top-level window created by App for tbm memory allocat... accepted/tizen/unified/20180205.060431 submit/tizen/20180131.043457
Hyunil [Tue, 30 Jan 2018 01:31:03 +0000 (01:31 +0000)]
Merge "tizenwlsink : Check non top-level window created by App for tbm memory allocation" into tizen

6 years agotizenwlsink : Check non top-level window created by App for tbm memory allocation 04/168204/1
Hyunil [Thu, 25 Jan 2018 04:13:22 +0000 (13:13 +0900)]
tizenwlsink : Check non top-level window created by App for tbm memory allocation

Change-Id: I8375dfb37774782e9cc9ebfcbfdc9c242c0dd2c2
Signed-off-by: Hyunil <hyunil46.park@samsung.com>
6 years agofixed svace issues 72/166272/2 accepted/tizen/unified/20180115.074451 submit/tizen/20180112.101533
Sejun Park [Tue, 9 Jan 2018 05:57:27 +0000 (14:57 +0900)]
fixed svace issues

Change-Id: I4e8f1f3c4bb55dc65c22c80308a89b12f4f0c754

6 years agotizenwlsink : Check instance of object_type 94/166094/2 submit/tizen/20180108.034048
Hyunil [Mon, 8 Jan 2018 00:48:39 +0000 (09:48 +0900)]
tizenwlsink : Check instance of object_type

Change-Id: I4ab2944d8a9432a370279e2bd9fef9ce974fa17e
Signed-off-by: Hyunil <hyunil46.park@samsung.com>
6 years agotizenwlsink : Check bo numbers in MMVideBuffer to avoid error 78/164578/3
Hyunil [Wed, 20 Dec 2017 00:25:07 +0000 (09:25 +0900)]
tizenwlsink : Check bo numbers in MMVideBuffer to avoid error

Change-Id: I9ff2b752532a0d86982f196ff7859a5390afe2bc
Signed-off-by: Hyunil <hyunil46.park@samsung.com>
6 years agoEngage with TPL to prevent muse-server crash. Fix sink pad caps unref. 37/163637/3
Andriy Martynets [Tue, 12 Dec 2017 14:04:33 +0000 (16:04 +0200)]
Engage with TPL to prevent muse-server crash. Fix sink pad caps unref.

Change-Id: I8a5c21d44553edcc236e50f20d9000c944accdd2
Signed-off-by: Andriy Martynets <a.martynets@partner.samsung.com>
6 years agotizenwlsink : Change location of creating flush_buffer 21/163421/1 accepted/tizen/unified/20171212.171921 submit/tizen/20171212.053432
Hyunil [Mon, 11 Dec 2017 06:01:17 +0000 (15:01 +0900)]
tizenwlsink : Change location of creating flush_buffer

Change-Id: I65ac01dd6e70a0e3593f3817144885d0efd0c30f
Signed-off-by: Hyunil <hyunil46.park@samsung.com>
6 years agotizenwlsink : Add exception handling for flush_buffer 91/163191/1 accepted/tizen/unified/20171211.061352 submit/tizen/20171208.044417
Hyunil [Fri, 8 Dec 2017 01:27:42 +0000 (10:27 +0900)]
tizenwlsink : Add exception handling for flush_buffer

Change-Id: I9ab05d493c102214a7e63bcde27e7b932c9aade0
Signed-off-by: Hyunil <hyunil46.park@samsung.com>
6 years agotizenwlsink : change log level for crash analysis 57/163057/1
Hyunil [Thu, 7 Dec 2017 05:24:51 +0000 (14:24 +0900)]
tizenwlsink : change log level for crash analysis

Change-Id: Id3d6771756e134ba8330d4b38e6ab7c7b22609c9
Signed-off-by: Hyunil <hyunil46.park@samsung.com>
6 years agoRemove GstNetSim in alfec plugin. 02/162602/2 accepted/tizen/unified/20171205.060652 submit/tizen/20171204.101050
Hyunsoo Park [Mon, 4 Dec 2017 10:03:06 +0000 (19:03 +0900)]
Remove GstNetSim in alfec plugin.

GstNetSim plugins goes to gst-plugins-bad. So it is duplicated gst-plugins-tizen and gst-plugins-bad.
So i removed GstNetSim in gst-plugins-tizen.

Change-Id: I7e9c633bfcdcc84e0562a575b7689f7a530e8164
Signed-off-by: Hyunsoo Park <hance.park@samsung.com>
6 years agotizenwlsink: fix SVACE issue (strerror) 80/161880/1 accepted/tizen/unified/20171128.150427 submit/tizen/20171128.060207
Hyunil [Tue, 28 Nov 2017 05:39:04 +0000 (14:39 +0900)]
tizenwlsink: fix SVACE issue (strerror)
Signed-off-by: Hyunil <hyunil46.park@samsung.com>
Change-Id: I59f6a31f6300901766b98e8c0ca5a1b18ac7d07e

6 years agoMerge "fixed svace issues" into tizen
Sejun Park [Tue, 28 Nov 2017 05:14:03 +0000 (05:14 +0000)]
Merge "fixed svace issues" into tizen

6 years agotizenwlsink: fix g_assert issue and modify gstbuffer for flush_buffer destroy process 10/161410/3 accepted/tizen/unified/20171124.064643 submit/tizen/20171123.113730
Hyunil [Thu, 23 Nov 2017 08:17:45 +0000 (17:17 +0900)]
tizenwlsink: fix g_assert issue and modify gstbuffer for flush_buffer destroy process

Change-Id: I61ea99db8186c38bd0e1f6b2ff95c3e07e1978d1
Signed-off-by: Hyunil <hyunil46.park@samsung.com>
7 years agotizenwlsink : restrict use of wayland buffer pool 30/161030/1 submit/tizen/20171121.080556
Hyunil [Tue, 21 Nov 2017 06:26:50 +0000 (15:26 +0900)]
tizenwlsink : restrict use of wayland buffer pool

Change-Id: I9924c6322f1feda3b27f296534d43ffee3dac4ee
Signed-off-by: Hyunil <hyunil46.park@samsung.com>
7 years agofixed svace issues 90/160590/1
Sejun Park [Fri, 17 Nov 2017 05:18:11 +0000 (14:18 +0900)]
fixed svace issues

Change-Id: If62e7e710f15410eab88735015301c21a418c22b

7 years agotizenwlsink : change type and function name 61/160061/1 accepted/tizen/unified/20171115.061238 submit/tizen/20171114.004442 submit/tizen/20171115.013055
Hyunil [Tue, 14 Nov 2017 09:11:03 +0000 (18:11 +0900)]
tizenwlsink : change type and function name

Change-Id: Id275fec91a931e1a490f48392c722660de292f81
Signed-off-by: Hyunil <hyunil46.park@samsung.com>
7 years agotizenwlsink: get source from gst-plugins-bad/ext/wayland and create new tizen wayland... 66/159466/3 submit/tizen/20171110.011647 submit/tizen/20171113.003957
Hyunil [Thu, 9 Nov 2017 05:51:36 +0000 (14:51 +0900)]
tizenwlsink: get source from gst-plugins-bad/ext/wayland and create new tizen wayland video sink

Change-Id: Id60188662450ac0c142b19ebff59df08fd4b9423
Signed-off-by: Hyunil <hyunil46.park@samsung.com>
7 years agoChange retry count to 20 69/158569/1 accepted/tizen/unified/20171107.055236 submit/tizen/20171106.095409
SeokHoon Lee [Thu, 2 Nov 2017 02:00:39 +0000 (11:00 +0900)]
Change retry count to 20

- Retry count is too big so change standard rtsp retry
  count.

Signed-off-by: SeokHoon Lee <andy.shlee@samsung.com>
Change-Id: I31c6e007236f40ed7826a1cdc553668506e3e051

7 years agoVideo360 plugin implementation added 32/152632/10 accepted/tizen/unified/20171031.055717 submit/tizen/20171030.055657
Andriy Martynets [Tue, 26 Sep 2017 15:41:31 +0000 (18:41 +0300)]
Video360 plugin implementation added

Change-Id: I893ed0a2c35e735fe3476b5d0278dde21228a2fe
Signed-off-by: Andriy Martynets <a.martynets@partner.samsung.com>
7 years agofix resource leak in RTSP_ERROR case 31/156031/2 accepted/tizen/unified/20171018.062610 submit/tizen/20171017.080630
SeokHoon Lee [Tue, 17 Oct 2017 04:32:09 +0000 (13:32 +0900)]
fix resource leak in RTSP_ERROR case

- add g_object_unref in RTSP_ERROR case.
- set wfd_msg to NULL after message_free for avoid double free
  in error case.

Signed-off-by: SeokHoon Lee <andy.shlee@samsung.com>
Change-Id: Ieab1eea9c33512bcc60d20666e6bd59ecdec2692

7 years agoChange macro to do{}while 61/153361/1
SeokHoon Lee [Thu, 28 Sep 2017 08:55:49 +0000 (17:55 +0900)]
Change macro to do{}while

- Change macro FREE_STRING and REPLACE_STRING to
  do { } while(0)  for single line use.
- valiable data change to tmpdata.

Signed-off-by: SeokHoon Lee <andy.shlee@samsung.com>
Change-Id: Iba10bc47f47c819f90e12d673ca556df5871b16e

7 years agoMerge "Removed TM1 kernel dependency" into tizen accepted/tizen/unified/20170913.071411 submit/tizen/20170912.080330
SeokHoon Lee [Tue, 12 Sep 2017 06:26:55 +0000 (06:26 +0000)]
Merge "Removed TM1 kernel dependency" into tizen

7 years agoModify while loop run always one time. 18/148618/3 accepted/tizen/4.0/unified/20170913.152906 submit/tizen_4.0/20170911.080400 tizen_4.0.IoT.p1_release
Hyunsoo [Fri, 8 Sep 2017 07:25:39 +0000 (16:25 +0900)]
Modify while loop run always one time.

In 'gst_wfd_message_get_contentprotection_type' api,
while loop which is always run one time logically. So i modified it.
    For testing,
    1. Make 'priv->protection_enabled' variable 'TRUE' which is in 'gst_rtsp_wfd_client_init' api.
    2. Unlock if statement for 'msg->content_protection' (if 0 -> 1).
    3. Find log in it on GST_LOG in sink.

Change-Id: Ib42635101bb46782bcb7edffc9a36b462ebcae22
Signed-off-by: Hyunsoo <hance.park@samsung.com>
7 years agoRemoved TM1 kernel dependency 95/147595/2
SeokHoon Lee [Tue, 5 Sep 2017 05:09:14 +0000 (14:09 +0900)]
Removed TM1 kernel dependency

Signed-off-by: SeokHoon Lee <andy.shlee@samsung.com>
Change-Id: I5a5ccda89923acf0ee80cc7634fe1301ff007569

7 years agoFix for build with UBSan 52/135452/2 accepted/tizen/unified/20170911.060222 submit/tizen/20170908.063614
Denis Khalikov [Thu, 22 Jun 2017 09:46:23 +0000 (12:46 +0300)]
Fix for build with UBSan

To prevent this kind of error:

gstwfdbasesrc.c: In function 'gst_wfd_base_src_get_vesa_resolution_and_set_to_src':
gstwfdbasesrc.c:4083:5: error: case label does not reduce to an integer constant
case GST_WFD_VESA_2560x1440P60:
     ^~~~

Change-Id: I0ee03e080ea8feff5ce4f93391172b0b084c11be
Signed-off-by: Denis Khalikov <d.khalikov@partner.samsung.com>
7 years agofix typo 61/142961/1
SeokHoon Lee [Tue, 8 Aug 2017 05:01:28 +0000 (14:01 +0900)]
fix typo

- udpsrc change to udpsink, it would have to be typo.

Signed-off-by: SeokHoon Lee <andy.shlee@samsung.com>
Change-Id: I6e1031e7726c666b71d66374aa159b50ce21d3fb

7 years agodirect streaming initial version 15/137215/3 accepted/tizen/4.0/unified/20170816.011852 accepted/tizen/4.0/unified/20170816.014959 accepted/tizen/4.0/unified/20170828.222506 accepted/tizen/unified/20170717.170249 submit/tizen/20170712.011946 submit/tizen/20170714.020023 submit/tizen_4.0/20170811.094300 submit/tizen_4.0/20170814.115522 submit/tizen_4.0/20170828.100005 submit/tizen_4.0_unified/20170814.115522
SeokHoon Lee [Wed, 5 Jul 2017 02:08:03 +0000 (11:08 +0900)]
direct streaming initial version

Signed-off-by: SeokHoon Lee <andy.shlee@samsung.com>
Change-Id: I4a952e862132e345dc5bae1536889c5f7bf99b0b

7 years agofixed memory leak 62/133762/2 accepted/tizen/unified/20170615.070936 submit/tizen/20170615.035550
Sejun Park [Tue, 13 Jun 2017 09:01:34 +0000 (18:01 +0900)]
fixed memory leak

Change-Id: I4a76a2a94d74cfb8d17b31cff4ffaff3b1cfa54b

7 years agoMerge "Fix typo in header" into tizen accepted/tizen/unified/20170608.072425 submit/tizen/20170608.033315
eunhae choi [Thu, 8 Jun 2017 03:31:59 +0000 (03:31 +0000)]
Merge "Fix typo in header" into tizen

7 years agoFix typo in header 43/127743/2
Slava Barinov [Fri, 28 Apr 2017 12:51:55 +0000 (15:51 +0300)]
Fix typo in header

Change-Id: I1784da839fbf2109103d7446960927cc3cd46fed
Signed-off-by: Slava Barinov <v.barinov@samsung.com>
7 years agoDisable tizenipcsrc/sink
Jeongmo Yang [Tue, 16 May 2017 04:08:10 +0000 (13:08 +0900)]
Disable tizenipcsrc/sink

[Version] 1.0.0-41
[Profile] Common
[Issue Type] Disable feature
[Dependency module] N/A

Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
7 years agoRemoving rtpresender module. 98/127198/1 accepted/tizen/unified/20170428.032525 submit/tizen/20170427.005848 tizen_4.0.m1_release
Hyunsoo, Park [Wed, 26 Apr 2017 11:02:03 +0000 (20:02 +0900)]
Removing rtpresender module.

When applying this patch, rtpresender is going to be removed.
Because of patent issue about rtpresender, we remove it.

[Version] 1.0.0-40
[Profile] Common
[Issue Type] Add feature
[Dependency module] platform/upstream/gst-rtsp-server (https://review.tizen.org/gerrit/127196)
[Test] [M(T) - Boot=(OK), sdb=(OK), Home=(OK), Touch=(OK), Version=tizen-mobile_20161111.1]

Change-Id: Id43577c7fb0850ed696696526e0bfc04736fd49c
Signed-off-by: Hyunsoo, Park <hance.park@samsung.com>
7 years agoaudioeq: update band when set filter_action 01/126601/1
Eunhae Choi [Mon, 24 Apr 2017 08:43:33 +0000 (17:43 +0900)]
audioeq: update band when set filter_action

Change-Id: I6969fa97bb985d744a7f74c642da7a2df228159a

7 years ago[Tizen] Fix 'Have choice' issue for TM1 64/121864/1 accepted/tizen_common accepted/tizen_ivi accepted/tizen_mobile accepted/tizen_tv accepted/tizen_wearable accepted/tizen/common/20170404.142400 accepted/tizen/ivi/20170403.130038 accepted/tizen/mobile/20170403.125656 accepted/tizen/tv/20170403.125834 accepted/tizen/unified/20170403.130128 accepted/tizen/wearable/20170403.125922 submit/tizen/20170403.050513
hk57.kim [Wed, 29 Mar 2017 08:22:19 +0000 (17:22 +0900)]
[Tizen] Fix 'Have choice' issue for TM1

- This is for Tizen 4.0.
- Fix buildrequires kernel-headers-tizen-dev --> kernel-headers-3.10-sc7730 for TM1

Change-Id: Id55d1c45e45cb51a903b6643e14c191a52daca8d
Signed-off-by: hk57.kim <hk57.kim@samsung.com>
7 years agopdpushsrc: merge branch tizen_3.0 to tizen 32/121832/1
Hyuntae, Kim [Tue, 8 Nov 2016 07:53:15 +0000 (16:53 +0900)]
pdpushsrc: merge branch tizen_3.0 to tizen

Change-Id: I939ada3add225aea09673f4a17f39105683413d7

7 years agoFix memory leak 57/121757/2
SeokHoon Lee [Wed, 29 Mar 2017 00:49:36 +0000 (09:49 +0900)]
Fix memory leak

- msg free in error case
- url0,url1 free after use

Signed-off-by: SeokHoon Lee <andy.shlee@samsung.com>
Change-Id: I9bfd4f481abd6b24ccc3df5f9990dd79bbf4d6cb

7 years agospec: Use %license macro to copy license 55/120355/6 accepted/tizen/common/20170328.140937 accepted/tizen/ivi/20170329.033019 accepted/tizen/mobile/20170329.032920 accepted/tizen/tv/20170329.032943 accepted/tizen/unified/20170329.033034 accepted/tizen/wearable/20170329.032953 submit/tizen/20170328.044727
Eunhae Choi [Wed, 22 Mar 2017 10:58:07 +0000 (19:58 +0900)]
spec: Use %license macro to copy license

- fix SVACE issue by Reviewer AEGIS

Change-Id: If8102bce9ca0de9ce422ad66292ec6c180188588

7 years ago[4.0] Remove Target_Name Dependency 28/113528/8
hk57.kim [Wed, 8 Feb 2017 05:28:47 +0000 (14:28 +0900)]
[4.0] Remove Target_Name Dependency

- This is for Tizen 4.0
- We are going to unify repositories as well as build projects.

- When you SR this, you need to create JIRA-TRE issue of:
  : add gst-plugins-tizen-extension-TM1 for TM1 (mobile)

(It's add, not replace.)

Change-Id: I98b7a5d14e875a36879744a9473dbb3b7a2dd38f
Signed-off-by: hk57.kim <hk57.kim@samsung.com>
7 years agoChange wfd message for video only mirroring 37/115837/10 accepted/tizen/common/20170303.090932 accepted/tizen/ivi/20170303.070310 accepted/tizen/mobile/20170303.070218 accepted/tizen/tv/20170303.070241 accepted/tizen/unified/20170309.035920 accepted/tizen/wearable/20170303.070251 submit/tizen/20170303.040910 submit/tizen_unified/20170308.100413
Hyunsoo, Park [Tue, 21 Feb 2017 11:25:20 +0000 (20:25 +0900)]
Change wfd message for video only mirroring

Using this patch, 'wfd-audio-formats' parameter have none parameter for video only sink.

Basically, screen mirroring provides video & audio simultaneously.
This patch will make screen mirroring to provide Video only.

-When Video only mirroring mode goes, it makes 'wfd_audio_codecs' messages to 'none'.

If 'sink session mode' in 'mmfw_wfd_sink.ini' is set '2',
screen mirroring runs without audio(that is, video only mirroring)

Change-Id: Ib71d7b1b9faacc2b98b9f6e3ae20c9bebac4d350
Signed-off-by: Hyunsoo, Park <hance.park@samsung.com>
7 years agofix memoryleak and unerflow 75/114575/1 accepted/tizen/common/20170214.173905 accepted/tizen/ivi/20170214.230155 accepted/tizen/mobile/20170214.230044 accepted/tizen/tv/20170214.230106 accepted/tizen/wearable/20170214.230128 submit/tizen/20170214.113450
SeokHoon Lee [Mon, 13 Feb 2017 06:02:56 +0000 (15:02 +0900)]
fix memoryleak and unerflow

Signed-off-by: SeokHoon Lee <andy.shlee@samsung.com>
Change-Id: Id3d760189f8bb32cf28f326eb07cd045016efcd0

7 years agoChange wfd message 32/113332/1
SeokHoon Lee [Tue, 7 Feb 2017 07:08:23 +0000 (16:08 +0900)]
Change wfd message

wfd-video-formats have none parameter for audio only sink

Signed-off-by: SeokHoon Lee <andy.shlee@samsung.com>
Change-Id: I9c4f4198a21c6ab7c02a8d2714a06f5bde0a2353

7 years agoAdd gst_caps_unref for assigned caps 98/108098/2 accepted/tizen/common/20170117.175045 accepted/tizen/ivi/20170118.041354 accepted/tizen/mobile/20170118.041252 accepted/tizen/tv/20170118.041314 accepted/tizen/wearable/20170118.041328 submit/tizen/20170117.102244
SeokHoon Lee [Tue, 3 Jan 2017 04:13:08 +0000 (13:13 +0900)]
Add gst_caps_unref for assigned caps

Signed-off-by: SeokHoon Lee <andy.shlee@samsung.com>
Change-Id: Ib2cf898af9492d7507685c3477d796131c9b22b6

7 years agoRemove unused plugins 59/107259/2
SeokHoon Lee [Tue, 27 Dec 2016 08:28:12 +0000 (17:28 +0900)]
Remove unused plugins
Signed-off-by: SeokHoon Lee <andy.shlee@samsung.com>
Change-Id: I84df2292350b4eb025886bf60708d37d7002e822

7 years agoAdd g_object_unref 29/107129/2 accepted/tizen/common/20161227.192515 accepted/tizen/ivi/20161227.091556 accepted/tizen/mobile/20161227.091458 accepted/tizen/tv/20161227.091514 accepted/tizen/wearable/20161227.091534 submit/tizen/20161227.042615
SeokHoon Lee [Tue, 27 Dec 2016 00:51:05 +0000 (09:51 +0900)]
Add g_object_unref

 add g_object_unre for assigned item by gst_element_get_clock

Signed-off-by: SeokHoon Lee <andy.shlee@samsung.com>
Change-Id: I9c43760d93959c77807e188d232f303813f9c9f3

7 years agoAdd gst_object_unref in case of pad assigned by gst_element_get_static_pad/gst_elemen... 87/105887/3
SeokHoon Lee [Mon, 19 Dec 2016 07:01:44 +0000 (16:01 +0900)]
Add gst_object_unref in case of pad assigned by gst_element_get_static_pad/gst_element_get_static_pad

[Version] 1.0.0
[Profile] Common
[Issue Type] Bug fix
[Dependency module] N/A
[Test] [M(T) - Boot=(OK), sdb=(OK), Home=(OK), Touch=(OK), Version=tizen-3.0-mobile_20161219.2]

Signed-off-by: SeokHoon Lee <andy.shlee@samsung.com>
Change-Id: I9cb13eaac3968bbbc12ce355e66045b735050d6b

7 years ago[encodebin] Remove unused function 01/105601/1
Jeongmo Yang [Mon, 19 Dec 2016 05:51:28 +0000 (14:51 +0900)]
[encodebin] Remove unused function

[Version] 1.0.0-33
[Profile] Common
[Issue Type] Clean up
[Dependency module] N/A

Change-Id: I710775ffa7a60cb629b1d8312027cc0dbe6f5dbb
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
7 years agoModify spell 'prefered' to 'preferred' 65/101065/2 accepted/tizen/common/20161214.160635 accepted/tizen/ivi/20161214.015334 accepted/tizen/mobile/20161214.014942 accepted/tizen/tv/20161214.015015 accepted/tizen/wearable/20161214.015212 submit/tizen/20161213.083228
Hyunsoo, Park [Wed, 30 Nov 2016 07:55:33 +0000 (16:55 +0900)]
Modify spell 'prefered' to 'preferred'

[Version] 1.0.0-32
[Profile] Common
[Issue Type] Modify mispelling api name
[Dependency module] N/A
[Test] [M(T) - Boot=(OK), sdb=(OK), Home=(OK), Touch=(OK), Version=tizen-mobile_20161111.1]

Change-Id: I5a7256ec75e75196dddcfdd394cc9ba8c982e1e0
Signed-off-by: Hyunsoo, Park <hance.park@samsung.com>
7 years agoAdd 'TCP/UDP Switching' feature 86/99486/4 accepted/tizen/common/20161129.173641 accepted/tizen/ivi/20161130.015443 accepted/tizen/mobile/20161130.015223 accepted/tizen/tv/20161130.015250 accepted/tizen/wearable/20161130.015339 submit/tizen/20161129.052917
Hyunsoo, Park [Wed, 23 Nov 2016 04:52:07 +0000 (13:52 +0900)]
Add 'TCP/UDP Switching' feature

Using this feature, User can choose transport layer protocol between TCP and UDP.

[Version] 1.0.0-31
[Profile] Common
[Issue Type] Add feature
[Dependency module] N/A
[Test] [M(T) - Boot=(OK), sdb=(OK), Home=(OK), Touch=(OK), Version=tizen-mobile_20161111.1]

Change-Id: I248acdc0fb826d8f00dc8265a3843ba160e66977
Signed-off-by: Hyunsoo, Park <hance.park@samsung.com>
8 years agoModify function because of return type 01/98501/5 accepted/tizen/common/20161122.192953 accepted/tizen/ivi/20161122.235947 accepted/tizen/mobile/20161122.235732 accepted/tizen/tv/20161122.235817 accepted/tizen/wearable/20161122.235853 submit/tizen/20161122.044017
Hyunsoo, Park [Thu, 17 Nov 2016 11:12:55 +0000 (20:12 +0900)]
Modify function because of return type

gstwfdbasesrc.c
- modify 'g_return_if_fail' to 'g_return_val_if_fail' because return type of 'gst_wfd_base_src_get_streaminfo' function is 'GstRTSPResult'.

Add free function of 'datatmp' & delete unreachable code

gstwfdextsrc.c
- modify memory leak of 'datatmp' variable. If program doesn't go inside of 'if' statement in line 1952, there is any free function of 'datatmp'.
  So i added it last of 'gst_wfd_ext_src_loop_tcp' function.
- delete unreachable codes. When 'body' variable is not NULL, we can reach line 880. But after that there is if statement which can go when body is NULL. In my opinion, it is unreachable codes. So i deleted those.

[Version] 1.0.0-30
[Profile] Common
[Issue Type] Bug fix
[Dependency module] N/A
[Test] [M(T) - Boot=(OK), sdb=(OK), Home=(OK), Touch=(OK), Version=tizen-mobile_20161101.3]
Change-Id: Ifaab0440056acc2068873683b6f2f63e0faae482
Signed-off-by: Hyunsoo, Park <hance.park@samsung.com>
8 years agoencodebin - Fix video recording resume failure 44/97944/1
Jeongmo Yang [Tue, 15 Nov 2016 11:21:49 +0000 (20:21 +0900)]
encodebin - Fix video recording resume failure

Since GStreamer 1.0, GST_BUFFER_DTS is used with GST_BUFFER_PTS(GST_BUFFER_TIMESTAMP),
but, GST_BUFFER_DTS is not updated in encodebin.
It causes the failure on muxer when resume recording.

[Version] 1.0.0-29
[Profile] Common
[Issue Type] Bug fix
[Dependency module] N/A
[Test] [M(T) - Boot=(OK), sdb=(OK), Home=(OK), Touch=(OK), Version=tizen-3.0-mobile_20161114.3]

Change-Id: Ia58f53a7215162d739845d5368275c77595a67c4
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
8 years agoMerge "Add AL-FEC feature" into tizen accepted/tizen/common/20161115.200723 accepted/tizen/ivi/20161115.234317 accepted/tizen/mobile/20161115.234106 accepted/tizen/tv/20161115.234214 accepted/tizen/wearable/20161115.234246 submit/tizen/20161115.062308
SeokHoon LEE [Mon, 14 Nov 2016 01:19:19 +0000 (17:19 -0800)]
Merge "Add AL-FEC feature" into tizen

8 years agoAdd AL-FEC feature 13/94313/10
Hyunsoo, Park [Fri, 28 Oct 2016 06:58:43 +0000 (15:58 +0900)]
Add AL-FEC feature

[Version] 1.6.1
[Profile] Common
[Issue Type] Add feature
[Dependency module] N/A
[Depends-on] https://review.tizen.org/gerrit/#/c/94310/ (Change-Id: I534d3acf3aa5f0114c2282b3ea80a7b0f51216cc)
[Test] [M(T) - Boot=(OK), sdb=(OK), Home=(OK), Touch=(OK), Version=tizen-mobile_20161025.2]

Change-Id: Iec3ba16bd8b61b96415e39126e25c4286cd02dc4
Signed-off-by: Hyunsoo, Park <hance.park@samsung.com>
8 years agoAdd notification parameter of screenshot event listener 46/96146/3 accepted/tizen/common/20161110.190216 accepted/tizen/ivi/20161111.001933 accepted/tizen/mobile/20161111.001834 accepted/tizen/tv/20161111.001852 accepted/tizen/wearable/20161111.001912 submit/tizen/20161110.060946
Hyunsoo, Park [Tue, 8 Nov 2016 04:41:21 +0000 (13:41 +0900)]
Add notification parameter of screenshot event listener

[Version] 1.0.0.28
[Profile] Common
[Issue Type] Add parameter of event listener
[Dependency module] N/A
[Test] [M(T) - Boot=(OK), sdb=(OK), Home=(OK), Touch=(OK), Version=tizen-mobile_20161101.3]

Change-Id: If1250e10dde6925ca658ab5cf44d0d64d2e46be0
Signed-off-by: Hyunsoo, Park <hance.park@samsung.com>
8 years agoremove evasimagesink 95/95395/1 accepted/tizen/common/20161109.140313 accepted/tizen/ivi/20161109.002851 accepted/tizen/mobile/20161109.002612 accepted/tizen/tv/20161109.002722 accepted/tizen/wearable/20161109.002806 submit/tizen/20161108.054351
NAMJEONGYOON [Thu, 3 Nov 2016 06:06:49 +0000 (15:06 +0900)]
remove evasimagesink

Change-Id: Ie5f131cfe5ab3fdc628b92a1259b461cd8d4eb7d