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

rtpdec: Move the URLContext used for RTCP RR out from the context, to a parameter

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö
2012-10-17 16:05:24 +03:00
parent a0b7e28907
commit 3f95f0dda5
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/rtpdec.h
View File

@@ -40,8 +40,7 @@ typedef struct RTPDynamicProtocolHandler RTPDynamicProtocolHandler;
typedef struct RTPDemuxContext RTPDemuxContext;
RTPDemuxContext *ff_rtp_parse_open(AVFormatContext *s1, AVStream *st,
URLContext *rtpc, int payload_type,
int queue_size);
int payload_type, int queue_size);
void ff_rtp_parse_set_dynamic_protocol(RTPDemuxContext *s, PayloadContext *ctx,
RTPDynamicProtocolHandler *handler);
int ff_rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt,
@@ -69,10 +68,10 @@ void ff_rtp_send_punch_packets(URLContext* rtp_handle);
/**
* some rtp servers assume client is dead if they don't hear from them...
* so we send a Receiver Report to the provided ByteIO context
* so we send a Receiver Report to the provided URLContext
* (we don't have access to the rtcp handle from here)
*/
int ff_rtp_check_and_send_back_rr(RTPDemuxContext *s, int count);
int ff_rtp_check_and_send_back_rr(RTPDemuxContext *s, URLContext *fd, int count);
// these statistics are used for rtcp receiver reports...
typedef struct RTPStatistics {
@@ -158,7 +157,6 @@ struct RTPDemuxContext {
int read_buf_index;
int read_buf_size;
/* used to send back RTCP RR */
URLContext *rtp_ctx;
char hostname[256];
/** Statistics for this stream (used by RTCP receiver reports) */