* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/intreadwrite.h"
+
#include "avformat.h"
#include "rtpenc.h"
void ff_rtp_send_aac(AVFormatContext *s1, const uint8_t *buff, int size)
{
RTPMuxContext *s = s1->priv_data;
- int len, max_packet_size;
+ 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;
- const int max_frames_per_packet = s->max_frames_per_packet ? s->max_frames_per_packet : 5;
- const int max_au_headers_size = 2 + 2 * max_frames_per_packet;
/* skip ADTS header, if present */
- if ((s1->streams[0]->codec->extradata_size) == 0) {
+ if ((s1->streams[0]->codecpar->extradata_size) == 0) {
size -= 7;
buff += 7;
}
- max_packet_size = s->max_payload_size - max_au_headers_size;
/* test if the packet must be sent */
len = (s->buf_ptr - s->buf);
- if ((s->num_frames == max_frames_per_packet) || (s->num_frames && (len + size) > s->max_payload_size)) {
+ if (s->num_frames &&
+ (s->num_frames == s->max_frames_per_packet ||
+ (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;
memmove(p + 2, s->buf + 2, au_size);
}
/* Write the AU header size */
- p[0] = au_size >> 5;
- p[1] = (au_size & 0x1F) << 3;
+ AV_WB16(p, au_size * 8);
ff_rtp_send_data(s1, p, s->buf_ptr - p, 1);
if (size <= max_packet_size) {
p = s->buf + s->num_frames++ * 2 + 2;
- *p++ = size >> 5;
- *p = (size & 0x1F) << 3;
+ AV_WB16(p, size * 8);
memcpy(s->buf_ptr, buff, size);
s->buf_ptr += size;
} else {
max_packet_size = s->max_payload_size - 4;
p = s->buf;
- p[0] = 0;
- p[1] = 16;
+ AV_WB16(p, 2 * 8);
while (size > 0) {
len = FFMIN(size, max_packet_size);
- p[2] = au_size >> 5;
- p[3] = (au_size & 0x1F) << 3;
+ AV_WB16(&p[2], au_size * 8);
memcpy(p + 4, buff, len);
ff_rtp_send_data(s1, p, len + 4, len == size);
size -= len;