| 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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 uint32_t ssrc) = 0; | 89 uint32_t ssrc) = 0; |
| 90 }; | 90 }; |
| 91 | 91 |
| 92 // TODO(pbos): Remove, use external handlers only. | 92 // TODO(pbos): Remove, use external handlers only. |
| 93 class DefaultUnsignalledSsrcHandler : public UnsignalledSsrcHandler { | 93 class DefaultUnsignalledSsrcHandler : public UnsignalledSsrcHandler { |
| 94 public: | 94 public: |
| 95 DefaultUnsignalledSsrcHandler(); | 95 DefaultUnsignalledSsrcHandler(); |
| 96 Action OnUnsignalledSsrc(WebRtcVideoChannel2* channel, | 96 Action OnUnsignalledSsrc(WebRtcVideoChannel2* channel, |
| 97 uint32_t ssrc) override; | 97 uint32_t ssrc) override; |
| 98 | 98 |
| 99 VideoRenderer* GetDefaultRenderer() const; | 99 rtc::VideoSinkInterface<VideoFrame>* GetDefaultSink() const; |
| 100 void SetDefaultRenderer(VideoMediaChannel* channel, VideoRenderer* renderer); | 100 void SetDefaultSink(VideoMediaChannel* channel, |
| 101 rtc::VideoSinkInterface<VideoFrame>* sink); |
| 101 | 102 |
| 102 private: | 103 private: |
| 103 uint32_t default_recv_ssrc_; | 104 uint32_t default_recv_ssrc_; |
| 104 VideoRenderer* default_renderer_; | 105 rtc::VideoSinkInterface<VideoFrame>* default_sink_; |
| 105 }; | 106 }; |
| 106 | 107 |
| 107 // WebRtcVideoEngine2 is used for the new native WebRTC Video API (webrtc:1667). | 108 // WebRtcVideoEngine2 is used for the new native WebRTC Video API (webrtc:1667). |
| 108 class WebRtcVideoEngine2 { | 109 class WebRtcVideoEngine2 { |
| 109 public: | 110 public: |
| 110 WebRtcVideoEngine2(); | 111 WebRtcVideoEngine2(); |
| 111 ~WebRtcVideoEngine2(); | 112 ~WebRtcVideoEngine2(); |
| 112 | 113 |
| 113 // Basic video engine implementation. | 114 // Basic video engine implementation. |
| 114 void Init(); | 115 void Init(); |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 bool GetSendCodec(VideoCodec* send_codec) override; | 163 bool GetSendCodec(VideoCodec* send_codec) override; |
| 163 bool SetSend(bool send) override; | 164 bool SetSend(bool send) override; |
| 164 bool SetVideoSend(uint32_t ssrc, | 165 bool SetVideoSend(uint32_t ssrc, |
| 165 bool mute, | 166 bool mute, |
| 166 const VideoOptions* options) override; | 167 const VideoOptions* options) override; |
| 167 bool AddSendStream(const StreamParams& sp) override; | 168 bool AddSendStream(const StreamParams& sp) override; |
| 168 bool RemoveSendStream(uint32_t ssrc) override; | 169 bool RemoveSendStream(uint32_t ssrc) override; |
| 169 bool AddRecvStream(const StreamParams& sp) override; | 170 bool AddRecvStream(const StreamParams& sp) override; |
| 170 bool AddRecvStream(const StreamParams& sp, bool default_stream); | 171 bool AddRecvStream(const StreamParams& sp, bool default_stream); |
| 171 bool RemoveRecvStream(uint32_t ssrc) override; | 172 bool RemoveRecvStream(uint32_t ssrc) override; |
| 172 bool SetRenderer(uint32_t ssrc, VideoRenderer* renderer) override; | 173 bool SetSink(uint32_t ssrc, |
| 174 rtc::VideoSinkInterface<VideoFrame>* sink) override; |
| 173 bool GetStats(VideoMediaInfo* info) override; | 175 bool GetStats(VideoMediaInfo* info) override; |
| 174 bool SetCapturer(uint32_t ssrc, VideoCapturer* capturer) override; | 176 bool SetCapturer(uint32_t ssrc, VideoCapturer* capturer) override; |
| 175 | 177 |
| 176 void OnPacketReceived(rtc::Buffer* packet, | 178 void OnPacketReceived(rtc::Buffer* packet, |
| 177 const rtc::PacketTime& packet_time) override; | 179 const rtc::PacketTime& packet_time) override; |
| 178 void OnRtcpReceived(rtc::Buffer* packet, | 180 void OnRtcpReceived(rtc::Buffer* packet, |
| 179 const rtc::PacketTime& packet_time) override; | 181 const rtc::PacketTime& packet_time) override; |
| 180 void OnReadyToSend(bool ready) override; | 182 void OnReadyToSend(bool ready) override; |
| 181 void SetInterface(NetworkInterface* iface) override; | 183 void SetInterface(NetworkInterface* iface) override; |
| 182 | 184 |
| (...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 524 VideoOptions options_; | 526 VideoOptions options_; |
| 525 // TODO(deadbeef): Don't duplicate information between | 527 // TODO(deadbeef): Don't duplicate information between |
| 526 // send_params/recv_params, rtp_extensions, options, etc. | 528 // send_params/recv_params, rtp_extensions, options, etc. |
| 527 VideoSendParameters send_params_; | 529 VideoSendParameters send_params_; |
| 528 VideoRecvParameters recv_params_; | 530 VideoRecvParameters recv_params_; |
| 529 }; | 531 }; |
| 530 | 532 |
| 531 } // namespace cricket | 533 } // namespace cricket |
| 532 | 534 |
| 533 #endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_ | 535 #endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_ |
| OLD | NEW |