mirror of
https://gitee.com/openharmony/third_party_ffmpeg
synced 2024-11-28 05:30:34 +00:00
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
This commit is contained in:
parent
cc0241283b
commit
d2ce53b786
@ -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…
Reference in New Issue
Block a user