Split some really long lines

[ffmpeg] / libavformat / rtp_mpv.c

diff --git a/libavformat/rtp_mpv.c b/libavformat/rtp_mpv.c
index 0db6663cbd21713f61a2ff668b64b153e273801e..7db453a345e0570ec46dabce0e772d8439d0e08b 100644 (file)
--- a/libavformat/rtp_mpv.c
+++ b/libavformat/rtp_mpv.c
@@ -21,6 +21,8 @@
 #include "avformat.h"
 #include "rtp_internal.h"
 
+#include "mpegvideo.h"
+
 /* NOTE: a single frame must be passed with sequence header if
    needed. XXX: use slices. */
 void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size)
@@ -29,32 +31,76 @@ void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size)
     AVStream *st = s1->streams[0];
     int len, h, max_packet_size;
     uint8_t *q;
+    int begin_of_slice, end_of_slice, frame_type, temporal_reference;
 
     max_packet_size = s->max_payload_size;
+    begin_of_slice = 1;
+    end_of_slice = 0;
+    frame_type = 0;
+    temporal_reference = 0;
 
     while (size > 0) {
-        /* XXX: more correct headers */
+        int begin_of_sequence;
+
+        begin_of_sequence = 0;
+        len = max_packet_size - 4;
+
+        if (len >= size) {
+            len = size;
+            end_of_slice = 1;
+        } else {
+            const uint8_t *r, *r1;
+            int start_code;
+
+            r1 = buf1;
+            while (1) {
+                start_code = -1;
+                r = ff_find_start_code(r1, buf1 + size, &start_code);
+                if((start_code & 0xFFFFFF00) == 0x100) {
+                    /* New start code found */
+                    if (start_code == 0x100) {
+                        frame_type = (r[1] & 0x38) >> 3;
+                        temporal_reference = (int)r[0] << 2 | r[1] >> 6;
+                    }
+                    if (start_code == 0x1B8) {
+                        begin_of_sequence = 1;
+                    }
+
+                    if (r - buf1 < len) {
+                        /* The current slice fits in the packet */
+                        if (begin_of_slice == 0) {
+                            /* no slice at the beginning of the packet... */
+                            end_of_slice = 1;
+                            len = r - buf1 - 4;
+                            break;
+                        }
+                        r1 = r;
+                    } else {
+                        if (r - r1 < max_packet_size) {
+                            len = r1 - buf1 - 4;
+                            end_of_slice = 1;
+                        }
+                        break;
+                    }
+                } else {
+                    break;
+                }
+            }
+        }
+
         h = 0;
-        if (st->codec->sub_id == 2)
-            h |= 1 << 26; /* mpeg 2 indicator */
+        h |= temporal_reference << 16;
+        h |= begin_of_sequence << 13;
+        h |= begin_of_slice << 12;
+        h |= end_of_slice << 11;
+        h |= frame_type << 8;
+
         q = s->buf;
         *q++ = h >> 24;
         *q++ = h >> 16;
         *q++ = h >> 8;
         *q++ = h;
 
-        if (st->codec->sub_id == 2) {
-            h = 0;
-            *q++ = h >> 24;
-            *q++ = h >> 16;
-            *q++ = h >> 8;
-            *q++ = h;
-        }
-
-        len = max_packet_size - (q - s->buf);
-        if (len > size)
-            len = size;
-
         memcpy(q, buf1, len);
         q += len;
 
@@ -65,6 +111,8 @@ void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size)
 
         buf1 += len;
         size -= len;
+        begin_of_slice = end_of_slice;
+        end_of_slice = 0;
     }
     s->cur_timestamp++;
 }