[svn-commits] file: branch group/media_formats r407394 - /team/group/media_formats/include/...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Wed Feb 5 06:59:27 CST 2014
Author: file
Date: Wed Feb 5 06:59:15 2014
New Revision: 407394
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=407394
Log:
Move new implementation into place and remove _ng from functions.
Added:
team/group/media_formats/include/asterisk/format.h
- copied, changed from r407393, team/group/media_formats/include/asterisk/format_ng.h
team/group/media_formats/include/asterisk/format_cap.h
- copied, changed from r407393, team/group/media_formats/include/asterisk/format_cap_ng.h
Removed:
team/group/media_formats/include/asterisk/format_cap_ng.h
team/group/media_formats/include/asterisk/format_ng.h
team/group/media_formats/include/asterisk/format_pref.h
Copied: team/group/media_formats/include/asterisk/format.h (from r407393, team/group/media_formats/include/asterisk/format_ng.h)
URL: http://svnview.digium.com/svn/asterisk/team/group/media_formats/include/asterisk/format.h?view=diff&rev=407394&p1=team/group/media_formats/include/asterisk/format_ng.h&r1=407393&p2=team/group/media_formats/include/asterisk/format.h&r2=407394
==============================================================================
--- team/group/media_formats/include/asterisk/format_ng.h (original)
+++ team/group/media_formats/include/asterisk/format.h Wed Feb 5 06:59:15 2014
@@ -117,14 +117,14 @@
* \note The format is returned with reference count incremented. It must be released using
* ao2_ref or ao2_cleanup.
*/
-struct ast_format *ast_format_ng_create(struct ast_codec *codec);
+struct ast_format *ast_format_create(struct ast_codec *codec);
/*!
* \brief Compare two formats
*
* \retval ast_format_cmp_res representing the result of comparing format1 and format2.
*/
-enum ast_format_cmp_res ast_format_ng_cmp(const struct ast_format *format1, const struct ast_format *format2);
+enum ast_format_cmp_res ast_format_cmp(const struct ast_format *format1, const struct ast_format *format2);
/*1
* \brief Get a common joint capability between two formats
@@ -134,14 +134,14 @@
*
* \note The returned format must be treated as immutable.
*/
-struct ast_format *ast_format_ng_joint(const struct ast_format *format1, const struct ast_format *format2);
+struct ast_format *ast_format_joint(const struct ast_format *format1, const struct ast_format *format2);
/*!
* \brief Copy a media format
*
* \note The returned format must be treated as immutable.
*/
-struct ast_format *ast_format_ng_copy(struct ast_format *format);
+struct ast_format *ast_format_copy(struct ast_format *format);
/*!
* \brief Set an attribute on a format to a specific value
@@ -153,7 +153,7 @@
* \retval 0 success
* \retval -1 failure
*/
-int ast_format_ng_attribute_set(struct ast_format *format, const char *name, const char *value);
+int ast_format_attribute_set(struct ast_format *format, const char *name, const char *value);
/*!
* \brief This function is used to have a media format aware module parse and interpret
@@ -166,7 +166,7 @@
* \retval 0 success, attribute values were valid
* \retval -1 failure, values were not acceptable
*/
-int ast_format_ng_sdp_parse(struct ast_format *format, const char *attributes);
+int ast_format_sdp_parse(struct ast_format *format, const char *attributes);
/*!
* \brief This function is used to produce an fmtp SDP line for an Asterisk format. The
@@ -176,7 +176,7 @@
* \param payload numerical payload for the fmtp line
* \param str structure that the fmtp line will be appended to
*/
-void ast_format_ng_sdp_generate(const struct ast_format *format, unsigned int payload, struct ast_str **str);
+void ast_format_sdp_generate(const struct ast_format *format, unsigned int payload, struct ast_str **str);
/*!
* \brief Register a format interface for use with the provided codec
@@ -199,6 +199,6 @@
* \retval 0 success
* \retval -1 failure
*/
-#define ast_format_ng_interface_register(codec, interface) __ast_format_interface_register(codec, interface, ast_module_info->self)
+#define ast_format_interface_register(codec, interface) __ast_format_interface_register(codec, interface, ast_module_info->self)
#endif /* _AST_FORMAT_H */
Copied: team/group/media_formats/include/asterisk/format_cap.h (from r407393, team/group/media_formats/include/asterisk/format_cap_ng.h)
URL: http://svnview.digium.com/svn/asterisk/team/group/media_formats/include/asterisk/format_cap.h?view=diff&rev=407394&p1=team/group/media_formats/include/asterisk/format_cap_ng.h&r1=407393&p2=team/group/media_formats/include/asterisk/format_cap.h&r2=407394
==============================================================================
--- team/group/media_formats/include/asterisk/format_cap_ng.h (original)
+++ team/group/media_formats/include/asterisk/format_cap.h Wed Feb 5 06:59:15 2014
@@ -46,7 +46,7 @@
* \retval ast_format_cap object on success.
* \retval NULL on failure.
*/
-struct ast_format_cap *ast_format_cap_ng_alloc(enum ast_format_cap_flags flags);
+struct ast_format_cap *ast_format_cap_alloc(enum ast_format_cap_flags flags);
/*!
* \brief Set the global framing.
@@ -54,7 +54,7 @@
* \param cap The capabilities structure.
* \param framing The framing value (in milliseconds).
*/
-void ast_format_cap_ng_set_framing(struct ast_format_cap *cap, unsigned int framing);
+void ast_format_cap_set_framing(struct ast_format_cap *cap, unsigned int framing);
/*!
* \brief Add format capability to capabilities structure.
@@ -70,7 +70,7 @@
*
* \note The order in which add is called determines the format preference order.
*/
-int ast_format_cap_ng_add(struct ast_format_cap *cap, struct ast_format *format, unsigned int framing);
+int ast_format_cap_add(struct ast_format_cap *cap, struct ast_format *format, unsigned int framing);
/*!
* \brief Add all codecs Asterisk knows about for a specific type to
@@ -86,7 +86,7 @@
*
* \note If AST_MEDIA_TYPE_UNKNOWN is passed as the type all known codecs will be added.
*/
-int ast_format_cap_ng_add_all_by_type(struct ast_format_cap *cap, enum ast_media_type type);
+int ast_format_cap_add_all_by_type(struct ast_format_cap *cap, enum ast_media_type type);
/*!
* \brief Append the formats in src to dst
@@ -97,7 +97,7 @@
* \retval 0 success
* \retval -1 failure
*/
-int ast_format_cap_ng_append(struct ast_format_cap *dst, const struct ast_format_cap *src);
+int ast_format_cap_append(struct ast_format_cap *dst, const struct ast_format_cap *src);
/*!
* \brief Get the number of formats present within the capabilities structure
@@ -106,7 +106,7 @@
*
* \return the number of formats
*/
-size_t ast_format_cap_ng_count(const struct ast_format_cap *cap);
+size_t ast_format_cap_count(const struct ast_format_cap *cap);
/*!
* \brief Get the format at a specific position
@@ -122,7 +122,7 @@
* \note The reference count of the returned format is increased. It must be released using ao2_ref
* or ao2_cleanup.
*/
-struct ast_format *ast_format_cap_ng_get_format(const struct ast_format_cap *cap, int position);
+struct ast_format *ast_format_cap_get_format(const struct ast_format_cap *cap, int position);
/*!
* \brief Get the framing for a format
@@ -132,7 +132,7 @@
*
* \return the framing (in milliseconds)
*/
-unsigned int ast_format_cap_ng_get_framing(const struct ast_format_cap *cap, const struct ast_format *format);
+unsigned int ast_format_cap_get_framing(const struct ast_format_cap *cap, const struct ast_format *format);
/*!
* \brief Remove format capability from capability structure.
@@ -143,7 +143,7 @@
* \retval 0, remove was successful
* \retval -1, remove failed. Could not find format to remove
*/
-int ast_format_cap_ng_remove(struct ast_format_cap *cap, struct ast_format *format);
+int ast_format_cap_remove(struct ast_format_cap *cap, struct ast_format *format);
/*!
* \brief Remove all formats matching a specific format type.
@@ -151,14 +151,14 @@
* \param cap The capabilities structure
* \param type The media type to remove formats of
*/
-void ast_format_cap_ng_remove_bytype(struct ast_format_cap *cap, enum ast_media_type type);
+void ast_format_cap_remove_bytype(struct ast_format_cap *cap, enum ast_media_type type);
/*!
* \brief Remove all format capabilities from capability structure
*
* \param cap The capabilities structure
*/
-void ast_format_cap_ng_remove_all(struct ast_format_cap *cap);
+void ast_format_cap_remove_all(struct ast_format_cap *cap);
/*!
* \brief Find if input ast_format is within the capabilities of the ast_format_cap object
@@ -170,14 +170,14 @@
* \note The reference count of the returned format is increased. It must be released using ao2_ref
* or ao2_cleanup.
*/
-struct ast_format *ast_format_cap_ng_get_compatible_format(const struct ast_format_cap *cap, const struct ast_format *format);
+struct ast_format *ast_format_cap_get_compatible_format(const struct ast_format_cap *cap, const struct ast_format *format);
/*!
* \brief Find if ast_format is within the capabilities of the ast_format_cap object.
*
* \retval ast_format_cmp_res representing the result of the compatibility check between cap and format.
*/
-enum ast_format_cmp_res ast_format_cap_ng_iscompatible_format(const struct ast_format_cap *cap, const struct ast_format *format);
+enum ast_format_cmp_res ast_format_cap_iscompatible_format(const struct ast_format_cap *cap, const struct ast_format *format);
/*!
* \brief Find the compatible formats between two capabilities structures
@@ -193,7 +193,7 @@
*
* \note If failure occurs the result format capabilities structure may contain a partial result.
*/
-int ast_format_cap_ng_get_compatible(const struct ast_format_cap *cap1, const struct ast_format_cap *cap2,
+int ast_format_cap_get_compatible(const struct ast_format_cap *cap1, const struct ast_format_cap *cap2,
struct ast_format_cap *result);
/*!
@@ -205,7 +205,7 @@
* \retval 0 no joint capabilities exist
* \retval 1 joint capabilities exist
*/
-int ast_format_cap_ng_iscompatible(const struct ast_format_cap *cap1, const struct ast_format_cap *cap2);
+int ast_format_cap_iscompatible(const struct ast_format_cap *cap1, const struct ast_format_cap *cap2);
/*!
* \brief Find out if the capabilities structure has any formats
@@ -214,7 +214,7 @@
* \retval 1 true
* \retval 0 false, no formats of specific type.
*/
-int ast_format_cap_ng_has_type(const struct ast_format_cap *cap, enum ast_media_type type);
+int ast_format_cap_has_type(const struct ast_format_cap *cap, enum ast_media_type type);
/*! \brief Get the names of codecs of a set of formats
* \param buf a buffer for the output string
@@ -222,6 +222,6 @@
* \param cap capabilities structure containing formats
* \return The return value is buf.
*/
-char *ast_getformatname_ng_multiple(char *buf, size_t size, struct ast_format_cap *cap);
+char *ast_getformatname_multiple(char *buf, size_t size, struct ast_format_cap *cap);
#endif /* _AST_FORMAT_CAP_H */
More information about the svn-commits
mailing list