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

rtmp: Factorize the code by adding handle_client_bw

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Samuel Pitoiset 2012-07-21 12:59:50 +02:00 committed by Martin Storsjö
parent 9b498148ca
commit 912ecc9a19
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libavformat/rtmpproto.c
View File

@ -880,6 +880,22 @@ static int rtmp_handshake(URLContext *s, RTMPContext *rt)
return 0; return 0;
} }
static int handle_client_bw(URLContext *s, RTMPPacket *pkt)
{
RTMPContext *rt = s->priv_data;
if (pkt->data_size < 4) {
av_log(s, AV_LOG_ERROR,
"Client bandwidth report packet is less than 4 bytes long (%d)\n",
pkt->data_size);
return -1;
}
av_log(s, AV_LOG_DEBUG, "Client bandwidth = %d\n", AV_RB32(pkt->data));
rt->client_report_size = AV_RB32(pkt->data) >> 1;
return 0;
}
static int handle_server_bw(URLContext *s, RTMPPacket *pkt) static int handle_server_bw(URLContext *s, RTMPPacket *pkt)
{ {
RTMPContext *rt = s->priv_data; RTMPContext *rt = s->priv_data;
@ -936,14 +952,8 @@ static int rtmp_parse_result(URLContext *s, RTMPContext *rt, RTMPPacket *pkt)
return ret; return ret;
break; break;
case RTMP_PT_CLIENT_BW: case RTMP_PT_CLIENT_BW:
if (pkt->data_size < 4) { if ((ret = handle_client_bw(s, pkt)) < 0)
av_log(s, AV_LOG_ERROR, return ret;
"Client bandwidth report packet is less than 4 bytes long (%d)\n",
pkt->data_size);
return -1;
}
av_log(s, AV_LOG_DEBUG, "Client bandwidth = %d\n", AV_RB32(pkt->data));
rt->client_report_size = AV_RB32(pkt->data) >> 1;
break; break;
case RTMP_PT_SERVER_BW: case RTMP_PT_SERVER_BW:
if ((ret = handle_server_bw(s, pkt)) < 0) if ((ret = handle_server_bw(s, pkt)) < 0)