Menu
▾
▴
gmyth-commits
|
From: <ren...@us...> - 2007-09-26 18:04:22
|
Revision: 863
http://gmyth.svn.sourceforge.net/gmyth/?rev=863&view=rev
Author: renatofilho
Date: 2007-09-26 11:04:24 -0700 (Wed, 26 Sep 2007)
Log Message:
-----------
create a flag to work with decodebin1
Modified Paths:
--------------
trunk/gmyth-stream/gmencoder/src/gmencoder.c
Modified: trunk/gmyth-stream/gmencoder/src/gmencoder.c
===================================================================
--- trunk/gmyth-stream/gmencoder/src/gmencoder.c 2007-09-24 15:08:56 UTC (rev 862)
+++ trunk/gmyth-stream/gmencoder/src/gmencoder.c 2007-09-26 18:04:24 UTC (rev 863)
@@ -887,7 +887,11 @@
if (src == NULL)
goto error;
- decode = gst_element_factory_make("decodebin2", "decode");
+
+ if (g_getenv ("USE_DECODEBIN1"))
+ decode = gst_element_factory_make("decodebin", "decode");
+ else
+ decode = gst_element_factory_make("decodebin2", "decode");
if (decode == NULL)
goto error;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2008-01-15 17:44:33
|
Revision: 895
http://gmyth.svn.sourceforge.net/gmyth/?rev=895&view=rev
Author: renatofilho
Date: 2008-01-15 09:44:34 -0800 (Tue, 15 Jan 2008)
Log Message:
-----------
fixed bug with uint properties
Modified Paths:
--------------
trunk/gmyth-stream/gmencoder/src/gmencoder.c
Modified: trunk/gmyth-stream/gmencoder/src/gmencoder.c
===================================================================
--- trunk/gmyth-stream/gmencoder/src/gmencoder.c 2008-01-07 18:49:22 UTC (rev 894)
+++ trunk/gmyth-stream/gmencoder/src/gmencoder.c 2008-01-15 17:44:34 UTC (rev 895)
@@ -228,6 +228,9 @@
case G_TYPE_INT:
g_value_set_int(&p, atoi(prop_val));
break;
+ case G_TYPE_UINT:
+ g_value_set_uint (&p, (guint) atoi(prop_val));
+ break;
case G_TYPE_ULONG:
g_value_set_ulong (&p, atol(prop_val));
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2008-01-29 20:12:27
|
Revision: 903
http://gmyth.svn.sourceforge.net/gmyth/?rev=903&view=rev
Author: renatofilho
Date: 2008-01-29 12:12:30 -0800 (Tue, 29 Jan 2008)
Log Message:
-----------
implemente audio-rate arg
Modified Paths:
--------------
trunk/gmyth-stream/gmencoder/src/gmencoder.c
Modified: trunk/gmyth-stream/gmencoder/src/gmencoder.c
===================================================================
--- trunk/gmyth-stream/gmencoder/src/gmencoder.c 2008-01-29 18:40:32 UTC (rev 902)
+++ trunk/gmyth-stream/gmencoder/src/gmencoder.c 2008-01-29 20:12:30 UTC (rev 903)
@@ -311,17 +311,46 @@
goto error;
}
- /*
- * if (rate > 0) { g_object_set (G_OBJECT (aencode), "bitrate", 32,
- * NULL); }
- */
+
gst_bin_add_many(GST_BIN(abin), aqueue, aconvert, aencode, aqueue_src,
NULL);
- if (gst_element_link_many(aqueue, aconvert, aencode, aqueue_src, NULL)
- == FALSE) {
+
+ if (!gst_element_link (aqueue, aconvert))
+ {
g_warning("Not Link audio elements");
+ goto error;
}
+
+ if (rate > 0) {
+ GstCaps *caps;
+
+ caps = gst_caps_new_simple ("audio/x-raw-int",
+ "rate", G_TYPE_INT, rate, NULL);
+ if (!gst_element_link_filtered (aconvert, aencode, caps))
+ {
+ gst_caps_unref (caps);
+ g_warning("Not link rate filter");
+ goto error;
+ }
+
+ gst_caps_unref (caps);
+ }
+ else
+ {
+ if (!gst_element_link (aconvert, aencode))
+ {
+ g_warning ("Fail to link audio elements");
+ goto error;
+ }
+ }
+
+
+ if (!gst_element_link (aencode, aqueue_src))
+ {
+ g_warning("Not Link audio elements");
+ goto error;
+ }
// TODO: apply audio rate
// ghost pad the audio bin
@@ -1021,8 +1050,10 @@
err_str = g_strdup_printf("Error [%d] %s (%s)", error->code,
error->message, debug);
priv->ready = FALSE;
+ /*
g_signal_emit(user_data, g_mencoder_signals[ERROR], 0,
err_str);
+ */
g_free(err_str);
g_clear_error(&error);
g_free(debug);
@@ -1076,7 +1107,8 @@
}
sink_pad = gst_element_get_pad(sink_element, "sink");
- gst_pad_link(pad, sink_pad);
+ if (!gst_pad_is_linked (sink_pad))
+ gst_pad_link(pad, sink_pad);
gst_object_unref(sink_element);
gst_object_unref(sink_pad);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2008-02-29 19:03:57
|
Revision: 942
http://gmyth.svn.sourceforge.net/gmyth/?rev=942&view=rev
Author: renatofilho
Date: 2008-02-29 11:03:41 -0800 (Fri, 29 Feb 2008)
Log Message:
-----------
put back timeout function
Modified Paths:
--------------
trunk/gmyth-stream/gmencoder/src/gmencoder.c
Modified: trunk/gmyth-stream/gmencoder/src/gmencoder.c
===================================================================
--- trunk/gmyth-stream/gmencoder/src/gmencoder.c 2008-02-28 08:10:55 UTC (rev 941)
+++ trunk/gmyth-stream/gmencoder/src/gmencoder.c 2008-02-29 19:03:41 UTC (rev 942)
@@ -708,7 +708,7 @@
if (priv->timeout_id != 0) {
g_source_remove (priv->timeout_id);
}
- //priv->timeout_id = g_timeout_add(GMENCODER_TIMEOUT, _process_timeout_cb, self);
+ priv->timeout_id = g_timeout_add(GMENCODER_TIMEOUT, _process_timeout_cb, self);
}
void
@@ -1237,6 +1237,8 @@
priv->timeout_id = 0;
}
+ priv->timeout_id = g_timeout_add(GMENCODER_TIMEOUT, _process_timeout_cb, user_data);
+
if (priv->send_chunked) {
if (_send_buffer (priv->handle, GST_BUFFER_DATA (buff), GST_BUFFER_SIZE (buff)) == FALSE)
goto error;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2008-03-04 13:51:15
|
Revision: 949
http://gmyth.svn.sourceforge.net/gmyth/?rev=949&view=rev
Author: renatofilho
Date: 2008-03-04 05:51:13 -0800 (Tue, 04 Mar 2008)
Log Message:
-----------
clear timeout function when gst emit error
Modified Paths:
--------------
trunk/gmyth-stream/gmencoder/src/gmencoder.c
Modified: trunk/gmyth-stream/gmencoder/src/gmencoder.c
===================================================================
--- trunk/gmyth-stream/gmencoder/src/gmencoder.c 2008-03-03 17:38:32 UTC (rev 948)
+++ trunk/gmyth-stream/gmencoder/src/gmencoder.c 2008-03-04 13:51:13 UTC (rev 949)
@@ -1064,6 +1064,11 @@
gchar *debug;
gchar *err_str;
+ if (priv->timeout_id != 0) {
+ g_source_remove (priv->timeout_id);
+ priv->timeout_id = 0;
+ }
+
if (priv->tick_id != 0) {
g_source_remove(priv->tick_id);
priv->tick_id = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ren...@us...> - 2008-03-04 13:57:53
|
Revision: 950
http://gmyth.svn.sourceforge.net/gmyth/?rev=950&view=rev
Author: renatofilho
Date: 2008-03-04 05:57:55 -0800 (Tue, 04 Mar 2008)
Log Message:
-----------
timeout interval increased
Modified Paths:
--------------
trunk/gmyth-stream/gmencoder/src/gmencoder.c
Modified: trunk/gmyth-stream/gmencoder/src/gmencoder.c
===================================================================
--- trunk/gmyth-stream/gmencoder/src/gmencoder.c 2008-03-04 13:51:13 UTC (rev 949)
+++ trunk/gmyth-stream/gmencoder/src/gmencoder.c 2008-03-04 13:57:55 UTC (rev 950)
@@ -40,7 +40,7 @@
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), G_TYPE_MENCODER, GMencoderPrivate))
#define USE_MANUAL_SINK
-#define GMENCODER_TIMEOUT 5000
+#define GMENCODER_TIMEOUT 10000
typedef struct _GMencoderPrivate GMencoderPrivate;
typedef struct _SetupInfo SetupInfo;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X