Correctly set the "AU size" field in the payload header for

[ffmpeg.git] / libavformat / rtp_aac.c

diff --git a/libavformat/rtp_aac.c b/libavformat/rtp_aac.c
index 267ed93..e19b286 100644 (file)
--- a/libavformat/rtp_aac.c
+++ b/libavformat/rtp_aac.c
@@ -19,31 +19,30 @@
  */
 
 #include "avformat.h"
-#include "rtp_aac.h"
-#include "rtp_internal.h"
+#include "rtpenc.h"
 
-#define MAX_FRAMES_PER_PACKET 5
-#define MAX_AU_HEADERS_SIZE (2 + 2 * MAX_FRAMES_PER_PACKET)
 
 void ff_rtp_send_aac(AVFormatContext *s1, const uint8_t *buff, int size)
 {
-    RTPDemuxContext *s = s1->priv_data;
+    RTPMuxContext *s = s1->priv_data;
     int len, max_packet_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) {
         size -= 7;
         buff += 7;
     }
-    max_packet_size = s->max_payload_size - MAX_AU_HEADERS_SIZE;
+    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->read_buf_index == MAX_FRAMES_PER_PACKET) || (len && (len + size) > max_packet_size)) {
-        int au_size = s->read_buf_index * 2;
+    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;
+        p = s->buf + max_au_headers_size - au_size - 2;
         if (p != s->buf) {
             memmove(p + 2, s->buf + 2, au_size);
         }
@@ -53,20 +52,34 @@ void ff_rtp_send_aac(AVFormatContext *s1, const uint8_t *buff, int size)
 
         ff_rtp_send_data(s1, p, s->buf_ptr - p, 1);
 
-        s->read_buf_index = 0;
+        s->num_frames = 0;
     }
-    if (s->read_buf_index == 0) {
-        s->buf_ptr = s->buf + MAX_AU_HEADERS_SIZE;
+    if (s->num_frames == 0) {
+        s->buf_ptr = s->buf + max_au_headers_size;
         s->timestamp = s->cur_timestamp;
     }
 
-    if (size < max_packet_size) {
-        p = s->buf + s->read_buf_index++ * 2 + 2;
+    if (size <= max_packet_size) {
+        p = s->buf + s->num_frames++ * 2 + 2;
         *p++ = size >> 5;
         *p = (size & 0x1F) << 3;
         memcpy(s->buf_ptr, buff, size);
         s->buf_ptr += size;
     } else {
-        av_log(s1, AV_LOG_ERROR, "Unsupported!\n");
+        int au_size = size;
+
+        max_packet_size = s->max_payload_size - 4;
+        p = s->buf;
+        p[0] = 0;
+        p[1] = 16;
+        while (size > 0) {
+            len = FFMIN(size, max_packet_size);
+            p[2] = au_size >> 5;
+            p[3] = (au_size & 0x1F) << 3;
+            memcpy(p + 4, buff, len);
+            ff_rtp_send_data(s1, p, len + 4, len == size);
+            size -= len;
+            buff += len;
+        }
     }
 }