Audio/video are not sent on the same channel.
RTMP_AUDIO_CHANNEL was unused before this, so there is no net
effect from the enum re-numbering.
---
libavformat/rtmppkt.h | 3 +--
libavformat/rtmpproto.c | 6 +++---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/libavformat/rtmppkt.h b/libavformat/rtmppkt.h
index ff5d171..f1ac460 100644
--- a/libavformat/rtmppkt.h
+++ b/libavformat/rtmppkt.h
@@ -36,9 +36,8 @@
enum RTMPChannel {
RTMP_NETWORK_CHANNEL = 2, ///< channel for network-related messages
(bandwidth report, ping, etc)
RTMP_SYSTEM_CHANNEL, ///< channel for sending server control
messages
- RTMP_SOURCE_CHANNEL, ///< channel for sending a/v to server
- RTMP_VIDEO_CHANNEL = 8, ///< channel for video data
RTMP_AUDIO_CHANNEL, ///< channel for audio data
+ RTMP_VIDEO_CHANNEL = 8, ///< channel for video data
};
/**
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index 74ca3d8..3277a4c 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -742,7 +742,7 @@ static int gen_publish(URLContext *s, RTMPContext *rt)
av_log(s, AV_LOG_DEBUG, "Sending publish command for '%s'\n",
rt->playpath);
- if ((ret = ff_rtmp_packet_create(&pkt, RTMP_SOURCE_CHANNEL, RTMP_PT_INVOKE,
+ if ((ret = ff_rtmp_packet_create(&pkt, RTMP_AUDIO_CHANNEL, RTMP_PT_INVOKE,
0, 30 + strlen(rt->playpath))) < 0)
return ret;
@@ -2599,7 +2599,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;
+ int channel = RTMP_AUDIO_CHANNEL;
bytestream_get_buffer(&buf_temp, rt->flv_header +
rt->flv_header_bytes, copy);
rt->flv_header_bytes += copy;
size_temp -= copy;
@@ -2618,7 +2618,7 @@ static int rtmp_write(URLContext *s, const uint8_t *buf,
int size)
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][RTMP_AUDIO_CHANNEL].channel_id = 0;
}
if (pkttype == RTMP_PT_VIDEO)
--
1.7.9.5
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
