Mercurial > libavformat.hg

comparison rtp_aac.c @ 4841:94eb88d4ac0f libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix two checks in the AAC packetiser, which were too conservative Patch by Martin Storsj (martin AT martin DOT st)
author lucabe
date Thu, 09 Apr 2009 21:37:11 +0000
parents 25430a31705d
children bbdefe369edc
comparison
equal deleted inserted replaced
4840:d99a060db4a4 4841:94eb88d4ac0f
37 } 37 }
38 max_packet_size = s->max_payload_size - MAX_AU_HEADERS_SIZE; 38 max_packet_size = s->max_payload_size - MAX_AU_HEADERS_SIZE;
39 39
40 /* test if the packet must be sent */ 40 /* test if the packet must be sent */
41 len = (s->buf_ptr - s->buf); 41 len = (s->buf_ptr - s->buf);
42 if ((s->num_frames == MAX_FRAMES_PER_PACKET) || (len && (len + size) > max_packet_size)) { 42 if ((s->num_frames == MAX_FRAMES_PER_PACKET) || (len && (len + size) > s->max_payload_size)) {
43 int au_size = s->num_frames * 2; 43 int au_size = s->num_frames * 2;
44 44
45 p = s->buf + MAX_AU_HEADERS_SIZE - au_size - 2; 45 p = s->buf + MAX_AU_HEADERS_SIZE - au_size - 2;
46 if (p != s->buf) { 46 if (p != s->buf) {
47 memmove(p + 2, s->buf + 2, au_size); 47 memmove(p + 2, s->buf + 2, au_size);
57 if (s->num_frames == 0) { 57 if (s->num_frames == 0) {
58 s->buf_ptr = s->buf + MAX_AU_HEADERS_SIZE; 58 s->buf_ptr = s->buf + MAX_AU_HEADERS_SIZE;
59 s->timestamp = s->cur_timestamp; 59 s->timestamp = s->cur_timestamp;
60 } 60 }
61 61
62 if (size < max_packet_size) { 62 if (size <= max_packet_size) {
63 p = s->buf + s->num_frames++ * 2 + 2; 63 p = s->buf + s->num_frames++ * 2 + 2;
64 *p++ = size >> 5; 64 *p++ = size >> 5;
65 *p = (size & 0x1F) << 3; 65 *p = (size & 0x1F) << 3;
66 memcpy(s->buf_ptr, buff, size); 66 memcpy(s->buf_ptr, buff, size);
67 s->buf_ptr += size; 67 s->buf_ptr += size;