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

Side by Side Diff: content/renderer/media/rtc_media_constraints.h

Issue 1615433002: Roll WebRTC 11523:11548, Libjingle 11522:11545 (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rolling to webrtc@11548 instead to pull in a fix 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 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_MEDIA_RTC_MEDIA_CONSTRAINTS_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_RTC_MEDIA_CONSTRAINTS_H_
6 #define CONTENT_RENDERER_MEDIA_RTC_MEDIA_CONSTRAINTS_H_ 6 #define CONTENT_RENDERER_MEDIA_RTC_MEDIA_CONSTRAINTS_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "content/common/content_export.h" 9 #include "content/common/content_export.h"
10 #include "third_party/libjingle/source/talk/app/webrtc/mediaconstraintsinterface .h" 10 #include "third_party/webrtc/api/mediaconstraintsinterface.h"
11 11
12 namespace blink { 12 namespace blink {
13 class WebMediaConstraints; 13 class WebMediaConstraints;
14 } 14 }
15 15
16 namespace content { 16 namespace content {
17 17
18 // RTCMediaConstraints acts as a glue layer between WebKits MediaConstraints and 18 // RTCMediaConstraints acts as a glue layer between WebKits MediaConstraints and
19 // libjingle webrtc::MediaConstraintsInterface. 19 // libjingle webrtc::MediaConstraintsInterface.
20 // Constraints are used by PeerConnection and getUserMedia API calls. 20 // Constraints are used by PeerConnection and getUserMedia API calls.
(...skipping 21 matching lines...) Expand all
42 const std::string& value, 42 const std::string& value,
43 bool override_if_exists); 43 bool override_if_exists);
44 Constraints mandatory_; 44 Constraints mandatory_;
45 Constraints optional_; 45 Constraints optional_;
46 }; 46 };
47 47
48 } // namespace content 48 } // namespace content
49 49
50 50
51 #endif // CONTENT_RENDERER_MEDIA_RTC_MEDIA_CONSTRAINTS_H_ 51 #endif // CONTENT_RENDERER_MEDIA_RTC_MEDIA_CONSTRAINTS_H_
OLDNEW
« no previous file with comments | « content/renderer/media/rtc_dtmf_sender_handler.h ('k') | content/renderer/media/rtc_peer_connection_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698