RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rtpenc_xiph: Set the ident value via a define 

Originally committed as revision 24749 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Martin Storsjö 2010-08-09 10:31:59 +00:00
parent 62c7e2c336
commit b5c4bb989d
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/rtp.h
View File

@ -76,4 +76,10 @@ enum CodecID ff_rtp_codec_id(const char *buf, enum AVMediaType codec_type);
#define RTCP_TX_RATIO_NUM 5
#define RTCP_TX_RATIO_DEN 1000
/* An arbitrary id value for RTP Xiph streams - only relevant to indicate
* the the configuration has changed within a stream (by changing the
* ident value sent).
*/
#define RTP_XIPH_IDENT 0xfecdba
#endif /* AVFORMAT_RTP_H */

8
libavformat/rtpenc_xiph.c
View File

@ -52,13 +52,13 @@ void ff_rtp_send_xiph(AVFormatContext *s1, const uint8_t *buff, int size)
break;
}
// Set ident. Must match the one in sdp.c
// Set ident.
// Probably need a non-fixed way of generating
// this, but it has to be done in SDP and passed in from there.
q = s->buf;
*q++ = 0xfe;
*q++ = 0xcd;
*q++ = 0xba;
*q++ = (RTP_XIPH_IDENT >> 16) & 0xff;
*q++ = (RTP_XIPH_IDENT >> 8) & 0xff;
*q++ = (RTP_XIPH_IDENT ) & 0xff;
// set fragment
// 0 - whole frame (possibly multiple frames)

6
libavformat/sdp.c
View File

@ -267,9 +267,9 @@ static char *xiph_extradata2config(AVCodecContext *c)
config[0] = config[1] = config[2] = 0;
config[3] = 1;
config[4] = 0xfe; // ident must match the one in rtpenc_xiph.c
config[5] = 0xcd;
config[6] = 0xba;
config[4] = (RTP_XIPH_IDENT >> 16) & 0xff;
config[5] = (RTP_XIPH_IDENT >> 8) & 0xff;
config[6] = (RTP_XIPH_IDENT ) & 0xff;
config[7] = (headers_len >> 8) & 0xff;
config[8] = headers_len & 0xff;
config[9] = 2;