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

Side by Side Diff: talk/media/base/fakemediaengine.h

Issue 1486123002: Return a copy of the supported RTP header extensions instead of a reference. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: . Created 5 years 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 | « no previous file | talk/media/base/mediaengine.h » ('j') | talk/media/base/mediaengine.h » ('J')
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 2004 Google Inc. 3 * Copyright 2004 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 680 matching lines...) Expand 10 before | Expand all | Expand 10 after
691 691
692 // A base class for all of the shared parts between FakeVoiceEngine 692 // A base class for all of the shared parts between FakeVoiceEngine
693 // and FakeVideoEngine. 693 // and FakeVideoEngine.
694 class FakeBaseEngine { 694 class FakeBaseEngine {
695 public: 695 public:
696 FakeBaseEngine() 696 FakeBaseEngine()
697 : options_changed_(false), 697 : options_changed_(false),
698 fail_create_channel_(false) {} 698 fail_create_channel_(false) {}
699 void set_fail_create_channel(bool fail) { fail_create_channel_ = fail; } 699 void set_fail_create_channel(bool fail) { fail_create_channel_ = fail; }
700 700
701 const std::vector<RtpHeaderExtension>& rtp_header_extensions() const { 701 std::vector<RtpHeaderExtension> SupportedRtpHeaderExtensions() const {
pthatcher1 2015/12/01 18:40:46 Can we please just skip right to what we want this
stefan-webrtc 2015/12/04 14:06:10 Done.
702 return rtp_header_extensions_; 702 return rtp_header_extensions_;
703 } 703 }
704 void set_rtp_header_extensions( 704 void set_rtp_header_extensions(
705 const std::vector<RtpHeaderExtension>& extensions) { 705 const std::vector<RtpHeaderExtension>& extensions) {
706 rtp_header_extensions_ = extensions; 706 rtp_header_extensions_ = extensions;
707 } 707 }
708 708
709 protected: 709 protected:
710 // Flag used by optionsmessagehandler_unittest for checking whether any 710 // Flag used by optionsmessagehandler_unittest for checking whether any
711 // relevant setting has been updated. 711 // relevant setting has been updated.
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
975 975
976 private: 976 private:
977 std::vector<FakeDataMediaChannel*> channels_; 977 std::vector<FakeDataMediaChannel*> channels_;
978 std::vector<DataCodec> data_codecs_; 978 std::vector<DataCodec> data_codecs_;
979 DataChannelType last_channel_type_; 979 DataChannelType last_channel_type_;
980 }; 980 };
981 981
982 } // namespace cricket 982 } // namespace cricket
983 983
984 #endif // TALK_MEDIA_BASE_FAKEMEDIAENGINE_H_ 984 #endif // TALK_MEDIA_BASE_FAKEMEDIAENGINE_H_
OLDNEW
« no previous file with comments | « no previous file | talk/media/base/mediaengine.h » ('j') | talk/media/base/mediaengine.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698