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

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

Issue 1452883002: Require negotiation to send transport cc feedback over RTCP. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Comments addressed Created 5 years, 1 month 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
« no previous file with comments | « talk/media/base/constants.cc ('k') | talk/media/webrtc/webrtcvideoengine2.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 const StreamParams& sp, 394 const StreamParams& sp,
395 const webrtc::VideoReceiveStream::Config& config, 395 const webrtc::VideoReceiveStream::Config& config,
396 WebRtcVideoDecoderFactory* external_decoder_factory, 396 WebRtcVideoDecoderFactory* external_decoder_factory,
397 bool default_stream, 397 bool default_stream,
398 const std::vector<VideoCodecSettings>& recv_codecs); 398 const std::vector<VideoCodecSettings>& recv_codecs);
399 ~WebRtcVideoReceiveStream(); 399 ~WebRtcVideoReceiveStream();
400 400
401 const std::vector<uint32_t>& GetSsrcs() const; 401 const std::vector<uint32_t>& GetSsrcs() const;
402 402
403 void SetLocalSsrc(uint32_t local_ssrc); 403 void SetLocalSsrc(uint32_t local_ssrc);
404 void SetNackAndRemb(bool nack_enabled, bool remb_enabled); 404 void SetFeedbackParameters(bool nack_enabled,
405 bool remb_enabled,
406 bool transport_cc_enabled);
405 void SetRecvCodecs(const std::vector<VideoCodecSettings>& recv_codecs); 407 void SetRecvCodecs(const std::vector<VideoCodecSettings>& recv_codecs);
406 void SetRtpExtensions(const std::vector<webrtc::RtpExtension>& extensions); 408 void SetRtpExtensions(const std::vector<webrtc::RtpExtension>& extensions);
407 409
408 void RenderFrame(const webrtc::VideoFrame& frame, 410 void RenderFrame(const webrtc::VideoFrame& frame,
409 int time_to_render_ms) override; 411 int time_to_render_ms) override;
410 bool IsTextureSupported() const override; 412 bool IsTextureSupported() const override;
411 bool IsDefaultStream() const; 413 bool IsDefaultStream() const;
412 414
413 void SetRenderer(cricket::VideoRenderer* renderer); 415 void SetRenderer(cricket::VideoRenderer* renderer);
414 cricket::VideoRenderer* GetRenderer(); 416 cricket::VideoRenderer* GetRenderer();
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
519 WebRtcVideoDecoderFactory* const external_decoder_factory_; 521 WebRtcVideoDecoderFactory* const external_decoder_factory_;
520 std::vector<VideoCodecSettings> recv_codecs_; 522 std::vector<VideoCodecSettings> recv_codecs_;
521 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; 523 std::vector<webrtc::RtpExtension> recv_rtp_extensions_;
522 webrtc::Call::Config::BitrateConfig bitrate_config_; 524 webrtc::Call::Config::BitrateConfig bitrate_config_;
523 VideoOptions options_; 525 VideoOptions options_;
524 }; 526 };
525 527
526 } // namespace cricket 528 } // namespace cricket
527 529
528 #endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_ 530 #endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_
OLDNEW
« no previous file with comments | « talk/media/base/constants.cc ('k') | talk/media/webrtc/webrtcvideoengine2.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698