diff options
| author | Trever Fischer <wm161@wm161.net> | 2011-02-24 17:50:59 -0500 |
|---|---|---|
| committer | Trever Fischer <wm161@wm161.net> | 2011-02-24 17:50:59 -0500 |
| commit | a7592fdd24f0e7c03707e06bbc9e899680ec5382 (patch) | |
| tree | 6b4e97b1e9b8dd3f5469148f4e6639cec59e4b2f | |
| parent | 972226a87a844924df419e50e594b32c61db395f (diff) | |
| download | camstream-a7592fdd24f0e7c03707e06bbc9e899680ec5382.tar.gz camstream-a7592fdd24f0e7c03707e06bbc9e899680ec5382.tar.xz camstream-a7592fdd24f0e7c03707e06bbc9e899680ec5382.zip | |
Move property setting to the end with everything else
| -rw-r--r-- | camstream.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/camstream.c b/camstream.c index 2d889ad..1f61257 100644 --- a/camstream.c +++ b/camstream.c @@ -126,9 +126,7 @@ GstElement *buildPipeline(const gchar *videoDev, const gchar *audioDev, const gc GstElement *rate = gst_element_factory_make("videorate", NULL); GstElement *scale = gst_element_factory_make("videoscale", NULL); GstElement *encode = gst_element_factory_make("theoraenc", NULL); - g_object_set(G_OBJECT(encode), "bitrate", 64, NULL); GstElement *videoQueue = gst_element_factory_make("queue", NULL); - g_object_set(G_OBJECT(videoQueue), "leaky", 1, NULL); gst_bin_add_many(GST_BIN(pipe), v4lsrc, convert, rate, scale, encode, videoQueue, NULL); gst_element_link(encode, videoQueue); @@ -141,7 +139,6 @@ GstElement *buildPipeline(const gchar *videoDev, const gchar *audioDev, const gc GstElement *audioConvert = gst_element_factory_make("audioconvert", NULL); GstElement *vorbisenc = gst_element_factory_make("vorbisenc", NULL); GstElement *audioQueue = gst_element_factory_make("queue", NULL); - g_object_set(G_OBJECT(audioQueue), "leaky", 1, NULL); gst_bin_add_many(GST_BIN(pipe), alsasrc, audioConvert, vorbisenc, audioQueue, NULL); gst_element_link_many(alsasrc, audioConvert, vorbisenc, audioQueue, NULL); @@ -175,6 +172,10 @@ GstElement *buildPipeline(const gchar *videoDev, const gchar *audioDev, const gc if (icecastMount) g_object_set(G_OBJECT(shout), "mount", mount, NULL); + g_object_set(G_OBJECT(encode), "bitrate", 64, NULL); + g_object_set(G_OBJECT(videoQueue), "leaky", 1, NULL); + g_object_set(G_OBJECT(audioQueue), "leaky", 1, NULL); + return pipe; } |