| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * libjingle | 2  * libjingle | 
| 3  * Copyright 2014 Google Inc. | 3  * Copyright 2014 Google Inc. | 
| 4  * | 4  * | 
| 5  * Redistribution and use in source and binary forms, with or without | 5  * Redistribution and use in source and binary forms, with or without | 
| 6  * modification, are permitted provided that the following conditions are met: | 6  * modification, are permitted provided that the following conditions are met: | 
| 7  * | 7  * | 
| 8  *  1. Redistributions of source code must retain the above copyright notice, | 8  *  1. Redistributions of source code must retain the above copyright notice, | 
| 9  *     this list of conditions and the following disclaimer. | 9  *     this list of conditions and the following disclaimer. | 
| 10  *  2. Redistributions in binary form must reproduce the above copyright notice, | 10  *  2. Redistributions in binary form must reproduce the above copyright notice, | 
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 153                       const VideoOptions& options, | 153                       const VideoOptions& options, | 
| 154                       const std::vector<VideoCodec>& recv_codecs, | 154                       const std::vector<VideoCodec>& recv_codecs, | 
| 155                       WebRtcVideoEncoderFactory* external_encoder_factory, | 155                       WebRtcVideoEncoderFactory* external_encoder_factory, | 
| 156                       WebRtcVideoDecoderFactory* external_decoder_factory); | 156                       WebRtcVideoDecoderFactory* external_decoder_factory); | 
| 157   ~WebRtcVideoChannel2() override; | 157   ~WebRtcVideoChannel2() override; | 
| 158 | 158 | 
| 159   // VideoMediaChannel implementation | 159   // VideoMediaChannel implementation | 
| 160   bool SetSendParameters(const VideoSendParameters& params) override; | 160   bool SetSendParameters(const VideoSendParameters& params) override; | 
| 161   bool SetRecvParameters(const VideoRecvParameters& params) override; | 161   bool SetRecvParameters(const VideoRecvParameters& params) override; | 
| 162   bool GetSendCodec(VideoCodec* send_codec) override; | 162   bool GetSendCodec(VideoCodec* send_codec) override; | 
| 163   bool SetSendStreamFormat(uint32_t ssrc, const VideoFormat& format) override; |  | 
| 164   bool SetSend(bool send) override; | 163   bool SetSend(bool send) override; | 
| 165   bool SetVideoSend(uint32_t ssrc, | 164   bool SetVideoSend(uint32_t ssrc, | 
| 166                     bool mute, | 165                     bool mute, | 
| 167                     const VideoOptions* options) override; | 166                     const VideoOptions* options) override; | 
| 168   bool AddSendStream(const StreamParams& sp) override; | 167   bool AddSendStream(const StreamParams& sp) override; | 
| 169   bool RemoveSendStream(uint32_t ssrc) override; | 168   bool RemoveSendStream(uint32_t ssrc) override; | 
| 170   bool AddRecvStream(const StreamParams& sp) override; | 169   bool AddRecvStream(const StreamParams& sp) override; | 
| 171   bool AddRecvStream(const StreamParams& sp, bool default_stream); | 170   bool AddRecvStream(const StreamParams& sp, bool default_stream); | 
| 172   bool RemoveRecvStream(uint32_t ssrc) override; | 171   bool RemoveRecvStream(uint32_t ssrc) override; | 
| 173   bool SetRenderer(uint32_t ssrc, VideoRenderer* renderer) override; | 172   bool SetRenderer(uint32_t ssrc, VideoRenderer* renderer) override; | 
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 254         const std::vector<webrtc::RtpExtension>& rtp_extensions, | 253         const std::vector<webrtc::RtpExtension>& rtp_extensions, | 
| 255         const VideoSendParameters& send_params); | 254         const VideoSendParameters& send_params); | 
| 256     ~WebRtcVideoSendStream(); | 255     ~WebRtcVideoSendStream(); | 
| 257 | 256 | 
| 258     void SetOptions(const VideoOptions& options); | 257     void SetOptions(const VideoOptions& options); | 
| 259     // TODO(pbos): Move logic from SetOptions into this method. | 258     // TODO(pbos): Move logic from SetOptions into this method. | 
| 260     void SetSendParameters(const ChangedSendParameters& send_params); | 259     void SetSendParameters(const ChangedSendParameters& send_params); | 
| 261 | 260 | 
| 262     void InputFrame(VideoCapturer* capturer, const VideoFrame* frame); | 261     void InputFrame(VideoCapturer* capturer, const VideoFrame* frame); | 
| 263     bool SetCapturer(VideoCapturer* capturer); | 262     bool SetCapturer(VideoCapturer* capturer); | 
| 264     bool SetVideoFormat(const VideoFormat& format); |  | 
| 265     void MuteStream(bool mute); | 263     void MuteStream(bool mute); | 
| 266     bool DisconnectCapturer(); | 264     bool DisconnectCapturer(); | 
| 267 | 265 | 
| 268     void Start(); | 266     void Start(); | 
| 269     void Stop(); | 267     void Stop(); | 
| 270 | 268 | 
| 271     const std::vector<uint32_t>& GetSsrcs() const; | 269     const std::vector<uint32_t>& GetSsrcs() const; | 
| 272     VideoSenderInfo GetVideoSenderInfo(); | 270     VideoSenderInfo GetVideoSenderInfo(); | 
| 273     void FillBandwidthEstimationInfo(BandwidthEstimationInfo* bwe_info); | 271     void FillBandwidthEstimationInfo(BandwidthEstimationInfo* bwe_info); | 
| 274 | 272 | 
| (...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 526   VideoOptions options_; | 524   VideoOptions options_; | 
| 527   // TODO(deadbeef): Don't duplicate information between | 525   // TODO(deadbeef): Don't duplicate information between | 
| 528   // send_params/recv_params, rtp_extensions, options, etc. | 526   // send_params/recv_params, rtp_extensions, options, etc. | 
| 529   VideoSendParameters send_params_; | 527   VideoSendParameters send_params_; | 
| 530   VideoRecvParameters recv_params_; | 528   VideoRecvParameters recv_params_; | 
| 531 }; | 529 }; | 
| 532 | 530 | 
| 533 }  // namespace cricket | 531 }  // namespace cricket | 
| 534 | 532 | 
| 535 #endif  // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_ | 533 #endif  // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_ | 
| OLD | NEW | 
|---|