generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rtpdec: Cosmetic cleanup of the header

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2012-12-11 20:23:50 +02:00
parent abf74a1169
commit 584a017925
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
libavformat/rtpdec.h
View File

@ -19,6 +19,7 @@
* License along with Libav; if not, write to the Free Software * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef AVFORMAT_RTPDEC_H #ifndef AVFORMAT_RTPDEC_H
#define AVFORMAT_RTPDEC_H #define AVFORMAT_RTPDEC_H
@ -38,7 +39,9 @@ typedef struct RTPDynamicProtocolHandler RTPDynamicProtocolHandler;
#define RTP_NOTS_VALUE ((uint32_t)-1) #define RTP_NOTS_VALUE ((uint32_t)-1)
typedef struct RTPDemuxContext RTPDemuxContext; typedef struct RTPDemuxContext RTPDemuxContext;
RTPDemuxContext *ff_rtp_parse_open(AVFormatContext *s1, AVStream *st, URLContext *rtpc, int payload_type, int queue_size); RTPDemuxContext *ff_rtp_parse_open(AVFormatContext *s1, AVStream *st,
URLContext *rtpc, int payload_type,
int queue_size);
void ff_rtp_parse_set_dynamic_protocol(RTPDemuxContext *s, PayloadContext *ctx, void ff_rtp_parse_set_dynamic_protocol(RTPDemuxContext *s, PayloadContext *ctx,
RTPDynamicProtocolHandler *handler); RTPDynamicProtocolHandler *handler);
int ff_rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt, int ff_rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt,
@ -100,13 +103,12 @@ typedef struct RTPStatistics {
* @param len length of buf * @param len length of buf
* @param flags flags from the RTP packet header (RTP_FLAG_*) * @param flags flags from the RTP packet header (RTP_FLAG_*)
*/ */
typedef int (*DynamicPayloadPacketHandlerProc) (AVFormatContext *ctx, typedef int (*DynamicPayloadPacketHandlerProc)(AVFormatContext *ctx,
PayloadContext *s, PayloadContext *s,
AVStream *st, AVStream *st, AVPacket *pkt,
AVPacket * pkt, uint32_t *timestamp,
uint32_t *timestamp, const uint8_t * buf,
const uint8_t * buf, int len, int flags);
int len, int flags);
struct RTPDynamicProtocolHandler { struct RTPDynamicProtocolHandler {
const char enc_name[50]; const char enc_name[50];
@ -116,15 +118,17 @@ struct RTPDynamicProtocolHandler {
* payload ID (PCMU), too, but that format doesn't * payload ID (PCMU), too, but that format doesn't
* require any custom depacketization code. */ * require any custom depacketization code. */
// may be null /** Initialize dynamic protocol handler, called after the full rtpmap line is parsed, may be null */
int (*init)(AVFormatContext *s, int st_index, PayloadContext *priv_data); ///< Initialize dynamic protocol handler, called after the full rtpmap line is parsed int (*init)(AVFormatContext *s, int st_index, PayloadContext *priv_data);
int (*parse_sdp_a_line) (AVFormatContext *s, /** Parse the a= line from the sdp field */
int st_index, int (*parse_sdp_a_line)(AVFormatContext *s, int st_index,
PayloadContext *priv_data, PayloadContext *priv_data, const char *line);
const char *line); ///< Parse the a= line from the sdp field /** Allocate any data needed by the rtp parsing for this dynamic data. */
PayloadContext *(*alloc) (void); ///< allocate any data needed by the rtp parsing for this dynamic data. PayloadContext *(*alloc)(void);
void (*free)(PayloadContext *protocol_data); ///< free any data needed by the rtp parsing for this dynamic data. /** Free any data needed by the rtp parsing for this dynamic data. */
DynamicPayloadPacketHandlerProc parse_packet; ///< parse handler for this dynamic packet. void (*free)(PayloadContext *protocol_data);
/** Parse handler for this dynamic packet */
DynamicPayloadPacketHandlerProc parse_packet;
struct RTPDynamicProtocolHandler *next; struct RTPDynamicProtocolHandler *next;
}; };
@ -156,7 +160,8 @@ struct RTPDemuxContext {
URLContext *rtp_ctx; URLContext *rtp_ctx;
char hostname[256]; char hostname[256];
RTPStatistics statistics; ///< Statistics for this stream (used by RTCP receiver reports) /** Statistics for this stream (used by RTCP receiver reports) */
RTPStatistics statistics;
/** Fields for packet reordering @{ */ /** Fields for packet reordering @{ */
int prev_ret; ///< The return value of the actual parsing of the previous packet int prev_ret; ///< The return value of the actual parsing of the previous packet
@ -189,7 +194,9 @@ RTPDynamicProtocolHandler *ff_rtp_handler_find_by_name(const char *name,
RTPDynamicProtocolHandler *ff_rtp_handler_find_by_id(int id, RTPDynamicProtocolHandler *ff_rtp_handler_find_by_id(int id,
enum AVMediaType codec_type); enum AVMediaType codec_type);
int ff_rtsp_next_attr_and_value(const char **p, char *attr, int attr_size, char *value, int value_size); ///< from rtsp.c, but used by rtp dynamic protocol handlers. /* from rtsp.c, but used by rtp dynamic protocol handlers. */
int ff_rtsp_next_attr_and_value(const char **p, char *attr, int attr_size,
char *value, int value_size);
int ff_parse_fmtp(AVStream *stream, PayloadContext *data, const char *p, int ff_parse_fmtp(AVStream *stream, PayloadContext *data, const char *p,
int (*parse_fmtp)(AVStream *stream, int (*parse_fmtp)(AVStream *stream,