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

Write timestamp deltas, not timestamps, for RTMP packets with partial header 

Originally committed as revision 20686 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Kostya Shishkov 2009-12-01 16:43:53 +00:00
parent e6b244a3b9
commit 817d967d96
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/rtmppkt.c
View File

@ -163,15 +163,18 @@ int ff_rtmp_packet_write(URLContext *h, RTMPPacket *pkt,
bytestream_put_le16(&p, pkt->channel_id - 64); bytestream_put_le16(&p, pkt->channel_id - 64);
} }
if (mode != RTMP_PS_ONEBYTE) { if (mode != RTMP_PS_ONEBYTE) {
bytestream_put_be24(&p, pkt->timestamp >= 0xFFFFFF ? 0xFFFFFF : pkt->timestamp); uint32_t timestamp = pkt->timestamp;
if (mode != RTMP_PS_TWELVEBYTES)
timestamp -= prev_pkt[pkt->channel_id].timestamp;
bytestream_put_be24(&p, timestamp >= 0xFFFFFF ? 0xFFFFFF : timestamp);
if (mode != RTMP_PS_FOURBYTES) { if (mode != RTMP_PS_FOURBYTES) {
bytestream_put_be24(&p, pkt->data_size); bytestream_put_be24(&p, pkt->data_size);
bytestream_put_byte(&p, pkt->type); bytestream_put_byte(&p, pkt->type);
if (mode == RTMP_PS_TWELVEBYTES) if (mode == RTMP_PS_TWELVEBYTES)
bytestream_put_le32(&p, pkt->extra); bytestream_put_le32(&p, pkt->extra);
} }
if (pkt->timestamp >= 0xFFFFFF) if (timestamp >= 0xFFFFFF)
bytestream_put_be32(&p, pkt->timestamp); bytestream_put_be32(&p, timestamp);
} }
url_write(h, pkt_hdr, p-pkt_hdr); url_write(h, pkt_hdr, p-pkt_hdr);
while (off < pkt->data_size) { while (off < pkt->data_size) {