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 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
266 // frames are then converted from cricket frames to webrtc frames. | 266 // frames are then converted from cricket frames to webrtc frames. |
267 class WebRtcVideoSendStream : public sigslot::has_slots<> { | 267 class WebRtcVideoSendStream : public sigslot::has_slots<> { |
268 public: | 268 public: |
269 WebRtcVideoSendStream( | 269 WebRtcVideoSendStream( |
270 webrtc::Call* call, | 270 webrtc::Call* call, |
271 WebRtcVideoEncoderFactory* external_encoder_factory, | 271 WebRtcVideoEncoderFactory* external_encoder_factory, |
272 const VideoOptions& options, | 272 const VideoOptions& options, |
273 int max_bitrate_bps, | 273 int max_bitrate_bps, |
274 const Settable<VideoCodecSettings>& codec_settings, | 274 const Settable<VideoCodecSettings>& codec_settings, |
275 const StreamParams& sp, | 275 const StreamParams& sp, |
276 const std::vector<webrtc::RtpExtension>& rtp_extensions); | 276 const std::vector<webrtc::RtpExtension>& rtp_extensions, |
| 277 const VideoSendParameters& send_params); |
277 ~WebRtcVideoSendStream(); | 278 ~WebRtcVideoSendStream(); |
278 | 279 |
279 void SetOptions(const VideoOptions& options); | 280 void SetOptions(const VideoOptions& options); |
280 void SetCodec(const VideoCodecSettings& codec); | 281 void SetCodec(const VideoCodecSettings& codec); |
281 void SetRtpExtensions( | 282 void SetRtpExtensions( |
282 const std::vector<webrtc::RtpExtension>& rtp_extensions); | 283 const std::vector<webrtc::RtpExtension>& rtp_extensions); |
283 | 284 |
284 void InputFrame(VideoCapturer* capturer, const VideoFrame* frame); | 285 void InputFrame(VideoCapturer* capturer, const VideoFrame* frame); |
285 bool SetCapturer(VideoCapturer* capturer); | 286 bool SetCapturer(VideoCapturer* capturer); |
286 bool SetVideoFormat(const VideoFormat& format); | 287 bool SetVideoFormat(const VideoFormat& format); |
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
535 std::vector<webrtc::RtpExtension> send_rtp_extensions_; | 536 std::vector<webrtc::RtpExtension> send_rtp_extensions_; |
536 | 537 |
537 WebRtcVoiceMediaChannel* voice_channel_; | 538 WebRtcVoiceMediaChannel* voice_channel_; |
538 const int voice_channel_id_; | 539 const int voice_channel_id_; |
539 WebRtcVideoEncoderFactory* const external_encoder_factory_; | 540 WebRtcVideoEncoderFactory* const external_encoder_factory_; |
540 WebRtcVideoDecoderFactory* const external_decoder_factory_; | 541 WebRtcVideoDecoderFactory* const external_decoder_factory_; |
541 std::vector<VideoCodecSettings> recv_codecs_; | 542 std::vector<VideoCodecSettings> recv_codecs_; |
542 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; | 543 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; |
543 webrtc::Call::Config::BitrateConfig bitrate_config_; | 544 webrtc::Call::Config::BitrateConfig bitrate_config_; |
544 VideoOptions options_; | 545 VideoOptions options_; |
| 546 // TODO(pbos): Don't duplicate information between |
| 547 // send_params/recv_params, rtp_extensions, options, etc. |
| 548 VideoSendParameters send_params_; |
| 549 VideoRecvParameters recv_params_; |
545 }; | 550 }; |
546 | 551 |
547 } // namespace cricket | 552 } // namespace cricket |
548 | 553 |
549 #endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_ | 554 #endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_ |
OLD | NEW |