#include "libavutil/lfg.h"
#include "libavutil/sha.h"
#include "avformat.h"
+#include "internal.h"
#include "network.h"
#define LOG_CONTEXT s
#endif
+//#define DEBUG
+
/** RTMP protocol handler state */
typedef enum {
STATE_START, ///< client has not done anything yet
STATE_READY, ///< client has sent all needed commands and waits for server reply
STATE_PLAYING, ///< client has started receiving multimedia data from server
STATE_PUBLISHING, ///< client has started sending multimedia data to server (for output)
+ STATE_STOPPED, ///< the broadcast has been stopped
} ClientState;
/** protocol handler context */
int flv_size; ///< current buffer size
int flv_off; ///< number of bytes read from current buffer
RTMPPacket out_pkt; ///< rtmp packet, created from flv a/v or metadata (for output)
+ uint32_t client_report_size; ///< number of bytes after which client should report to server
+ uint32_t bytes_read; ///< number of bytes read from server
+ uint32_t last_bytes_read; ///< number of bytes read last reported to server
} RTMPContext;
#define PLAYER_KEY_OPEN_PART_LEN 30 ///< length of partial key used for first client digest signing
ff_rtmp_packet_create(&pkt, RTMP_SYSTEM_CHANNEL, RTMP_PT_INVOKE, 0, 4096);
p = pkt.data;
- snprintf(tcurl, sizeof(tcurl), "%s://%s:%d/%s", proto, host, port, rt->app);
+ ff_url_join(tcurl, sizeof(tcurl), proto, NULL, host, port, "/%s", rt->app);
ff_amf_write_string(&p, "connect");
ff_amf_write_number(&p, 1.0);
ff_amf_write_object_start(&p);
pkt.data_size = p - pkt.data;
ff_rtmp_packet_write(rt->stream, &pkt, rt->chunk_size, rt->prev_pkt[1]);
+ ff_rtmp_packet_destroy(&pkt);
}
/**
ff_rtmp_packet_create(&pkt, RTMP_NETWORK_CHANNEL, RTMP_PT_PING, ppkt->timestamp + 1, 6);
p = pkt.data;
bytestream_put_be16(&p, 7);
- bytestream_put_be32(&p, AV_RB32(ppkt->data+2) + 1);
+ bytestream_put_be32(&p, AV_RB32(ppkt->data+2));
+ ff_rtmp_packet_write(rt->stream, &pkt, rt->chunk_size, rt->prev_pkt[1]);
+ ff_rtmp_packet_destroy(&pkt);
+}
+
+/**
+ * Generates report on bytes read so far and sends it to the server.
+ */
+static void gen_bytes_read(URLContext *s, RTMPContext *rt, uint32_t ts)
+{
+ RTMPPacket pkt;
+ uint8_t *p;
+
+ ff_rtmp_packet_create(&pkt, RTMP_NETWORK_CHANNEL, RTMP_PT_BYTES_READ, ts, 4);
+ p = pkt.data;
+ bytestream_put_be32(&p, rt->bytes_read);
ff_rtmp_packet_write(rt->stream, &pkt, rt->chunk_size, rt->prev_pkt[1]);
ff_rtmp_packet_destroy(&pkt);
}
av_log(LOG_CONTEXT, AV_LOG_DEBUG, "Server version %d.%d.%d.%d\n",
serverdata[5], serverdata[6], serverdata[7], serverdata[8]);
- if (rt->is_input) {
+ if (rt->is_input && serverdata[5] >= 3) {
server_pos = rtmp_validate_digest(serverdata + 1, 772);
if (!server_pos) {
server_pos = rtmp_validate_digest(serverdata + 1, 8);
int i, t;
const uint8_t *data_end = pkt->data + pkt->data_size;
+#ifdef DEBUG
+ ff_rtmp_packet_dump(LOG_CONTEXT, pkt);
+#endif
+
switch (pkt->type) {
case RTMP_PT_CHUNK_SIZE:
if (pkt->data_size != 4) {
if (t == 6)
gen_pong(s, rt, pkt);
break;
+ case RTMP_PT_CLIENT_BW:
+ if (pkt->data_size < 4) {
+ av_log(LOG_CONTEXT, AV_LOG_ERROR,
+ "Client bandwidth report packet is less than 4 bytes long (%d)\n",
+ pkt->data_size);
+ return -1;
+ }
+ av_log(LOG_CONTEXT, AV_LOG_DEBUG, "Client bandwidth = %d\n", AV_RB32(pkt->data));
+ rt->client_report_size = AV_RB32(pkt->data) >> 1;
+ break;
case RTMP_PT_INVOKE:
//TODO: check for the messages sent for wrong state?
if (!memcmp(pkt->data, "\002\000\006_error", 9)) {
t = ff_amf_get_field_value(ptr, data_end,
"code", tmpstr, sizeof(tmpstr));
if (!t && !strcmp(tmpstr, "NetStream.Play.Start")) rt->state = STATE_PLAYING;
+ if (!t && !strcmp(tmpstr, "NetStream.Play.Stop")) rt->state = STATE_STOPPED;
+ if (!t && !strcmp(tmpstr, "NetStream.Play.UnpublishNotify")) rt->state = STATE_STOPPED;
if (!t && !strcmp(tmpstr, "NetStream.Publish.Start")) rt->state = STATE_PUBLISHING;
}
break;
{
RTMPContext *rt = s->priv_data;
int ret;
+ uint8_t *p;
+ const uint8_t *next;
+ uint32_t data_size;
+ uint32_t ts, cts, pts=0;
+
+ if (rt->state == STATE_STOPPED)
+ return AVERROR_EOF;
for (;;) {
RTMPPacket rpkt;
if ((ret = ff_rtmp_packet_read(rt->stream, &rpkt,
- rt->chunk_size, rt->prev_pkt[0])) != 0) {
- if (ret > 0) {
+ rt->chunk_size, rt->prev_pkt[0])) <= 0) {
+ if (ret == 0) {
return AVERROR(EAGAIN);
} else {
return AVERROR(EIO);
}
}
+ rt->bytes_read += ret;
+ if (rt->bytes_read > rt->last_bytes_read + rt->client_report_size) {
+ av_log(LOG_CONTEXT, AV_LOG_DEBUG, "Sending bytes read report\n");
+ gen_bytes_read(s, rt, rpkt.timestamp + 1);
+ rt->last_bytes_read = rt->bytes_read;
+ }
ret = rtmp_parse_result(s, rt, &rpkt);
if (ret < 0) {//serious error in current packet
ff_rtmp_packet_destroy(&rpkt);
return -1;
}
+ if (rt->state == STATE_STOPPED) {
+ ff_rtmp_packet_destroy(&rpkt);
+ return AVERROR_EOF;
+ }
if (for_header && (rt->state == STATE_PLAYING || rt->state == STATE_PUBLISHING)) {
ff_rtmp_packet_destroy(&rpkt);
return 0;
}
if (rpkt.type == RTMP_PT_VIDEO || rpkt.type == RTMP_PT_AUDIO ||
(rpkt.type == RTMP_PT_NOTIFY && !memcmp("\002\000\012onMetaData", rpkt.data, 13))) {
- uint8_t *p;
- uint32_t ts = rpkt.timestamp;
+ ts = rpkt.timestamp;
// generate packet header and put data into buffer for FLV demuxer
rt->flv_off = 0;
rt->flv_off = 0;
rt->flv_size = rpkt.data_size;
rt->flv_data = av_realloc(rt->flv_data, rt->flv_size);
+ /* rewrite timestamps */
+ next = rpkt.data;
+ ts = rpkt.timestamp;
+ while (next - rpkt.data < rpkt.data_size - 11) {
+ next++;
+ data_size = bytestream_get_be24(&next);
+ p=next;
+ cts = bytestream_get_be24(&next);
+ cts |= bytestream_get_byte(&next);
+ if (pts==0)
+ pts=cts;
+ ts += cts - pts;
+ pts = cts;
+ bytestream_put_be24(&p, ts);
+ bytestream_put_byte(&p, ts >> 24);
+ next += data_size + 3 + 4;
+ }
memcpy(rt->flv_data, rpkt.data, rpkt.data_size);
ff_rtmp_packet_destroy(&rpkt);
return 0;
s->priv_data = rt;
rt->is_input = !(flags & URL_WRONLY);
- url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname), &port,
- path, sizeof(path), s->filename);
+ ff_url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname), &port,
+ path, sizeof(path), s->filename);
if (port < 0)
port = RTMP_DEFAULT_PORT;
- snprintf(buf, sizeof(buf), "tcp://%s:%d", hostname, port);
+ ff_url_join(buf, sizeof(buf), "tcp", NULL, hostname, port, NULL);
if (url_open(&rt->stream, buf, URL_RDWR) < 0) {
av_log(LOG_CONTEXT, AV_LOG_ERROR, "Cannot open connection %s\n", buf);
}
strncat(rt->playpath, fname, sizeof(rt->playpath) - 5);
+ rt->client_report_size = 1048576;
+ rt->bytes_read = 0;
+ rt->last_bytes_read = 0;
+
av_log(LOG_CONTEXT, AV_LOG_DEBUG, "Proto = %s, path = %s, app = %s, fname = %s\n",
proto, path, rt->app, rt->playpath);
gen_connect(s, rt, proto, hostname, port);
projects / ffmpeg / blobdiff