diff options
| author | David Vossel <dvossel@digium.com> | 2011-02-03 16:22:10 +0000 |
|---|---|---|
| committer | David Vossel <dvossel@digium.com> | 2011-02-03 16:22:10 +0000 |
| commit | c26c190711a1bbe3b5fff1a93facae333757c56e (patch) | |
| tree | 00da0caa5a07b7b25729f089dbcafb08129fa9be /include/asterisk/speech.h | |
| parent | 652fb64a01c7a8656697d07e606620ee0ced6929 (diff) | |
Asterisk media architecture conversion - no more format bitfields
This patch is the foundation of an entire new way of looking at media in Asterisk.
The code present in this patch is everything required to complete phase1 of my
Media Architecture proposal. For more information about this project visit the link below.
https://wiki.asterisk.org/wiki/display/AST/Media+Architecture+Proposal
The primary function of this patch is to convert all the usages of format
bitfields in Asterisk to use the new format and format_cap APIs. Functionally
no change in behavior should be present in this patch. Thanks to twilson
and russell for all the time they spent reviewing these changes.
Review: https://reviewboard.asterisk.org/r/1083/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@306010 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/speech.h')
| -rw-r--r-- | include/asterisk/speech.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asterisk/speech.h b/include/asterisk/speech.h index cb167d5b5..5397d8aaa 100644 --- a/include/asterisk/speech.h +++ b/include/asterisk/speech.h @@ -58,7 +58,7 @@ struct ast_speech { /*! Current state of structure */ int state; /*! Expected write format */ - int format; + struct ast_format format; /*! Data for speech engine */ void *data; /*! Cached results */ @@ -74,7 +74,7 @@ struct ast_speech_engine { /*! Name of speech engine */ char *name; /*! Set up the speech structure within the engine */ - int (*create)(struct ast_speech *speech, int format); + int (*create)(struct ast_speech *speech, struct ast_format *format); /*! Destroy any data set on the speech structure by the engine */ int (*destroy)(struct ast_speech *speech); /*! Load a local grammar on the speech structure */ @@ -98,7 +98,7 @@ struct ast_speech_engine { /*! Try to get results */ struct ast_speech_result *(*get)(struct ast_speech *speech); /*! Accepted formats by the engine */ - int formats; + struct ast_format_cap *formats; AST_LIST_ENTRY(ast_speech_engine) list; }; @@ -131,7 +131,7 @@ int ast_speech_results_free(struct ast_speech_result *result); /*! \brief Indicate to the speech engine that audio is now going to start being written */ void ast_speech_start(struct ast_speech *speech); /*! \brief Create a new speech structure */ -struct ast_speech *ast_speech_new(const char *engine_name, int formats); +struct ast_speech *ast_speech_new(const char *engine_name, const struct ast_format_cap *formats); /*! \brief Destroy a speech structure */ int ast_speech_destroy(struct ast_speech *speech); /*! \brief Write audio to the speech engine */ |