Rework link property configuration system.

[ffmpeg] / libavformat / rtp_mpv.c

diff --git a/libavformat/rtp_mpv.c b/libavformat/rtp_mpv.c
index bcd239d2c48f0cc7f8decd2a396d3587ab8c3dcd..c8bf81f9a667d63dea78a4a03d3f82cba9c810a0 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) 2007 Luca Abeni.
  *
  * This file is part of FFmpeg.
  *
@@ -28,17 +29,20 @@
 void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size)
 {
     RTPDemuxContext *s = s1->priv_data;
-    AVStream *st = s1->streams[0];
     int len, h, max_packet_size;
     uint8_t *q;
-    int begin_of_slice, end_of_slice, frame_type;
+    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) {
@@ -56,6 +60,10 @@ void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size)
                     /* 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) {
@@ -81,6 +89,8 @@ 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;
@@ -95,8 +105,7 @@ void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size)
         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
+        s->timestamp = s->cur_timestamp;
         ff_rtp_send_data(s1, s->buf, q - s->buf, (len == size));
 
         buf1 += len;
@@ -104,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++;
 }