mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-26 11:41:09 +00:00
we don't use // in code we commit :)
Original commit message from CVS: hi wtay (and some others): we don't use // in code we commit :)
This commit is contained in:
parent
bac184e6fb
commit
ce8e4a8879
9 changed files with 16 additions and 18 deletions
|
@ -462,7 +462,7 @@ gst_scheduler_show(GST_ELEMENT_SCHED(autoplugger));
|
|||
g_return_if_fail(autoplugger->autobin != NULL);
|
||||
gst_bin_add(GST_BIN(autoplugger),autoplugger->autobin);
|
||||
|
||||
* // re-attach the srcpad's original peer to the cache *
|
||||
* * re-attach the srcpad's original peer to the cache *
|
||||
* GST_DEBUG(GST_CAT_AUTOPLUG, "reconnecting the cache to the downstream peer"); *
|
||||
* gst_pad_connect(autoplugger->cache_srcpad,autoplugger->srcpadpeer); *
|
||||
|
||||
|
|
|
@ -478,7 +478,7 @@ gst_clock_wait_id (GstClock *clock, GstClockID id)
|
|||
entry->func = gst_clock_unlock_func;
|
||||
target = GST_CLOCK_ENTRY_TIME (entry) - current + current_real;
|
||||
|
||||
//g_print ("%lld %lld %lld\n", target, current, current_real);
|
||||
/* g_print ("%lld %lld %lld\n", target, current, current_real); */
|
||||
|
||||
if (target > current_real) {
|
||||
timeval.tv_usec = target % 1000000;
|
||||
|
|
|
@ -335,8 +335,6 @@ gst_object_set_name (GstObject *object, const gchar *name)
|
|||
const gchar*
|
||||
gst_object_get_name (GstObject *object)
|
||||
{
|
||||
/* CR1: GLib checks for NULL */
|
||||
//FIXME: _REDUNDANT g_return_val_if_fail (object != NULL, NULL);
|
||||
g_return_val_if_fail (GST_IS_OBJECT (object), NULL);
|
||||
|
||||
return object->name;
|
||||
|
|
|
@ -178,7 +178,7 @@ struct _GstRealPad {
|
|||
GstRealPad *peer;
|
||||
|
||||
GstBuffer *bufpen;
|
||||
//CR1: FIXME: regiontype should go away
|
||||
/* CR1: FIXME: regiontype should go away */
|
||||
GstRegionType regiontype;
|
||||
guint64 offset;
|
||||
guint64 len;
|
||||
|
|
|
@ -256,7 +256,7 @@ make_connections (graph_t *g, GError **error)
|
|||
|
||||
a = c->src_pads;
|
||||
b = c->sink_pads;
|
||||
// g_print ("a: %p, b: %p\n", a, b);
|
||||
/* g_print ("a: %p, b: %p\n", a, b); */
|
||||
if (a && b) {
|
||||
/* balanced multipad connection */
|
||||
while (a && b) {
|
||||
|
@ -289,14 +289,14 @@ make_connections (graph_t *g, GError **error)
|
|||
}
|
||||
} else if (a) {
|
||||
if ((pt1 = gst_element_get_pad_template (src, (gchar*)a->data))) {
|
||||
// g_print ("have padtemplate %s, SOMETIMES=%s\n", pt1->name_template, pt1->presence == GST_PAD_SOMETIMES ? "TRUE" : "FALSE");
|
||||
/* g_print ("have padtemplate %s, SOMETIMES=%s\n", pt1->name_template, pt1->presence == GST_PAD_SOMETIMES ? "TRUE" : "FALSE"); */
|
||||
if ((p1 = gst_element_get_pad (src, (gchar*)a->data)) || pt1->presence == GST_PAD_SOMETIMES) {
|
||||
if (!p1) {
|
||||
/* sigh, a hack until i fix the gstelement api... */
|
||||
if ((pt2 = gst_element_get_compatible_pad_template (sink, pt1))) {
|
||||
// g_print ("have compatible pad template %s\n", pt2->name_template);
|
||||
/* g_print ("have compatible pad template %s\n", pt2->name_template); */
|
||||
if ((p2 = gst_element_get_pad (sink, pt2->name_template))) {
|
||||
// g_print ("got the pad\n");
|
||||
/* g_print ("got the pad\n"); */
|
||||
dc = g_new0 (dynamic_connection_t, 1);
|
||||
dc->srcpadname = (gchar*)a->data;
|
||||
dc->target_pad = p2;
|
||||
|
|
|
@ -50,7 +50,7 @@ gst_registry_option_set (const gchar *registry)
|
|||
gboolean
|
||||
gst_registry_use_global (void)
|
||||
{
|
||||
//struct stat reg_stat;
|
||||
/* struct stat reg_stat; */
|
||||
FILE *reg;
|
||||
|
||||
if (getuid () == 0) return TRUE; /* root always uses global */
|
||||
|
|
|
@ -683,7 +683,7 @@ gst_basic_scheduler_chain_enable_element (GstSchedulerChain * chain, GstElement
|
|||
|
||||
/* notify the scheduler that something changed */
|
||||
GST_FLAG_SET(chain->sched, GST_BASIC_SCHEDULER_CHANGE);
|
||||
//GST_FLAG_UNSET(element, GST_ELEMENT_COTHREAD_STOPPING);
|
||||
/* GST_FLAG_UNSET(element, GST_ELEMENT_COTHREAD_STOPPING); */
|
||||
|
||||
/* reschedule the chain */
|
||||
return gst_basic_scheduler_cothreaded_chain (GST_BIN (GST_SCHEDULER (chain->sched)->parent), chain);
|
||||
|
|
|
@ -333,7 +333,7 @@ gst_fast_scheduler_chained_element (GstBin *bin, GstElement *element) {
|
|||
|
||||
GST_DEBUG (GST_CAT_SCHEDULING,"chain entered\n");
|
||||
|
||||
// walk through all the pads
|
||||
/* walk through all the pads */
|
||||
pads = gst_element_get_pad_list (element);
|
||||
while (pads) {
|
||||
pad = GST_PAD (pads->data);
|
||||
|
@ -536,9 +536,9 @@ gst_fast_scheduler_chain_elements (GstFastScheduler * sched, GstElement * elemen
|
|||
/* take the contents of chain2 and merge them into chain1 */
|
||||
chain1->disabled = g_list_concat (chain1->disabled, g_list_copy (chain2->disabled));
|
||||
chain1->elements = g_list_concat (chain1->elements, g_list_copy (chain2->elements));
|
||||
//chain1->cothreaded_elements = g_list_concat (chain1->cothreaded_elements, g_list_copy (chain2->cothreaded_elements));
|
||||
/* chain1->cothreaded_elements = g_list_concat (chain1->cothreaded_elements, g_list_copy (chain2->cothreaded_elements)); */
|
||||
chain1->num_elements += chain2->num_elements;
|
||||
//chain1->num_cothreaded += chain2->num_cothreaded;
|
||||
/* chain1->num_cothreaded += chain2->num_cothreaded; */
|
||||
|
||||
gst_fast_scheduler_chain_destroy (chain2);
|
||||
|
||||
|
@ -938,7 +938,7 @@ gst_fast_scheduler_iterate (GstScheduler * sched)
|
|||
continue;
|
||||
}
|
||||
|
||||
//if (chain->num_cothreaded > 1) {
|
||||
/* if (chain->num_cothreaded > 1) { */
|
||||
if (FALSE) {
|
||||
g_warning ("this scheduler can only deal with 1 cothreaded element in a chain");
|
||||
|
||||
|
|
|
@ -308,7 +308,7 @@ gst_unitconv_register_unit(const gchar *domain_name,
|
|||
unit->domain_default = is_domain_default;
|
||||
unit->logarithmic = is_logarithmic;
|
||||
unit->convert_to_funcs = g_hash_table_new(NULL,NULL);
|
||||
//unit->convert_properties = g_hash_table_new(g_str_hash,g_str_equal);
|
||||
/* unit->convert_properties = g_hash_table_new(g_str_hash,g_str_equal); */
|
||||
|
||||
g_hash_table_insert(_gst_units, g_strdup(unit_name), unit);
|
||||
|
||||
|
@ -382,7 +382,7 @@ static void
|
|||
gst_unitconv_time_seconds_to_samples(GstUnitConvert *unitconv, GValue *seconds_val, GValue *samples_val)
|
||||
{
|
||||
GValue *samplerate;
|
||||
//GValue *samplerate = g_hash_table_lookup(unitconv->currentToUnit->convert_properties, "samplerate");
|
||||
/* GValue *samplerate = g_hash_table_lookup(unitconv->currentToUnit->convert_properties, "samplerate"); */
|
||||
g_value_set_int64(samples_val,
|
||||
(gint64)(g_value_get_float(seconds_val) * (gfloat)g_value_get_int(samplerate)));
|
||||
}
|
||||
|
@ -391,7 +391,7 @@ static void
|
|||
gst_unitconv_time_samples_to_seconds(GstUnitConvert *unitconv, GValue *samples_val, GValue *seconds_val)
|
||||
{
|
||||
GValue *samplerate;
|
||||
//GValue *samplerate = g_hash_table_lookup(unitconv->currentFromUnit->convert_properties, "samplerate");
|
||||
/* GValue *samplerate = g_hash_table_lookup(unitconv->currentFromUnit->convert_properties, "samplerate"); */
|
||||
g_value_set_float(seconds_val,
|
||||
((gfloat)g_value_get_int64(samples_val)) / (gfloat)g_value_get_int(samplerate));
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue