mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-27 14:31:01 +00:00
Code Issues 1 Projects Releases Wiki Activity

docs/gst/gstreamer-sections.txt: remove mention of removed functions

Browse source 
Original commit message from CVS:

* docs/gst/gstreamer-sections.txt:
remove mention of removed functions
* docs/gst/tmpl/gstbuffer.sgml:
* docs/gst/tmpl/gstutils.sgml:
* gst/gstutils.c:
* gst/gstutils.h:
move buffer_stamp and _merge
This commit is contained in:
Thomas Vander Stichele 2005-02-11 16:21:46 +00:00
parent 484d9a3224
commit 931f43aa54
6 changed files with 84 additions and 195 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2005-02-11 Thomas Vander Stichele <thomas at apestaart dot org>
* docs/gst/gstreamer-sections.txt:
remove mention of removed functions
* docs/gst/tmpl/gstbuffer.sgml:
* docs/gst/tmpl/gstutils.sgml:
* gst/gstutils.c:
* gst/gstutils.h:
move buffer_stamp and _merge
2005-02-11 Wim Taymans <wim@fluendo.com>
* docs/design/part-clocks.txt:

187
docs/gst/gstreamer-sections.txt
View file

@ -16,10 +16,6 @@ gst_init_check
gst_init_with_popt_table
gst_init_check_with_popt_table
gst_init_get_popt_table
gst_use_threads
gst_has_threads
gst_main
gst_main_quit
</SECTION>
<SECTION>
@ -48,15 +44,7 @@ gst_bin_remove
gst_bin_remove_many
gst_bin_get_by_name
gst_bin_get_by_name_recurse_up
gst_bin_get_list
gst_bin_get_by_interface
gst_bin_get_all_by_interface
gst_bin_iterate
gst_bin_use_clock
gst_bin_get_clock
gst_bin_auto_clock
gst_bin_sync_children_state
gst_bin_child_state_change
<SUBSECTION Standard>
GstBinClass
GST_BIN
@ -94,13 +82,11 @@ GST_BUFFER_OFFSET_END
gst_buffer_ref
gst_buffer_ref_by_count
gst_buffer_unref
gst_buffer_stamp
gst_buffer_copy
gst_buffer_is_writable
gst_buffer_copy_on_write
gst_buffer_create_sub
gst_buffer_join
gst_buffer_merge
gst_buffer_span
gst_buffer_is_span_fast
gst_buffer_default_free
@ -150,28 +136,22 @@ gst_caps_new_simple
gst_caps_new_full
gst_caps_new_full_valist
gst_caps_copy
gst_caps_free
gst_static_caps_get
gst_caps_append
gst_caps_append_structure
gst_caps_split_one
gst_caps_get_size
gst_caps_get_structure
gst_caps_copy_1
gst_caps_set_simple
gst_caps_set_simple_valist
gst_caps_is_any
gst_caps_is_empty
gst_caps_is_chained
gst_caps_is_fixed
gst_caps_is_equal
gst_caps_is_equal_fixed
gst_caps_is_always_compatible
gst_caps_is_subset
gst_caps_intersect
gst_caps_union
gst_caps_normalize
gst_caps_simplify
gst_caps_do_simplify
gst_caps_save_thyself
gst_caps_load_thyself
@ -208,7 +188,6 @@ GST_TIME_TO_TIMEVAL
GST_CLOCK_ENTRY_TRACE_NAME
GstClockEntry
GstClockCallback
GstClockEntryStatus
GstClockEntryType
GST_CLOCK_ENTRY
GST_CLOCK_ENTRY_CLOCK
@ -219,26 +198,15 @@ GST_CLOCK_ENTRY_STATUS
GstClockReturn
GstClockFlags
GST_CLOCK_FLAGS
gst_clock_set_speed
gst_clock_get_speed
gst_clock_set_resolution
gst_clock_get_resolution
gst_clock_set_active
gst_clock_is_active
gst_clock_reset
gst_clock_handle_discont
gst_clock_get_time
gst_clock_get_event_time
gst_clock_get_event_time_delay
gst_clock_get_next_id
gst_clock_new_single_shot_id
gst_clock_new_periodic_id
gst_clock_id_get_time
gst_clock_id_wait
gst_clock_id_wait_async
gst_clock_id_unschedule
gst_clock_id_unlock
gst_clock_id_free
<SUBSECTION Standard>
GstClockClass
GST_CLOCK
@ -255,26 +223,6 @@ gst_clock_get_type
<FILE>gstcompat</FILE>
<TITLE>GstCompat</TITLE>
<SUBSECTION Standard>
GST_PAD_IS_CONNECTED
gst_element_connect
gst_element_connect_pads
gst_element_connect_many
gst_element_connect_filtered
gst_element_disconnect
gst_pad_connect
gst_pad_connect_filtered
gst_pad_disconnect
gst_pad_proxy_connect
gst_pad_set_connect_function
gst_pad_call_chain_function
gst_pad_call_get_function
GST_PAD_CONNECT_REFUSED
GST_PAD_CONNECT_DELAYED
GST_PAD_CONNECT_OK
GST_PAD_CONNECT_DONE
GstPadConnectReturn
GstPadConnectFunction
gst_info
<SUBSECTION Private>
</SECTION>
@ -355,37 +303,18 @@ GST_ELEMENT_QUERY_TYPE_FUNCTION
GST_ELEMENT_FORMATS_FUNCTION
GST_ELEMENT_EVENT_MASK_FUNCTION
GstElementFlags
GST_ELEMENT_IS_THREAD_SUGGESTED
GST_ELEMENT_IS_EVENT_AWARE
GST_ELEMENT_IS_DECOUPLED
GST_ELEMENT_NAME
GST_ELEMENT_PARENT
GST_ELEMENT_SCHED
GST_ELEMENT_CLOCK
GST_ELEMENT_PADS
GST_ELEMENT_ERROR
GstElementLoopFunction
GstElementPreRunFunction
GstElementPostRunFunction
gst_element_class_add_pad_template
gst_element_class_install_std_props
gst_element_class_set_details
gst_element_default_deep_notify
gst_element_default_error
gst_element_set_loop_function
gst_element_get_name
gst_element_set_name
gst_element_get_parent
gst_element_set_parent
gst_element_set
gst_element_get
gst_element_set_valist
gst_element_get_valist
gst_element_set_property
gst_element_get_property
gst_element_enable_threadsafe_properties
gst_element_disable_threadsafe_properties
gst_element_set_pending_properties
gst_element_requires_clock
gst_element_provides_clock
gst_element_get_clock
@ -393,32 +322,22 @@ gst_element_set_clock
gst_element_clock_wait
gst_element_get_time
gst_element_wait
gst_element_set_time
gst_element_set_time_delay
gst_element_adjust_time
gst_element_is_indexable
gst_element_set_index
gst_element_get_index
gst_element_release_locks
gst_element_yield
gst_element_interrupt
gst_element_set_scheduler
gst_element_get_scheduler
gst_element_add_pad
gst_element_remove_pad
gst_element_add_ghost_pad
gst_element_remove_ghost_pad
gst_element_get_pad
gst_element_get_static_pad
gst_element_get_request_pad
gst_element_release_request_pad
gst_element_get_pad_list
gst_element_get_compatible_pad
gst_element_get_compatible_pad_filtered
gst_element_class_get_pad_template
gst_element_class_get_pad_template_list
gst_element_get_pad_template
gst_element_get_pad_template_list
gst_element_get_compatible_pad_template
gst_element_link
gst_element_link_many
@ -435,19 +354,13 @@ gst_element_get_query_types
gst_element_query
gst_element_get_formats
gst_element_convert
gst_element_found_tags
gst_element_found_tags_for_pad
gst_element_set_eos
gst_element_error_full
gst_element_is_locked_state
gst_element_set_locked_state
gst_element_sync_state_with_parent
gst_element_get_state
gst_element_set_state
gst_element_wait_state_change
gst_element_state_get_name
gst_element_get_factory
gst_element_get_managing_bin
gst_element_no_more_pads
<SUBSECTION Standard>
GstElementClass
@ -487,8 +400,6 @@ gst_element_factory_get_uri_type
gst_element_factory_get_uri_protocols
gst_element_factory_create
gst_element_factory_make
gst_element_factory_can_src_caps
gst_element_factory_can_sink_caps
<SUBSECTION Standard>
GstElementFactoryClass
GST_ELEMENT_FACTORY
@ -508,7 +419,6 @@ GST_TYPE_ALLOC_TRACE_FLAGS
GST_TYPE_ASSOC_FLAGS
GST_TYPE_BIN_FLAGS
GST_TYPE_BUFFER_FLAG
GST_TYPE_CLOCK_ENTRY_STATUS
GST_TYPE_CLOCK_ENTRY_TYPE
GST_TYPE_CLOCK_FLAGS
GST_TYPE_CLOCK_RETURN
@ -544,13 +454,11 @@ GST_TYPE_RESOURCE_ERROR
GST_TYPE_RESULT
GST_TYPE_RANK
GST_TYPE_SCHEDULER_FLAGS
GST_TYPE_SCHEDULER_STATE
GST_TYPE_SEEK_ACCURACY
GST_TYPE_SEEK_TYPE
GST_TYPE_STREAM_ERROR
GST_TYPE_TAG_FLAG
GST_TYPE_TAG_MERGE_MODE
GST_TYPE_THREAD_STATE
GST_TYPE_TYPE_FIND_PROBABILITY
GST_TYPE_URI_TYPE
<SUBSECTION Private>
@ -558,7 +466,6 @@ gst_alloc_trace_flags_get_type
gst_assoc_flags_get_type
gst_bin_flags_get_type
gst_buffer_flag_get_type
gst_clock_entry_status_get_type
gst_clock_entry_type_get_type
gst_clock_flags_get_type
gst_clock_return_get_type
@ -594,13 +501,11 @@ gst_resource_error_get_type
gst_result_get_type
gst_rank_get_type
gst_scheduler_flags_get_type
gst_scheduler_state_get_type
gst_seek_accuracy_get_type
gst_seek_type_get_type
gst_stream_error_get_type
gst_tag_flag_get_type
gst_tag_merge_mode_get_type
gst_thread_state_get_type
gst_type_find_probability_get_type
gst_uri_type_get_type
</SECTION>
@ -617,7 +522,6 @@ GST_RESOURCE_ERROR
GST_CORE_ERROR
GST_STREAM_ERROR
GST_ERROR_SYSTEM
gst_error_get_message
gst_stream_error_quark
gst_core_error_quark
gst_resource_error_quark
@ -633,7 +537,6 @@ gst_g_error_get_type
<TITLE>GstEvent</TITLE>
GstEvent
GstEventType
GST_EVENT_ANY
GST_EVENT_TRACE_NAME
GST_EVENT_TYPE
GST_EVENT_TIMESTAMP
@ -656,7 +559,6 @@ GST_EVENT_SEEK_FLAGS
GST_EVENT_SEEK_OFFSET
GST_EVENT_SEEK_ENDOFFSET
GST_EVENT_SEEK_ACCURACY
GST_EVENT_DISCONT_NEW_MEDIA
GST_EVENT_DISCONT_OFFSET
GST_EVENT_DISCONT_OFFSET_LEN
GST_EVENT_SIZE_FORMAT
@ -703,7 +605,6 @@ gst_format_register
gst_format_get_by_nick
gst_formats_contains
gst_format_get_details
gst_format_get_definitions
</SECTION>
<SECTION>
@ -930,8 +831,6 @@ GST_FLAG_SET
GST_FLAG_UNSET
GST_OBJECT_NAME
GST_OBJECT_PARENT
GST_OBJECT_DESTROYED
GST_OBJECT_FLOATING
GST_LOCK
GST_TRYLOCK
GST_UNLOCK
@ -977,7 +876,6 @@ GST_PAD_QUERY_TYPE_FUNCTION
GST_PAD_FORMATS_FUNCTION
GST_PAD_EVENT_MASK_FUNCTION
GstPadChainFunction
GstPadGetFunction
GstPadEventFunction
GstPadConvertFunction
GstPadQueryFunction
@ -988,7 +886,6 @@ GstPadQueryTypeFunction
GstPadLinkFunction
GstPadUnlinkFunction
GstPadGetCapsFunction
GstPadFixateFunction
GstPadBufferAllocFunction
GstPadDispatcherFunction
GstPadDirection
@ -1004,7 +901,6 @@ GST_PAD_PEER
GST_PAD_IS_LINKED
GST_PAD_IS_ACTIVE
GST_PAD_IS_NEGOTIATING
GST_PAD_IS_DISPATCHING
GST_PAD_IS_USABLE
GST_PAD_CAN_PULL
GST_PAD_IS_SRC
@ -1024,15 +920,10 @@ gst_pad_get_element_private
gst_pad_set_parent
gst_pad_get_parent
gst_pad_get_real_parent
gst_pad_get_scheduler
gst_pad_add_ghost_pad
gst_pad_remove_ghost_pad
gst_pad_get_ghost_pad_list
gst_pad_get_pad_template
gst_pad_set_bufferalloc_function
gst_pad_alloc_buffer
gst_pad_set_chain_function
gst_pad_set_get_function
gst_pad_set_event_function
gst_pad_set_event_mask_function
gst_pad_get_event_masks
@ -1047,38 +938,14 @@ gst_pad_unlink
gst_pad_is_linked
gst_pad_get_peer
gst_pad_get_negotiated_caps
gst_pad_is_negotiated
gst_pad_get_caps
gst_pad_get_pad_template_caps
gst_pad_try_set_caps
gst_pad_try_set_caps_nonfixed
gst_pad_check_compatibility
gst_pad_set_getcaps_function
gst_pad_set_fixate_function
gst_pad_proxy_getcaps
gst_pad_proxy_pad_link
gst_pad_proxy_fixate
gst_pad_proxy_link
gst_pad_set_explicit_caps
gst_pad_use_explicit_caps
gst_pad_relink_filtered
gst_pad_perform_negotiate
gst_pad_renegotiate
gst_pad_unnegotiate
gst_pad_try_relink_filtered
gst_pad_get_allowed_caps
gst_pad_caps_change_notify
gst_pad_recover_caps_error
gst_pad_push
gst_pad_pull
gst_pad_send_event
gst_pad_event_default
gst_pad_select
gst_pad_selectv
gst_pad_select_valist
gst_pad_collect
gst_pad_collectv
gst_pad_collect_valist
gst_pad_set_formats_function
gst_pad_get_formats
gst_pad_get_formats_default
@ -1125,7 +992,6 @@ GstPadTemplateFlags
gst_pad_template_new
gst_static_pad_template_get
gst_pad_template_get_caps
gst_pad_template_get_caps_by_name
<SUBSECTION Standard>
GstPadTemplateClass
GST_PAD_TEMPLATE
@ -1260,7 +1126,6 @@ gst_query_type_register
gst_query_type_get_by_nick
gst_query_types_contains
gst_query_type_get_details
gst_query_type_get_definitions
</SECTION>
<SECTION>
@ -1290,11 +1155,7 @@ GST_RPAD_CAPS
GST_RPAD_APPFILTER
GST_RPAD_PEER
GST_RPAD_CHAINFUNC
GST_RPAD_CHAINHANDLER
GST_RPAD_GETFUNC
GST_RPAD_GETHANDLER
GST_RPAD_EVENTFUNC
GST_RPAD_EVENTHANDLER
GST_RPAD_CONVERTFUNC
GST_RPAD_QUERYFUNC
GST_RPAD_INTLINKFUNC
@ -1304,10 +1165,7 @@ GST_RPAD_EVENTMASKFUNC
GST_RPAD_LINKFUNC
GST_RPAD_UNLINKFUNC
GST_RPAD_GETCAPSFUNC
GST_RPAD_FIXATEFUNC
GST_RPAD_BUFFERALLOCFUNC
GST_RPAD_LINK
GST_RPAD_EXPLICIT_CAPS
<SUBSECTION Standard>
GstRealPadClass
GST_REAL_PAD
@ -1387,30 +1245,8 @@ GstScheduler
GstSchedulerFlags
GST_SCHEDULER_PARENT
GST_SCHEDULER_STATE
GstSchedulerState
gst_scheduler_setup
gst_scheduler_reset
gst_scheduler_add_element
gst_scheduler_remove_element
gst_scheduler_add_scheduler
gst_scheduler_remove_scheduler
gst_scheduler_state_transition
gst_scheduler_scheduling_change
gst_scheduler_lock_element
gst_scheduler_unlock_element
gst_scheduler_yield
gst_scheduler_interrupt
gst_scheduler_error
gst_scheduler_pad_link
gst_scheduler_pad_unlink
gst_scheduler_pad_select
gst_scheduler_clock_wait
gst_scheduler_iterate
gst_scheduler_use_clock
gst_scheduler_set_clock
gst_scheduler_get_clock
gst_scheduler_auto_clock
gst_scheduler_show
GST_SCHEDULER_DEFAULT_NAME
<SUBSECTION Standard>
GstSchedulerClass
@ -1635,27 +1471,6 @@ GST_TYPE_TAG_SETTER
gst_tag_setter_get_type
</SECTION>
<SECTION>
<FILE>gstthread</FILE>
<TITLE>GstThread</TITLE>
GstThread
gst_thread_current
GstThreadState
gst_thread_new
gst_thread_set_priority
gst_thread_get_current
<SUBSECTION Standard>
GstThreadClass
GST_THREAD
GST_IS_THREAD
GST_THREAD_CLASS
GST_IS_THREAD_CLASS
GST_THREAD_GET_CLASS
GST_TYPE_THREAD
<SUBSECTION Private>
gst_thread_get_type
</SECTION>
<SECTION>
<FILE>gsttrace</FILE>
<TITLE>GstTrace</TITLE>
@ -1787,6 +1602,8 @@ gst_util_set_object_arg
gst_util_dump_mem
gst_print_pad_caps
gst_print_element_args
gst_buffer_merge
gst_buffer_stamp
GST_BOILERPLATE_FULL
GST_BOILERPLATE
GST_CALL_PARENT

