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

rtmp: Check ff_rtmp_packet_create calls 

Check malloc calls used by ff_rtmp_packet_create, unify error
handling and pass on error codes.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Samuel Pitoiset 2012-05-23 22:45:03 +02:00 committed by Martin Storsjö
parent c7448c182a
commit f645f1d6ea
2 changed files with 140 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/rtmppkt.c
View File

@ -79,6 +79,7 @@ int ff_rtmp_packet_read(URLContext *h, RTMPPacket *p,
uint32_t extra = 0; uint32_t extra = 0;
enum RTMPPacketType type; enum RTMPPacketType type;
int size = 0; int size = 0;
int ret;
if (ffurl_read(h, &hdr, 1) != 1) if (ffurl_read(h, &hdr, 1) != 1)
return AVERROR(EIO); return AVERROR(EIO);
@ -129,8 +130,9 @@ int ff_rtmp_packet_read(URLContext *h, RTMPPacket *p,
if (hdr != RTMP_PS_TWELVEBYTES) if (hdr != RTMP_PS_TWELVEBYTES)
timestamp += prev_pkt[channel_id].timestamp; timestamp += prev_pkt[channel_id].timestamp;
if (ff_rtmp_packet_create(p, channel_id, type, timestamp, data_size)) if ((ret = ff_rtmp_packet_create(p, channel_id, type, timestamp,
return -1; data_size)) < 0)
return ret;
p->extra = extra; p->extra = extra;
// save history // save history
prev_pkt[channel_id].channel_id = channel_id; prev_pkt[channel_id].channel_id = channel_id;

189
libavformat/rtmpproto.c
View File

@ -115,12 +115,16 @@ static const uint8_t rtmp_server_key[] = {
/** /**
* Generate 'connect' call and send it to the server. * Generate 'connect' call and send it to the server.
*/ */
static void gen_connect(URLContext *s, RTMPContext *rt) static int gen_connect(URLContext *s, RTMPContext *rt)
{ {
RTMPPacket pkt; RTMPPacket pkt;
uint8_t *p; uint8_t *p;
int ret;
if ((ret = ff_rtmp_packet_create(&pkt, RTMP_SYSTEM_CHANNEL, RTMP_PT_INVOKE,
0, 4096)) < 0)
return ret;
ff_rtmp_packet_create(&pkt, RTMP_SYSTEM_CHANNEL, RTMP_PT_INVOKE, 0, 4096);
p = pkt.data; p = pkt.data;
ff_amf_write_string(&p, "connect"); ff_amf_write_string(&p, "connect");
@ -165,19 +169,23 @@ static void gen_connect(URLContext *s, RTMPContext *rt)
ff_rtmp_packet_write(rt->stream, &pkt, rt->chunk_size, rt->prev_pkt[1]); ff_rtmp_packet_write(rt->stream, &pkt, rt->chunk_size, rt->prev_pkt[1]);
ff_rtmp_packet_destroy(&pkt); ff_rtmp_packet_destroy(&pkt);
return 0;
} }
/** /**
* Generate 'releaseStream' call and send it to the server. It should make * Generate 'releaseStream' call and send it to the server. It should make
* the server release some channel for media streams. * the server release some channel for media streams.
*/ */
static void gen_release_stream(URLContext *s, RTMPContext *rt) static int gen_release_stream(URLContext *s, RTMPContext *rt)
{ {
RTMPPacket pkt; RTMPPacket pkt;
uint8_t *p; uint8_t *p;
int ret;
ff_rtmp_packet_create(&pkt, RTMP_SYSTEM_CHANNEL, RTMP_PT_INVOKE, 0, if ((ret = ff_rtmp_packet_create(&pkt, RTMP_SYSTEM_CHANNEL, RTMP_PT_INVOKE,
29 + strlen(rt->playpath)); 0, 29 + strlen(rt->playpath))) < 0)
return ret;
av_log(s, AV_LOG_DEBUG, "Releasing stream...\n"); av_log(s, AV_LOG_DEBUG, "Releasing stream...\n");
p = pkt.data; p = pkt.data;
@ -188,19 +196,23 @@ static void gen_release_stream(URLContext *s, RTMPContext *rt)
ff_rtmp_packet_write(rt->stream, &pkt, rt->chunk_size, rt->prev_pkt[1]); ff_rtmp_packet_write(rt->stream, &pkt, rt->chunk_size, rt->prev_pkt[1]);
ff_rtmp_packet_destroy(&pkt); ff_rtmp_packet_destroy(&pkt);
return 0;
} }
/** /**
* Generate 'FCPublish' call and send it to the server. It should make * Generate 'FCPublish' call and send it to the server. It should make
* the server preapare for receiving media streams. * the server preapare for receiving media streams.
*/ */
static void gen_fcpublish_stream(URLContext *s, RTMPContext *rt) static int gen_fcpublish_stream(URLContext *s, RTMPContext *rt)
{ {
RTMPPacket pkt; RTMPPacket pkt;
uint8_t *p; uint8_t *p;
int ret;
ff_rtmp_packet_create(&pkt, RTMP_SYSTEM_CHANNEL, RTMP_PT_INVOKE, 0, if ((ret = ff_rtmp_packet_create(&pkt, RTMP_SYSTEM_CHANNEL, RTMP_PT_INVOKE,
25 + strlen(rt->playpath)); 0, 25 + strlen(rt->playpath))) < 0)
return ret;
av_log(s, AV_LOG_DEBUG, "FCPublish stream...\n"); av_log(s, AV_LOG_DEBUG, "FCPublish stream...\n");
p = pkt.data; p = pkt.data;
@ -211,19 +223,23 @@ static void gen_fcpublish_stream(URLContext *s, RTMPContext *rt)
ff_rtmp_packet_write(rt->stream, &pkt, rt->chunk_size, rt->prev_pkt[1]); ff_rtmp_packet_write(rt->stream, &pkt, rt->chunk_size, rt->prev_pkt[1]);
ff_rtmp_packet_destroy(&pkt); ff_rtmp_packet_destroy(&pkt);
return 0;
} }
/** /**
* Generate 'FCUnpublish' call and send it to the server. It should make * Generate 'FCUnpublish' call and send it to the server. It should make
* the server destroy stream. * the server destroy stream.
*/ */
static void gen_fcunpublish_stream(URLContext *s, RTMPContext *rt) static int gen_fcunpublish_stream(URLContext *s, RTMPContext *rt)
{ {
RTMPPacket pkt; RTMPPacket pkt;
uint8_t *p; uint8_t *p;
int ret;
ff_rtmp_packet_create(&pkt, RTMP_SYSTEM_CHANNEL, RTMP_PT_INVOKE, 0, if ((ret = ff_rtmp_packet_create(&pkt, RTMP_SYSTEM_CHANNEL, RTMP_PT_INVOKE,
27 + strlen(rt->playpath)); 0, 27 + strlen(rt->playpath))) < 0)
return ret;
av_log(s, AV_LOG_DEBUG, "UnPublishing stream...\n"); av_log(s, AV_LOG_DEBUG, "UnPublishing stream...\n");
p = pkt.data; p = pkt.data;
@ -234,19 +250,25 @@ static void gen_fcunpublish_stream(URLContext *s, RTMPContext *rt)
ff_rtmp_packet_write(rt->stream, &pkt, rt->chunk_size, rt->prev_pkt[1]); ff_rtmp_packet_write(rt->stream, &pkt, rt->chunk_size, rt->prev_pkt[1]);
ff_rtmp_packet_destroy(&pkt); ff_rtmp_packet_destroy(&pkt);
return 0;
} }
/** /**
* Generate 'createStream' call and send it to the server. It should make * Generate 'createStream' call and send it to the server. It should make
* the server allocate some channel for media streams. * the server allocate some channel for media streams.
*/ */
static void gen_create_stream(URLContext *s, RTMPContext *rt) static int gen_create_stream(URLContext *s, RTMPContext *rt)
{ {
RTMPPacket pkt; RTMPPacket pkt;
uint8_t *p; uint8_t *p;
int ret;
av_log(s, AV_LOG_DEBUG, "Creating stream...\n"); av_log(s, AV_LOG_DEBUG, "Creating stream...\n");
ff_rtmp_packet_create(&pkt, RTMP_SYSTEM_CHANNEL, RTMP_PT_INVOKE, 0, 25);
if ((ret = ff_rtmp_packet_create(&pkt, RTMP_SYSTEM_CHANNEL, RTMP_PT_INVOKE,
0, 25)) < 0)
return ret;
p = pkt.data; p = pkt.data;
ff_amf_write_string(&p, "createStream"); ff_amf_write_string(&p, "createStream");
@ -256,6 +278,8 @@ static void gen_create_stream(URLContext *s, RTMPContext *rt)
ff_rtmp_packet_write(rt->stream, &pkt, rt->chunk_size, rt->prev_pkt[1]); ff_rtmp_packet_write(rt->stream, &pkt, rt->chunk_size, rt->prev_pkt[1]);
ff_rtmp_packet_destroy(&pkt); ff_rtmp_packet_destroy(&pkt);
return 0;
} }
@ -263,13 +287,17 @@ static void gen_create_stream(URLContext *s, RTMPContext *rt)
* Generate 'deleteStream' call and send it to the server. It should make * Generate 'deleteStream' call and send it to the server. It should make
* the server remove some channel for media streams. * the server remove some channel for media streams.
*/ */
static void gen_delete_stream(URLContext *s, RTMPContext *rt) static int gen_delete_stream(URLContext *s, RTMPContext *rt)
{ {
RTMPPacket pkt; RTMPPacket pkt;
uint8_t *p; uint8_t *p;
int ret;
av_log(s, AV_LOG_DEBUG, "Deleting stream...\n"); av_log(s, AV_LOG_DEBUG, "Deleting stream...\n");
ff_rtmp_packet_create(&pkt, RTMP_SYSTEM_CHANNEL, RTMP_PT_INVOKE, 0, 34);
if ((ret = ff_rtmp_packet_create(&pkt, RTMP_SYSTEM_CHANNEL, RTMP_PT_INVOKE,
0, 34)) < 0)
return ret;
p = pkt.data; p = pkt.data;
ff_amf_write_string(&p, "deleteStream"); ff_amf_write_string(&p, "deleteStream");
@ -279,20 +307,26 @@ static void gen_delete_stream(URLContext *s, RTMPContext *rt)
ff_rtmp_packet_write(rt->stream, &pkt, rt->chunk_size, rt->prev_pkt[1]); ff_rtmp_packet_write(rt->stream, &pkt, rt->chunk_size, rt->prev_pkt[1]);
ff_rtmp_packet_destroy(&pkt); ff_rtmp_packet_destroy(&pkt);
return 0;
} }
/** /**
* Generate 'play' call and send it to the server, then ping the server * Generate 'play' call and send it to the server, then ping the server
* to start actual playing. * to start actual playing.
*/ */
static void gen_play(URLContext *s, RTMPContext *rt) static int gen_play(URLContext *s, RTMPContext *rt)
{ {
RTMPPacket pkt; RTMPPacket pkt;
uint8_t *p; uint8_t *p;
int ret;
av_log(s, AV_LOG_DEBUG, "Sending play command for '%s'\n", rt->playpath); av_log(s, AV_LOG_DEBUG, "Sending play command for '%s'\n", rt->playpath);
ff_rtmp_packet_create(&pkt, RTMP_VIDEO_CHANNEL, RTMP_PT_INVOKE, 0,
29 + strlen(rt->playpath)); if ((ret = ff_rtmp_packet_create(&pkt, RTMP_VIDEO_CHANNEL, RTMP_PT_INVOKE,
0, 29 + strlen(rt->playpath))) < 0)
return ret;
pkt.extra = rt->main_channel_id; pkt.extra = rt->main_channel_id;
p = pkt.data; p = pkt.data;
@ -306,7 +340,9 @@ static void gen_play(URLContext *s, RTMPContext *rt)
ff_rtmp_packet_destroy(&pkt); ff_rtmp_packet_destroy(&pkt);
// set client buffer time disguised in ping packet // set client buffer time disguised in ping packet
ff_rtmp_packet_create(&pkt, RTMP_NETWORK_CHANNEL, RTMP_PT_PING, 1, 10); if ((ret = ff_rtmp_packet_create(&pkt, RTMP_NETWORK_CHANNEL, RTMP_PT_PING,
1, 10)) < 0)
return ret;
p = pkt.data; p = pkt.data;
bytestream_put_be16(&p, 3); bytestream_put_be16(&p, 3);
@ -315,19 +351,25 @@ static void gen_play(URLContext *s, RTMPContext *rt)
ff_rtmp_packet_write(rt->stream, &pkt, rt->chunk_size, rt->prev_pkt[1]); ff_rtmp_packet_write(rt->stream, &pkt, rt->chunk_size, rt->prev_pkt[1]);
ff_rtmp_packet_destroy(&pkt); ff_rtmp_packet_destroy(&pkt);
return 0;
} }
/** /**
* Generate 'publish' call and send it to the server. * Generate 'publish' call and send it to the server.
*/ */
static void gen_publish(URLContext *s, RTMPContext *rt) static int gen_publish(URLContext *s, RTMPContext *rt)
{ {
RTMPPacket pkt; RTMPPacket pkt;
uint8_t *p; uint8_t *p;
int ret;
av_log(s, AV_LOG_DEBUG, "Sending publish command for '%s'\n", rt->playpath); av_log(s, AV_LOG_DEBUG, "Sending publish command for '%s'\n", rt->playpath);
ff_rtmp_packet_create(&pkt, RTMP_SOURCE_CHANNEL, RTMP_PT_INVOKE, 0,
30 + strlen(rt->playpath)); if ((ret = ff_rtmp_packet_create(&pkt, RTMP_SOURCE_CHANNEL, RTMP_PT_INVOKE,
0, 30 + strlen(rt->playpath))) < 0)
return ret;
pkt.extra = rt->main_channel_id; pkt.extra = rt->main_channel_id;
p = pkt.data; p = pkt.data;
@ -339,48 +381,65 @@ static void gen_publish(URLContext *s, RTMPContext *rt)
ff_rtmp_packet_write(rt->stream, &pkt, rt->chunk_size, rt->prev_pkt[1]); ff_rtmp_packet_write(rt->stream, &pkt, rt->chunk_size, rt->prev_pkt[1]);
ff_rtmp_packet_destroy(&pkt); ff_rtmp_packet_destroy(&pkt);
return ret;
} }
/** /**
* Generate ping reply and send it to the server. * Generate ping reply and send it to the server.
*/ */
static void gen_pong(URLContext *s, RTMPContext *rt, RTMPPacket *ppkt) static int gen_pong(URLContext *s, RTMPContext *rt, RTMPPacket *ppkt)
{ {
RTMPPacket pkt; RTMPPacket pkt;
uint8_t *p; uint8_t *p;
int ret;
if ((ret = ff_rtmp_packet_create(&pkt, RTMP_NETWORK_CHANNEL, RTMP_PT_PING,
ppkt->timestamp + 1, 6)) < 0)
return ret;
ff_rtmp_packet_create(&pkt, RTMP_NETWORK_CHANNEL, RTMP_PT_PING, ppkt->timestamp + 1, 6);
p = pkt.data; p = pkt.data;
bytestream_put_be16(&p, 7); bytestream_put_be16(&p, 7);
bytestream_put_be32(&p, AV_RB32(ppkt->data+2)); 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_write(rt->stream, &pkt, rt->chunk_size, rt->prev_pkt[1]);
ff_rtmp_packet_destroy(&pkt); ff_rtmp_packet_destroy(&pkt);
return 0;
} }
/** /**
* Generate server bandwidth message and send it to the server. * Generate server bandwidth message and send it to the server.
*/ */
static void gen_server_bw(URLContext *s, RTMPContext *rt) static int gen_server_bw(URLContext *s, RTMPContext *rt)
{ {
RTMPPacket pkt; RTMPPacket pkt;
uint8_t *p; uint8_t *p;
int ret;
if ((ret = ff_rtmp_packet_create(&pkt, RTMP_NETWORK_CHANNEL, RTMP_PT_SERVER_BW,
0, 4)) < 0)
return ret;
ff_rtmp_packet_create(&pkt, RTMP_NETWORK_CHANNEL, RTMP_PT_SERVER_BW, 0, 4);
p = pkt.data; p = pkt.data;
bytestream_put_be32(&p, 2500000); bytestream_put_be32(&p, 2500000);
ff_rtmp_packet_write(rt->stream, &pkt, rt->chunk_size, rt->prev_pkt[1]); ff_rtmp_packet_write(rt->stream, &pkt, rt->chunk_size, rt->prev_pkt[1]);
ff_rtmp_packet_destroy(&pkt); ff_rtmp_packet_destroy(&pkt);
return 0;
} }
/** /**
* Generate check bandwidth message and send it to the server. * Generate check bandwidth message and send it to the server.
*/ */
static void gen_check_bw(URLContext *s, RTMPContext *rt) static int gen_check_bw(URLContext *s, RTMPContext *rt)
{ {
RTMPPacket pkt; RTMPPacket pkt;
uint8_t *p; uint8_t *p;
int ret;
ff_rtmp_packet_create(&pkt, RTMP_SYSTEM_CHANNEL, RTMP_PT_INVOKE, 0, 21); if ((ret = ff_rtmp_packet_create(&pkt, RTMP_SYSTEM_CHANNEL, RTMP_PT_INVOKE,
0, 21)) < 0)
return ret;
p = pkt.data; p = pkt.data;
ff_amf_write_string(&p, "_checkbw"); ff_amf_write_string(&p, "_checkbw");
@ -389,21 +448,29 @@ static void gen_check_bw(URLContext *s, RTMPContext *rt)
ff_rtmp_packet_write(rt->stream, &pkt, rt->chunk_size, rt->prev_pkt[1]); ff_rtmp_packet_write(rt->stream, &pkt, rt->chunk_size, rt->prev_pkt[1]);
ff_rtmp_packet_destroy(&pkt); ff_rtmp_packet_destroy(&pkt);
return ret;
} }
/** /**
* Generate report on bytes read so far and send it to the server. * Generate report on bytes read so far and send it to the server.
*/ */
static void gen_bytes_read(URLContext *s, RTMPContext *rt, uint32_t ts) static int gen_bytes_read(URLContext *s, RTMPContext *rt, uint32_t ts)
{ {
RTMPPacket pkt; RTMPPacket pkt;
uint8_t *p; uint8_t *p;
int ret;
if ((ret = ff_rtmp_packet_create(&pkt, RTMP_NETWORK_CHANNEL, RTMP_PT_BYTES_READ,
ts, 4)) < 0)
return ret;
ff_rtmp_packet_create(&pkt, RTMP_NETWORK_CHANNEL, RTMP_PT_BYTES_READ, ts, 4);
p = pkt.data; p = pkt.data;
bytestream_put_be32(&p, rt->bytes_read); bytestream_put_be32(&p, rt->bytes_read);
ff_rtmp_packet_write(rt->stream, &pkt, rt->chunk_size, rt->prev_pkt[1]); ff_rtmp_packet_write(rt->stream, &pkt, rt->chunk_size, rt->prev_pkt[1]);
ff_rtmp_packet_destroy(&pkt); ff_rtmp_packet_destroy(&pkt);
return 0;
} }
//TODO: Move HMAC code somewhere. Eventually. //TODO: Move HMAC code somewhere. Eventually.
@ -599,6 +666,7 @@ static int rtmp_parse_result(URLContext *s, RTMPContext *rt, RTMPPacket *pkt)
{ {
int i, t; int i, t;
const uint8_t *data_end = pkt->data + pkt->data_size; const uint8_t *data_end = pkt->data + pkt->data_size;
int ret;
#ifdef DEBUG #ifdef DEBUG
ff_rtmp_packet_dump(s, pkt); ff_rtmp_packet_dump(s, pkt);
@ -623,7 +691,8 @@ static int rtmp_parse_result(URLContext *s, RTMPContext *rt, RTMPPacket *pkt)
case RTMP_PT_PING: case RTMP_PT_PING:
t = AV_RB16(pkt->data); t = AV_RB16(pkt->data);
if (t == 6) if (t == 6)
gen_pong(s, rt, pkt); if ((ret = gen_pong(s, rt, pkt)) < 0)
return ret;
break; break;
case RTMP_PT_CLIENT_BW: case RTMP_PT_CLIENT_BW:
if (pkt->data_size < 4) { if (pkt->data_size < 4) {
@ -648,14 +717,18 @@ static int rtmp_parse_result(URLContext *s, RTMPContext *rt, RTMPPacket *pkt)
switch (rt->state) { switch (rt->state) {
case STATE_HANDSHAKED: case STATE_HANDSHAKED:
if (!rt->is_input) { if (!rt->is_input) {
gen_release_stream(s, rt); if ((ret = gen_release_stream(s, rt)) < 0)
gen_fcpublish_stream(s, rt); return ret;
if ((ret = gen_fcpublish_stream(s, rt)) < 0)
return ret;
rt->state = STATE_RELEASING; rt->state = STATE_RELEASING;
} else { } else {
gen_server_bw(s, rt); if ((ret = gen_server_bw(s, rt)) < 0)
return ret;
rt->state = STATE_CONNECTING; rt->state = STATE_CONNECTING;
} }
gen_create_stream(s, rt); if ((ret = gen_create_stream(s, rt)) < 0)
return ret;
break; break;
case STATE_FCPUBLISH: case STATE_FCPUBLISH:
rt->state = STATE_CONNECTING; rt->state = STATE_CONNECTING;
@ -679,9 +752,11 @@ static int rtmp_parse_result(URLContext *s, RTMPContext *rt, RTMPPacket *pkt)
rt->main_channel_id = av_int2double(AV_RB64(pkt->data + 21)); rt->main_channel_id = av_int2double(AV_RB64(pkt->data + 21));
} }
if (rt->is_input) { if (rt->is_input) {
gen_play(s, rt); if ((ret = gen_play(s, rt)) < 0)
return ret;
} else { } else {
gen_publish(s, rt); if ((ret = gen_publish(s, rt)) < 0)
return ret;
} }
rt->state = STATE_READY; rt->state = STATE_READY;
break; break;
@ -711,7 +786,8 @@ static int rtmp_parse_result(URLContext *s, RTMPContext *rt, RTMPPacket *pkt)
if (!t && !strcmp(tmpstr, "NetStream.Play.UnpublishNotify")) 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; if (!t && !strcmp(tmpstr, "NetStream.Publish.Start")) rt->state = STATE_PUBLISHING;
} else if (!memcmp(pkt->data, "\002\000\010onBWDone", 11)) { } else if (!memcmp(pkt->data, "\002\000\010onBWDone", 11)) {
gen_check_bw(s, rt); if ((ret = gen_check_bw(s, rt)) < 0)
return ret;
} }
break; break;
} }
@ -754,14 +830,15 @@ static int get_packet(URLContext *s, int for_header)
rt->bytes_read += ret; rt->bytes_read += ret;
if (rt->bytes_read > rt->last_bytes_read + rt->client_report_size) { if (rt->bytes_read > rt->last_bytes_read + rt->client_report_size) {
av_log(s, AV_LOG_DEBUG, "Sending bytes read report\n"); av_log(s, AV_LOG_DEBUG, "Sending bytes read report\n");
gen_bytes_read(s, rt, rpkt.timestamp + 1); if ((ret = gen_bytes_read(s, rt, rpkt.timestamp + 1)) < 0)
return ret;
rt->last_bytes_read = rt->bytes_read; rt->last_bytes_read = rt->bytes_read;
} }
ret = rtmp_parse_result(s, rt, &rpkt); ret = rtmp_parse_result(s, rt, &rpkt);
if (ret < 0) {//serious error in current packet if (ret < 0) {//serious error in current packet
ff_rtmp_packet_destroy(&rpkt); ff_rtmp_packet_destroy(&rpkt);
return -1; return ret;
} }
if (rt->state == STATE_STOPPED) { if (rt->state == STATE_STOPPED) {
ff_rtmp_packet_destroy(&rpkt); ff_rtmp_packet_destroy(&rpkt);
@ -825,20 +902,21 @@ static int get_packet(URLContext *s, int for_header)
static int rtmp_close(URLContext *h) static int rtmp_close(URLContext *h)
{ {
RTMPContext *rt = h->priv_data; RTMPContext *rt = h->priv_data;
int ret = 0;
if (!rt->is_input) { if (!rt->is_input) {
rt->flv_data = NULL; rt->flv_data = NULL;
if (rt->out_pkt.data_size) if (rt->out_pkt.data_size)
ff_rtmp_packet_destroy(&rt->out_pkt); ff_rtmp_packet_destroy(&rt->out_pkt);
if (rt->state > STATE_FCPUBLISH) if (rt->state > STATE_FCPUBLISH)
gen_fcunpublish_stream(h, rt); ret = gen_fcunpublish_stream(h, rt);
} }
if (rt->state > STATE_HANDSHAKED) if (rt->state > STATE_HANDSHAKED)
gen_delete_stream(h, rt); ret = gen_delete_stream(h, rt);
av_freep(&rt->flv_data); av_freep(&rt->flv_data);
ffurl_close(rt->stream); ffurl_close(rt->stream);
return 0; return ret;
} }
/** /**
@ -868,14 +946,14 @@ static int rtmp_open(URLContext *s, const char *uri, int flags)
port = RTMP_DEFAULT_PORT; port = RTMP_DEFAULT_PORT;
ff_url_join(buf, sizeof(buf), "tcp", NULL, hostname, port, NULL); ff_url_join(buf, sizeof(buf), "tcp", NULL, hostname, port, NULL);
if (ffurl_open(&rt->stream, buf, AVIO_FLAG_READ_WRITE, if ((ret = ffurl_open(&rt->stream, buf, AVIO_FLAG_READ_WRITE,
&s->interrupt_callback, NULL) < 0) { &s->interrupt_callback, NULL)) < 0) {
av_log(s , AV_LOG_ERROR, "Cannot open connection %s\n", buf); av_log(s , AV_LOG_ERROR, "Cannot open connection %s\n", buf);
goto fail; goto fail;
} }
rt->state = STATE_START; rt->state = STATE_START;
if (rtmp_handshake(s, rt)) if ((ret = rtmp_handshake(s, rt)) < 0)
goto fail; goto fail;
rt->chunk_size = 128; rt->chunk_size = 128;
@ -886,8 +964,8 @@ static int rtmp_open(URLContext *s, const char *uri, int flags)
rt->app = av_malloc(APP_MAX_LENGTH); rt->app = av_malloc(APP_MAX_LENGTH);
if (!rt->app) { if (!rt->app) {
rtmp_close(s); ret = AVERROR(ENOMEM);
return AVERROR(ENOMEM); goto fail;
} }
//extract "app" part from path //extract "app" part from path
@ -922,8 +1000,8 @@ static int rtmp_open(URLContext *s, const char *uri, int flags)
if (!rt->playpath) { if (!rt->playpath) {
rt->playpath = av_malloc(PLAYPATH_MAX_LENGTH); rt->playpath = av_malloc(PLAYPATH_MAX_LENGTH);
if (!rt->playpath) { if (!rt->playpath) {
rtmp_close(s); ret = AVERROR(ENOMEM);
return AVERROR(ENOMEM); goto fail;
} }
if (!strchr(fname, ':') && if (!strchr(fname, ':') &&
@ -960,7 +1038,8 @@ static int rtmp_open(URLContext *s, const char *uri, int flags)
av_log(s, AV_LOG_DEBUG, "Proto = %s, path = %s, app = %s, fname = %s\n", av_log(s, AV_LOG_DEBUG, "Proto = %s, path = %s, app = %s, fname = %s\n",
proto, path, rt->app, rt->playpath); proto, path, rt->app, rt->playpath);
gen_connect(s, rt); if ((ret = gen_connect(s, rt)) < 0)
goto fail;
do { do {
ret = get_packet(s, 1); ret = get_packet(s, 1);
@ -987,7 +1066,7 @@ static int rtmp_open(URLContext *s, const char *uri, int flags)
fail: fail:
rtmp_close(s); rtmp_close(s);
return AVERROR(EIO); return ret;
} }
static int rtmp_read(URLContext *s, uint8_t *buf, int size) static int rtmp_read(URLContext *s, uint8_t *buf, int size)
@ -1024,6 +1103,7 @@ static int rtmp_write(URLContext *s, const uint8_t *buf, int size)
int pktsize, pkttype; int pktsize, pkttype;
uint32_t ts; uint32_t ts;
const uint8_t *buf_temp = buf; const uint8_t *buf_temp = buf;
int ret;
do { do {
if (rt->skip_bytes) { if (rt->skip_bytes) {
@ -1059,7 +1139,10 @@ static int rtmp_write(URLContext *s, const uint8_t *buf, int size)
} }
//this can be a big packet, it's better to send it right here //this can be a big packet, it's better to send it right here
ff_rtmp_packet_create(&rt->out_pkt, RTMP_SOURCE_CHANNEL, pkttype, ts, pktsize); if ((ret = ff_rtmp_packet_create(&rt->out_pkt, RTMP_SOURCE_CHANNEL,
pkttype, ts, pktsize)) < 0)
return ret;
rt->out_pkt.extra = rt->main_channel_id; rt->out_pkt.extra = rt->main_channel_id;
rt->flv_data = rt->out_pkt.data; rt->flv_data = rt->out_pkt.data;