Enable unscaled packed422 -> planar 420 converters by default as the

[ffmpeg] / libavformat / rtp_mpv.c

diff --git a/libavformat/rtp_mpv.c b/libavformat/rtp_mpv.c
index dc18d90d39f92614523b1c6537edbf7e1437f146..f3f45013676924b84e27fdd853c2af9b9ed0d6a2 100644 (file)
--- a/libavformat/rtp_mpv.c
+++ b/libavformat/rtp_mpv.c
@@ -1,6 +1,7 @@
 /*
  * RTP packetization for MPEG video
- * Copyright (c) 2002 Fabrice Bellard.
+ * Copyright (c) 2002 Fabrice Bellard
+ * Copyright (c) 2007 Luca Abeni
  *
  * This file is part of FFmpeg.
  *
@@ -18,26 +19,30 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#include "avformat.h"
-#include "rtp_internal.h"
 
-#include "mpegvideo.h"
+#include "libavcodec/mpegvideo.h"
+#include "avformat.h"
+#include "rtpenc.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)
 {
-    RTPDemuxContext *s = s1->priv_data;
-    AVStream *st = s1->streams[0];
+    RTPMuxContext *s = s1->priv_data;
     int len, h, max_packet_size;
     uint8_t *q;
-    int begin_of_slice, end_of_slice;
+    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) {
+        int begin_of_sequence;
+
+        begin_of_sequence = 0;
         len = max_packet_size - 4;
 
         if (len >= size) {
@@ -53,7 +58,15 @@ void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size)
                 r = ff_find_start_code(r1, buf1 + size, &start_code);
                 if((start_code & 0xFFFFFF00) == 0x100) {
                     /* New start code found */
-                    if (r - buf1 < len) {
+                    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 - 4 <= len) {
                         /* The current slice fits in the packet */
                         if (begin_of_slice == 0) {
                             /* no slice at the beginning of the packet... */
@@ -63,7 +76,7 @@ void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size)
                         }
                         r1 = r;
                     } else {
-                        if (r - r1 < max_packet_size) {
+                        if ((r1 - buf1 > 4) && (r - r1 < max_packet_size)) {
                             len = r1 - buf1 - 4;
                             end_of_slice = 1;
                         }
@@ -76,8 +89,11 @@ void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size)
         }
 
         h = 0;
+        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;
@@ -88,9 +104,8 @@ void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size)
         memcpy(q, buf1, len);
         q += len;
 
-        /* 90 KHz time stamp */
-        s->timestamp = s->base_timestamp +
-            av_rescale((int64_t)s->cur_timestamp * st->codec->time_base.num, 90000, st->codec->time_base.den); //FIXME pass timestamps
+        /* 90kHz time stamp */
+        s->timestamp = s->cur_timestamp;
         ff_rtp_send_data(s1, s->buf, q - s->buf, (len == size));
 
         buf1 += len;
@@ -98,7 +113,6 @@ void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size)
         begin_of_slice = end_of_slice;
         end_of_slice = 0;
     }
-    s->cur_timestamp++;
 }