Mercurial > libavformat.hg
diff rtp_h264.c @ 3975:44561554cb7e libavformat
Rename RTP payload contexts to PayloadContext, suggested by Luca in
"RDT/Realmedia patches #2" thread on ML.
author | rbultje |
---|---|
date | Sat, 04 Oct 2008 04:11:12 +0000 |
parents | 7100924e2932 |
children | 64056a0c38ce |
line wrap: on
line diff
--- a/rtp_h264.c Fri Oct 03 19:37:41 2008 +0000 +++ b/rtp_h264.c Sat Oct 04 04:11:12 2008 +0000 @@ -52,7 +52,7 @@ /** RTP/H264 specific private data. */ -typedef struct h264_rtp_extra_data { +struct PayloadContext { unsigned long cookie; ///< sanity check, to make sure we get the pointer we're expecting. //sdp setup parameters @@ -63,14 +63,14 @@ #ifdef DEBUG int packet_types_received[32]; #endif -} h264_rtp_extra_data; +}; #define MAGIC_COOKIE (0xdeadbeef) ///< Cookie for the extradata; to verify we are what we think we are, and that we haven't been freed. #define DEAD_COOKIE (0xdeaddead) ///< Cookie for the extradata; once it is freed. /* ---------------- private code */ static void sdp_parse_fmtp_config_h264(AVStream * stream, - h264_rtp_extra_data * h264_data, + PayloadContext * h264_data, char *attr, char *value) { AVCodecContext *codec = stream->codec; @@ -166,7 +166,7 @@ int len, int flags) { #ifdef DEBUG - h264_rtp_extra_data *data = s->dynamic_protocol_context; + PayloadContext *data = s->dynamic_protocol_context; #endif uint8_t nal = buf[0]; uint8_t type = (nal & 0x1f); @@ -315,10 +315,10 @@ } /* ---------------- public code */ -static void *h264_new_extradata(void) +static PayloadContext *h264_new_extradata(void) { - h264_rtp_extra_data *data = - av_mallocz(sizeof(h264_rtp_extra_data) + + PayloadContext *data = + av_mallocz(sizeof(PayloadContext) + FF_INPUT_BUFFER_PADDING_SIZE); if (data) { @@ -328,9 +328,8 @@ return data; } -static void h264_free_extradata(void *d) +static void h264_free_extradata(PayloadContext *data) { - h264_rtp_extra_data *data = (h264_rtp_extra_data *) d; #ifdef DEBUG int ii; @@ -351,11 +350,10 @@ av_free(data); } -static int parse_h264_sdp_line(AVStream * stream, void *data, +static int parse_h264_sdp_line(AVStream * stream, PayloadContext *h264_data, const char *line) { AVCodecContext *codec = stream->codec; - h264_rtp_extra_data *h264_data = (h264_rtp_extra_data *) data; const char *p = line; assert(h264_data->cookie == MAGIC_COOKIE);