@@ -139,7 +139,12 @@ OBJS-$(CONFIG_RM_DEMUXER)                += rmdec.o

 OBJS-$(CONFIG_RM_MUXER)                  += rmenc.o

 OBJS-$(CONFIG_ROQ_DEMUXER)               += idroq.o

 OBJS-$(CONFIG_ROQ_MUXER)                 += raw.o

-OBJS-$(CONFIG_RTP_MUXER)                 += rtp.o rtpenc.o rtp_mpv.o rtp_aac.o

+OBJS-$(CONFIG_RTP_MUXER)                 += rtp.o         \

+                                            rtpenc.o      \

+                                            rtp_mpv.o     \

+                                            rtp_aac.o     \

+                                            rtpenc_h264.o \

+                                            avc.o

 OBJS-$(CONFIG_RTSP_DEMUXER)              += rtsp.o

 OBJS-$(CONFIG_SDP_DEMUXER)               += rtsp.o rtp.o rtpdec.o rtp_h264.o

 OBJS-$(CONFIG_SEGAFILM_DEMUXER)          += segafilm.o

@@ -25,5 +25,6 @@

 #include "rtp_internal.h"

 extern RTPDynamicProtocolHandler ff_h264_dynamic_handler;

+void ff_rtp_send_h264(AVFormatContext *s1, uint8_t *buf1, int size);

 #endif /* FFMPEG_RTP_H264_H */

@@ -28,6 +28,7 @@

 #include "rtp_internal.h"

 #include "rtp_mpv.h"

 #include "rtp_aac.h"

+#include "rtp_h264.h"

 //#define DEBUG

@@ -334,6 +335,9 @@ static int rtp_write_packet(AVFormatContext *s1, AVPacket *pkt)

     case CODEC_ID_MPEG2TS:

         rtp_send_mpegts_raw(s1, buf1, size);

         break;

+    case CODEC_ID_H264:

+        ff_rtp_send_h264(s1, buf1, size);

+        break;

     default:

         /* better than nothing : send the codec raw data */

         rtp_send_raw(s1, buf1, size);

new file mode 100644

@@ -0,0 +1,78 @@

+/*

+ * RTP packetization for H.264 (RFC3984)

+ * Copyright (c) 2008 Luca Abeni.

+ *

+ * 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

+ */

+

+/**

+ * @file rtpenc_h264.c

+ * @brief H.264 packetization

+ * @author Luca Abeni <lucabe72@email.it>

+ */

+

+#include "avformat.h"

+#include "avc.h"

+#include "rtp_h264.h"

+

+static void nal_send(AVFormatContext *s1, const uint8_t *buf, int size, int last)

+{

+    RTPDemuxContext *s = s1->priv_data;

+

+    av_log(s1, AV_LOG_DEBUG, "Sending NAL %x of len %d M=%d\n", buf[0] & 0x1F, size, last);

+    if (size <= s->max_payload_size) {

+        ff_rtp_send_data(s1, buf, size, last);

+    } else {

+        uint8_t type = buf[0] & 0x1F;

+        uint8_t nri = buf[0] & 0x60;

+

+        av_log(s1, AV_LOG_DEBUG, "NAL size %d > %d\n", size, s->max_payload_size);

+        s->buf[0] = 28;        /* FU Indicator; Type = 28 ---> FU-A */

+        s->buf[0] |= nri;

+        s->buf[1] = type;

+        s->buf[1] |= 1 << 7;

+        buf += 1;

+        size -= 1;

+        while (size + 2 > s->max_payload_size) {

+            memcpy(&s->buf[2], buf, s->max_payload_size - 2);

+            ff_rtp_send_data(s1, s->buf, s->max_payload_size, 0);

+            buf += s->max_payload_size - 2;

+            size -= s->max_payload_size - 2;

+            s->buf[1] &= ~(1 << 7);

+        }

+        s->buf[1] |= 1 << 6;

+        memcpy(&s->buf[2], buf, size);

+        ff_rtp_send_data(s1, s->buf, size + 2, 1);

+    }

+}

+

+void ff_rtp_send_h264(AVFormatContext *s1, uint8_t *buf1, int size)

+{

+    uint8_t *r;

+    RTPDemuxContext *s = s1->priv_data;

+

+    s->timestamp = s->cur_timestamp;

+    r = ff_avc_find_startcode(buf1, buf1 + size);

+    while (r < buf1 + size) {

+        uint8_t *r1;

+

+        while(!*(r++));

+        r1 = ff_avc_find_startcode(r, buf1 + size);

+        nal_send(s1, r, r1 - r, (r1 == buf1 + size));

+        r = r1;

+    }

+}