changeset 4589:df35708c640a libavformat

Don't (ab)use PKT_FLAG_* in RTP code, since the two have virtually nothing in common except for this one value. Change was requested by Luca in the "[FFmpeg-devel] RTP mark bit not passed to parse_packet" thread.
author rbultje
date Thu, 26 Feb 2009 14:23:05 +0000
parents e1a5b4f5b9be
children 85c7d517d556
files rdt.c rtpdec.h
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/rdt.c	Thu Feb 26 14:15:41 2009 +0000
+++ b/rdt.c	Thu Feb 26 14:23:05 2009 +0000
@@ -306,7 +306,7 @@
         int pos;
 
         init_put_byte(&pb, buf, len, 0, NULL, NULL, NULL, NULL);
-        flags = (flags & PKT_FLAG_KEY) ? 2 : 0;
+        flags = (flags & RTP_FLAG_KEY) ? 2 : 0;
         res = ff_rm_parse_packet (rdt->rmctx, &pb, st, rdt->rmst[st->index], len, pkt,
                                   &seq, &flags, timestamp);
         pos = url_ftell(&pb);
@@ -361,7 +361,7 @@
     if (is_keyframe &&
         (set_id != s->prev_set_id || timestamp != s->prev_timestamp ||
          stream_id != s->prev_stream_id)) {
-        flags |= PKT_FLAG_KEY;
+        flags |= RTP_FLAG_KEY;
         s->prev_set_id    = set_id;
         s->prev_timestamp = timestamp;
     }
--- a/rtpdec.h	Thu Feb 26 14:15:41 2009 +0000
+++ b/rtpdec.h	Thu Feb 26 14:23:05 2009 +0000
@@ -92,6 +92,7 @@
     uint32_t jitter;            ///< estimated jitter.
 } RTPStatistics;
 
+#define RTP_FLAG_KEY    0x1 ///< RTP packet contains a keyframe
 /**
  * Packet parsing for "private" payloads in the RTP specs.
  *
@@ -102,7 +103,7 @@
  * @param timestamp pointer in which to write the timestamp of this RTP packet
  * @param buf pointer to raw RTP packet data
  * @param len length of buf
- * @param flags flags from the RTP packet header (PKT_FLAG_*)
+ * @param flags flags from the RTP packet header (RTP_FLAG_*)
  */
 typedef int (*DynamicPayloadPacketHandlerProc) (AVFormatContext *ctx,
                                                 PayloadContext *s,