Module: libav
Branch: master
Commit: 120af23cd5fcfc539d9575d17d403247ab17109b
Author: Josh Allmann <joshua.allm...@gmail.com>
Committer: Martin Storsjö <mar...@martin.st>
Date: Mon Sep 16 13:20:56 2013 -0700
rtmp: Send video on a separate channel.
Sending non-monotonic packets (e.g. when the audio and video
streams are monotonic within themselves but not muxed
monotonically) will lead to negative values the RTMP timestamp
field (where timestamps are transmitted only as deltas for each
channel), and this delta can end up being incorrectly written as
a large unsigned number.
Signed-off-by: Martin Storsjö <mar...@martin.st>
---
libavformat/rtmpproto.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index 04a3137..f9412bf 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -2637,6 +2637,7 @@ static int rtmp_write(URLContext *s, const uint8_t *buf,
int size)
if (rt->flv_header_bytes < 11) {
const uint8_t *header = rt->flv_header;
int copy = FFMIN(11 - rt->flv_header_bytes, size_temp);
+ int channel = RTMP_SOURCE_CHANNEL;
bytestream_get_buffer(&buf_temp, rt->flv_header +
rt->flv_header_bytes, copy);
rt->flv_header_bytes += copy;
size_temp -= copy;
@@ -2650,16 +2651,19 @@ static int rtmp_write(URLContext *s, const uint8_t
*buf, int size)
bytestream_get_be24(&header);
rt->flv_size = pktsize;
+ if (pkttype == RTMP_PT_VIDEO)
+ channel = RTMP_VIDEO_CHANNEL;
+
//force 12bytes header
if (((pkttype == RTMP_PT_VIDEO || pkttype == RTMP_PT_AUDIO) && ts
== 0) ||
pkttype == RTMP_PT_NOTIFY) {
if (pkttype == RTMP_PT_NOTIFY)
pktsize += 16;
- rt->prev_pkt[1][RTMP_SOURCE_CHANNEL].channel_id = 0;
+ rt->prev_pkt[1][channel].channel_id = 0;
}
//this can be a big packet, it's better to send it right here
- if ((ret = ff_rtmp_packet_create(&rt->out_pkt, RTMP_SOURCE_CHANNEL,
+ if ((ret = ff_rtmp_packet_create(&rt->out_pkt, channel,
pkttype, ts, pktsize)) < 0)
return ret;
_______________________________________________
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
