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

Side by Side Diff: talk/session/media/channel.h

Issue 1610243002: Move talk/app/webrtc to webrtc/api (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Updated location for peerconnection_unittests.isolate Created 4 years, 11 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 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 10 matching lines...) Expand all
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 #ifndef TALK_SESSION_MEDIA_CHANNEL_H_ 28 #ifndef TALK_SESSION_MEDIA_CHANNEL_H_
29 #define TALK_SESSION_MEDIA_CHANNEL_H_ 29 #define TALK_SESSION_MEDIA_CHANNEL_H_
30 30
31 #include <string>
32 #include <vector>
33 #include <map> 31 #include <map>
34 #include <set> 32 #include <set>
33 #include <string>
35 #include <utility> 34 #include <utility>
35 #include <vector>
36 36
37 #include "talk/media/base/mediachannel.h" 37 #include "talk/media/base/mediachannel.h"
38 #include "talk/media/base/mediaengine.h" 38 #include "talk/media/base/mediaengine.h"
39 #include "talk/media/base/streamparams.h" 39 #include "talk/media/base/streamparams.h"
40 #include "talk/media/base/videocapturer.h" 40 #include "talk/media/base/videocapturer.h"
41 #include "talk/session/media/audiomonitor.h" 41 #include "talk/session/media/audiomonitor.h"
42 #include "talk/session/media/bundlefilter.h" 42 #include "talk/session/media/bundlefilter.h"
43 #include "talk/session/media/mediamonitor.h" 43 #include "talk/session/media/mediamonitor.h"
44 #include "talk/session/media/mediasession.h" 44 #include "talk/session/media/mediasession.h"
45 #include "talk/session/media/rtcpmuxfilter.h" 45 #include "talk/session/media/rtcpmuxfilter.h"
(...skipping 597 matching lines...) Expand 10 before | Expand all | Expand 10 after
643 // SetSendParameters. 643 // SetSendParameters.
644 DataSendParameters last_send_params_; 644 DataSendParameters last_send_params_;
645 // Last DataRecvParameters sent down to the media_channel() via 645 // Last DataRecvParameters sent down to the media_channel() via
646 // SetRecvParameters. 646 // SetRecvParameters.
647 DataRecvParameters last_recv_params_; 647 DataRecvParameters last_recv_params_;
648 }; 648 };
649 649
650 } // namespace cricket 650 } // namespace cricket
651 651
652 #endif // TALK_SESSION_MEDIA_CHANNEL_H_ 652 #endif // TALK_SESSION_MEDIA_CHANNEL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698