1 |
pacho 14/02/22 11:14:31 |
2 |
|
3 |
Added: subtitleeditor-0.41.0-keyframe-generation.patch |
4 |
subtitleeditor-0.41.0-textoverlay.patch |
5 |
Log: |
6 |
Fix compat with latest gstreamermm, also fixing bug #501862 by Mark Purtill, drop old |
7 |
|
8 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A188FBD4) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 media-video/subtitleeditor/files/subtitleeditor-0.41.0-keyframe-generation.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/subtitleeditor/files/subtitleeditor-0.41.0-keyframe-generation.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/subtitleeditor/files/subtitleeditor-0.41.0-keyframe-generation.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: subtitleeditor-0.41.0-keyframe-generation.patch |
17 |
=================================================================== |
18 |
Author: Philip Rinn <rinni@×××××××××.org> |
19 |
Description: Prevent crash when generating keyframes with gstreamermm 0.10.11 |
20 |
--- a/plugins/actions/keyframesmanagement/keyframesgenerator.cc |
21 |
+++ b/plugins/actions/keyframesmanagement/keyframesgenerator.cc |
22 |
@@ -87,12 +87,20 @@ |
23 |
if(structure_name.find("video") == Glib::ustring::npos) |
24 |
return Glib::RefPtr<Gst::Element>(NULL); |
25 |
|
26 |
- Glib::RefPtr<Gst::Bin> videobin = Glib::RefPtr<Gst::Bin>::cast_dynamic( |
27 |
- Gst::Parse::create_bin( |
28 |
- "ffmpegcolorspace ! fakesink name=vsink", true)); |
29 |
+ // ffmpegcolorspace |
30 |
+ Glib::RefPtr<Gst::Element> conv = Gst::ElementFactory::create_element("ffmpegcolorspace", "conv"); |
31 |
+ // fakesink |
32 |
+ Glib::RefPtr<Gst::FakeSink> vsink = Gst::FakeSink::create("vsink"); |
33 |
+ // videobin |
34 |
+ Glib::RefPtr<Gst::Bin> videobin = Gst::Bin::create("videobin"); |
35 |
|
36 |
- Glib::RefPtr<Gst::FakeSink> vsink = Glib::RefPtr<Gst::FakeSink>::cast_dynamic( |
37 |
- videobin->get_element("vsink")); |
38 |
+ // Add and link |
39 |
+ videobin->add(conv)->add(vsink); |
40 |
+ conv->link_pads("src", vsink, "sink"); |
41 |
+ |
42 |
+ // Add sink pad to bin element |
43 |
+ Glib::RefPtr<Gst::Pad> pad = conv->get_static_pad("sink"); |
44 |
+ videobin->add_pad(Gst::GhostPad::create(pad, "sink")); |
45 |
|
46 |
vsink->set_sync(false); |
47 |
vsink->property_silent() = true; |
48 |
|
49 |
|
50 |
|
51 |
1.1 media-video/subtitleeditor/files/subtitleeditor-0.41.0-textoverlay.patch |
52 |
|
53 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/subtitleeditor/files/subtitleeditor-0.41.0-textoverlay.patch?rev=1.1&view=markup |
54 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/subtitleeditor/files/subtitleeditor-0.41.0-textoverlay.patch?rev=1.1&content-type=text/plain |
55 |
|
56 |
Index: subtitleeditor-0.41.0-textoverlay.patch |
57 |
=================================================================== |
58 |
Author: Philip Rinn <rinni@×××××××××.org> |
59 |
Description: Get textoverlay working with gstreamermm 0.10.11 |
60 |
--- a/src/vp/gstplayer.cc |
61 |
+++ b/src/vp/gstplayer.cc |
62 |
@@ -656,7 +656,10 @@ |
63 |
"Please check your GStreamer installation."), "ffmpegcolorspace")); |
64 |
} |
65 |
// textoverlay |
66 |
- textoverlay = Gst::ElementFactory::create_element("textoverlay", "overlay"); |
67 |
+ // Workaround to prevent getting a NULL pointer from the |
68 |
+ // cast_dynamic(textoverlay) call under gstreamermm 0.10.11 |
69 |
+ textoverlay = Gst::TextOverlay::create("overlay"); |
70 |
+ |
71 |
if(!textoverlay) |
72 |
{ |
73 |
throw std::runtime_error( |