| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2012 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2012 The WebRTC Project Authors. All rights reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 #include "webrtc/examples/peerconnection/client/conductor.h" | 11 #include "webrtc/examples/peerconnection/client/conductor.h" |
| 12 | 12 |
| 13 #include <utility> | 13 #include <utility> |
| 14 #include <vector> | 14 #include <vector> |
| 15 | 15 |
| 16 #include "webrtc/api/videosourceinterface.h" | |
| 17 #include "webrtc/api/test/fakeconstraints.h" | 16 #include "webrtc/api/test/fakeconstraints.h" |
| 18 #include "webrtc/base/common.h" | 17 #include "webrtc/base/common.h" |
| 19 #include "webrtc/base/json.h" | 18 #include "webrtc/base/json.h" |
| 20 #include "webrtc/base/logging.h" | 19 #include "webrtc/base/logging.h" |
| 21 #include "webrtc/examples/peerconnection/client/defaults.h" | 20 #include "webrtc/examples/peerconnection/client/defaults.h" |
| 22 #include "webrtc/media/engine/webrtcvideocapturerfactory.h" | 21 #include "webrtc/media/engine/webrtcvideocapturerfactory.h" |
| 23 #include "webrtc/modules/video_capture/video_capture_factory.h" | 22 #include "webrtc/modules/video_capture/video_capture_factory.h" |
| 24 | 23 |
| 25 // Names used for a IceCandidate JSON object. | 24 // Names used for a IceCandidate JSON object. |
| 26 const char kCandidateSdpMidName[] = "sdpMid"; | 25 const char kCandidateSdpMidName[] = "sdpMid"; |
| (...skipping 513 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 540 } | 539 } |
| 541 | 540 |
| 542 void Conductor::OnFailure(const std::string& error) { | 541 void Conductor::OnFailure(const std::string& error) { |
| 543 LOG(LERROR) << error; | 542 LOG(LERROR) << error; |
| 544 } | 543 } |
| 545 | 544 |
| 546 void Conductor::SendMessage(const std::string& json_object) { | 545 void Conductor::SendMessage(const std::string& json_object) { |
| 547 std::string* msg = new std::string(json_object); | 546 std::string* msg = new std::string(json_object); |
| 548 main_wnd_->QueueUIThreadCallback(SEND_MESSAGE_TO_PEER, msg); | 547 main_wnd_->QueueUIThreadCallback(SEND_MESSAGE_TO_PEER, msg); |
| 549 } | 548 } |
| OLD | NEW |