generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rtmp: Factorize the code by adding handle_chunk_size

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Samuel Pitoiset 2012-07-21 12:59:52 +02:00 committed by Martin Storsjö
parent 0ffd5161c4
commit 7be2a7d8ff
1 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
libavformat/rtmpproto.c
View File

@ -880,6 +880,34 @@ static int rtmp_handshake(URLContext *s, RTMPContext *rt)
return 0; return 0;
} }
static int handle_chunk_size(URLContext *s, RTMPPacket *pkt)
{
RTMPContext *rt = s->priv_data;
int ret;
if (pkt->data_size != 4) {
av_log(s, AV_LOG_ERROR,
"Chunk size change packet is not 4 bytes long (%d)\n",
pkt->data_size);
return -1;
}
if (!rt->is_input) {
if ((ret = ff_rtmp_packet_write(rt->stream, pkt, rt->chunk_size,
rt->prev_pkt[1])) < 0)
return ret;
}
rt->chunk_size = AV_RB32(pkt->data);
if (rt->chunk_size <= 0) {
av_log(s, AV_LOG_ERROR, "Incorrect chunk size %d\n", rt->chunk_size);
return -1;
}
av_log(s, AV_LOG_DEBUG, "New chunk size = %d\n", rt->chunk_size);
return 0;
}
static int handle_ping(URLContext *s, RTMPPacket *pkt) static int handle_ping(URLContext *s, RTMPPacket *pkt)
{ {
RTMPContext *rt = s->priv_data; RTMPContext *rt = s->priv_data;
@ -943,21 +971,8 @@ static int rtmp_parse_result(URLContext *s, RTMPContext *rt, RTMPPacket *pkt)
switch (pkt->type) { switch (pkt->type) {
case RTMP_PT_CHUNK_SIZE: case RTMP_PT_CHUNK_SIZE:
if (pkt->data_size != 4) { if ((ret = handle_chunk_size(s, pkt)) < 0)
av_log(s, AV_LOG_ERROR,
"Chunk size change packet is not 4 bytes long (%d)\n", pkt->data_size);
return -1;
}
if (!rt->is_input)
if ((ret = ff_rtmp_packet_write(rt->stream, pkt, rt->chunk_size,
rt->prev_pkt[1])) < 0)
return ret; return ret;
rt->chunk_size = AV_RB32(pkt->data);
if (rt->chunk_size <= 0) {
av_log(s, AV_LOG_ERROR, "Incorrect chunk size %d\n", rt->chunk_size);
return -1;
}
av_log(s, AV_LOG_DEBUG, "New chunk size = %d\n", rt->chunk_size);
break; break;
case RTMP_PT_PING: case RTMP_PT_PING:
if ((ret = handle_ping(s, pkt)) < 0) if ((ret = handle_ping(s, pkt)) < 0)