blob: 1128e048997c52d2b7183678fa9eeb9538ede457 [file] [log] [blame]
niklase@google.com470e71d2011-07-07 08:21:25 +00001/*
mflodman@webrtc.orgc80d9d92012-02-06 10:11:25 +00002 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
niklase@google.com470e71d2011-07-07 08:21:25 +00003 *
4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree.
9 */
10
philipel5908c712015-12-21 08:23:20 -080011#include "webrtc/modules/video_coding/video_coding_impl.h"
12
13#include <algorithm>
14
pbos@webrtc.orga4407322013-07-16 12:32:05 +000015#include "webrtc/common_types.h"
16#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
sprang3911c262016-04-15 01:24:14 -070017#include "webrtc/base/criticalsection.h"
Henrik Kjellander2557b862015-11-18 22:00:21 +010018#include "webrtc/modules/video_coding/include/video_codec_interface.h"
19#include "webrtc/modules/video_coding/encoded_frame.h"
20#include "webrtc/modules/video_coding/jitter_buffer.h"
21#include "webrtc/modules/video_coding/packet.h"
Henrik Kjellander98f53512015-10-28 18:17:40 +010022#include "webrtc/system_wrappers/include/clock.h"
niklase@google.com470e71d2011-07-07 08:21:25 +000023
agalusza@google.coma7e360e2013-08-01 03:15:08 +000024namespace webrtc {
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +000025namespace vcm {
niklase@google.com470e71d2011-07-07 08:21:25 +000026
philipel5908c712015-12-21 08:23:20 -080027int64_t VCMProcessTimer::Period() const {
28 return _periodMs;
niklase@google.com470e71d2011-07-07 08:21:25 +000029}
30
philipel5908c712015-12-21 08:23:20 -080031int64_t VCMProcessTimer::TimeUntilProcess() const {
32 const int64_t time_since_process = _clock->TimeInMilliseconds() - _latestMs;
33 const int64_t time_until_process = _periodMs - time_since_process;
34 return std::max<int64_t>(time_until_process, 0);
niklase@google.com470e71d2011-07-07 08:21:25 +000035}
36
philipel5908c712015-12-21 08:23:20 -080037void VCMProcessTimer::Processed() {
38 _latestMs = _clock->TimeInMilliseconds();
niklase@google.com470e71d2011-07-07 08:21:25 +000039}
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +000040} // namespace vcm
niklase@google.com470e71d2011-07-07 08:21:25 +000041
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +000042namespace {
andresp@webrtc.org1df9dc32014-01-09 08:01:57 +000043// This wrapper provides a way to modify the callback without the need to expose
44// a register method all the way down to the function calling it.
45class EncodedImageCallbackWrapper : public EncodedImageCallback {
46 public:
47 EncodedImageCallbackWrapper()
48 : cs_(CriticalSectionWrapper::CreateCriticalSection()), callback_(NULL) {}
49
50 virtual ~EncodedImageCallbackWrapper() {}
51
52 void Register(EncodedImageCallback* callback) {
53 CriticalSectionScoped cs(cs_.get());
54 callback_ = callback;
55 }
56
pbos@webrtc.org273a4142014-12-01 15:23:21 +000057 virtual int32_t Encoded(const EncodedImage& encoded_image,
andresp@webrtc.org1df9dc32014-01-09 08:01:57 +000058 const CodecSpecificInfo* codec_specific_info,
59 const RTPFragmentationHeader* fragmentation) {
60 CriticalSectionScoped cs(cs_.get());
61 if (callback_)
philipel5908c712015-12-21 08:23:20 -080062 return callback_->Encoded(encoded_image, codec_specific_info,
63 fragmentation);
andresp@webrtc.org1df9dc32014-01-09 08:01:57 +000064 return 0;
65 }
66
67 private:
kwiberg3f55dea2016-02-29 05:51:59 -080068 std::unique_ptr<CriticalSectionWrapper> cs_;
andresp@webrtc.org1df9dc32014-01-09 08:01:57 +000069 EncodedImageCallback* callback_ GUARDED_BY(cs_);
70};
71
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +000072class VideoCodingModuleImpl : public VideoCodingModule {
73 public:
stefan@webrtc.org34c5da62014-04-11 14:08:35 +000074 VideoCodingModuleImpl(Clock* clock,
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +000075 EventFactory* event_factory,
mflodmanfcf54bd2015-04-14 21:28:08 +020076 VideoEncoderRateObserver* encoder_rate_observer,
philipel83f831a2016-03-12 03:30:23 -080077 VCMQMSettingsCallback* qm_settings_callback,
78 NackSender* nack_sender,
sprang3911c262016-04-15 01:24:14 -070079 KeyFrameRequestSender* keyframe_request_sender,
80 EncodedImageCallback* pre_decode_image_callback)
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +000081 : VideoCodingModule(),
pbos0fa9b222015-11-13 05:59:57 -080082 sender_(clock,
83 &post_encode_callback_,
84 encoder_rate_observer,
85 qm_settings_callback),
philipel83f831a2016-03-12 03:30:23 -080086 receiver_(clock,
87 event_factory,
sprang3911c262016-04-15 01:24:14 -070088 pre_decode_image_callback,
philipel83f831a2016-03-12 03:30:23 -080089 nack_sender,
Peter Boström0b250722016-04-22 18:23:15 +020090 keyframe_request_sender) {}
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +000091
Peter Boström0b250722016-04-22 18:23:15 +020092 virtual ~VideoCodingModuleImpl() {}
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +000093
kjellander@webrtc.org14665ff2015-03-04 12:58:35 +000094 int64_t TimeUntilNextProcess() override {
pbos0fa9b222015-11-13 05:59:57 -080095 int64_t sender_time = sender_.TimeUntilNextProcess();
96 int64_t receiver_time = receiver_.TimeUntilNextProcess();
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +000097 assert(sender_time >= 0);
98 assert(receiver_time >= 0);
99 return VCM_MIN(sender_time, receiver_time);
100 }
101
pbosa26ac922016-02-25 04:50:01 -0800102 void Process() override {
103 sender_.Process();
104 receiver_.Process();
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000105 }
106
kjellander@webrtc.org14665ff2015-03-04 12:58:35 +0000107 int32_t RegisterSendCodec(const VideoCodec* sendCodec,
108 uint32_t numberOfCores,
109 uint32_t maxPayloadSize) override {
pbos0fa9b222015-11-13 05:59:57 -0800110 return sender_.RegisterSendCodec(sendCodec, numberOfCores, maxPayloadSize);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000111 }
112
kjellander@webrtc.org14665ff2015-03-04 12:58:35 +0000113 int32_t RegisterExternalEncoder(VideoEncoder* externalEncoder,
114 uint8_t payloadType,
115 bool internalSource) override {
Peter Boström795dbe42015-11-27 14:09:07 +0100116 sender_.RegisterExternalEncoder(externalEncoder, payloadType,
117 internalSource);
118 return 0;
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000119 }
120
kjellander@webrtc.org14665ff2015-03-04 12:58:35 +0000121 int Bitrate(unsigned int* bitrate) const override {
pbos0fa9b222015-11-13 05:59:57 -0800122 return sender_.Bitrate(bitrate);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000123 }
124
kjellander@webrtc.org14665ff2015-03-04 12:58:35 +0000125 int FrameRate(unsigned int* framerate) const override {
pbos0fa9b222015-11-13 05:59:57 -0800126 return sender_.FrameRate(framerate);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000127 }
128
kjellander@webrtc.org14665ff2015-03-04 12:58:35 +0000129 int32_t SetChannelParameters(uint32_t target_bitrate, // bits/s.
130 uint8_t lossRate,
131 int64_t rtt) override {
pbos0fa9b222015-11-13 05:59:57 -0800132 return sender_.SetChannelParameters(target_bitrate, lossRate, rtt);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000133 }
134
kjellander@webrtc.org14665ff2015-03-04 12:58:35 +0000135 int32_t RegisterTransportCallback(
136 VCMPacketizationCallback* transport) override {
pbos0fa9b222015-11-13 05:59:57 -0800137 return sender_.RegisterTransportCallback(transport);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000138 }
139
kjellander@webrtc.org14665ff2015-03-04 12:58:35 +0000140 int32_t RegisterSendStatisticsCallback(
141 VCMSendStatisticsCallback* sendStats) override {
pbos0fa9b222015-11-13 05:59:57 -0800142 return sender_.RegisterSendStatisticsCallback(sendStats);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000143 }
144
kjellander@webrtc.org14665ff2015-03-04 12:58:35 +0000145 int32_t RegisterProtectionCallback(
146 VCMProtectionCallback* protection) override {
pbos0fa9b222015-11-13 05:59:57 -0800147 return sender_.RegisterProtectionCallback(protection);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000148 }
149
kjellander@webrtc.org14665ff2015-03-04 12:58:35 +0000150 int32_t SetVideoProtection(VCMVideoProtection videoProtection,
151 bool enable) override {
pbosba8c15b2015-07-14 09:36:34 -0700152 // TODO(pbos): Remove enable from receive-side protection modes as well.
153 if (enable)
pbos0fa9b222015-11-13 05:59:57 -0800154 sender_.SetVideoProtection(videoProtection);
155 return receiver_.SetVideoProtection(videoProtection, enable);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000156 }
157
Miguel Casas-Sanchez47650702015-05-29 17:21:40 -0700158 int32_t AddVideoFrame(const VideoFrame& videoFrame,
kjellander@webrtc.org14665ff2015-03-04 12:58:35 +0000159 const VideoContentMetrics* contentMetrics,
160 const CodecSpecificInfo* codecSpecificInfo) override {
pbos0fa9b222015-11-13 05:59:57 -0800161 return sender_.AddVideoFrame(videoFrame, contentMetrics, codecSpecificInfo);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000162 }
163
kjellander@webrtc.org14665ff2015-03-04 12:58:35 +0000164 int32_t IntraFrameRequest(int stream_index) override {
pbos0fa9b222015-11-13 05:59:57 -0800165 return sender_.IntraFrameRequest(stream_index);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000166 }
167
kjellander@webrtc.org14665ff2015-03-04 12:58:35 +0000168 int32_t EnableFrameDropper(bool enable) override {
pbos0fa9b222015-11-13 05:59:57 -0800169 return sender_.EnableFrameDropper(enable);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000170 }
171
kjellander@webrtc.org14665ff2015-03-04 12:58:35 +0000172 void SuspendBelowMinBitrate() override {
pbos0fa9b222015-11-13 05:59:57 -0800173 return sender_.SuspendBelowMinBitrate();
henrik.lundin@webrtc.org572699d2013-09-30 12:16:08 +0000174 }
175
pbos0fa9b222015-11-13 05:59:57 -0800176 bool VideoSuspended() const override { return sender_.VideoSuspended(); }
henrik.lundin@webrtc.org572699d2013-09-30 12:16:08 +0000177
kjellander@webrtc.org14665ff2015-03-04 12:58:35 +0000178 int32_t RegisterReceiveCodec(const VideoCodec* receiveCodec,
179 int32_t numberOfCores,
180 bool requireKeyFrame) override {
pbos0fa9b222015-11-13 05:59:57 -0800181 return receiver_.RegisterReceiveCodec(receiveCodec, numberOfCores,
182 requireKeyFrame);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000183 }
184
Peter Boström795dbe42015-11-27 14:09:07 +0100185 void RegisterExternalDecoder(VideoDecoder* externalDecoder,
perkj796cfaf2015-12-10 09:27:38 -0800186 uint8_t payloadType) override {
187 receiver_.RegisterExternalDecoder(externalDecoder, payloadType);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000188 }
189
kjellander@webrtc.org14665ff2015-03-04 12:58:35 +0000190 int32_t RegisterReceiveCallback(
191 VCMReceiveCallback* receiveCallback) override {
pbos0fa9b222015-11-13 05:59:57 -0800192 return receiver_.RegisterReceiveCallback(receiveCallback);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000193 }
194
kjellander@webrtc.org14665ff2015-03-04 12:58:35 +0000195 int32_t RegisterReceiveStatisticsCallback(
196 VCMReceiveStatisticsCallback* receiveStats) override {
pbos0fa9b222015-11-13 05:59:57 -0800197 return receiver_.RegisterReceiveStatisticsCallback(receiveStats);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000198 }
199
kjellander@webrtc.org14665ff2015-03-04 12:58:35 +0000200 int32_t RegisterDecoderTimingCallback(
201 VCMDecoderTimingCallback* decoderTiming) override {
pbos0fa9b222015-11-13 05:59:57 -0800202 return receiver_.RegisterDecoderTimingCallback(decoderTiming);
fischman@webrtc.org37bb4972013-10-23 23:59:45 +0000203 }
204
kjellander@webrtc.org14665ff2015-03-04 12:58:35 +0000205 int32_t RegisterFrameTypeCallback(
206 VCMFrameTypeCallback* frameTypeCallback) override {
pbos0fa9b222015-11-13 05:59:57 -0800207 return receiver_.RegisterFrameTypeCallback(frameTypeCallback);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000208 }
209
kjellander@webrtc.org14665ff2015-03-04 12:58:35 +0000210 int32_t RegisterPacketRequestCallback(
211 VCMPacketRequestCallback* callback) override {
pbos0fa9b222015-11-13 05:59:57 -0800212 return receiver_.RegisterPacketRequestCallback(callback);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000213 }
214
kjellander@webrtc.org14665ff2015-03-04 12:58:35 +0000215 int32_t Decode(uint16_t maxWaitTimeMs) override {
pbos0fa9b222015-11-13 05:59:57 -0800216 return receiver_.Decode(maxWaitTimeMs);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000217 }
218
kjellander@webrtc.org14665ff2015-03-04 12:58:35 +0000219 int32_t ReceiveCodec(VideoCodec* currentReceiveCodec) const override {
pbos0fa9b222015-11-13 05:59:57 -0800220 return receiver_.ReceiveCodec(currentReceiveCodec);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000221 }
222
kjellander@webrtc.org14665ff2015-03-04 12:58:35 +0000223 VideoCodecType ReceiveCodec() const override {
pbos0fa9b222015-11-13 05:59:57 -0800224 return receiver_.ReceiveCodec();
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000225 }
226
kjellander@webrtc.org14665ff2015-03-04 12:58:35 +0000227 int32_t IncomingPacket(const uint8_t* incomingPayload,
228 size_t payloadLength,
229 const WebRtcRTPHeader& rtpInfo) override {
pbos0fa9b222015-11-13 05:59:57 -0800230 return receiver_.IncomingPacket(incomingPayload, payloadLength, rtpInfo);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000231 }
232
kjellander@webrtc.org14665ff2015-03-04 12:58:35 +0000233 int32_t SetMinimumPlayoutDelay(uint32_t minPlayoutDelayMs) override {
pbos0fa9b222015-11-13 05:59:57 -0800234 return receiver_.SetMinimumPlayoutDelay(minPlayoutDelayMs);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000235 }
236
kjellander@webrtc.org14665ff2015-03-04 12:58:35 +0000237 int32_t SetRenderDelay(uint32_t timeMS) override {
pbos0fa9b222015-11-13 05:59:57 -0800238 return receiver_.SetRenderDelay(timeMS);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000239 }
240
pbos0fa9b222015-11-13 05:59:57 -0800241 int32_t Delay() const override { return receiver_.Delay(); }
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000242
kjellander@webrtc.org14665ff2015-03-04 12:58:35 +0000243 uint32_t DiscardedPackets() const override {
pbos0fa9b222015-11-13 05:59:57 -0800244 return receiver_.DiscardedPackets();
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000245 }
246
kjellander@webrtc.org14665ff2015-03-04 12:58:35 +0000247 int SetReceiverRobustnessMode(ReceiverRobustness robustnessMode,
248 VCMDecodeErrorMode errorMode) override {
pbos0fa9b222015-11-13 05:59:57 -0800249 return receiver_.SetReceiverRobustnessMode(robustnessMode, errorMode);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000250 }
251
kjellander@webrtc.org14665ff2015-03-04 12:58:35 +0000252 void SetNackSettings(size_t max_nack_list_size,
253 int max_packet_age_to_nack,
254 int max_incomplete_time_ms) override {
pbos0fa9b222015-11-13 05:59:57 -0800255 return receiver_.SetNackSettings(max_nack_list_size, max_packet_age_to_nack,
256 max_incomplete_time_ms);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000257 }
258
kjellander@webrtc.org14665ff2015-03-04 12:58:35 +0000259 void SetDecodeErrorMode(VCMDecodeErrorMode decode_error_mode) override {
pbos0fa9b222015-11-13 05:59:57 -0800260 return receiver_.SetDecodeErrorMode(decode_error_mode);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000261 }
262
kjellander@webrtc.org14665ff2015-03-04 12:58:35 +0000263 int SetMinReceiverDelay(int desired_delay_ms) override {
pbos0fa9b222015-11-13 05:59:57 -0800264 return receiver_.SetMinReceiverDelay(desired_delay_ms);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000265 }
266
kjellander@webrtc.org14665ff2015-03-04 12:58:35 +0000267 int32_t SetReceiveChannelParameters(int64_t rtt) override {
pbos0fa9b222015-11-13 05:59:57 -0800268 return receiver_.SetReceiveChannelParameters(rtt);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000269 }
270
kjellander@webrtc.org14665ff2015-03-04 12:58:35 +0000271 void RegisterPostEncodeImageCallback(
272 EncodedImageCallback* observer) override {
andresp@webrtc.org1df9dc32014-01-09 08:01:57 +0000273 post_encode_callback_.Register(observer);
sprang@webrtc.org40709352013-11-26 11:41:59 +0000274 }
275
pbos0fa9b222015-11-13 05:59:57 -0800276 void TriggerDecoderShutdown() override { receiver_.TriggerDecoderShutdown(); }
pbos@webrtc.org4dd40d62015-02-17 13:22:43 +0000277
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000278 private:
andresp@webrtc.org1df9dc32014-01-09 08:01:57 +0000279 EncodedImageCallbackWrapper post_encode_callback_;
pbos0fa9b222015-11-13 05:59:57 -0800280 vcm::VideoSender sender_;
281 vcm::VideoReceiver receiver_;
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000282};
283} // namespace
284
Peter Boström7776e782016-01-07 15:42:47 +0100285void VideoCodingModule::Codec(VideoCodecType codecType, VideoCodec* codec) {
Peter Boström92f8dbd2015-11-24 13:55:55 +0100286 VCMCodecDataBase::Codec(codecType, codec);
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000287}
288
philipel83f831a2016-03-12 03:30:23 -0800289// Create method for current interface, will be removed when the
290// new jitter buffer is in place.
pbos@webrtc.org891d4832015-02-26 13:15:22 +0000291VideoCodingModule* VideoCodingModule::Create(
mflodmanfcf54bd2015-04-14 21:28:08 +0200292 Clock* clock,
293 VideoEncoderRateObserver* encoder_rate_observer,
294 VCMQMSettingsCallback* qm_settings_callback) {
philipel83f831a2016-03-12 03:30:23 -0800295 return VideoCodingModule::Create(clock, encoder_rate_observer,
296 qm_settings_callback,
297 nullptr, // NackSender
sprang3911c262016-04-15 01:24:14 -0700298 nullptr, // KeyframeRequestSender
299 nullptr); // Pre-decode image callback
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000300}
301
philipel83f831a2016-03-12 03:30:23 -0800302// Create method for the new jitter buffer.
303VideoCodingModule* VideoCodingModule::Create(
304 Clock* clock,
305 VideoEncoderRateObserver* encoder_rate_observer,
306 VCMQMSettingsCallback* qm_settings_callback,
307 NackSender* nack_sender,
sprang3911c262016-04-15 01:24:14 -0700308 KeyFrameRequestSender* keyframe_request_sender,
309 EncodedImageCallback* pre_decode_image_callback) {
Peter Boström0b250722016-04-22 18:23:15 +0200310 return new VideoCodingModuleImpl(
311 clock, nullptr, encoder_rate_observer, qm_settings_callback, nack_sender,
312 keyframe_request_sender, pre_decode_image_callback);
philipel83f831a2016-03-12 03:30:23 -0800313}
314
315// Create method for current interface, will be removed when the
316// new jitter buffer is in place.
philipel5908c712015-12-21 08:23:20 -0800317VideoCodingModule* VideoCodingModule::Create(Clock* clock,
318 EventFactory* event_factory) {
philipel83f831a2016-03-12 03:30:23 -0800319 return VideoCodingModule::Create(clock, event_factory,
320 nullptr, // NackSender
321 nullptr); // KeyframeRequestSender
322}
323
324// Create method for the new jitter buffer.
325VideoCodingModule* VideoCodingModule::Create(
326 Clock* clock,
327 EventFactory* event_factory,
328 NackSender* nack_sender,
329 KeyFrameRequestSender* keyframe_request_sender) {
andresp@webrtc.orgf7eb75b2013-09-14 00:25:28 +0000330 assert(clock);
331 assert(event_factory);
Peter Boström0b250722016-04-22 18:23:15 +0200332 return new VideoCodingModuleImpl(clock, event_factory, nullptr, nullptr,
333 nack_sender, keyframe_request_sender,
334 nullptr);
niklase@google.com470e71d2011-07-07 08:21:25 +0000335}
336
stefan@webrtc.org791eec72011-10-11 07:53:43 +0000337} // namespace webrtc