aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJacek Antonelli2009-03-26 02:04:27 -0500
committerJacek Antonelli2009-03-26 02:09:31 -0500
commit8ea92c69d3405d1a3614f9e454050e607e4437d7 (patch)
tree8687c9cb4542013463e8c55cb52bea5720ba782e
parentRemoved all that llgst and symbol grabbing silliness. (diff)
downloadmeta-impy-8ea92c69d3405d1a3614f9e454050e607e4437d7.zip
meta-impy-8ea92c69d3405d1a3614f9e454050e607e4437d7.tar.gz
meta-impy-8ea92c69d3405d1a3614f9e454050e607e4437d7.tar.bz2
meta-impy-8ea92c69d3405d1a3614f9e454050e607e4437d7.tar.xz
Removed obsolete gstreamer_syms files.
Diffstat
-rw-r--r--ChangeLog.txt12
-rw-r--r--linden/indra/llmedia/llmediaimplgstreamer_syms.cpp188
-rw-r--r--linden/indra/llmedia/llmediaimplgstreamer_syms.h78
-rw-r--r--linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc50
-rw-r--r--linden/indra/llmedia/llmediaimplgstreamer_syms_rawa.inc5
-rw-r--r--linden/indra/llmedia/llmediaimplgstreamer_syms_rawv.inc5
6 files changed, 12 insertions, 326 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index bf59661..6f1f4ce 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,17 @@
12009-03-26 Jacek Antonelli <jacek.antonelli@gmail.com> 12009-03-26 Jacek Antonelli <jacek.antonelli@gmail.com>
2 2
3 * linden/indra/llmedia/llmediaimplgstreamer_syms.cpp:
4 Removed obsolete gstreamer_syms files.
5 * linden/indra/llmedia/llmediaimplgstreamer_syms.h:
6 Ditto.
7 * linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc:
8 Ditto.
9 * linden/indra/llmedia/llmediaimplgstreamer_syms_rawa.inc:
10 Ditto.
11 * linden/indra/llmedia/llmediaimplgstreamer_syms_rawv.inc:
12 Ditto.
13
14
3 * linden/indra/llmedia/llmediaimplgstreamer.cpp: 15 * linden/indra/llmedia/llmediaimplgstreamer.cpp:
4 Removed all that llgst and symbol grabbing silliness. 16 Removed all that llgst and symbol grabbing silliness.
5 Some symbols require gstreamer >= 0.10.11. 17 Some symbols require gstreamer >= 0.10.11.
diff --git a/linden/indra/llmedia/llmediaimplgstreamer_syms.cpp b/linden/indra/llmedia/llmediaimplgstreamer_syms.cpp
deleted file mode 100644
index fb1949a..0000000
--- a/linden/indra/llmedia/llmediaimplgstreamer_syms.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
1/**
2 * @file llmediaimplgstreamer_syms.cpp
3 * @brief dynamic GStreamer symbol-grabbing code
4 *
5 * $LicenseInfo:firstyear=2007&license=viewergpl$
6 *
7 * Copyright (c) 2007-2008, Linden Research, Inc.
8 *
9 * Second Life Viewer Source Code
10 * The source code in this file ("Source Code") is provided by Linden Lab
11 * to you under the terms of the GNU General Public License, version 2.0
12 * ("GPL"), unless you have obtained a separate licensing agreement
13 * ("Other License"), formally executed by you and Linden Lab. Terms of
14 * the GPL can be found in doc/GPL-license.txt in this distribution, or
15 * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
16 *
17 * There are special exceptions to the terms and conditions of the GPL as
18 * it is applied to this Source Code. View the full text of the exception
19 * in the file doc/FLOSS-exception.txt in this software distribution, or
20 * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
21 *
22 * By copying, modifying or distributing this software, you acknowledge
23 * that you have read and understood your obligations described above,
24 * and agree to abide by those obligations.
25 *
26 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
27 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
28 * COMPLETENESS OR PERFORMANCE.
29 * $/LicenseInfo$
30 */
31
32///#if LL_GSTREAMER_ENABLED
33
34extern "C" {
35#include <gst/gst.h>
36
37#include "apr_pools.h"
38#include "apr_dso.h"
39}
40
41#include "llmediaimplgstreamer.h"
42
43#define LL_GST_SYM(REQ, GSTSYM, RTN, ...) RTN (*ll##GSTSYM)(__VA_ARGS__) = NULL
44#include "llmediaimplgstreamer_syms_raw.inc"
45#include "llmediaimplgstreamer_syms_rawa.inc"
46#include "llmediaimplgstreamer_syms_rawv.inc"
47#undef LL_GST_SYM
48
49
50static bool sSymsGrabbed = false;
51static apr_pool_t *sSymGSTDSOMemoryPool = NULL;
52static apr_dso_handle_t *sSymGSTDSOHandleG = NULL;
53static apr_dso_handle_t *sSymGSTDSOHandleV = NULL;
54static apr_dso_handle_t *sSymGSTDSOHandleA = NULL;
55
56
57bool grab_gst_syms(std::string gst_dso_name,
58 std::string gst_dso_name_vid,
59 std::string gst_dso_name_aud)
60{
61 if (sSymsGrabbed)
62 {
63 // already have grabbed good syms
64 return TRUE;
65 }
66
67 bool sym_error = false;
68 bool rtn = false;
69 apr_status_t rv;
70 apr_dso_handle_t *sSymGSTDSOHandle = NULL;
71
72#define LL_GST_SYM(REQ, GSTSYM, RTN, ...) do{rv = apr_dso_sym((apr_dso_handle_sym_t*)&ll##GSTSYM, sSymGSTDSOHandle, #GSTSYM); if (rv != APR_SUCCESS) {INFOMSG("Failed to grab symbol: %s", #GSTSYM); if (REQ) sym_error = true;} else DEBUGMSG("grabbed symbol: %s from %p", #GSTSYM, (void*)ll##GSTSYM);}while(0)
73
74 //attempt to load the shared libraries
75 apr_pool_create(&sSymGSTDSOMemoryPool, NULL);
76
77 if ( APR_SUCCESS == (rv = apr_dso_load(&sSymGSTDSOHandle,
78 gst_dso_name.c_str(),
79 sSymGSTDSOMemoryPool) ))
80 {
81 INFOMSG("Found DSO: %s", gst_dso_name.c_str());
82#include "llmediaimplgstreamer_syms_raw.inc"
83
84 if ( sSymGSTDSOHandle )
85 {
86 sSymGSTDSOHandleG = sSymGSTDSOHandle;
87 sSymGSTDSOHandle = NULL;
88 }
89
90 if ( APR_SUCCESS == (rv = apr_dso_load(&sSymGSTDSOHandle,
91 gst_dso_name_aud.c_str(),
92 sSymGSTDSOMemoryPool) ))
93 {
94 INFOMSG("Found DSO: %s", gst_dso_name_aud.c_str());
95#include "llmediaimplgstreamer_syms_rawa.inc"
96
97 if ( sSymGSTDSOHandle )
98 {
99 sSymGSTDSOHandleA = sSymGSTDSOHandle;
100 sSymGSTDSOHandle = NULL;
101 }
102
103 if ( APR_SUCCESS ==
104 (rv = apr_dso_load(&sSymGSTDSOHandle,
105 gst_dso_name_vid.c_str(),
106 sSymGSTDSOMemoryPool) ))
107 {
108 INFOMSG("Found DSO: %s", gst_dso_name_vid.c_str());
109#include "llmediaimplgstreamer_syms_rawv.inc"
110 }
111 else
112 {
113 INFOMSG("Couldn't load DSO: %s", gst_dso_name_vid.c_str());
114 rtn = false; // failure
115 }
116 }
117 else
118 {
119 INFOMSG("Couldn't load DSO: %s", gst_dso_name_aud.c_str());
120 rtn = false; // failure
121 }
122
123 rtn = !sym_error;
124 }
125 else
126 {
127 INFOMSG("Couldn't load DSO: %s", gst_dso_name.c_str());
128 rtn = false; // failure
129 }
130
131 if (sym_error)
132 {
133 WARNMSG("Failed to find necessary symbols in GStreamer libraries.");
134 }
135
136 if ( sSymGSTDSOHandle )
137 {
138 sSymGSTDSOHandleV = sSymGSTDSOHandle;
139 sSymGSTDSOHandle = NULL;
140 }
141#undef LL_GST_SYM
142
143 sSymsGrabbed = !!rtn;
144 return rtn;
145}
146
147
148void ungrab_gst_syms()
149{
150 // should be safe to call regardless of whether we've
151 // actually grabbed syms.
152
153 if ( sSymGSTDSOHandleG )
154 {
155 apr_dso_unload(sSymGSTDSOHandleG);
156 sSymGSTDSOHandleG = NULL;
157 }
158
159 if ( sSymGSTDSOHandleA )
160 {
161 apr_dso_unload(sSymGSTDSOHandleA);
162 sSymGSTDSOHandleA = NULL;
163 }
164
165 if ( sSymGSTDSOHandleV )
166 {
167 apr_dso_unload(sSymGSTDSOHandleV);
168 sSymGSTDSOHandleV = NULL;
169 }
170
171 if ( sSymGSTDSOMemoryPool )
172 {
173 apr_pool_destroy(sSymGSTDSOMemoryPool);
174 sSymGSTDSOMemoryPool = NULL;
175 }
176
177 // NULL-out all of the symbols we'd grabbed
178#define LL_GST_SYM(REQ, GSTSYM, RTN, ...) do{ll##GSTSYM = NULL;}while(0)
179#include "llmediaimplgstreamer_syms_raw.inc"
180#include "llmediaimplgstreamer_syms_rawa.inc"
181#include "llmediaimplgstreamer_syms_rawv.inc"
182#undef LL_GST_SYM
183
184 sSymsGrabbed = false;
185}
186
187
188///#endif // LL_GSTREAMER_ENABLED
diff --git a/linden/indra/llmedia/llmediaimplgstreamer_syms.h b/linden/indra/llmedia/llmediaimplgstreamer_syms.h
deleted file mode 100644
index ebebd80..0000000
--- a/linden/indra/llmedia/llmediaimplgstreamer_syms.h
+++ /dev/null
@@ -1,78 +0,0 @@
1/**
2 * @file llmediaimplgstreamer_syms.h
3 * @brief dynamic GStreamer symbol-grabbing code
4 *
5 * $LicenseInfo:firstyear=2007&license=viewergpl$
6 *
7 * Copyright (c) 2007-2008, Linden Research, Inc.
8 *
9 * Second Life Viewer Source Code
10 * The source code in this file ("Source Code") is provided by Linden Lab
11 * to you under the terms of the GNU General Public License, version 2.0
12 * ("GPL"), unless you have obtained a separate licensing agreement
13 * ("Other License"), formally executed by you and Linden Lab. Terms of
14 * the GPL can be found in doc/GPL-license.txt in this distribution, or
15 * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
16 *
17 * There are special exceptions to the terms and conditions of the GPL as
18 * it is applied to this Source Code. View the full text of the exception
19 * in the file doc/FLOSS-exception.txt in this software distribution, or
20 * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
21 *
22 * By copying, modifying or distributing this software, you acknowledge
23 * that you have read and understood your obligations described above,
24 * and agree to abide by those obligations.
25 *
26 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
27 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
28 * COMPLETENESS OR PERFORMANCE.
29 * $/LicenseInfo$
30 */
31
32#include "linden_common.h"
33
34///#if LL_GSTREAMER_ENABLED
35
36extern "C" {
37#include <gst/gst.h>
38}
39
40bool grab_gst_syms(std::string gst_dso_name,
41 std::string gst_dso_name_vid,
42 std::string gst_dso_name_aud);
43void ungrab_gst_syms();
44
45#define LL_GST_SYM(REQ, GSTSYM, RTN, ...) extern RTN (*ll##GSTSYM)(__VA_ARGS__)
46#include "llmediaimplgstreamer_syms_raw.inc"
47#include "llmediaimplgstreamer_syms_rawa.inc"
48#include "llmediaimplgstreamer_syms_rawv.inc"
49#undef LL_GST_SYM
50
51// regrettable hacks to give us better runtime compatibility with older systems
52#define llg_return_if_fail(COND) do{if (!(COND)) return;}while(0)
53#define llg_return_val_if_fail(COND,V) do{if (!(COND)) return V;}while(0)
54
55// regrettable hacks because GStreamer was not designed for runtime loading
56#undef GST_TYPE_MESSAGE
57#define GST_TYPE_MESSAGE (llgst_message_get_type())
58#undef GST_TYPE_OBJECT
59#define GST_TYPE_OBJECT (llgst_object_get_type())
60#undef GST_TYPE_PIPELINE
61#define GST_TYPE_PIPELINE (llgst_pipeline_get_type())
62#undef GST_TYPE_ELEMENT
63#define GST_TYPE_ELEMENT (llgst_element_get_type())
64#undef GST_TYPE_AUDIO_SINK
65#define GST_TYPE_AUDIO_SINK (llgst_audio_sink_get_type())
66#undef GST_TYPE_VIDEO_SINK
67#define GST_TYPE_VIDEO_SINK (llgst_video_sink_get_type())
68#undef _gst_debug_register_funcptr
69#define _gst_debug_register_funcptr ll_gst_debug_register_funcptr
70#undef _gst_debug_category_new
71#define _gst_debug_category_new ll_gst_debug_category_new
72#undef __gst_debug_enabled
73#define __gst_debug_enabled (0)
74
75// more hacks
76#define LLGST_MESSAGE_TYPE_NAME(M) (llgst_message_type_get_name(GST_MESSAGE_TYPE(M)))
77
78///#endif // LL_GSTREAMER_ENABLED
diff --git a/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc b/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc
deleted file mode 100644
index 0d0d764..0000000
--- a/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc
+++ /dev/null
@@ -1,50 +0,0 @@
1
2// required symbols to grab
3LL_GST_SYM(true, gst_init_check, gboolean, int *argc, char **argv[], GError ** err);
4LL_GST_SYM(true, gst_message_get_type, GType, void);
5LL_GST_SYM(true, gst_message_type_get_name, const gchar*, GstMessageType type);
6LL_GST_SYM(true, gst_message_parse_error, void, GstMessage *message, GError **gerror, gchar **debug);
7LL_GST_SYM(true, gst_message_parse_warning, void, GstMessage *message, GError **gerror, gchar **debug);
8LL_GST_SYM(true, gst_message_parse_state_changed, void, GstMessage *message, GstState *oldstate, GstState *newstate, GstState *pending);
9LL_GST_SYM(true, gst_element_set_state, GstStateChangeReturn, GstElement *element, GstState state);
10LL_GST_SYM(true, gst_element_get_state, GstStateChangeReturn, GstElement *element, GstState *state, GstState *pending, GstClockTime timeout);
11LL_GST_SYM(true, gst_object_unref, void, gpointer object);
12LL_GST_SYM(true, gst_object_ref, gpointer, gpointer object);
13LL_GST_SYM(true, gst_object_get_type, GType, void);
14LL_GST_SYM(true, gst_pipeline_get_type, GType, void);
15LL_GST_SYM(true, gst_pipeline_get_bus, GstBus*, GstPipeline *pipeline);
16LL_GST_SYM(true, gst_bus_add_watch, guint, GstBus * bus, GstBusFunc func, gpointer user_data);
17LL_GST_SYM(true, gst_element_factory_make, GstElement*, const gchar *factoryname, const gchar *name);
18LL_GST_SYM(true, gst_element_get_type, GType, void);
19LL_GST_SYM(true, gst_static_pad_template_get, GstPadTemplate*, GstStaticPadTemplate *pad_template);
20LL_GST_SYM(true, gst_element_class_add_pad_template, void, GstElementClass *klass, GstPadTemplate *temp);
21LL_GST_SYM(true, gst_element_class_set_details, void, GstElementClass *klass, const GstElementDetails *details);
22LL_GST_SYM(true, gst_caps_unref, void, GstCaps* caps);
23LL_GST_SYM(true, gst_caps_ref, GstCaps *, GstCaps* caps);
24LL_GST_SYM(true, _gst_debug_register_funcptr, void, GstDebugFuncPtr func, gchar* ptrname);
25LL_GST_SYM(true, _gst_debug_category_new, GstDebugCategory *, gchar *name, guint color, gchar *description);
26LL_GST_SYM(true, gst_caps_is_empty, gboolean, const GstCaps *caps);
27LL_GST_SYM(true, gst_caps_from_string, GstCaps *, const gchar *string);
28LL_GST_SYM(true, gst_caps_replace, void, GstCaps **caps, GstCaps *newcaps);
29LL_GST_SYM(true, gst_caps_get_structure, GstStructure *, const GstCaps *caps, guint index);
30LL_GST_SYM(true, gst_caps_copy, GstCaps *, const GstCaps * caps);
31LL_GST_SYM(true, gst_caps_intersect, GstCaps *, const GstCaps *caps1, const GstCaps *caps2);
32LL_GST_SYM(true, gst_element_register, gboolean, GstPlugin *plugin, const gchar *name, guint rank, GType type);
33LL_GST_SYM(true, _gst_plugin_register_static, void, GstPluginDesc *desc);
34LL_GST_SYM(true, gst_structure_get_int, gboolean, const GstStructure *structure, const gchar *fieldname, gint *value);
35LL_GST_SYM(true, gst_structure_get_value, G_CONST_RETURN GValue *, const GstStructure *structure, const gchar *fieldname);
36LL_GST_SYM(true, gst_value_get_fraction_numerator, gint, const GValue *value);
37LL_GST_SYM(true, gst_value_get_fraction_denominator, gint, const GValue *value);
38LL_GST_SYM(true, gst_structure_get_name, G_CONST_RETURN gchar *, const GstStructure *structure);
39LL_GST_SYM(true, gst_element_seek, bool, GstElement *, gdouble, GstFormat, GstSeekFlags, GstSeekType, gint64, GstSeekType, gint64);
40LL_GST_SYM(true, gst_version, void, guint *major, guint *minor, guint *micro, guint *nano);
41LL_GST_SYM(true, gst_element_state_change_return_get_name, const gchar *, GstStateChangeReturn state_ret);
42
43// optional symbols to grab
44LL_GST_SYM(false, gst_segtrap_set_enabled, void, gboolean enabled);
45LL_GST_SYM(false, gst_message_parse_buffering, void, GstMessage *message, gint *percent);
46LL_GST_SYM(false, gst_message_parse_info, void, GstMessage *message, GError **gerror, gchar **debug);
47
48//aw tag infos (Artist, Title, ...tbc...)
49LL_GST_SYM(true, gst_message_parse_tag, void, GstMessage *message, GstTagList **tag_list);
50LL_GST_SYM(true, gst_tag_list_get_string, gboolean, const GstTagList *list, const gchar *tag, gchar **value);
diff --git a/linden/indra/llmedia/llmediaimplgstreamer_syms_rawa.inc b/linden/indra/llmedia/llmediaimplgstreamer_syms_rawa.inc
deleted file mode 100644
index 0be99b5..0000000
--- a/linden/indra/llmedia/llmediaimplgstreamer_syms_rawa.inc
+++ /dev/null
@@ -1,5 +0,0 @@
1
2// required symbols to grab
3LL_GST_SYM(true, gst_audio_sink_get_type, GType, void);
4
5// optional symbols to grab
diff --git a/linden/indra/llmedia/llmediaimplgstreamer_syms_rawv.inc b/linden/indra/llmedia/llmediaimplgstreamer_syms_rawv.inc
deleted file mode 100644
index 14fbcb4..0000000
--- a/linden/indra/llmedia/llmediaimplgstreamer_syms_rawv.inc
+++ /dev/null
@@ -1,5 +0,0 @@
1
2// required symbols to grab
3LL_GST_SYM(true, gst_video_sink_get_type, GType, void);
4
5// optional symbols to grab
generated by cgit v1.1 at 2025-01-15 19:00:36 +0000