| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #include "remoting/protocol/webrtc_transport.h" | 5 #include "remoting/protocol/webrtc_transport.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 if (sdp_message->has_video() && | 73 if (sdp_message->has_video() && |
| 74 !sdp_message->AddCodecParameter( | 74 !sdp_message->AddCodecParameter( |
| 75 "VP8", "x-google-min-bitrate=1000; x-google-max-bitrate=100000")) { | 75 "VP8", "x-google-min-bitrate=1000; x-google-max-bitrate=100000")) { |
| 76 if (incoming) { | 76 if (incoming) { |
| 77 LOG(WARNING) << "VP8 not found in an incoming SDP."; | 77 LOG(WARNING) << "VP8 not found in an incoming SDP."; |
| 78 } else { | 78 } else { |
| 79 LOG(FATAL) << "VP8 not found in SDP generated by WebRTC."; | 79 LOG(FATAL) << "VP8 not found in SDP generated by WebRTC."; |
| 80 } | 80 } |
| 81 } | 81 } |
| 82 | 82 |
| 83 // Update SDP format to use stereo for opus codec. | 83 // Update SDP format to use 160kbps stereo for opus codec. |
| 84 if (sdp_message->has_audio() && | 84 if (sdp_message->has_audio() && |
| 85 !sdp_message->AddCodecParameter("opus", | 85 !sdp_message->AddCodecParameter("opus", |
| 86 "stereo=1; x-google-min-bitrate=160")) { | 86 "stereo=1; maxaveragebitrate=163840")) { |
| 87 if (incoming) { | 87 if (incoming) { |
| 88 LOG(WARNING) << "Opus not found in an incoming SDP."; | 88 LOG(WARNING) << "Opus not found in an incoming SDP."; |
| 89 } else { | 89 } else { |
| 90 LOG(FATAL) << "Opus not found in SDP generated by WebRTC."; | 90 LOG(FATAL) << "Opus not found in SDP generated by WebRTC."; |
| 91 } | 91 } |
| 92 } | 92 } |
| 93 } | 93 } |
| 94 | 94 |
| 95 // A webrtc::CreateSessionDescriptionObserver implementation used to receive the | 95 // A webrtc::CreateSessionDescriptionObserver implementation used to receive the |
| 96 // results of creating descriptions for this end of the PeerConnection. | 96 // results of creating descriptions for this end of the PeerConnection. |
| (...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 711 // the stack and so it must be destroyed later. | 711 // the stack and so it must be destroyed later. |
| 712 base::ThreadTaskRunnerHandle::Get()->DeleteSoon( | 712 base::ThreadTaskRunnerHandle::Get()->DeleteSoon( |
| 713 FROM_HERE, peer_connection_wrapper_.release()); | 713 FROM_HERE, peer_connection_wrapper_.release()); |
| 714 | 714 |
| 715 if (error != OK) | 715 if (error != OK) |
| 716 event_handler_->OnWebrtcTransportError(error); | 716 event_handler_->OnWebrtcTransportError(error); |
| 717 } | 717 } |
| 718 | 718 |
| 719 } // namespace protocol | 719 } // namespace protocol |
| 720 } // namespace remoting | 720 } // namespace remoting |
| OLD | NEW |