[FFmpeg-devel] [PATCH] RTSP-MS 12/15: ASF payload support

[Ronald S. Bultje]

Hi Luca,

On Tue, Mar 17, 2009 at 7:18 PM, Luca Abeni <lucabe72 at email.it> wrote:
> The rtpdec part is just registering 2 payload handlers, right?
> Why not having the ff_ms_rtp_asf_pfv_handler() and
> ff_ms_rtp_asf_pfa_handler() prototypes in a header file (rtp_asf.h)?

Good point, patch adjusted to take this into account.

> Anyway, looks ok if it works.

Will apply this in 2-3 days unless you object. :-).

Ronald
-------------- next part --------------
Index: ffmpeg-svn/libavformat/rtp_asf.c
===================================================================
--- ffmpeg-svn.orig/libavformat/rtp_asf.c	2009-03-17 14:35:28.000000000 -0400
+++ ffmpeg-svn/libavformat/rtp_asf.c	2009-03-17 16:42:53.000000000 -0400
@@ -27,6 +27,7 @@
 
 #include <libavutil/base64.h>
 #include <libavutil/avstring.h>
+#include "rtp.h"
 #include "rtp_asf.h"
 #include "rtsp.h"
 #include "asf.h"
@@ -50,3 +51,41 @@
         rt->asf_ctx->pb = NULL;
     }
 }
+
+static int
+asfrtp_parse_sdp_line (AVFormatContext *s, int stream_index,
+                       PayloadContext *asf, const char *line)
+{
+    if (av_strstart(line, "stream:", &line)) {
+        RTSPState *rt = s->priv_data;
+
+        s->streams[stream_index]->id = strtol(line, NULL, 10);
+
+        if (rt->asf_ctx) {
+            int i;
+
+            for (i = 0; i < rt->asf_ctx->nb_streams; i++) {
+                if (s->streams[stream_index]->id == rt->asf_ctx->streams[i]->id) {
+                    *s->streams[stream_index]->codec =
+                        *rt->asf_ctx->streams[i]->codec;
+                    rt->asf_ctx->streams[i]->codec->extradata_size = 0;
+                    rt->asf_ctx->streams[i]->codec->extradata = NULL;
+                    av_set_pts_info(s->streams[stream_index], 32, 1, 1000);
+                }
+           }
+        }
+    }
+
+    return 0;
+}
+
+#define RTP_ASF_HANDLER(n, s, t) \
+RTPDynamicProtocolHandler ff_ms_rtp_ ## n ## _handler = { \
+    s, \
+    t, \
+    CODEC_ID_NONE, \
+    asfrtp_parse_sdp_line, \
+};
+
+RTP_ASF_HANDLER(asf_pfv, "x-asf-pf",  CODEC_TYPE_VIDEO);
+RTP_ASF_HANDLER(asf_pfa, "x-asf-pf",  CODEC_TYPE_AUDIO);
Index: ffmpeg-svn/libavformat/rtpdec.c
===================================================================
--- ffmpeg-svn.orig/libavformat/rtpdec.c	2009-03-17 14:35:20.000000000 -0400
+++ ffmpeg-svn/libavformat/rtpdec.c	2009-03-18 19:16:55.000000000 -0400
@@ -30,6 +30,7 @@
 #include "network.h"
 
 #include "rtpdec.h"
+#include "rtp_asf.h"
 #include "rtp_h264.h"
 
 //#define DEBUG
@@ -60,6 +61,9 @@
     ff_register_dynamic_payload_handler(&mp4v_es_handler);
     ff_register_dynamic_payload_handler(&mpeg4_generic_handler);
     ff_register_dynamic_payload_handler(&ff_h264_dynamic_handler);
+
+    ff_register_dynamic_payload_handler(&ff_ms_rtp_asf_pfv_handler);
+    ff_register_dynamic_payload_handler(&ff_ms_rtp_asf_pfa_handler);
 }
 
 static int rtcp_parse_packet(RTPDemuxContext *s, const unsigned char *buf, int len)
Index: ffmpeg-svn/libavformat/rtp_asf.h
===================================================================
--- ffmpeg-svn.orig/libavformat/rtp_asf.h	2009-03-17 08:31:43.000000000 -0400
+++ ffmpeg-svn/libavformat/rtp_asf.h	2009-03-18 19:19:07.000000000 -0400
@@ -32,4 +32,11 @@
  */
 void ff_wms_parse_sdp_a_line(AVFormatContext *s, const char *p);
 
+/**
+ * Handlers for the x-asf-pf payloads (the payload ID for RTP/ASF).
+ * Defined and implemented in rtp_asf.c, registered in rtpdec.c.
+ */
+extern RTPDynamicProtocolHandler ff_ms_rtp_asf_pfv_handler,
+                                 ff_ms_rtp_asf_pfa_handler;
+
 #endif /* AVFORMAT_RTP_ASF_H */