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

Merge commit 'ba77757a7efafe38924b6b423acfca8c1e1c62d6' 

* commit 'ba77757a7efafe38924b6b423acfca8c1e1c62d6':
  rtmp: Replace a magic number with a macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-09-23 11:45:11 +02:00
parent c70e647a15 ba77757a7e
commit eaa20afa76
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavformat/rtmpproto.c
View File

@ -53,6 +53,7 @@
#define TCURL_MAX_LENGTH 512 #define TCURL_MAX_LENGTH 512
#define FLASHVER_MAX_LENGTH 64 #define FLASHVER_MAX_LENGTH 64
#define RTMP_PKTDATA_DEFAULT_SIZE 4096 #define RTMP_PKTDATA_DEFAULT_SIZE 4096
#define RTMP_HEADER 11
/** RTMP protocol handler state */ /** RTMP protocol handler state */
typedef enum { typedef enum {
@ -95,7 +96,7 @@ typedef struct RTMPContext {
uint32_t bytes_read; ///< number of bytes read from server uint32_t bytes_read; ///< number of bytes read from server
uint32_t last_bytes_read; ///< number of bytes read last reported to server uint32_t last_bytes_read; ///< number of bytes read last reported to server
int skip_bytes; ///< number of bytes to skip from the input FLV stream in the next write call int skip_bytes; ///< number of bytes to skip from the input FLV stream in the next write call
uint8_t flv_header[11]; ///< partial incoming flv packet header uint8_t flv_header[RTMP_HEADER]; ///< partial incoming flv packet header
int flv_header_bytes; ///< number of initialized bytes in flv_header int flv_header_bytes; ///< number of initialized bytes in flv_header
int nb_invokes; ///< keeps track of invoke messages int nb_invokes; ///< keeps track of invoke messages
char* tcurl; ///< url of the target stream char* tcurl; ///< url of the target stream
@ -1998,7 +1999,7 @@ static int handle_invoke_status(URLContext *s, RTMPPacket *pkt)
{ {
RTMPContext *rt = s->priv_data; RTMPContext *rt = s->priv_data;
const uint8_t *data_end = pkt->data + pkt->size; const uint8_t *data_end = pkt->data + pkt->size;
const uint8_t *ptr = pkt->data + 11; const uint8_t *ptr = pkt->data + RTMP_HEADER;
uint8_t tmpstr[256]; uint8_t tmpstr[256];
int i, t; int i, t;
@ -2197,7 +2198,7 @@ static int handle_metadata(RTMPContext *rt, RTMPPacket *pkt)
/* copy data while rewriting timestamps */ /* copy data while rewriting timestamps */
ts = pkt->timestamp; ts = pkt->timestamp;
while (next - pkt->data < pkt->size - 11) { while (next - pkt->data < pkt->size - RTMP_HEADER) {
type = bytestream_get_byte(&next); type = bytestream_get_byte(&next);
size = bytestream_get_be24(&next); size = bytestream_get_be24(&next);
cts = bytestream_get_be24(&next); cts = bytestream_get_be24(&next);
@ -2214,7 +2215,7 @@ static int handle_metadata(RTMPContext *rt, RTMPPacket *pkt)
next += size + 3 + 4; next += size + 3 + 4;
p += size + 3 + 4; p += size + 3 + 4;
} }
memcpy(p, next, 11); memcpy(p, next, RTMP_HEADER);
return 0; return 0;
} }
@ -2645,14 +2646,14 @@ static int rtmp_write(URLContext *s, const uint8_t *buf, int size)
continue; continue;
} }
if (rt->flv_header_bytes < 11) { if (rt->flv_header_bytes < RTMP_HEADER) {
const uint8_t *header = rt->flv_header; const uint8_t *header = rt->flv_header;
int copy = FFMIN(11 - rt->flv_header_bytes, size_temp); int copy = FFMIN(RTMP_HEADER - rt->flv_header_bytes, size_temp);
int channel = RTMP_AUDIO_CHANNEL; int channel = RTMP_AUDIO_CHANNEL;
bytestream_get_buffer(&buf_temp, rt->flv_header + rt->flv_header_bytes, copy); bytestream_get_buffer(&buf_temp, rt->flv_header + rt->flv_header_bytes, copy);
rt->flv_header_bytes += copy; rt->flv_header_bytes += copy;
size_temp -= copy; size_temp -= copy;
if (rt->flv_header_bytes < 11) if (rt->flv_header_bytes < RTMP_HEADER)
break; break;
pkttype = bytestream_get_byte(&header); pkttype = bytestream_get_byte(&header);