[FFmpeg-cvslog] r24797 - in trunk/libavformat: Makefile rtpenc.c rtpenc.h rtpenc_vp8.c sdp.c

[mstorsjo]

Author: mstorsjo
Date: Mon Aug 16 16:21:17 2010
New Revision: 24797

Log:
Add RTP packetization of VP8

Patch by Josh Allmann, joshua dot allmann at gmail

Added:
   trunk/libavformat/rtpenc_vp8.c
Modified:
   trunk/libavformat/Makefile
   trunk/libavformat/rtpenc.c
   trunk/libavformat/rtpenc.h
   trunk/libavformat/sdp.c

Modified: trunk/libavformat/Makefile
==============================================================================
--- trunk/libavformat/Makefile	Sat Aug 14 22:34:51 2010	(r24796)
+++ trunk/libavformat/Makefile	Mon Aug 16 16:21:17 2010	(r24797)
@@ -219,6 +219,7 @@ OBJS-$(CONFIG_RTP_MUXER)                
                                             rtpenc_mpv.o     \
                                             rtpenc.o      \
                                             rtpenc_h264.o \
+                                            rtpenc_vp8.o  \
                                             rtpenc_xiph.o \
                                             avc.o
 OBJS-$(CONFIG_RTSP_DEMUXER)              += rtsp.o httpauth.o

Modified: trunk/libavformat/rtpenc.c
==============================================================================
--- trunk/libavformat/rtpenc.c	Sat Aug 14 22:34:51 2010	(r24796)
+++ trunk/libavformat/rtpenc.c	Mon Aug 16 16:21:17 2010	(r24797)
@@ -55,6 +55,7 @@ static int is_supported(enum CodecID id)
     case CODEC_ID_AMR_WB:
     case CODEC_ID_VORBIS:
     case CODEC_ID_THEORA:
+    case CODEC_ID_VP8:
         return 1;
     default:
         return 0;
@@ -144,6 +145,9 @@ static int rtp_write_header(AVFormatCont
         s->max_payload_size -= 6; // ident+frag+tdt/vdt+pkt_num+pkt_length
         s->num_frames = 0;
         goto defaultcase;
+    case CODEC_ID_VP8:
+        av_log(s1, AV_LOG_WARNING, "RTP VP8 payload is still experimental\n");
+        break;
     case CODEC_ID_AMR_NB:
     case CODEC_ID_AMR_WB:
         if (!s->max_frames_per_packet)
@@ -407,6 +411,9 @@ static int rtp_write_packet(AVFormatCont
     case CODEC_ID_THEORA:
         ff_rtp_send_xiph(s1, pkt->data, size);
         break;
+    case CODEC_ID_VP8:
+        ff_rtp_send_vp8(s1, pkt->data, size);
+        break;
     default:
         /* better than nothing : send the codec raw data */
         rtp_send_raw(s1, pkt->data, size);

Modified: trunk/libavformat/rtpenc.h
==============================================================================
--- trunk/libavformat/rtpenc.h	Sat Aug 14 22:34:51 2010	(r24796)
+++ trunk/libavformat/rtpenc.h	Mon Aug 16 16:21:17 2010	(r24797)
@@ -68,5 +68,6 @@ void ff_rtp_send_aac(AVFormatContext *s1
 void ff_rtp_send_amr(AVFormatContext *s1, const uint8_t *buff, int size);
 void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size);
 void ff_rtp_send_xiph(AVFormatContext *s1, const uint8_t *buff, int size);
+void ff_rtp_send_vp8(AVFormatContext *s1, const uint8_t *buff, int size);
 
 #endif /* AVFORMAT_RTPENC_H */

Added: trunk/libavformat/rtpenc_vp8.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/libavformat/rtpenc_vp8.c	Mon Aug 16 16:21:17 2010	(r24797)
@@ -0,0 +1,47 @@
+/*
+ * RTP VP8 Packetizer
+ * Copyright (c) 2010 Josh Allmann
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "rtpenc.h"
+
+/* Based on a draft spec for VP8 RTP.
+ * ( http://www.webmproject.org/code/specs/rtp/ ) */
+void ff_rtp_send_vp8(AVFormatContext *s1, const uint8_t *buf, int size)
+{
+    RTPMuxContext *s = s1->priv_data;
+    int len, max_packet_size;
+
+    s->buf_ptr      = s->buf;
+    s->timestamp    = s->cur_timestamp;
+    max_packet_size = s->max_payload_size - 1; // minus one for header byte
+
+    *s->buf_ptr++ = 1; // 0b1 indicates start of frame
+    while (size > 0) {
+        len = FFMIN(size, max_packet_size);
+
+        memcpy(s->buf_ptr, buf, len);
+        ff_rtp_send_data(s1, s->buf, len+1, size == len); // marker bit is last packet in frame
+
+        size         -= len;
+        buf          += len;
+        s->buf_ptr    = s->buf;
+        *s->buf_ptr++ = 0; // payload descriptor
+    }
+}

Modified: trunk/libavformat/sdp.c
==============================================================================
--- trunk/libavformat/sdp.c	Sat Aug 14 22:34:51 2010	(r24796)
+++ trunk/libavformat/sdp.c	Mon Aug 16 16:21:17 2010	(r24797)
@@ -412,6 +412,10 @@ static char *sdp_write_media_attributes(
                                     c->width, c->height, pix_fmt, config);
             break;
         }
+        case CODEC_ID_VP8:
+            av_strlcatf(buff, size, "a=rtpmap:%d VP8/90000\r\n",
+                                     payload_type);
+            break;
         default:
             /* Nothing special to do here... */
             break;