Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(310)

Side by Side Diff: talk/media/webrtc/webrtcvideoengine2.h

Issue 1273363005: Add send transports to individual webrtc::Call streams. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fix for most vexing parse + comments Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 webrtc::FecConfig fec; 260 webrtc::FecConfig fec;
261 int rtx_payload_type; 261 int rtx_payload_type;
262 }; 262 };
263 263
264 // Wrapper for the sender part, this is where the capturer is connected and 264 // Wrapper for the sender part, this is where the capturer is connected and
265 // frames are then converted from cricket frames to webrtc frames. 265 // frames are then converted from cricket frames to webrtc frames.
266 class WebRtcVideoSendStream : public sigslot::has_slots<> { 266 class WebRtcVideoSendStream : public sigslot::has_slots<> {
267 public: 267 public:
268 WebRtcVideoSendStream( 268 WebRtcVideoSendStream(
269 webrtc::Call* call, 269 webrtc::Call* call,
270 const StreamParams& sp,
271 const webrtc::VideoSendStream::Config& config,
270 WebRtcVideoEncoderFactory* external_encoder_factory, 272 WebRtcVideoEncoderFactory* external_encoder_factory,
271 const VideoOptions& options, 273 const VideoOptions& options,
272 int max_bitrate_bps, 274 int max_bitrate_bps,
273 const Settable<VideoCodecSettings>& codec_settings, 275 const Settable<VideoCodecSettings>& codec_settings,
274 const StreamParams& sp,
275 const std::vector<webrtc::RtpExtension>& rtp_extensions); 276 const std::vector<webrtc::RtpExtension>& rtp_extensions);
276 ~WebRtcVideoSendStream(); 277 ~WebRtcVideoSendStream();
277 278
278 void SetOptions(const VideoOptions& options); 279 void SetOptions(const VideoOptions& options);
279 void SetCodec(const VideoCodecSettings& codec); 280 void SetCodec(const VideoCodecSettings& codec);
280 void SetRtpExtensions( 281 void SetRtpExtensions(
281 const std::vector<webrtc::RtpExtension>& rtp_extensions); 282 const std::vector<webrtc::RtpExtension>& rtp_extensions);
282 283
283 void InputFrame(VideoCapturer* capturer, const VideoFrame* frame); 284 void InputFrame(VideoCapturer* capturer, const VideoFrame* frame);
284 bool SetCapturer(VideoCapturer* capturer); 285 bool SetCapturer(VideoCapturer* capturer);
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 }; 407 };
407 408
408 // Wrapper for the receiver part, contains configs etc. that are needed to 409 // Wrapper for the receiver part, contains configs etc. that are needed to
409 // reconstruct the underlying VideoReceiveStream. Also serves as a wrapper 410 // reconstruct the underlying VideoReceiveStream. Also serves as a wrapper
410 // between webrtc::VideoRenderer and cricket::VideoRenderer. 411 // between webrtc::VideoRenderer and cricket::VideoRenderer.
411 class WebRtcVideoReceiveStream : public webrtc::VideoRenderer { 412 class WebRtcVideoReceiveStream : public webrtc::VideoRenderer {
412 public: 413 public:
413 WebRtcVideoReceiveStream( 414 WebRtcVideoReceiveStream(
414 webrtc::Call* call, 415 webrtc::Call* call,
415 const StreamParams& sp, 416 const StreamParams& sp,
417 const webrtc::VideoReceiveStream::Config& config,
416 WebRtcVideoDecoderFactory* external_decoder_factory, 418 WebRtcVideoDecoderFactory* external_decoder_factory,
417 bool default_stream, 419 bool default_stream,
418 const webrtc::VideoReceiveStream::Config& config,
419 const std::vector<VideoCodecSettings>& recv_codecs); 420 const std::vector<VideoCodecSettings>& recv_codecs);
420 ~WebRtcVideoReceiveStream(); 421 ~WebRtcVideoReceiveStream();
421 422
422 const std::vector<uint32>& GetSsrcs() const; 423 const std::vector<uint32>& GetSsrcs() const;
423 424
424 void SetLocalSsrc(uint32_t local_ssrc); 425 void SetLocalSsrc(uint32_t local_ssrc);
425 void SetNackAndRemb(bool nack_enabled, bool remb_enabled); 426 void SetNackAndRemb(bool nack_enabled, bool remb_enabled);
426 void SetRecvCodecs(const std::vector<VideoCodecSettings>& recv_codecs); 427 void SetRecvCodecs(const std::vector<VideoCodecSettings>& recv_codecs);
427 void SetRtpExtensions(const std::vector<webrtc::RtpExtension>& extensions); 428 void SetRtpExtensions(const std::vector<webrtc::RtpExtension>& extensions);
428 429
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 WebRtcVideoDecoderFactory* const external_decoder_factory_; 538 WebRtcVideoDecoderFactory* const external_decoder_factory_;
538 std::vector<VideoCodecSettings> recv_codecs_; 539 std::vector<VideoCodecSettings> recv_codecs_;
539 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; 540 std::vector<webrtc::RtpExtension> recv_rtp_extensions_;
540 webrtc::Call::Config::BitrateConfig bitrate_config_; 541 webrtc::Call::Config::BitrateConfig bitrate_config_;
541 VideoOptions options_; 542 VideoOptions options_;
542 }; 543 };
543 544
544 } // namespace cricket 545 } // namespace cricket
545 546
546 #endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_ 547 #endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_
OLDNEW
« no previous file with comments | « no previous file | talk/media/webrtc/webrtcvideoengine2.cc » ('j') | talk/media/webrtc/webrtcvoiceengine_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698