From 09778b268ea887ef53de4a8dc8f17c5fec615d5c Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Thu, 8 Jun 2006 23:10:45 +0000 Subject: move 'struct ast_rtp' back to rtp.c where it belongs git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@33133 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- include/asterisk/rtp.h | 62 ++++++++------------------------------------------ 1 file changed, 9 insertions(+), 53 deletions(-) (limited to 'include/asterisk/rtp.h') diff --git a/include/asterisk/rtp.h b/include/asterisk/rtp.h index 4410d7fb6..b7be53a1c 100644 --- a/include/asterisk/rtp.h +++ b/include/asterisk/rtp.h @@ -80,59 +80,11 @@ struct rtpPayloadType { int code; }; -/*! \brief RTP session description */ -struct ast_rtp { - int s; - char resp; - struct ast_frame f; - unsigned char rawdata[8192 + AST_FRIENDLY_OFFSET]; - unsigned int ssrc; /*!< Synchronization source, RFC 3550, page 10. */ - unsigned int themssrc; /*!< Their SSRC */ - unsigned int rxssrc; - unsigned int lastts; - unsigned int lastdigitts; - unsigned int lastrxts; - unsigned int lastividtimestamp; - unsigned int lastovidtimestamp; - unsigned int lasteventseqn; - int lastrxseqno; /*!< Last received sequence number */ - unsigned short seedrxseqno; /*!< What sequence number did they start with?*/ - unsigned int seedrxts; /*!< What RTP timestamp did they start with? */ - unsigned int rxcount; /*!< How many packets have we received? */ - unsigned int rxoctetcount; /*!< How many octets have we received? should be rxcount *160*/ - unsigned int txcount; /*!< How many packets have we sent? */ - unsigned int txoctetcount; /*!< How many octets have we sent? (txcount*160)*/ - unsigned int cycles; /*!< Shifted count of sequence number cycles */ - double rxjitter; /*!< Interarrival jitter at the moment */ - double rxtransit; /*!< Relative transit time for previous packet */ - unsigned int lasteventendseqn; - int lasttxformat; - int lastrxformat; - int dtmfcount; - unsigned int dtmfduration; - int nat; - unsigned int flags; - struct sockaddr_in us; /*!< Socket representation of the local endpoint. */ - struct sockaddr_in them; /*!< Socket representation of the remote endpoint. */ - struct timeval rxcore; - struct timeval txcore; - double drxcore; /*!< The double representation of the first received packet */ - struct timeval lastrx; /*!< timeval when we last received a packet */ - struct timeval dtmfmute; - struct ast_smoother *smoother; - int *ioid; - unsigned short seqno; /*!< Sequence number, RFC 3550, page 13. */ - unsigned short rxseqno; - struct sched_context *sched; - struct io_context *io; - void *data; - ast_rtp_callback callback; - struct rtpPayloadType current_RTP_PT[MAX_RTP_PT]; - int rtp_lookup_code_cache_isAstFormat; /*!< a cache for the result of rtp_lookup_code(): */ - int rtp_lookup_code_cache_code; - int rtp_lookup_code_cache_result; - struct ast_rtcp *rtcp; -}; +/*! + * \brief Get the amount of space required to hold an RTP session + * \return number of bytes required + */ +size_t ast_rtp_alloc_size(void); /*! * \brief Initializate a RTP session. @@ -196,6 +148,10 @@ int ast_rtp_settos(struct ast_rtp *rtp, int tos); void ast_rtp_pt_clear(struct ast_rtp* rtp); /*! \brief Set payload types to defaults */ void ast_rtp_pt_default(struct ast_rtp* rtp); + +/*! \brief Copy payload types between RTP structures */ +void ast_rtp_pt_copy(struct ast_rtp *dest, const struct ast_rtp *src); + void ast_rtp_set_m_type(struct ast_rtp* rtp, int pt); void ast_rtp_set_rtpmap_type(struct ast_rtp* rtp, int pt, char* mimeType, char* mimeSubtype); -- cgit v1.2.3