Ubuntu
gst-plugins-bad1.0 package

Merge ~alfonsosanchezbeato/ubuntu/+source/gst-plugins-bad1.0:master into ~ubuntu-desktop/ubuntu/+source/gst-plugins-bad1.0:master

  1. Git
  2. lp:~alfonsosanchezbeato/ubuntu/+source/gst-plugins-bad1.0
  3. master
  4. Merge into master
Proposed by Alfonso Sanchez-Beato
Status: Merged
Merged at revision: 550e97b3267df1c6191cb098d5a907971bd1ce18
Proposed branch: ~alfonsosanchezbeato/ubuntu/+source/gst-plugins-bad1.0:master
Merge into: ~ubuntu-desktop/ubuntu/+source/gst-plugins-bad1.0:master
Diff against target: 159 lines (+28/-16)
2 files modified
debian/changelog (+6/-0)
debian/patches/adding-mirsink-and-android-media-over-hybris-support.patch (+22/-16)
Reviewer Review Type Date Requested Status
Ubuntu Desktop Pending
Review via email: mp+273509@code.launchpad.net

Description of the change

Release buffer pool when mirsinkg stops to avoid fd and memory leakage.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index e93177d..52dfc8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
1gst-plugins-bad1.0 (1.5.91-1ubuntu2) UNRELEASED; urgency=medium
2
3 * Release buffer pool when mirsink stops
4
5 -- Alfonso Sanchez-Beato (email Canonical) <alfonso.sanchez-beato@canonical.com> Tue, 06 Oct 2015 11:15:21 +0200
6
1gst-plugins-bad1.0 (1.5.91-1ubuntu1) wily; urgency=medium7gst-plugins-bad1.0 (1.5.91-1ubuntu1) wily; urgency=medium
28
3 * Merge with Debian experimental; remaining changes:9 * Merge with Debian experimental; remaining changes:
diff --git a/debian/patches/adding-mirsink-and-android-media-over-hybris-support.patch b/debian/patches/adding-mirsink-and-android-media-over-hybris-support.patch
index d574b0d..8b97d09 100644
--- a/debian/patches/adding-mirsink-and-android-media-over-hybris-support.patch
+++ b/debian/patches/adding-mirsink-and-android-media-over-hybris-support.patch
@@ -12,7 +12,7 @@ Forwarded: no
12 configure.ac | 15 +12 configure.ac | 15 +
13 ext/Makefile.am | 8 +13 ext/Makefile.am | 8 +
14 ext/mir/Makefile.am | 17 +14 ext/mir/Makefile.am | 17 +
15 ext/mir/gstmirsink.c | 848 ++++++++++15 ext/mir/gstmirsink.c | 854 ++++++++++
16 ext/mir/gstmirsink.h | 134 ++16 ext/mir/gstmirsink.h | 134 ++
17 ext/mir/mirpool.c | 434 +++++17 ext/mir/mirpool.c | 434 +++++
18 ext/mir/mirpool.h | 91 ++18 ext/mir/mirpool.h | 91 ++
@@ -34,7 +34,7 @@ Forwarded: no
34 tests/check/Makefile.am | 7 +34 tests/check/Makefile.am | 7 +
35 tests/check/pipelines/gstamcvideodec.c | 538 +++++++35 tests/check/pipelines/gstamcvideodec.c | 538 +++++++
36 tests/check/pipelines/gstamcvideodec_egl.c | 56 +36 tests/check/pipelines/gstamcvideodec_egl.c | 56 +
37 25 files changed, 8751 insertions(+), 6 deletions(-)37 25 files changed, 8757 insertions(+), 6 deletions(-)
38 create mode 100644 ext/mir/Makefile.am38 create mode 100644 ext/mir/Makefile.am
39 create mode 100644 ext/mir/gstmirsink.c39 create mode 100644 ext/mir/gstmirsink.c
40 create mode 100644 ext/mir/gstmirsink.h40 create mode 100644 ext/mir/gstmirsink.h
@@ -52,10 +52,10 @@ Forwarded: no
52 create mode 100644 tests/check/pipelines/gstamcvideodec_egl.c52 create mode 100644 tests/check/pipelines/gstamcvideodec_egl.c
5353
54diff --git a/configure.ac b/configure.ac54diff --git a/configure.ac b/configure.ac
55index 59566d4..96c0152 10064455index 1c06bed..54c2852 100644
56--- a/configure.ac56--- a/configure.ac
57+++ b/configure.ac57+++ b/configure.ac
58@@ -1591,6 +1591,18 @@ AG_GST_CHECK_FEATURE(ANDROID_MEDIA, [Android Media], androidmedia, [58@@ -1606,6 +1606,18 @@ AG_GST_CHECK_FEATURE(ANDROID_MEDIA, [Android Media], androidmedia, [
59 esac59 esac
60 ])60 ])
61 61
@@ -74,7 +74,7 @@ index 59566d4..96c0152 100644
74 dnl *** AppleMedia (OS X and iOS) ***74 dnl *** AppleMedia (OS X and iOS) ***
75 translit(dnm, m, l) AM_CONDITIONAL(USE_APPLE_MEDIA, true)75 translit(dnm, m, l) AM_CONDITIONAL(USE_APPLE_MEDIA, true)
76 HAVE_APPLE_MEDIA="no"76 HAVE_APPLE_MEDIA="no"
77@@ -3000,6 +3012,7 @@ AM_CONDITIONAL(DECKLINK_OSX, false)77@@ -3086,6 +3098,7 @@ AM_CONDITIONAL(DECKLINK_OSX, false)
78 AM_CONDITIONAL(USE_DIRECTFB, false)78 AM_CONDITIONAL(USE_DIRECTFB, false)
79 AM_CONDITIONAL(USE_WAYLAND, false)79 AM_CONDITIONAL(USE_WAYLAND, false)
80 AM_CONDITIONAL(USE_DAALA, false)80 AM_CONDITIONAL(USE_DAALA, false)
@@ -82,7 +82,7 @@ index 59566d4..96c0152 100644
82 AM_CONDITIONAL(USE_DTS, false)82 AM_CONDITIONAL(USE_DTS, false)
83 AM_CONDITIONAL(USE_EXIF, false)83 AM_CONDITIONAL(USE_EXIF, false)
84 AM_CONDITIONAL(USE_RESINDVD, false)84 AM_CONDITIONAL(USE_RESINDVD, false)
85@@ -3232,6 +3245,7 @@ gst-libs/gst/gl/egl/Makefile85@@ -3319,6 +3332,7 @@ gst-libs/gst/gl/egl/Makefile
86 gst-libs/gst/gl/wayland/Makefile86 gst-libs/gst/gl/wayland/Makefile
87 gst-libs/gst/gl/win32/Makefile87 gst-libs/gst/gl/win32/Makefile
88 gst-libs/gst/gl/x11/Makefile88 gst-libs/gst/gl/x11/Makefile
@@ -90,7 +90,7 @@ index 59566d4..96c0152 100644
90 gst-libs/gst/insertbin/Makefile90 gst-libs/gst/insertbin/Makefile
91 gst-libs/gst/interfaces/Makefile91 gst-libs/gst/interfaces/Makefile
92 gst-libs/gst/codecparsers/Makefile92 gst-libs/gst/codecparsers/Makefile
93@@ -3311,6 +3325,7 @@ ext/dc1394/Makefile93@@ -3398,6 +3412,7 @@ ext/dc1394/Makefile
94 ext/directfb/Makefile94 ext/directfb/Makefile
95 ext/wayland/Makefile95 ext/wayland/Makefile
96 ext/daala/Makefile96 ext/daala/Makefile
@@ -99,7 +99,7 @@ index 59566d4..96c0152 100644
99 ext/gl/Makefile99 ext/gl/Makefile
100 ext/gtk/Makefile100 ext/gtk/Makefile
101diff --git a/ext/Makefile.am b/ext/Makefile.am101diff --git a/ext/Makefile.am b/ext/Makefile.am
102index 66dccd6..e403264 100644102index 33ddba7..ee47a92 100644
103--- a/ext/Makefile.am103--- a/ext/Makefile.am
104+++ b/ext/Makefile.am104+++ b/ext/Makefile.am
105@@ -76,6 +76,12 @@ else105@@ -76,6 +76,12 @@ else
@@ -115,7 +115,7 @@ index 66dccd6..e403264 100644
115 if USE_DTS115 if USE_DTS
116 DTS_DIR=dts116 DTS_DIR=dts
117 else117 else
118@@ -457,6 +463,7 @@ SUBDIRS=\118@@ -464,6 +470,7 @@ SUBDIRS=\
119 $(LIBFAME_DIR) \119 $(LIBFAME_DIR) \
120 $(LIBMMS_DIR) \120 $(LIBMMS_DIR) \
121 $(LIBVISUAL_DIR) \121 $(LIBVISUAL_DIR) \
@@ -123,7 +123,7 @@ index 66dccd6..e403264 100644
123 $(MODPLUG_DIR) \123 $(MODPLUG_DIR) \
124 $(MPEG2ENC_DIR) \124 $(MPEG2ENC_DIR) \
125 $(MPG123_DIR) \125 $(MPG123_DIR) \
126@@ -507,6 +514,7 @@ DIST_SUBDIRS = \126@@ -514,6 +521,7 @@ DIST_SUBDIRS = \
127 dc1394 \127 dc1394 \
128 directfb \128 directfb \
129 wayland \129 wayland \
@@ -156,10 +156,10 @@ index 0000000..d588fc7
156+noinst_HEADERS =156+noinst_HEADERS =
157diff --git a/ext/mir/gstmirsink.c b/ext/mir/gstmirsink.c157diff --git a/ext/mir/gstmirsink.c b/ext/mir/gstmirsink.c
158new file mode 100644158new file mode 100644
159index 0000000..987117e159index 0000000..ca88ae3
160--- /dev/null160--- /dev/null
161+++ b/ext/mir/gstmirsink.c161+++ b/ext/mir/gstmirsink.c
162@@ -0,0 +1,848 @@162@@ -0,0 +1,854 @@
163+/*163+/*
164+ * GStreamer Mir video sink164+ * GStreamer Mir video sink
165+ * Copyright (C) 2013 Canonical Ltd165+ * Copyright (C) 2013 Canonical Ltd
@@ -791,6 +791,12 @@ index 0000000..987117e
791+791+
792+ GST_DEBUG_OBJECT (sink, "stop");792+ GST_DEBUG_OBJECT (sink, "stop");
793+793+
794+ /* The pool is not re-used so must be destroyed here */
795+ if (sink->pool) {
796+ gst_object_unref (sink->pool);
797+ sink->pool = NULL;
798+ }
799+
794+ /* MediaCodec (hybris layer) will destroy the underlying800+ /* MediaCodec (hybris layer) will destroy the underlying
795+ * SurfaceTextureClientHybris instance, * so set it to NULL here so that801+ * SurfaceTextureClientHybris instance, * so set it to NULL here so that
796+ * we don't point to an invalid instance.802+ * we don't point to an invalid instance.
@@ -2377,7 +2383,7 @@ index 5fcfb8f..2628a8a 100644
2377 libgstandroidmedia_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)2383 libgstandroidmedia_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
2378 libgstandroidmedia_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)2384 libgstandroidmedia_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
2379diff --git a/sys/androidmedia/gstamc-constants.h b/sys/androidmedia/gstamc-constants.h2385diff --git a/sys/androidmedia/gstamc-constants.h b/sys/androidmedia/gstamc-constants.h
2380index ae52464..f5bb86f 1006442386index cc43f61..8984f5a 100644
2381--- a/sys/androidmedia/gstamc-constants.h2387--- a/sys/androidmedia/gstamc-constants.h
2382+++ b/sys/androidmedia/gstamc-constants.h2388+++ b/sys/androidmedia/gstamc-constants.h
2383@@ -93,6 +93,8 @@ enum2389@@ -93,6 +93,8 @@ enum
@@ -2404,7 +2410,7 @@ index ae52464..f5bb86f 100644
2404 2410
2405 enum2411 enum
2406diff --git a/sys/androidmedia/gstamc.h b/sys/androidmedia/gstamc.h2412diff --git a/sys/androidmedia/gstamc.h b/sys/androidmedia/gstamc.h
2407index 88d49fb..567752e 1006442413index a3fb9bc..eda5278 100644
2408--- a/sys/androidmedia/gstamc.h2414--- a/sys/androidmedia/gstamc.h
2409+++ b/sys/androidmedia/gstamc.h2415+++ b/sys/androidmedia/gstamc.h
2410@@ -24,12 +24,67 @@2416@@ -24,12 +24,67 @@
@@ -8551,10 +8557,10 @@ index 0000000..cff94c4
8551+ return TRUE;8557+ return TRUE;
8552+}8558+}
8553diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am8559diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
8554index 295791b..1d42491 1006448560index 1e5c23a..90a2271 100644
8555--- a/tests/check/Makefile.am8561--- a/tests/check/Makefile.am
8556+++ b/tests/check/Makefile.am8562+++ b/tests/check/Makefile.am
8557@@ -211,6 +211,12 @@ else8563@@ -210,6 +210,12 @@ else
8558 check_gl=8564 check_gl=
8559 endif8565 endif
8560 8566

Subscribers

People subscribed via source and target branches