diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 01:31:45 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 01:31:49 +0100 |
commit | 5cb6b53050e39ed3cf7dabcf3cd8198a934f9bd2 (patch) | |
tree | fd71fe492208b02db3eb5d3cf615e6a5ddbd6ed2 /libavformat/rtpenc_aac.c | |
parent | 78c59f3f0c9f20c3d143bd75fdf125bdf032b16d (diff) | |
parent | 4f6cd883f06f7893a2b60a41e7a4f8ae633dac2f (diff) |
Merge commit '4f6cd883f06f7893a2b60a41e7a4f8ae633dac2f'
* commit '4f6cd883f06f7893a2b60a41e7a4f8ae633dac2f':
rtpenc: Don't set max_frames_per_packet based on the packet frame size or frame rate
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpenc_aac.c')
-rw-r--r-- | libavformat/rtpenc_aac.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/rtpenc_aac.c b/libavformat/rtpenc_aac.c index c20bbebc8f..f835183ac3 100644 --- a/libavformat/rtpenc_aac.c +++ b/libavformat/rtpenc_aac.c @@ -27,6 +27,7 @@ void ff_rtp_send_aac(AVFormatContext *s1, const uint8_t *buff, int size) { RTPMuxContext *s = s1->priv_data; + AVStream *st = s1->streams[0]; const int max_au_headers_size = 2 + 2 * s->max_frames_per_packet; int len, max_packet_size = s->max_payload_size - max_au_headers_size; uint8_t *p; @@ -41,7 +42,9 @@ void ff_rtp_send_aac(AVFormatContext *s1, const uint8_t *buff, int size) len = (s->buf_ptr - s->buf); if (s->num_frames && (s->num_frames == s->max_frames_per_packet || - (len + size) > s->max_payload_size)) { + (len + size) > s->max_payload_size || + av_compare_ts(s->cur_timestamp - s->timestamp, st->time_base, + s1->max_delay, AV_TIME_BASE_Q) >= 0)) { int au_size = s->num_frames * 2; p = s->buf + max_au_headers_size - au_size - 2; |