diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-17 14:06:06 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-17 14:06:11 +0100 |
commit | 8d07bbca6360a938c607dab4dcb333e12f3d915b (patch) | |
tree | 9f253cc9866c746732ab2d07edb4d87b25e3799c /libavformat/rtpenc.c | |
parent | 021b3497e1bccd4d6b2e54ecf89cfd43793a2489 (diff) | |
parent | f322b2073581119de5da74f92a03309a36891cfa (diff) | |
download | android_external_ffmpeg-8d07bbca6360a938c607dab4dcb333e12f3d915b.tar.gz android_external_ffmpeg-8d07bbca6360a938c607dab4dcb333e12f3d915b.tar.bz2 android_external_ffmpeg-8d07bbca6360a938c607dab4dcb333e12f3d915b.zip |
Merge commit 'f322b2073581119de5da74f92a03309a36891cfa'
* commit 'f322b2073581119de5da74f92a03309a36891cfa':
lavr: only save/restore the mixing matrix if mixing is being done
rtpdec_vp8: Cosmetics: Fix bad alignment/indentation
rtpenc: Allow including a SDES/CNAME block in RTCP SR packets
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpenc.c')
-rw-r--r-- | libavformat/rtpenc.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index 0010a92e2d..b7502704b1 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -34,6 +34,7 @@ static const AVOption options[] = { FF_RTP_FLAG_OPTS(RTPMuxContext, flags), { "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 }, { NULL }, }; @@ -271,6 +272,22 @@ static void rtcp_send_sr(AVFormatContext *s1, int64_t ntp_time) avio_wb32(s1->pb, rtp_ts); avio_wb32(s1->pb, s->packet_count); avio_wb32(s1->pb, s->octet_count); + + if (s->cname) { + int len = FFMIN(strlen(s->cname), 255); + avio_w8(s1->pb, (RTP_VERSION << 6) + 1); + avio_w8(s1->pb, RTCP_SDES); + avio_wb16(s1->pb, (7 + len + 3) / 4); /* length in words - 1 */ + + avio_wb32(s1->pb, s->ssrc); + avio_w8(s1->pb, 0x01); /* CNAME */ + avio_w8(s1->pb, len); + avio_write(s1->pb, s->cname, len); + avio_w8(s1->pb, 0); /* END */ + for (len = (7 + len) % 4; len % 4; len++) + avio_w8(s1->pb, 0); + } + avio_flush(s1->pb); } |