| Index: webrtc/video/vie_channel.h
|
| diff --git a/webrtc/video/vie_channel.h b/webrtc/video/vie_channel.h
|
| index 3c00749e72e6b6d2a075da57874b4551a53a9ac4..e50d8dda3c44bf31213b5c887a66648cb7004f1b 100644
|
| --- a/webrtc/video/vie_channel.h
|
| +++ b/webrtc/video/vie_channel.h
|
| @@ -87,11 +87,6 @@ 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.
|
| - void RegisterExternalDecoder(const uint8_t pl_type, VideoDecoder* decoder);
|
| - int32_t ReceiveCodecStatistics(uint32_t* num_key_frames,
|
| - uint32_t* num_delta_frames);
|
| - void SetExpectedRenderDelay(int delay_ms);
|
|
|
| void SetRTCPMode(const RtcpMode rtcp_mode);
|
| void SetProtectionMode(bool enable_nack,
|
| @@ -101,15 +96,9 @@ class ViEChannel : public VCMFrameTypeCallback,
|
| bool IsSendingFecEnabled();
|
| int SetSenderBufferingMode(int target_delay_ms);
|
| int SetSendTimestampOffsetStatus(bool enable, int id);
|
| - int SetReceiveTimestampOffsetStatus(bool enable, int id);
|
| int SetSendAbsoluteSendTimeStatus(bool enable, int id);
|
| - int SetReceiveAbsoluteSendTimeStatus(bool enable, int id);
|
| int SetSendVideoRotationStatus(bool enable, int id);
|
| - int SetReceiveVideoRotationStatus(bool enable, int id);
|
| int SetSendTransportSequenceNumber(bool enable, int id);
|
| - int SetReceiveTransportSequenceNumber(bool enable, int id);
|
| - void SetRtcpXrRrtrStatus(bool enable);
|
| - void EnableTMMBR(bool enable);
|
|
|
| // Sets SSRC for outgoing stream.
|
| int32_t SetSSRC(const uint32_t SSRC,
|
| @@ -191,8 +180,6 @@ class ViEChannel : public VCMFrameTypeCallback,
|
| void OnIncomingSSRCChanged(const uint32_t ssrc) override;
|
| void OnIncomingCSRCChanged(const uint32_t CSRC, const bool added) override;
|
|
|
| - int32_t SetRemoteSSRCType(const StreamType usage, const uint32_t SSRC);
|
| -
|
| int32_t StartSend();
|
| int32_t StopSend();
|
| bool Sending();
|
| @@ -211,6 +198,7 @@ class ViEChannel : public VCMFrameTypeCallback,
|
|
|
| // Gets the modules used by the channel.
|
| RtpRtcp* rtp_rtcp();
|
| + ViEReceiver* vie_receiver();
|
| VCMProtectionCallback* vcm_protection_callback();
|
|
|
|
|
| @@ -256,10 +244,7 @@ class ViEChannel : public VCMFrameTypeCallback,
|
| VoEVideoSync* ve_sync_interface);
|
| int32_t VoiceChannel();
|
|
|
| - // New-style callbacks, used by VideoReceiveStream.
|
| void RegisterPreRenderCallback(I420FrameCallback* pre_render_callback);
|
| - void RegisterPreDecodeImageCallback(
|
| - EncodedImageCallback* pre_decode_callback);
|
|
|
| void RegisterSendFrameCountObserver(FrameCountObserver* observer);
|
| void RegisterRtcpPacketTypeCounterObserver(
|
|
|