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

Side by Side Diff: talk/app/webrtc/localaudiosource.cc

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
« no previous file with comments | « talk/app/webrtc/localaudiosource.h ('k') | talk/app/webrtc/localaudiosource_unittest.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 2013 Google Inc. 3 * Copyright 2013 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 12 matching lines...) Expand all
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 #include "talk/app/webrtc/localaudiosource.h" 28 #include "talk/app/webrtc/localaudiosource.h"
29 29
30 #include <vector> 30 #include <vector>
31 31
32 #include "talk/app/webrtc/mediaconstraintsinterface.h" 32 #include "talk/app/webrtc/mediaconstraintsinterface.h"
33 #include "talk/media/base/mediaengine.h" 33 #include "webrtc/media/base/mediaengine.h"
34 34
35 using webrtc::MediaConstraintsInterface; 35 using webrtc::MediaConstraintsInterface;
36 using webrtc::MediaSourceInterface; 36 using webrtc::MediaSourceInterface;
37 37
38 namespace webrtc { 38 namespace webrtc {
39 39
40 namespace { 40 namespace {
41 41
42 // Convert constraints to audio options. Return false if constraints are 42 // Convert constraints to audio options. Return false if constraints are
43 // invalid. 43 // invalid.
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 // constraints. 104 // constraints.
105 FromConstraints(constraints->GetOptional(), &options_); 105 FromConstraints(constraints->GetOptional(), &options_);
106 106
107 cricket::AudioOptions mandatory_options; 107 cricket::AudioOptions mandatory_options;
108 FromConstraints(constraints->GetMandatory(), &mandatory_options); 108 FromConstraints(constraints->GetMandatory(), &mandatory_options);
109 options_.SetAll(mandatory_options); 109 options_.SetAll(mandatory_options);
110 source_state_ = kLive; 110 source_state_ = kLive;
111 } 111 }
112 112
113 } // namespace webrtc 113 } // namespace webrtc
OLDNEW
« no previous file with comments | « talk/app/webrtc/localaudiosource.h ('k') | talk/app/webrtc/localaudiosource_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698