ffmpeg source update for sep 09

source/patched-ffmpeg-mt/libavformat/rtpenc.c

 /*
  * RTP output format
  * Copyright (c) 2002 Fabrice Bellard
  *
  * 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.
@@ skipping 37 matching lines @@
     case CODEC_ID_PCM_S16BE:
     case CODEC_ID_PCM_S16LE:
     case CODEC_ID_PCM_U16BE:
     case CODEC_ID_PCM_U16LE:
     case CODEC_ID_PCM_U8:
     case CODEC_ID_MPEG2TS:
     case CODEC_ID_AMR_NB:
     case CODEC_ID_AMR_WB:
     case CODEC_ID_VORBIS:
     case CODEC_ID_THEORA:
+    case CODEC_ID_VP8:
         return 1;
     default:
         return 0;
     }
 }
 
 static int rtp_write_header(AVFormatContext *s1)
 {
     RTPMuxContext *s = s1->priv_data;
     int max_packet_size, n;
@@ skipping 69 matching lines @@
             s->nal_length_size = (st->codec->extradata[4] & 0x03) + 1;
         }
         break;
     case CODEC_ID_VORBIS:
     case CODEC_ID_THEORA:
         if (!s->max_frames_per_packet) s->max_frames_per_packet = 15;
         s->max_frames_per_packet = av_clip(s->max_frames_per_packet, 1, 15);
         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)
             s->max_frames_per_packet = 12;
         if (st->codec->codec_id == CODEC_ID_AMR_NB)
             n = 31;
         else
             n = 61;
         /* max_header_toc_size + the largest AMR payload must fit */
         if (1 + s->max_frames_per_packet + n > s->max_payload_size) {
@@ skipping 23 matching lines @@
 {
     RTPMuxContext *s = s1->priv_data;
     uint32_t rtp_ts;
 
     dprintf(s1, "RTCP: %02x %"PRIx64" %x\n", s->payload_type, ntp_time, s->timestamp);
 
     s->last_rtcp_ntp_time = ntp_time;
     rtp_ts = av_rescale_q(ntp_time - s->first_rtcp_ntp_time, (AVRational){1, 1000000},
                           s1->streams[0]->time_base) + s->base_timestamp;
     put_byte(s1->pb, (RTP_VERSION << 6));
-    put_byte(s1->pb, 200);
+    put_byte(s1->pb, RTCP_SR);
     put_be16(s1->pb, 6); /* length in words - 1 */
     put_be32(s1->pb, s->ssrc);
     put_be32(s1->pb, ntp_time / 1000000);
     put_be32(s1->pb, ((ntp_time % 1000000) << 32) / 1000000);
     put_be32(s1->pb, rtp_ts);
     put_be32(s1->pb, s->packet_count);
     put_be32(s1->pb, s->octet_count);
     put_flush_packet(s1->pb);
 }
 
@@ skipping 199 matching lines @@
         ff_rtp_send_h264(s1, pkt->data, size);
         break;
     case CODEC_ID_H263:
     case CODEC_ID_H263P:
         ff_rtp_send_h263(s1, pkt->data, size);
         break;
     case CODEC_ID_VORBIS:
     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);
         break;
     }
     return 0;
 }
 
 static int rtp_write_trailer(AVFormatContext *s1)
 {
     RTPMuxContext *s = s1->priv_data;
 
     av_freep(&s->buf);
 
     return 0;
 }
 
 AVOutputFormat rtp_muxer = {
     "rtp",
     NULL_IF_CONFIG_SMALL("RTP output format"),
     NULL,
     NULL,
     sizeof(RTPMuxContext),
     CODEC_ID_PCM_MULAW,
     CODEC_ID_NONE,
     rtp_write_header,
     rtp_write_packet,
     rtp_write_trailer,
 };