Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Unified Diff: source/patched-ffmpeg-mt/libavformat/rtpenc.c

Issue 3384002: ffmpeg source update for sep 09 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/patched-ffmpeg-mt/libavformat/rtpenc.h ('k') | source/patched-ffmpeg-mt/libavformat/rtpenc_vp8.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/patched-ffmpeg-mt/libavformat/rtpenc.c
===================================================================
--- source/patched-ffmpeg-mt/libavformat/rtpenc.c (revision 59334)
+++ source/patched-ffmpeg-mt/libavformat/rtpenc.c (working copy)
@@ -55,6 +55,7 @@
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 @@
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)
@@ -187,7 +191,7 @@
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);
@@ -407,6 +411,9 @@
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);
« no previous file with comments | « source/patched-ffmpeg-mt/libavformat/rtpenc.h ('k') | source/patched-ffmpeg-mt/libavformat/rtpenc_vp8.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698