diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-06-06 08:56:57 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-06-06 08:56:57 -0500 |
| commit | e3d290c957b37bbbf0f739fdad9a906281a8d36d (patch) | |
| tree | ec96e062bd7de616bd0539382cad4b4c6d5ca908 /include | |
| parent | 6f6de091a6a1e4be8e14a691fff7d1dc90c562c1 (diff) | |
| parent | ca2b3584b24e2e5621aec288fa37f6cc929439f6 (diff) | |
Merge "format: Reintroduce smoother flags" into 14
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/codec.h | 3 | ||||
| -rw-r--r-- | include/asterisk/format.h | 11 | ||||
| -rw-r--r-- | include/asterisk/smoother.h | 1 |
3 files changed, 15 insertions, 0 deletions
diff --git a/include/asterisk/codec.h b/include/asterisk/codec.h index 3873324b1..e3b71062b 100644 --- a/include/asterisk/codec.h +++ b/include/asterisk/codec.h @@ -26,6 +26,9 @@ #ifndef _AST_CODEC_H_ #define _AST_CODEC_H_ +#define AST_SMOOTHER_FLAGS_PACK(x) ((x) << 1) +#define AST_SMOOTHER_FLAGS_UNPACK(x) ((x) >> 1) + /*! \brief Types of media */ enum ast_media_type { AST_MEDIA_TYPE_UNKNOWN = 0, diff --git a/include/asterisk/format.h b/include/asterisk/format.h index a5ca03818..fb130e83b 100644 --- a/include/asterisk/format.h +++ b/include/asterisk/format.h @@ -338,6 +338,17 @@ const char *ast_format_get_codec_name(const struct ast_format *format); int ast_format_can_be_smoothed(const struct ast_format *format); /*! + * \since 13.17.0 + * + * \brief Get smoother flags for this format + * + * \param format The media format + * + * \return smoother flags for the provided format + */ +int ast_format_get_smoother_flags(const struct ast_format *format); + +/*! * \brief Get the media type of a format * * \param format The media format diff --git a/include/asterisk/smoother.h b/include/asterisk/smoother.h index e63aa77bd..65ac88921 100644 --- a/include/asterisk/smoother.h +++ b/include/asterisk/smoother.h @@ -33,6 +33,7 @@ extern "C" { #define AST_SMOOTHER_FLAG_G729 (1 << 0) #define AST_SMOOTHER_FLAG_BE (1 << 1) +#define AST_SMOOTHER_FLAG_FORCED (1 << 2) /*! \name AST_Smoother */ |