Signed-off-by: Robert Schwebel <r.schwe...@pengutronix.de>
---
...-reset-the-have_index-flag-at-transition-.patch | 26 ------------
...-destroy-open-buffers-when-changing-to-NU.patch | 43 --------------------
patches/gst-plugins-good-0.10.23/series | 2 -
...-reset-the-have_index-flag-at-transition-.patch | 26 ++++++++++++
...-destroy-open-buffers-when-changing-to-NU.patch | 36 ++++++++++++++++
patches/gst-plugins-good-0.10.28/series | 1 +
rules/gst-plugins-good.make | 2 +-
7 files changed, 64 insertions(+), 72 deletions(-)
delete mode 100644
patches/gst-plugins-good-0.10.23/0001-gstavidemux-reset-the-have_index-flag-at-transition-.patch
delete mode 100644
patches/gst-plugins-good-0.10.23/0002-gstv4l2sink-destroy-open-buffers-when-changing-to-NU.patch
delete mode 100644 patches/gst-plugins-good-0.10.23/series
create mode 100644
patches/gst-plugins-good-0.10.28/0001-gstavidemux-reset-the-have_index-flag-at-transition-.patch
create mode 100644
patches/gst-plugins-good-0.10.28/0002-gstv4l2sink-destroy-open-buffers-when-changing-to-NU.patch
create mode 100644 patches/gst-plugins-good-0.10.28/series
diff --git
a/patches/gst-plugins-good-0.10.23/0001-gstavidemux-reset-the-have_index-flag-at-transition-.patch
b/patches/gst-plugins-good-0.10.23/0001-gstavidemux-reset-the-have_index-flag-at-transition-.patch
deleted file mode 100644
index 687f19e..0000000
---
a/patches/gst-plugins-good-0.10.23/0001-gstavidemux-reset-the-have_index-flag-at-transition-.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 15d09f55a687f5e5f26c5a5c7d9cabc36ee19512 Mon Sep 17 00:00:00 2001
-From: Michael Grzeschik <m.grzesc...@pengutronix.de>
-Date: Wed, 23 Jun 2010 12:15:13 +0200
-Subject: [PATCH 1/2] [gstavidemux] reset the have_index flag at transition
PAUSED_TO_READY
-
-If we restart the Stream in the case of doing a transition from
-PAUSED_TO_READY and back with READY_TO_PAUSED aso. the duration of the video
-will get calculated even if we have a avi header with that information.
-
-Signed-off-by: Michael Grzeschik <m.grzesc...@pengutronix.de>
----
- gst/avi/gstavidemux.c | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-Index: gst-plugins-good-0.10.23/gst/avi/gstavidemux.c
-===================================================================
---- gst-plugins-good-0.10.23.orig/gst/avi/gstavidemux.c 2010-06-23
17:36:48.000000000 +0200
-+++ gst-plugins-good-0.10.23/gst/avi/gstavidemux.c 2010-06-23
17:36:50.000000000 +0200
-@@ -5345,6 +5345,7 @@
-
- switch (transition) {
- case GST_STATE_CHANGE_PAUSED_TO_READY:
-+ avi->have_index = FALSE;
- gst_avi_demux_reset (avi);
- break;
- default:
diff --git
a/patches/gst-plugins-good-0.10.23/0002-gstv4l2sink-destroy-open-buffers-when-changing-to-NU.patch
b/patches/gst-plugins-good-0.10.23/0002-gstv4l2sink-destroy-open-buffers-when-changing-to-NU.patch
deleted file mode 100644
index b4b08f7..0000000
---
a/patches/gst-plugins-good-0.10.23/0002-gstv4l2sink-destroy-open-buffers-when-changing-to-NU.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 49e64005c4ed0a09ccf9ccb2b0e7521e64d21efd Mon Sep 17 00:00:00 2001
-From: Michael Grzeschik <m.grzesc...@pengutronix.de>
-Date: Wed, 23 Jun 2010 11:47:43 +0200
-Subject: [PATCH 2/2] [gstv4l2sink] destroy open buffers when changing to NULL
-
-In the case we change the State from READY_TO_NULL the open buffers
-still hold a open dup filedescriptor to the device, therefor the device
-release function will not be called and the device probably answer with
--EBUSY when we reopen it at transition NULL_TO_READY.
-
-Signed-off-by: Michael Grzeschik <m.grzesc...@pengutronix.de>
----
- sys/v4l2/gstv4l2sink.c | 10 +++-------
- 1 files changed, 3 insertions(+), 7 deletions(-)
-
-Index: gst-plugins-good-0.10.23/sys/v4l2/gstv4l2sink.c
-===================================================================
---- gst-plugins-good-0.10.23.orig/sys/v4l2/gstv4l2sink.c 2010-06-23
17:36:47.000000000 +0200
-+++ gst-plugins-good-0.10.23/sys/v4l2/gstv4l2sink.c 2010-06-23
17:36:55.000000000 +0200
-@@ -461,6 +461,8 @@
- }
- break;
- case GST_STATE_CHANGE_READY_TO_NULL:
-+ gst_v4l2_buffer_pool_destroy(v4l2sink->pool);
-+ v4l2sink->pool=NULL;
- /* close the device */
- if (!gst_v4l2_object_stop (v4l2sink->v4l2object))
- return GST_STATE_CHANGE_FAILURE;
-@@ -557,13 +559,7 @@
- }
-
- if (v4l2sink->pool) {
-- /* TODO: if we've already allocated buffers, we probably need to
-- * do something here to free and reallocate....
-- *
-- * gst_v4l2_object_stop_streaming()
-- * gst_v4l2_buffer_pool_destroy()
-- *
-- */
-+ gst_v4l2_object_stop_streaming(v4l2sink->v4l2object);
- GST_DEBUG_OBJECT (v4l2sink, "warning, changing caps not supported yet");
- return FALSE;
- }
diff --git a/patches/gst-plugins-good-0.10.23/series
b/patches/gst-plugins-good-0.10.23/series
deleted file mode 100644
index 8fcf4a2..0000000
--- a/patches/gst-plugins-good-0.10.23/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-gstavidemux-reset-the-have_index-flag-at-transition-.patch
-0002-gstv4l2sink-destroy-open-buffers-when-changing-to-NU.patch
diff --git
a/patches/gst-plugins-good-0.10.28/0001-gstavidemux-reset-the-have_index-flag-at-transition-.patch
b/patches/gst-plugins-good-0.10.28/0001-gstavidemux-reset-the-have_index-flag-at-transition-.patch
new file mode 100644
index 0000000..687f19e
--- /dev/null
+++
b/patches/gst-plugins-good-0.10.28/0001-gstavidemux-reset-the-have_index-flag-at-transition-.patch
@@ -0,0 +1,26 @@
+From 15d09f55a687f5e5f26c5a5c7d9cabc36ee19512 Mon Sep 17 00:00:00 2001
+From: Michael Grzeschik <m.grzesc...@pengutronix.de>
+Date: Wed, 23 Jun 2010 12:15:13 +0200
+Subject: [PATCH 1/2] [gstavidemux] reset the have_index flag at transition
PAUSED_TO_READY
+
+If we restart the Stream in the case of doing a transition from
+PAUSED_TO_READY and back with READY_TO_PAUSED aso. the duration of the video
+will get calculated even if we have a avi header with that information.
+
+Signed-off-by: Michael Grzeschik <m.grzesc...@pengutronix.de>
+---
+ gst/avi/gstavidemux.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+Index: gst-plugins-good-0.10.23/gst/avi/gstavidemux.c
+===================================================================
+--- gst-plugins-good-0.10.23.orig/gst/avi/gstavidemux.c 2010-06-23
17:36:48.000000000 +0200
++++ gst-plugins-good-0.10.23/gst/avi/gstavidemux.c 2010-06-23
17:36:50.000000000 +0200
+@@ -5345,6 +5345,7 @@
+
+ switch (transition) {
+ case GST_STATE_CHANGE_PAUSED_TO_READY:
++ avi->have_index = FALSE;
+ gst_avi_demux_reset (avi);
+ break;
+ default:
diff --git
a/patches/gst-plugins-good-0.10.28/0002-gstv4l2sink-destroy-open-buffers-when-changing-to-NU.patch
b/patches/gst-plugins-good-0.10.28/0002-gstv4l2sink-destroy-open-buffers-when-changing-to-NU.patch
new file mode 100644
index 0000000..fd17dba
--- /dev/null
+++
b/patches/gst-plugins-good-0.10.28/0002-gstv4l2sink-destroy-open-buffers-when-changing-to-NU.patch
@@ -0,0 +1,36 @@
+From 49e64005c4ed0a09ccf9ccb2b0e7521e64d21efd Mon Sep 17 00:00:00 2001
+From: Michael Grzeschik <m.grzesc...@pengutronix.de>
+Date: Wed, 23 Jun 2010 11:47:43 +0200
+Subject: [PATCH 2/2] [gstv4l2sink] destroy open buffers when changing to NULL
+
+In the case we change the State from READY_TO_NULL the open buffers
+still hold a open dup filedescriptor to the device, therefor the device
+release function will not be called and the device probably answer with
+-EBUSY when we reopen it at transition NULL_TO_READY.
+
+FIXME rsc: reworked for 0.10.23 -> 0.10.28, is this still necessary?
+
+Signed-off-by: Michael Grzeschik <m.grzesc...@pengutronix.de>
+---
+ sys/v4l2/gstv4l2sink.c | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+Index: gst-plugins-good-0.10.28/sys/v4l2/gstv4l2sink.c
+===================================================================
+--- gst-plugins-good-0.10.28.orig/sys/v4l2/gstv4l2sink.c
++++ gst-plugins-good-0.10.28/sys/v4l2/gstv4l2sink.c
+@@ -718,13 +718,7 @@ gst_v4l2sink_set_caps (GstBaseSink * bsi
+ }
+
+ if (v4l2sink->pool) {
+- /* TODO: if we've already allocated buffers, we probably need to
+- * do something here to free and reallocate....
+- *
+- * gst_v4l2_object_stop_streaming()
+- * gst_v4l2_buffer_pool_destroy()
+- *
+- */
++ gst_v4l2_object_stop_streaming(v4l2sink->v4l2object);
+ GST_DEBUG_OBJECT (v4l2sink, "warning, changing caps not supported yet");
+ return FALSE;
+ }
diff --git a/patches/gst-plugins-good-0.10.28/series
b/patches/gst-plugins-good-0.10.28/series
new file mode 100644
index 0000000..b6cb47b
--- /dev/null
+++ b/patches/gst-plugins-good-0.10.28/series
@@ -0,0 +1 @@
+0002-gstv4l2sink-destroy-open-buffers-when-changing-to-NU.patch
diff --git a/rules/gst-plugins-good.make b/rules/gst-plugins-good.make
index fe37382..75f134d 100644
--- a/rules/gst-plugins-good.make
+++ b/rules/gst-plugins-good.make
@@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_GST_PLUGINS_GOOD) += gst-plugins-good
#
# Paths and names
#
-GST_PLUGINS_GOOD_VERSION := 0.10.23
+GST_PLUGINS_GOOD_VERSION := 0.10.28
GST_PLUGINS_GOOD := gst-plugins-good-$(GST_PLUGINS_GOOD_VERSION)
GST_PLUGINS_GOOD_SUFFIX := tar.bz2
GST_PLUGINS_GOOD_URL :=
http://gstreamer.freedesktop.org/src/gst-plugins-good/$(GST_PLUGINS_GOOD).$(GST_PLUGINS_GOOD_SUFFIX)
--
1.7.2.3
--
ptxdist mailing list
ptxdist@pengutronix.de
