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: webrtc/pc/channel.h

Issue 1691463002: Move talk/session/media -> webrtc/pc (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Last rebase Created 4 years, 10 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
« no previous file with comments | « webrtc/pc/bundlefilter_unittest.cc ('k') | webrtc/pc/channel.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 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 16 matching lines...) Expand all
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 <map> 31 #include <map>
32 #include <set> 32 #include <set>
33 #include <string> 33 #include <string>
34 #include <utility> 34 #include <utility>
35 #include <vector> 35 #include <vector>
36 36
37 #include "talk/session/media/audiomonitor.h"
38 #include "talk/session/media/bundlefilter.h"
39 #include "talk/session/media/mediamonitor.h"
40 #include "talk/session/media/mediasession.h"
41 #include "talk/session/media/rtcpmuxfilter.h"
42 #include "talk/session/media/srtpfilter.h"
43 #include "webrtc/audio/audio_sink.h" 37 #include "webrtc/audio/audio_sink.h"
44 #include "webrtc/base/asyncudpsocket.h" 38 #include "webrtc/base/asyncudpsocket.h"
45 #include "webrtc/base/criticalsection.h" 39 #include "webrtc/base/criticalsection.h"
46 #include "webrtc/base/network.h" 40 #include "webrtc/base/network.h"
47 #include "webrtc/base/sigslot.h" 41 #include "webrtc/base/sigslot.h"
48 #include "webrtc/base/window.h" 42 #include "webrtc/base/window.h"
49 #include "webrtc/media/base/mediachannel.h" 43 #include "webrtc/media/base/mediachannel.h"
50 #include "webrtc/media/base/mediaengine.h" 44 #include "webrtc/media/base/mediaengine.h"
51 #include "webrtc/media/base/streamparams.h" 45 #include "webrtc/media/base/streamparams.h"
52 #include "webrtc/media/base/videocapturer.h" 46 #include "webrtc/media/base/videocapturer.h"
53 #include "webrtc/media/base/videosinkinterface.h" 47 #include "webrtc/media/base/videosinkinterface.h"
54 #include "webrtc/p2p/base/transportcontroller.h" 48 #include "webrtc/p2p/base/transportcontroller.h"
55 #include "webrtc/p2p/client/socketmonitor.h" 49 #include "webrtc/p2p/client/socketmonitor.h"
50 #include "webrtc/pc/audiomonitor.h"
51 #include "webrtc/pc/bundlefilter.h"
52 #include "webrtc/pc/mediamonitor.h"
53 #include "webrtc/pc/mediasession.h"
54 #include "webrtc/pc/rtcpmuxfilter.h"
55 #include "webrtc/pc/srtpfilter.h"
56 56
57 namespace webrtc { 57 namespace webrtc {
58 class AudioSinkInterface; 58 class AudioSinkInterface;
59 } // namespace webrtc 59 } // namespace webrtc
60 60
61 namespace cricket { 61 namespace cricket {
62 62
63 struct CryptoParams; 63 struct CryptoParams;
64 class MediaContentDescription; 64 class MediaContentDescription;
65 65
(...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after
637 // SetSendParameters. 637 // SetSendParameters.
638 DataSendParameters last_send_params_; 638 DataSendParameters last_send_params_;
639 // Last DataRecvParameters sent down to the media_channel() via 639 // Last DataRecvParameters sent down to the media_channel() via
640 // SetRecvParameters. 640 // SetRecvParameters.
641 DataRecvParameters last_recv_params_; 641 DataRecvParameters last_recv_params_;
642 }; 642 };
643 643
644 } // namespace cricket 644 } // namespace cricket
645 645
646 #endif // TALK_SESSION_MEDIA_CHANNEL_H_ 646 #endif // TALK_SESSION_MEDIA_CHANNEL_H_
OLDNEW
« no previous file with comments | « webrtc/pc/bundlefilter_unittest.cc ('k') | webrtc/pc/channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698