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

Side by Side Diff: talk/app/webrtc/peerconnectioninterface.h

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased to b647aca12a884a13c1728118586245399b55fa3d (#11493) 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
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 67
68 #ifndef TALK_APP_WEBRTC_PEERCONNECTIONINTERFACE_H_ 68 #ifndef TALK_APP_WEBRTC_PEERCONNECTIONINTERFACE_H_
69 #define TALK_APP_WEBRTC_PEERCONNECTIONINTERFACE_H_ 69 #define TALK_APP_WEBRTC_PEERCONNECTIONINTERFACE_H_
70 70
71 #include <string> 71 #include <string>
72 #include <utility> 72 #include <utility>
73 #include <vector> 73 #include <vector>
74 74
75 #include "talk/app/webrtc/datachannelinterface.h" 75 #include "talk/app/webrtc/datachannelinterface.h"
76 #include "talk/app/webrtc/dtlsidentitystore.h" 76 #include "talk/app/webrtc/dtlsidentitystore.h"
77 #include "talk/app/webrtc/dtlsidentitystore.h"
77 #include "talk/app/webrtc/dtmfsenderinterface.h" 78 #include "talk/app/webrtc/dtmfsenderinterface.h"
78 #include "talk/app/webrtc/dtlsidentitystore.h"
79 #include "talk/app/webrtc/jsep.h" 79 #include "talk/app/webrtc/jsep.h"
80 #include "talk/app/webrtc/mediastreaminterface.h" 80 #include "talk/app/webrtc/mediastreaminterface.h"
81 #include "talk/app/webrtc/rtpreceiverinterface.h" 81 #include "talk/app/webrtc/rtpreceiverinterface.h"
82 #include "talk/app/webrtc/rtpsenderinterface.h" 82 #include "talk/app/webrtc/rtpsenderinterface.h"
83 #include "talk/app/webrtc/statstypes.h" 83 #include "talk/app/webrtc/statstypes.h"
84 #include "talk/app/webrtc/umametrics.h" 84 #include "talk/app/webrtc/umametrics.h"
85 #include "webrtc/base/fileutils.h" 85 #include "webrtc/base/fileutils.h"
86 #include "webrtc/base/network.h" 86 #include "webrtc/base/network.h"
87 #include "webrtc/base/rtccertificate.h" 87 #include "webrtc/base/rtccertificate.h"
88 #include "webrtc/base/socketaddress.h"
88 #include "webrtc/base/sslstreamadapter.h" 89 #include "webrtc/base/sslstreamadapter.h"
89 #include "webrtc/base/socketaddress.h"
90 #include "webrtc/p2p/base/portallocator.h" 90 #include "webrtc/p2p/base/portallocator.h"
91 91
92 namespace rtc { 92 namespace rtc {
93 class SSLIdentity; 93 class SSLIdentity;
94 class Thread; 94 class Thread;
95 } 95 }
96 96
97 namespace cricket { 97 namespace cricket {
98 class WebRtcVideoDecoderFactory; 98 class WebRtcVideoDecoderFactory;
99 class WebRtcVideoEncoderFactory; 99 class WebRtcVideoEncoderFactory;
(...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after
621 CreatePeerConnectionFactory( 621 CreatePeerConnectionFactory(
622 rtc::Thread* worker_thread, 622 rtc::Thread* worker_thread,
623 rtc::Thread* signaling_thread, 623 rtc::Thread* signaling_thread,
624 AudioDeviceModule* default_adm, 624 AudioDeviceModule* default_adm,
625 cricket::WebRtcVideoEncoderFactory* encoder_factory, 625 cricket::WebRtcVideoEncoderFactory* encoder_factory,
626 cricket::WebRtcVideoDecoderFactory* decoder_factory); 626 cricket::WebRtcVideoDecoderFactory* decoder_factory);
627 627
628 } // namespace webrtc 628 } // namespace webrtc
629 629
630 #endif // TALK_APP_WEBRTC_PEERCONNECTIONINTERFACE_H_ 630 #endif // TALK_APP_WEBRTC_PEERCONNECTIONINTERFACE_H_
OLDNEW
« no previous file with comments | « talk/app/webrtc/peerconnectionfactory_unittest.cc ('k') | talk/app/webrtc/peerconnectioninterface_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698