diff options
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch index 9fbebd5700..9e95524057 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From be6163cfa3a255493f9d75bad9541cbfe1723fee Mon Sep 17 00:00:00 2001 | 1 | From 918c96b24d10f61b7455b4cef3bab490849d0d77 Mon Sep 17 00:00:00 2001 |
2 | From: Mingke Wang <mingke.wang@freescale.com> | 2 | From: Mingke Wang <mingke.wang@freescale.com> |
3 | Date: Thu, 19 Mar 2015 14:17:10 +0800 | 3 | Date: Thu, 19 Mar 2015 14:17:10 +0800 |
4 | Subject: [PATCH 3/4] ssaparse: enhance SSA text lines parsing. | 4 | Subject: [PATCH] ssaparse: enhance SSA text lines parsing. |
5 | 5 | ||
6 | some parser will pass in the original ssa text line which starts with "Dialog:" | 6 | some parser will pass in the original ssa text line which starts with "Dialog:" |
7 | and there's are maybe multiple Dialog lines in one input buffer. | 7 | and there's are maybe multiple Dialog lines in one input buffer. |
@@ -10,13 +10,18 @@ Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=747496] | |||
10 | 10 | ||
11 | Signed-off-by: Mingke Wang <mingke.wang@freescale.com> | 11 | Signed-off-by: Mingke Wang <mingke.wang@freescale.com> |
12 | 12 | ||
13 | --- | ||
14 | gst/subparse/gstssaparse.c | 150 ++++++++++++++++++++++++++++++++++++++++----- | ||
15 | 1 file changed, 134 insertions(+), 16 deletions(-) | ||
16 | mode change 100644 => 100755 gst/subparse/gstssaparse.c | ||
17 | |||
13 | diff --git a/gst/subparse/gstssaparse.c b/gst/subparse/gstssaparse.c | 18 | diff --git a/gst/subparse/gstssaparse.c b/gst/subparse/gstssaparse.c |
14 | old mode 100644 | 19 | old mode 100644 |
15 | new mode 100755 | 20 | new mode 100755 |
16 | index 06ecef9..0ab5dce | 21 | index c849c08..4b9636c |
17 | --- a/gst/subparse/gstssaparse.c | 22 | --- a/gst/subparse/gstssaparse.c |
18 | +++ b/gst/subparse/gstssaparse.c | 23 | +++ b/gst/subparse/gstssaparse.c |
19 | @@ -260,6 +260,7 @@ gst_ssa_parse_remove_override_codes (GstSsaParse * parse, gchar * txt) | 24 | @@ -262,6 +262,7 @@ gst_ssa_parse_remove_override_codes (GstSsaParse * parse, gchar * txt) |
20 | * gst_ssa_parse_push_line: | 25 | * gst_ssa_parse_push_line: |
21 | * @parse: caller element | 26 | * @parse: caller element |
22 | * @txt: text to push | 27 | * @txt: text to push |
@@ -24,7 +29,7 @@ index 06ecef9..0ab5dce | |||
24 | * @start: timestamp for the buffer | 29 | * @start: timestamp for the buffer |
25 | * @duration: duration for the buffer | 30 | * @duration: duration for the buffer |
26 | * | 31 | * |
27 | @@ -269,27 +270,133 @@ gst_ssa_parse_remove_override_codes (GstSsaParse * parse, gchar * txt) | 32 | @@ -271,27 +272,133 @@ gst_ssa_parse_remove_override_codes (GstSsaParse * parse, gchar * txt) |
28 | * Returns: result of the push of the created buffer | 33 | * Returns: result of the push of the created buffer |
29 | */ | 34 | */ |
30 | static GstFlowReturn | 35 | static GstFlowReturn |
@@ -169,7 +174,7 @@ index 06ecef9..0ab5dce | |||
169 | GST_LOG_OBJECT (parse, "Text : %s", t); | 174 | GST_LOG_OBJECT (parse, "Text : %s", t); |
170 | 175 | ||
171 | if (gst_ssa_parse_remove_override_codes (parse, t)) { | 176 | if (gst_ssa_parse_remove_override_codes (parse, t)) { |
172 | @@ -307,13 +414,22 @@ gst_ssa_parse_push_line (GstSsaParse * parse, gchar * txt, | 177 | @@ -309,13 +416,22 @@ gst_ssa_parse_push_line (GstSsaParse * parse, gchar * txt, |
173 | gst_buffer_fill (buf, 0, escaped, len + 1); | 178 | gst_buffer_fill (buf, 0, escaped, len + 1); |
174 | gst_buffer_set_size (buf, len); | 179 | gst_buffer_set_size (buf, len); |
175 | g_free (escaped); | 180 | g_free (escaped); |
@@ -196,7 +201,7 @@ index 06ecef9..0ab5dce | |||
196 | 201 | ||
197 | ret = gst_pad_push (parse->srcpad, buf); | 202 | ret = gst_pad_push (parse->srcpad, buf); |
198 | 203 | ||
199 | @@ -333,6 +449,7 @@ gst_ssa_parse_chain (GstPad * sinkpad, GstObject * parent, GstBuffer * buf) | 204 | @@ -335,6 +451,7 @@ gst_ssa_parse_chain (GstPad * sinkpad, GstObject * parent, GstBuffer * buf) |
200 | GstClockTime ts; | 205 | GstClockTime ts; |
201 | gchar *txt; | 206 | gchar *txt; |
202 | GstMapInfo map; | 207 | GstMapInfo map; |
@@ -204,7 +209,7 @@ index 06ecef9..0ab5dce | |||
204 | 209 | ||
205 | if (G_UNLIKELY (!parse->framed)) | 210 | if (G_UNLIKELY (!parse->framed)) |
206 | goto not_framed; | 211 | goto not_framed; |
207 | @@ -350,13 +467,14 @@ gst_ssa_parse_chain (GstPad * sinkpad, GstObject * parent, GstBuffer * buf) | 212 | @@ -352,13 +469,14 @@ gst_ssa_parse_chain (GstPad * sinkpad, GstObject * parent, GstBuffer * buf) |
208 | /* make double-sure it's 0-terminated and all */ | 213 | /* make double-sure it's 0-terminated and all */ |
209 | gst_buffer_map (buf, &map, GST_MAP_READ); | 214 | gst_buffer_map (buf, &map, GST_MAP_READ); |
210 | txt = g_strndup ((gchar *) map.data, map.size); | 215 | txt = g_strndup ((gchar *) map.data, map.size); |
@@ -220,6 +225,3 @@ index 06ecef9..0ab5dce | |||
220 | 225 | ||
221 | if (ret != GST_FLOW_OK && GST_CLOCK_TIME_IS_VALID (ts)) { | 226 | if (ret != GST_FLOW_OK && GST_CLOCK_TIME_IS_VALID (ts)) { |
222 | GstSegment segment; | 227 | GstSegment segment; |
223 | -- | ||
224 | 1.7.9.5 | ||
225 | |||