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

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

Issue 1291763003: Don't do reconfiguration if recv codec order/preference changes (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: missed a line 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 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 VideoCodecSettings(); 254 VideoCodecSettings();
255 255
256 bool operator==(const VideoCodecSettings& other) const; 256 bool operator==(const VideoCodecSettings& other) const;
257 bool operator!=(const VideoCodecSettings& other) const; 257 bool operator!=(const VideoCodecSettings& other) const;
258 258
259 VideoCodec codec; 259 VideoCodec codec;
260 webrtc::FecConfig fec; 260 webrtc::FecConfig fec;
261 int rtx_payload_type; 261 int rtx_payload_type;
262 }; 262 };
263 263
264 static std::string CodecSettingsVectorToString(
265 const std::vector<VideoCodecSettings>& codecs);
266
264 // Wrapper for the sender part, this is where the capturer is connected and 267 // Wrapper for the sender part, this is where the capturer is connected and
265 // frames are then converted from cricket frames to webrtc frames. 268 // frames are then converted from cricket frames to webrtc frames.
266 class WebRtcVideoSendStream : public sigslot::has_slots<> { 269 class WebRtcVideoSendStream : public sigslot::has_slots<> {
267 public: 270 public:
268 WebRtcVideoSendStream( 271 WebRtcVideoSendStream(
269 webrtc::Call* call, 272 webrtc::Call* call,
270 WebRtcVideoEncoderFactory* external_encoder_factory, 273 WebRtcVideoEncoderFactory* external_encoder_factory,
271 const VideoOptions& options, 274 const VideoOptions& options,
272 int max_bitrate_bps, 275 int max_bitrate_bps,
273 const Settable<VideoCodecSettings>& codec_settings, 276 const Settable<VideoCodecSettings>& codec_settings,
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 bool SendRtp(const uint8_t* data, size_t len) override; 490 bool SendRtp(const uint8_t* data, size_t len) override;
488 bool SendRtcp(const uint8_t* data, size_t len) override; 491 bool SendRtcp(const uint8_t* data, size_t len) override;
489 492
490 void StartAllSendStreams(); 493 void StartAllSendStreams();
491 void StopAllSendStreams(); 494 void StopAllSendStreams();
492 495
493 static std::vector<VideoCodecSettings> MapCodecs( 496 static std::vector<VideoCodecSettings> MapCodecs(
494 const std::vector<VideoCodec>& codecs); 497 const std::vector<VideoCodec>& codecs);
495 std::vector<VideoCodecSettings> FilterSupportedCodecs( 498 std::vector<VideoCodecSettings> FilterSupportedCodecs(
496 const std::vector<VideoCodecSettings>& mapped_codecs) const; 499 const std::vector<VideoCodecSettings>& mapped_codecs) const;
500 static bool ReceiveCodecsHaveChanged(std::vector<VideoCodecSettings> before,
tommi 2015/08/22 21:44:04 shouldn't these be passed by const ref instead of
pthatcher1 2015/08/24 16:19:11 They get sorted immediately after being passed in,
501 std::vector<VideoCodecSettings> after);
497 502
498 void FillSenderStats(VideoMediaInfo* info); 503 void FillSenderStats(VideoMediaInfo* info);
499 void FillReceiverStats(VideoMediaInfo* info); 504 void FillReceiverStats(VideoMediaInfo* info);
500 void FillBandwidthEstimationStats(const webrtc::Call::Stats& stats, 505 void FillBandwidthEstimationStats(const webrtc::Call::Stats& stats,
501 VideoMediaInfo* info); 506 VideoMediaInfo* info);
502 507
503 rtc::ThreadChecker thread_checker_; 508 rtc::ThreadChecker thread_checker_;
504 509
505 uint32_t rtcp_receiver_report_ssrc_; 510 uint32_t rtcp_receiver_report_ssrc_;
506 bool sending_; 511 bool sending_;
(...skipping 30 matching lines...) Expand all
537 WebRtcVideoDecoderFactory* const external_decoder_factory_; 542 WebRtcVideoDecoderFactory* const external_decoder_factory_;
538 std::vector<VideoCodecSettings> recv_codecs_; 543 std::vector<VideoCodecSettings> recv_codecs_;
539 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; 544 std::vector<webrtc::RtpExtension> recv_rtp_extensions_;
540 webrtc::Call::Config::BitrateConfig bitrate_config_; 545 webrtc::Call::Config::BitrateConfig bitrate_config_;
541 VideoOptions options_; 546 VideoOptions options_;
542 }; 547 };
543 548
544 } // namespace cricket 549 } // namespace cricket
545 550
546 #endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_ 551 #endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_
OLDNEW
« no previous file with comments | « no previous file | talk/media/webrtc/webrtcvideoengine2.cc » ('j') | talk/media/webrtc/webrtcvideoengine2.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698