[FFmpeg-cvslog] r25289 - in trunk/libavformat: rdt.c rdt.h rtpdec.c rtpdec.h rtsp.c

[mstorsjo]

Author: mstorsjo
Date: Fri Oct  1 19:43:27 2010
New Revision: 25289

Log:
rtsp/rtpdec: Allow rtp_parse_packet to take ownership of the packet buffer

Do the same change for ff_rdt_parse_packet, too, to keep the interfaces
similar.

Modified:
   trunk/libavformat/rdt.c
   trunk/libavformat/rdt.h
   trunk/libavformat/rtpdec.c
   trunk/libavformat/rtpdec.h
   trunk/libavformat/rtsp.c

Modified: trunk/libavformat/rdt.c
==============================================================================
--- trunk/libavformat/rdt.c	Fri Oct  1 19:41:31 2010	(r25288)
+++ trunk/libavformat/rdt.c	Fri Oct  1 19:43:27 2010	(r25289)
@@ -337,8 +337,9 @@ get_cache:
 
 int
 ff_rdt_parse_packet(RDTDemuxContext *s, AVPacket *pkt,
-                    const uint8_t *buf, int len)
+                    uint8_t **bufptr, int len)
 {
+    uint8_t *buf = bufptr ? *bufptr : NULL;
     int seq_no, flags = 0, stream_id, set_id, is_keyframe;
     uint32_t timestamp;
     int rv= 0;

Modified: trunk/libavformat/rdt.h
==============================================================================
--- trunk/libavformat/rdt.h	Fri Oct  1 19:41:31 2010	(r25288)
+++ trunk/libavformat/rdt.h	Fri Oct  1 19:43:27 2010	(r25289)
@@ -96,7 +96,7 @@ int ff_rdt_parse_header(const uint8_t *b
  * Usage similar to rtp_parse_packet().
  */
 int ff_rdt_parse_packet(RDTDemuxContext *s, AVPacket *pkt,
-                        const uint8_t *buf, int len);
+                        uint8_t **buf, int len);
 
 /**
  * Parse a server-related SDP line.

Modified: trunk/libavformat/rtpdec.c
==============================================================================
--- trunk/libavformat/rtpdec.c	Fri Oct  1 19:41:31 2010	(r25288)
+++ trunk/libavformat/rtpdec.c	Fri Oct  1 19:43:27 2010	(r25289)
@@ -414,14 +414,15 @@ static void finalize_packet(RTPDemuxCont
  * Parse an RTP or RTCP packet directly sent as a buffer.
  * @param s RTP parse context.
  * @param pkt returned packet
- * @param buf input buffer or NULL to read the next packets
+ * @param bufptr pointer to the input buffer or NULL to read the next packets
  * @param len buffer len
  * @return 0 if a packet is returned, 1 if a packet is returned and more can follow
  * (use buf as NULL to read the next). -1 if no packet (error or no more packet).
  */
 int rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt,
-                     const uint8_t *buf, int len)
+                     uint8_t **bufptr, int len)
 {
+    uint8_t* buf = bufptr ? *bufptr : NULL;
     unsigned int ssrc, h;
     int payload_type, seq, ret, flags = 0;
     AVStream *st;

Modified: trunk/libavformat/rtpdec.h
==============================================================================
--- trunk/libavformat/rtpdec.h	Fri Oct  1 19:41:31 2010	(r25288)
+++ trunk/libavformat/rtpdec.h	Fri Oct  1 19:43:27 2010	(r25289)
@@ -39,7 +39,7 @@ RTPDemuxContext *rtp_parse_open(AVFormat
 void rtp_parse_set_dynamic_protocol(RTPDemuxContext *s, PayloadContext *ctx,
                                     RTPDynamicProtocolHandler *handler);
 int rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt,
-                     const uint8_t *buf, int len);
+                     uint8_t **buf, int len);
 void rtp_parse_close(RTPDemuxContext *s);
 #if (LIBAVFORMAT_VERSION_MAJOR <= 53)
 int rtp_get_local_port(URLContext *h);

Modified: trunk/libavformat/rtsp.c
==============================================================================
--- trunk/libavformat/rtsp.c	Fri Oct  1 19:41:31 2010	(r25288)
+++ trunk/libavformat/rtsp.c	Fri Oct  1 19:43:27 2010	(r25289)
@@ -1843,9 +1843,9 @@ static int rtsp_fetch_packet(AVFormatCon
     if (len == 0)
         return AVERROR_EOF;
     if (rt->transport == RTSP_TRANSPORT_RDT) {
-        ret = ff_rdt_parse_packet(rtsp_st->transport_priv, pkt, rt->recvbuf, len);
+        ret = ff_rdt_parse_packet(rtsp_st->transport_priv, pkt, &rt->recvbuf, len);
     } else {
-        ret = rtp_parse_packet(rtsp_st->transport_priv, pkt, rt->recvbuf, len);
+        ret = rtp_parse_packet(rtsp_st->transport_priv, pkt, &rt->recvbuf, len);
         if (ret < 0) {
             /* Either bad packet, or a RTCP packet. Check if the
              * first_rtcp_ntp_time field was initialized. */