diff options
| author | Wang Zidan <b50113@freescale.com> | 2014-08-07 09:50:23 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-11 10:53:07 +0100 |
| commit | c8aba32fe99c22381fa379d5c52d3dcaef917db0 (patch) | |
| tree | 35718562d0481603f31293a4c5b3e24841375236 /meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good | |
| parent | b88b5b7c8d5e60a73b6bd1fa4b3c0b7dc45c9892 (diff) | |
| download | poky-c8aba32fe99c22381fa379d5c52d3dcaef917db0.tar.gz | |
gstreamer1.0-plugins-good: fix the bug for gstrtpmp4gpay
set dafault value for MPEG4 without codec data in caps
https://bugzilla.gnome.org/show_bug.cgi?id=734263
(From OE-Core rev: fe4dc1d30eea723361a0f88109717d8a70b2b17d)
Signed-off-by: Wang Zidan <b50113@freescale.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good')
| -rwxr-xr-x | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-gstrtpmp4gpay-set-dafault-value-for-MPEG4-without-co.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-gstrtpmp4gpay-set-dafault-value-for-MPEG4-without-co.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-gstrtpmp4gpay-set-dafault-value-for-MPEG4-without-co.patch new file mode 100755 index 0000000000..53147df42b --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-gstrtpmp4gpay-set-dafault-value-for-MPEG4-without-co.patch | |||
| @@ -0,0 +1,62 @@ | |||
| 1 | From c782a30482908a4b4dd9cd4abff9f9bc4016698f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Song Bing <b06498@freescale.com> | ||
| 3 | Date: Tue, 5 Aug 2014 14:40:46 +0800 | ||
| 4 | Subject: [PATCH] gstrtpmp4gpay: set dafault value for MPEG4 without codec | ||
| 5 | data in caps. | ||
| 6 | |||
| 7 | https://bugzilla.gnome.org/show_bug.cgi?id=734263 | ||
| 8 | |||
| 9 | Upstream Status: Submitted | ||
| 10 | |||
| 11 | Signed-off-by: Song Bing <b06498@freescale.com> | ||
| 12 | --- | ||
| 13 | gst/rtp/gstrtpmp4gpay.c | 19 ++++++++++++++++++- | ||
| 14 | 1 file changed, 18 insertions(+), 1 deletion(-) | ||
| 15 | |||
| 16 | diff --git a/gst/rtp/gstrtpmp4gpay.c b/gst/rtp/gstrtpmp4gpay.c | ||
| 17 | index 7913d9a..1749d39 100644 | ||
| 18 | --- a/gst/rtp/gstrtpmp4gpay.c | ||
| 19 | +++ b/gst/rtp/gstrtpmp4gpay.c | ||
| 20 | @@ -390,6 +390,7 @@ gst_rtp_mp4g_pay_setcaps (GstRTPBasePayload * payload, GstCaps * caps) | ||
| 21 | const GValue *codec_data; | ||
| 22 | const gchar *media_type = NULL; | ||
| 23 | gboolean res; | ||
| 24 | + const gchar *name; | ||
| 25 | |||
| 26 | rtpmp4gpay = GST_RTP_MP4G_PAY (payload); | ||
| 27 | |||
| 28 | @@ -400,7 +401,6 @@ gst_rtp_mp4g_pay_setcaps (GstRTPBasePayload * payload, GstCaps * caps) | ||
| 29 | GST_LOG_OBJECT (rtpmp4gpay, "got codec_data"); | ||
| 30 | if (G_VALUE_TYPE (codec_data) == GST_TYPE_BUFFER) { | ||
| 31 | GstBuffer *buffer; | ||
| 32 | - const gchar *name; | ||
| 33 | |||
| 34 | buffer = gst_value_get_buffer (codec_data); | ||
| 35 | GST_LOG_OBJECT (rtpmp4gpay, "configuring codec_data"); | ||
| 36 | @@ -426,6 +426,23 @@ gst_rtp_mp4g_pay_setcaps (GstRTPBasePayload * payload, GstCaps * caps) | ||
| 37 | |||
| 38 | rtpmp4gpay->config = gst_buffer_copy (buffer); | ||
| 39 | } | ||
| 40 | + } else { | ||
| 41 | + name = gst_structure_get_name (structure); | ||
| 42 | + | ||
| 43 | + if (!strcmp (name, "video/mpeg")) { | ||
| 44 | + rtpmp4gpay->profile = g_strdup ("1"); | ||
| 45 | + | ||
| 46 | + /* fixed rate */ | ||
| 47 | + rtpmp4gpay->rate = 90000; | ||
| 48 | + /* video stream type */ | ||
| 49 | + rtpmp4gpay->streamtype = "4"; | ||
| 50 | + /* no params for video */ | ||
| 51 | + rtpmp4gpay->params = NULL; | ||
| 52 | + /* mode */ | ||
| 53 | + rtpmp4gpay->mode = "generic"; | ||
| 54 | + | ||
| 55 | + media_type = "video"; | ||
| 56 | + } | ||
| 57 | } | ||
| 58 | if (media_type == NULL) | ||
| 59 | goto config_failed; | ||
| 60 | -- | ||
| 61 | 1.7.9.5 | ||
| 62 | |||