10
docs/gst/tmpl/gstbuffer.sgml
View file

@ -311,16 +311,6 @@ If the refcount is 1, this function just returns the original buffer.
@Returns:
<!-- ##### FUNCTION gst_buffer_merge ##### -->
<para>
</para>
@buf1:
@buf2:
@Returns:
<!-- ##### FUNCTION gst_buffer_span ##### -->
<para>

19
docs/gst/tmpl/gstutils.sgml
View file

@ -62,6 +62,25 @@ various utility functions
@element:
<!-- ##### FUNCTION gst_buffer_merge ##### -->
<para>
</para>
@buf1:
@buf2:
@Returns:
<!-- ##### FUNCTION gst_buffer_stamp ##### -->
<para>
</para>
@dest:
@src:
<!-- ##### MACRO GST_BOILERPLATE_FULL ##### -->
<para>

49
gst/gstutils.c
View file

@ -1597,3 +1597,52 @@ gst_element_class_install_std_props (GstElementClass * klass,
va_end (args);
}
/**
* gst_buffer_merge:
* @buf1: a first source #GstBuffer to merge.
* @buf2: the second source #GstBuffer to merge.
*
* Create a new buffer that is the concatenation of the two source
* buffers. The original source buffers will not be modified or
* unref'd.
*
* WARNING: Incorrect use of this function can lead to memory leaks.
* It is recommended to use gst_buffer_join() instead of this function.
*
* If the buffers point to contiguous areas of memory, the buffer
* is created without copying the data.
*
* Returns: the new #GstBuffer that's the concatenation of the source buffers.
*/
GstBuffer *
gst_buffer_merge (GstBuffer * buf1, GstBuffer * buf2)
{
GstBuffer *result;
/* we're just a specific case of the more general gst_buffer_span() */
result = gst_buffer_span (buf1, 0, buf2, buf1->size + buf2->size);
return result;
}
/**
* gst_buffer_stamp:
* @dest: buffer to stamp
* @src: buffer to stamp from
*
* Copies additional information (timestamps and offsets) from one buffer to
* the other.
*/
void
gst_buffer_stamp (GstBuffer * dest, const GstBuffer * src)
{
g_return_if_fail (dest != NULL);
g_return_if_fail (src != NULL);
GST_BUFFER_TIMESTAMP (dest) = GST_BUFFER_TIMESTAMP (src);
GST_BUFFER_DURATION (dest) = GST_BUFFER_DURATION (src);
GST_BUFFER_OFFSET (dest) = GST_BUFFER_OFFSET (src);
GST_BUFFER_OFFSET_END (dest) = GST_BUFFER_OFFSET_END (src);
}

4
gst/gstutils.h
View file

@ -272,6 +272,10 @@ GstCaps* gst_pad_get_fixed_caps_func (GstPad *pad);
void gst_bin_add_many (GstBin *bin, GstElement *element_1, ...);
void gst_bin_remove_many (GstBin *bin, GstElement *element_1, ...);
/* buffer functions */
GstBuffer * gst_buffer_merge (GstBuffer * buf1, GstBuffer * buf2);
void gst_buffer_stamp (GstBuffer * dest, const GstBuffer * src);
G_END_DECLS