Remove unused variables, fixes the following warnings:

[ffmpeg] / libavformat / rtp_mpv.c

diff --git a/libavformat/rtp_mpv.c b/libavformat/rtp_mpv.c
index 3886d8bcebdcb7203e58e7fbc8572fa13bc63ed7..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.
  *
@@ -21,32 +22,78 @@
 #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)
 {
     RTPDemuxContext *s = s1->priv_data;
-    AVStream *st = s1->streams[0];
     int len, h, max_packet_size;
-    int b=1, e=0;
     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) {
+        int begin_of_sequence;
+
+        begin_of_sequence = 0;
         len = max_packet_size - 4;
 
         if (len >= size) {
             len = size;
-            e = 1;
+            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;
-        h |= b << 12;
-        h |= e << 11;
-
-//        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;
@@ -54,26 +101,18 @@ void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size)
         *q++ = h >> 8;
         *q++ = h;
 
-/*        if (st->codec->sub_id == 2) {
-            h = 0;
-            *q++ = h >> 24;
-            *q++ = h >> 16;
-            *q++ = h >> 8;
-            *q++ = h;
-        } */
-
         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
+        s->timestamp = s->cur_timestamp;
         ff_rtp_send_data(s1, s->buf, q - s->buf, (len == size));
 
         buf1 += len;
         size -= len;
+        begin_of_slice = end_of_slice;
+        end_of_slice = 0;
     }
-    s->cur_timestamp++;
 }