From 3c5c1d29ea63e7af80d00f37b40004d752015760 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Moutte?= Date: Thu, 12 Jan 2006 22:04:58 +0000 Subject: [PATCH] libs/gst/base/gstbasesink.c: *cur = (now - base) * basesink->segment.abs_rate + time; replaced by Original commit message from CVS: * libs/gst/base/gstbasesink.c: *cur = (now - base) * basesink->segment.abs_rate + time; replaced by *cur = gst_guint64_to_gdouble(now - base) * basesink->segment.abs_rate + time; for vs6 * win32/common/config.h: added some defines GST_MAJORMINOR and HOST_CPU * win32/common/libgstbase.def: * win32/common/libgstreamer.def: added some exported functions --- ChangeLog | 11 +++++ gst/gstsegment.c | 1 + libs/gst/base/gstbasesink.c | 4 +- win32/common/config.h | 6 +++ win32/common/libgstbase.def | 58 +++++++++++++++------- win32/common/libgstreamer.def | 92 ++++++++++++++++++++++++++++++++++- 6 files changed, 152 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index c8e4cac279..54353a18c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2006-01-12 Sebastien Moutte + + * libs/gst/base/gstbasesink.c: + *cur = (now - base) * basesink->segment.abs_rate + time; replaced by + *cur = gst_guint64_to_gdouble(now - base) * basesink->segment.abs_rate + time; for vs6 + * win32/common/config.h: + added some defines GST_MAJORMINOR and HOST_CPU + * win32/common/libgstbase.def: + * win32/common/libgstreamer.def: + added some exported functions. + 2006-01-12 Stefan Kost * libs/gst/controller/gstcontroller.c: diff --git a/gst/gstsegment.c b/gst/gstsegment.c index 6c50b49464..23e252b4a7 100644 --- a/gst/gstsegment.c +++ b/gst/gstsegment.c @@ -393,6 +393,7 @@ gst_segment_set_newsegment (GstSegment * segment, gboolean update, gdouble rate, /* use previous rate to calculate duration */ segment->accum += gst_gdouble_to_guint64 ( (gst_guint64_to_gdouble (duration) / segment->abs_rate)); + /* then update the current segment */ segment->rate = rate; segment->abs_rate = ABS (rate); diff --git a/libs/gst/base/gstbasesink.c b/libs/gst/base/gstbasesink.c index 4ea95bf7dd..5d97277a81 100644 --- a/libs/gst/base/gstbasesink.c +++ b/libs/gst/base/gstbasesink.c @@ -1398,7 +1398,9 @@ gst_base_sink_get_position (GstBaseSink * basesink, GstFormat format, base = GST_ELEMENT_CAST (basesink)->base_time; base += basesink->segment.accum; base = MIN (now, base); - *cur = (now - base) * basesink->segment.abs_rate + time; + *cur = + gst_guint64_to_gdouble (now - base) * basesink->segment.abs_rate + + time; GST_DEBUG_OBJECT (basesink, "now %" GST_TIME_FORMAT " - base %" GST_TIME_FORMAT " - accum %" diff --git a/win32/common/config.h b/win32/common/config.h index 70ca42ac37..7d252fcabe 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -35,6 +35,12 @@ /* Define the version */ #define GST_VERSION "0.10.1.1" +/* Define the MAJOR.MINOR version */ +#define GST_MAJORMINOR "0.10" + +/* Define host CPU */ +#define HOST_CPU "i386" + /* Define if the host CPU is an Alpha */ #undef HAVE_CPU_ALPHA diff --git a/win32/common/libgstbase.def b/win32/common/libgstbase.def index cfa3ecdb69..dfb308b995 100644 --- a/win32/common/libgstbase.def +++ b/win32/common/libgstbase.def @@ -1,17 +1,41 @@ -EXPORTS - gst_base_transform_set_passthrough - gst_base_transform_get_type - gst_base_sink_get_type - gst_base_src_set_live - gst_base_src_get_type - gst_base_src_is_live - gst_push_src_get_type - gst_type_find_helper - gst_collect_pads_add_pad - gst_collect_pads_remove_pad - gst_collect_pads_peek - gst_collect_pads_pop - gst_collect_pads_start - gst_collect_pads_stop - gst_collect_pads_set_function - gst_collect_pads_new +EXPORTS + + gst_base_transform_set_passthrough + + gst_base_transform_get_type + + gst_base_sink_get_type + + gst_base_src_set_live + + gst_base_src_get_type + + gst_base_src_is_live + + gst_push_src_get_type + + gst_type_find_helper + + gst_collect_pads_add_pad + + gst_collect_pads_remove_pad + + gst_collect_pads_peek + + gst_collect_pads_pop + + gst_collect_pads_start + + gst_collect_pads_stop + + gst_collect_pads_set_function + + gst_collect_pads_new + + gst_collect_pads_flush + + gst_collect_pads_read + + gst_collect_pads_available + + diff --git a/win32/common/libgstreamer.def b/win32/common/libgstreamer.def index d3a956e221..15f68c6bb3 100644 --- a/win32/common/libgstreamer.def +++ b/win32/common/libgstreamer.def @@ -39,6 +39,8 @@ EXPORTS gst_buffer_new_and_alloc gst_buffer_stamp + + gst_bus_new gst_bus_poll @@ -84,9 +86,19 @@ EXPORTS gst_caps_to_string + gst_clock_get_calibration + + gst_clock_get_internal_time + gst_clock_get_type + gst_clock_set_calibration + + gst_clock_set_master + gst_core_error_quark + + gst_date_get_type gst_deinit @@ -97,6 +109,8 @@ EXPORTS gst_element_class_add_pad_template gst_element_class_get_pad_template + + gst_element_class_get_pad_template_list gst_element_class_set_details @@ -122,7 +136,11 @@ EXPORTS gst_element_get_clock + gst_element_get_factory + gst_element_get_pad + + gst_element_get_request_pad gst_element_get_state @@ -135,6 +153,8 @@ EXPORTS gst_element_link_many gst_element_link_pads + + gst_element_make_from_uri gst_element_no_more_pads @@ -145,9 +165,13 @@ EXPORTS gst_element_remove_pad gst_element_requires_clock - + + gst_element_send_event + + gst_element_set_bus + gst_element_set_state - + gst_element_sync_state_with_parent gst_element_unlink @@ -164,6 +188,8 @@ EXPORTS gst_format_get_details + gst_format_get_name + gst_format_register gst_fourcc_get_type @@ -171,6 +197,16 @@ EXPORTS gst_fraction_get_type gst_fraction_range_get_type + + gst_ghost_pad_get_type + + gst_ghost_pad_new + + gst_ghost_pad_new_no_target + + gst_ghost_pad_set_target + + gst_implements_interface_cast gst_implements_interface_check @@ -193,6 +229,8 @@ EXPORTS gst_init_get_option_group gst_int_range_get_type + + gst_library_error_quark gst_marshal_BOOLEAN__POINTER @@ -203,6 +241,8 @@ EXPORTS gst_marshal_VOID__POINTER_OBJECT gst_marshal_VOID__UINT_BOXED + + gst_message_new_element gst_message_get_structure @@ -223,6 +263,8 @@ EXPORTS gst_message_parse_warning gst_mini_object_get_type + + gst_mini_object_make_writable gst_mini_object_new @@ -247,6 +289,12 @@ EXPORTS gst_object_set_name gst_object_unref + + gst_pad_add_buffer_probe + + gst_pad_add_data_probe + + gst_pad_add_event_probe gst_pad_alloc_buffer @@ -259,12 +307,16 @@ EXPORTS gst_pad_get_direction gst_pad_get_element_private + + gst_pad_get_internal_links gst_pad_get_internal_links_default gst_pad_get_negotiated_caps gst_pad_get_pad_template_caps + + gst_pad_get_parent_element gst_pad_get_peer @@ -291,11 +343,17 @@ EXPORTS gst_pad_query gst_pad_query_default + + gst_pad_remove_buffer_probe + + gst_pad_remove_data_probe gst_pad_send_event gst_pad_set_active + gst_pad_set_blocked_async + gst_pad_set_chain_function gst_pad_set_element_private @@ -321,6 +379,8 @@ EXPORTS gst_pad_template_new gst_pad_unlink + + gst_param_spec_mini_object gst_parse_launch @@ -330,6 +390,8 @@ EXPORTS gst_pipeline_new + gst_pipeline_set_new_stream_time + gst_plugin_feature_get_name gst_plugin_feature_get_type @@ -347,10 +409,14 @@ EXPORTS gst_stream_error_quark gst_structure_copy + + gst_structure_fixate_field_boolean gst_structure_fixate_field_nearest_double gst_structure_fixate_field_nearest_int + + gst_structure_fixate_field_nearest_fraction gst_structure_foreach @@ -359,6 +425,8 @@ EXPORTS gst_structure_get_double gst_structure_get_fourcc + + gst_structure_get_fraction gst_structure_get_int @@ -370,6 +438,8 @@ EXPORTS gst_structure_has_field + gst_structure_has_name + gst_structure_new gst_structure_remove_field @@ -408,8 +478,14 @@ EXPORTS gst_util_set_object_arg + gst_value_array_append_value + + gst_value_array_get_size + gst_value_array_get_type + gst_value_array_get_value + gst_value_get_caps gst_value_get_fraction_denominator @@ -519,6 +595,8 @@ EXPORTS gst_iterator_fold gst_iterator_free + + gst_message_new_custom gst_message_new_eos @@ -550,6 +628,8 @@ EXPORTS gst_pad_activate_push + gst_pad_alloc_buffer_and_set_caps + gst_pad_chain gst_pad_check_pull_range @@ -642,6 +722,8 @@ EXPORTS gst_segment_clip + gst_segment_set_duration + gst_segment_set_newsegment gst_segment_to_running_time @@ -659,8 +741,12 @@ EXPORTS gst_tag_list_foreach gst_tag_list_free + + gst_tag_list_get_date_index gst_tag_list_get_double_index + + gst_tag_list_get_string gst_tag_list_get_string_index @@ -693,6 +779,8 @@ EXPORTS gst_util_guint64_to_gdouble gst_util_uint64_scale + + gst_util_uint64_scale_int gst_value_get_int_range_max