Browse Source

Fix two checks in the AAC packetiser, which were too conservative

Patch by Martin Storsjö (martin AT martin DOT st)

Originally committed as revision 18400 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.6
Martin Storsjö Luca Abeni 16 years ago
parent
commit
d2ce53b786
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      libavformat/rtp_aac.c

+ 2
- 2
libavformat/rtp_aac.c View File

@@ -39,7 +39,7 @@ void ff_rtp_send_aac(AVFormatContext *s1, const uint8_t *buff, int size)

/* test if the packet must be sent */
len = (s->buf_ptr - s->buf);
if ((s->num_frames == MAX_FRAMES_PER_PACKET) || (len && (len + size) > max_packet_size)) {
if ((s->num_frames == MAX_FRAMES_PER_PACKET) || (len && (len + size) > s->max_payload_size)) {
int au_size = s->num_frames * 2;

p = s->buf + MAX_AU_HEADERS_SIZE - au_size - 2;
@@ -59,7 +59,7 @@ void ff_rtp_send_aac(AVFormatContext *s1, const uint8_t *buff, int size)
s->timestamp = s->cur_timestamp;
}

if (size < max_packet_size) {
if (size <= max_packet_size) {
p = s->buf + s->num_frames++ * 2 + 2;
*p++ = size >> 5;
*p = (size & 0x1F) << 3;


Loading…
Cancel
Save