| Index: webrtc/video_engine/vie_channel.h
|
| diff --git a/webrtc/video_engine/vie_channel.h b/webrtc/video_engine/vie_channel.h
|
| index 00c953201b529c67f8727b6a21a1fb3cb6d59c22..a87835b37175d15e3cb7cf5f8e1cd9fa7f7b57b5 100644
|
| --- a/webrtc/video_engine/vie_channel.h
|
| +++ b/webrtc/video_engine/vie_channel.h
|
| @@ -86,14 +86,8 @@ class ViEChannel : public VCMFrameTypeCallback,
|
| // type has changed and we should start a new RTP stream.
|
| int32_t SetSendCodec(const VideoCodec& video_codec, bool new_stream = true);
|
| int32_t SetReceiveCodec(const VideoCodec& video_codec);
|
| - // Registers an external decoder. |buffered_rendering| means that the decoder
|
| - // will render frames after decoding according to the render timestamp
|
| - // provided by the video coding module. |render_delay| indicates the time
|
| - // needed to decode and render a frame.
|
| - int32_t RegisterExternalDecoder(const uint8_t pl_type,
|
| - VideoDecoder* decoder,
|
| - bool buffered_rendering,
|
| - int32_t render_delay);
|
| + // Registers an external decoder.
|
| + void RegisterExternalDecoder(const uint8_t pl_type, VideoDecoder* decoder);
|
| int32_t ReceiveCodecStatistics(uint32_t* num_key_frames,
|
| uint32_t* num_delta_frames);
|
| uint32_t DiscardedPackets() const;
|
| @@ -101,6 +95,8 @@ class ViEChannel : public VCMFrameTypeCallback,
|
| // Returns the estimated delay in milliseconds.
|
| int ReceiveDelay() const;
|
|
|
| + void SetExpectedRenderDelay(int32_t delay_ms);
|
| +
|
| void SetRTCPMode(const RtcpMode rtcp_mode);
|
| void SetProtectionMode(bool enable_nack,
|
| bool enable_fec,
|
|
|