| Index: webrtc/video/vie_channel.h
|
| diff --git a/webrtc/video/vie_channel.h b/webrtc/video/vie_channel.h
|
| index 4ba394817f256a1622c5ca9a354973a2f6db135c..144e531ed699428fee1be32bda097b814d365e6c 100644
|
| --- a/webrtc/video/vie_channel.h
|
| +++ b/webrtc/video/vie_channel.h
|
| @@ -56,7 +56,8 @@ enum StreamType {
|
| kViEStreamTypeRtx = 1 // Retransmission media stream
|
| };
|
|
|
| -class ViEChannel : public VCMFrameTypeCallback,
|
| +class ViEChannel : public Module,
|
| + public VCMFrameTypeCallback,
|
| public VCMReceiveCallback,
|
| public VCMReceiveStatisticsCallback,
|
| public VCMDecoderTimingCallback,
|
| @@ -82,9 +83,13 @@ class ViEChannel : public VCMFrameTypeCallback,
|
|
|
| int32_t Init();
|
|
|
| - // Sets the encoder to use for the channel. |new_stream| indicates the encoder
|
| - // type has changed and we should start a new RTP stream.
|
| - int32_t SetSendCodec(const VideoCodec& video_codec, bool new_stream = true);
|
| + // Runs all RTP modules. Done since all modules have to be registered on the
|
| + // main thread, but we allocate/deallocate on the encoding thread.
|
| + int64_t TimeUntilNextProcess() override;
|
| + int32_t Process() override;
|
| +
|
| + // Sets the encoder to use for the channel.
|
| + void SetSendCodec(const VideoCodec& video_codec);
|
| int32_t SetReceiveCodec(const VideoCodec& video_codec);
|
| // Registers an external decoder.
|
| void RegisterExternalDecoder(const uint8_t pl_type, VideoDecoder* decoder);
|
|
|