| Submitter | Anatolij Gustschin |
|---|---|
| Date | Nov. 29, 2011, 1:12 p.m. |
| Message ID | <1322572367-4246-1-git-send-email-agust@denx.de> |
| Download | mbox | patch |
| Permalink | /patch/15603/ |
| State | New |
| Headers | show |
Comments
On Tue, 2011-11-29 at 14:12 +0100, Anatolij Gustschin wrote: > Fix QML video player crash which happens when attempting > to play OGG video files. > > Signed-off-by: Anatolij Gustschin <agust@denx.de> > --- > ...stvideoconnector-fixed-buffers-allocation.patch | 32 ++++++++++++++++++++ > meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 3 +- > 2 files changed, 34 insertions(+), 1 deletions(-) > create mode 100644 meta/recipes-qt/qt4/files/0001-gstvideoconnector-fixed-buffers-allocation.patch Merged to master but please send patches against master in future. Cheers, Richard
Am Dienstag, den 29.11.2011, 13:47 +0000 schrieb Richard Purdie: > On Tue, 2011-11-29 at 14:12 +0100, Anatolij Gustschin wrote: > > Fix QML video player crash which happens when attempting > > to play OGG video files. > > > > Signed-off-by: Anatolij Gustschin <agust@denx.de> > > --- > > ...stvideoconnector-fixed-buffers-allocation.patch | 32 ++++++++++++++++++++ > > meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 3 +- > > 2 files changed, 34 insertions(+), 1 deletions(-) > > create mode 100644 meta/recipes-qt/qt4/files/0001-gstvideoconnector-fixed-buffers-allocation.patch > > Merged to master but please send patches against master in future. It looks like the patch file was not committed [1]. Could you also fix the patch header while fixing this up? That would be great. Thanks, Paul [1] http://git.openembedded.org/openembedded-core/commit/?id=aadca104f18eb1df7495ec24649042276be01985
On Tue, 29 Nov 2011 13:47:48 +0000 Richard Purdie <richard.purdie@linuxfoundation.org> wrote: > On Tue, 2011-11-29 at 14:12 +0100, Anatolij Gustschin wrote: > > Fix QML video player crash which happens when attempting > > to play OGG video files. > > > > Signed-off-by: Anatolij Gustschin <agust@denx.de> > > --- > > ...stvideoconnector-fixed-buffers-allocation.patch | 32 ++++++++++++++++++++ > > meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 3 +- > > 2 files changed, 34 insertions(+), 1 deletions(-) > > create mode 100644 meta/recipes-qt/qt4/files/0001-gstvideoconnector-fixed-buffers-allocation.patch > > Merged to master but please send patches against master in future. Thanks for merging and sorry about my not applicable patch. I'll base against master in future. I just pulled from master and noticed that the patch file 0001-gstvideoconnector-fixed-buffers-allocation.patch got lost while merging. Can you fix it or should I resend a proper patch. Thanks, Anatolij
On Tue, 2011-11-29 at 15:09 +0100, Anatolij Gustschin wrote: > On Tue, 29 Nov 2011 13:47:48 +0000 > Richard Purdie <richard.purdie@linuxfoundation.org> wrote: > > > On Tue, 2011-11-29 at 14:12 +0100, Anatolij Gustschin wrote: > > > Fix QML video player crash which happens when attempting > > > to play OGG video files. > > > > > > Signed-off-by: Anatolij Gustschin <agust@denx.de> > > > --- > > > ...stvideoconnector-fixed-buffers-allocation.patch | 32 ++++++++++++++++++++ > > > meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 3 +- > > > 2 files changed, 34 insertions(+), 1 deletions(-) > > > create mode 100644 meta/recipes-qt/qt4/files/0001-gstvideoconnector-fixed-buffers-allocation.patch > > > > Merged to master but please send patches against master in future. > > Thanks for merging and sorry about my not applicable patch. > I'll base against master in future. > > I just pulled from master and noticed that the patch file > 0001-gstvideoconnector-fixed-buffers-allocation.patch got lost > while merging. Can you fix it or should I resend a proper patch. I've fixed it, that was my fault when tried to fix the merge manually. Cheers, Richard
Patch
diff --git a/meta/recipes-qt/qt4/files/0001-gstvideoconnector-fixed-buffers-allocation.patch b/meta/recipes-qt/qt4/files/0001-gstvideoconnector-fixed-buffers-allocation.patch new file mode 100644 index 0000000..cea07c9 --- /dev/null +++ b/meta/recipes-qt/qt4/files/0001-gstvideoconnector-fixed-buffers-allocation.patch @@ -0,0 +1,32 @@ +From b308508b49afa9a129b4e4589c57cd107d1320b8 Mon Sep 17 00:00:00 2001 +From: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> +Date: Fri, 6 May 2011 10:35:11 +1000 +Subject: [PATCH] gstvideoconnector: fixed buffers allocation + +It should not be necessary, but at least theora video decoder doesn't +iniatilize *buf, while gst_pad_alloc_buffer relies on buf being NULL. + +Task-number: QTMOBILITY-1611 +Reviewed-by: Michael Goddard +--- + plugins/multimedia/gstreamer/gstvideoconnector.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/plugins/multimedia/gstreamer/gstvideoconnector.c b/plugins/multimedia/gstreamer/gstvideoconnector.c +index ddf68e0..9f8ceae 100644 +--- a/plugins/multimedia/gstreamer/gstvideoconnector.c ++++ b/plugins/multimedia/gstreamer/gstvideoconnector.c +@@ -186,6 +186,10 @@ gst_video_connector_buffer_alloc (GstPad * pad, guint64 offset, guint size, + GstFlowReturn res = GST_FLOW_OK; + element = GST_VIDEO_CONNECTOR (GST_PAD_PARENT (pad)); + ++ if (!buf) ++ return GST_FLOW_ERROR; ++ *buf = NULL; ++ + GST_OBJECT_LOCK (element); + gst_object_ref(element->srcpad); + GST_OBJECT_UNLOCK (element); +-- +1.7.4.1 + diff --git a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc index f665e64..bff6e61 100644 --- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc +++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc @@ -5,7 +5,8 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354" -SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.tar.gz " +SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.tar.gz \ + file://0001-gstvideoconnector-fixed-buffers-allocation.patch" SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8" SRC_URI[sha256sum]="ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44"
Fix QML video player crash which happens when attempting to play OGG video files. Signed-off-by: Anatolij Gustschin <agust@denx.de> --- ...stvideoconnector-fixed-buffers-allocation.patch | 32 ++++++++++++++++++++ meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 3 +- 2 files changed, 34 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-qt/qt4/files/0001-gstvideoconnector-fixed-buffers-allocation.patch