diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-22 14:27:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-22 14:27:48 +0100 |
| commit | 73b59cc1bad802612d04c112844aab49953ede64 (patch) | |
| tree | fc10f203df63429499223682b39940a2f7cab14f /libavformat/rtpenc.c | |
| parent | eb2f499e37ee8c890836f80c3ffba57e971fe514 (diff) | |
| parent | 4f56e773fe8a554b8c2662650aaf799c2ece2721 (diff) | |
| download | ffmpeg-73b59cc1bad802612d04c112844aab49953ede64.tar.gz | |
Merge commit '4f56e773fe8a554b8c2662650aaf799c2ece2721'
* commit '4f56e773fe8a554b8c2662650aaf799c2ece2721':
x86: ac3: Fix HAVE_MMXEXT condition to only refer to external assembly
rtpenc: Start the sequence numbers from a random offset
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpenc.c')
| -rw-r--r-- | libavformat/rtpenc.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index b7502704b1..6d710043db 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -35,6 +35,7 @@ static const AVOption options[] = { { "payload_type", "Specify RTP payload type", offsetof(RTPMuxContext, payload_type), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, 127, AV_OPT_FLAG_ENCODING_PARAM }, { "ssrc", "Stream identifier", offsetof(RTPMuxContext, ssrc), AV_OPT_TYPE_INT, { .i64 = 0 }, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM }, { "cname", "CNAME to include in RTCP SR packets", offsetof(RTPMuxContext, cname), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, AV_OPT_FLAG_ENCODING_PARAM }, + { "seq", "Starting sequence number", offsetof(RTPMuxContext, seq), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 65535, AV_OPT_FLAG_ENCODING_PARAM }, { NULL }, }; @@ -124,6 +125,13 @@ static int rtp_write_header(AVFormatContext *s1) /* Round the NTP time to whole milliseconds. */ s->first_rtcp_ntp_time = (s1->start_time_realtime / 1000) * 1000 + NTP_OFFSET_US; + // Pick a random sequence start number, but in the lower end of the + // available range, so that any wraparound doesn't happen immediately. + // (Immediate wraparound would be an issue for SRTP.) + if (s->seq < 0) + s->seq = av_get_random_seed() & 0x0fff; + else + s->seq &= 0xffff; // Use the given parameter, wrapped to the right interval if (s1->packet_size) { if (s1->pb->max_packet_size) @@ -309,7 +317,7 @@ void ff_rtp_send_data(AVFormatContext *s1, const uint8_t *buf1, int len, int m) avio_write(s1->pb, buf1, len); avio_flush(s1->pb); - s->seq++; + s->seq = (s->seq + 1) & 0xffff; s->octet_count += len; s->packet_count++; } |