| OLD | NEW | 
|     1 /* |     1 /* | 
|     2  *  Copyright (c) 2004 The WebRTC project authors. All Rights Reserved. |     2  *  Copyright (c) 2004 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  | 
| (...skipping 25 matching lines...) Expand all  Loading... | 
|    36 // TODO(juberti): re-evaluate this include |    36 // TODO(juberti): re-evaluate this include | 
|    37 #include "webrtc/pc/audiomonitor.h" |    37 #include "webrtc/pc/audiomonitor.h" | 
|    38  |    38  | 
|    39 namespace rtc { |    39 namespace rtc { | 
|    40 class RateLimiter; |    40 class RateLimiter; | 
|    41 class Timing; |    41 class Timing; | 
|    42 } |    42 } | 
|    43  |    43  | 
|    44 namespace webrtc { |    44 namespace webrtc { | 
|    45 class AudioSinkInterface; |    45 class AudioSinkInterface; | 
 |    46 class RtpContributingSource; | 
|    46 class VideoFrame; |    47 class VideoFrame; | 
|    47 } |    48 } | 
|    48  |    49  | 
|    49 namespace cricket { |    50 namespace cricket { | 
|    50  |    51  | 
|    51 class AudioSource; |    52 class AudioSource; | 
|    52 class VideoCapturer; |    53 class VideoCapturer; | 
|    53 struct RtpHeader; |    54 struct RtpHeader; | 
|    54 struct VideoFormat; |    55 struct VideoFormat; | 
|    55  |    56  | 
| (...skipping 943 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   999   // The |ssrc| should be either 0 or a valid send stream ssrc. |  1000   // The |ssrc| should be either 0 or a valid send stream ssrc. | 
|  1000   // The valid value for the |event| are 0 to 15 which corresponding to |  1001   // The valid value for the |event| are 0 to 15 which corresponding to | 
|  1001   // DTMF event 0-9, *, #, A-D. |  1002   // DTMF event 0-9, *, #, A-D. | 
|  1002   virtual bool InsertDtmf(uint32_t ssrc, int event, int duration) = 0; |  1003   virtual bool InsertDtmf(uint32_t ssrc, int event, int duration) = 0; | 
|  1003   // Gets quality stats for the channel. |  1004   // Gets quality stats for the channel. | 
|  1004   virtual bool GetStats(VoiceMediaInfo* info) = 0; |  1005   virtual bool GetStats(VoiceMediaInfo* info) = 0; | 
|  1005  |  1006  | 
|  1006   virtual void SetRawAudioSink( |  1007   virtual void SetRawAudioSink( | 
|  1007       uint32_t ssrc, |  1008       uint32_t ssrc, | 
|  1008       std::unique_ptr<webrtc::AudioSinkInterface> sink) = 0; |  1009       std::unique_ptr<webrtc::AudioSinkInterface> sink) = 0; | 
 |  1010  | 
 |  1011   virtual const std::vector<webrtc::RtpContributingSource*>& | 
 |  1012   GetContributingSources(uint32_t ssrc) = 0; | 
|  1009 }; |  1013 }; | 
|  1010  |  1014  | 
|  1011 // TODO(deadbeef): Rename to VideoSenderParameters, since they're intended to |  1015 // TODO(deadbeef): Rename to VideoSenderParameters, since they're intended to | 
|  1012 // encapsulate all the parameters needed for a video RtpSender. |  1016 // encapsulate all the parameters needed for a video RtpSender. | 
|  1013 struct VideoSendParameters : RtpSendParameters<VideoCodec> { |  1017 struct VideoSendParameters : RtpSendParameters<VideoCodec> { | 
|  1014   // Use conference mode? This flag comes from the remote |  1018   // Use conference mode? This flag comes from the remote | 
|  1015   // description's SDP line 'a=x-google-flag:conference', copied over |  1019   // description's SDP line 'a=x-google-flag:conference', copied over | 
|  1016   // by VideoChannel::SetRemoteContent_w, and ultimately used by |  1020   // by VideoChannel::SetRemoteContent_w, and ultimately used by | 
|  1017   // conference mode screencast logic in |  1021   // conference mode screencast logic in | 
|  1018   // WebRtcVideoChannel2::WebRtcVideoSendStream::CreateVideoEncoderConfig. |  1022   // WebRtcVideoChannel2::WebRtcVideoSendStream::CreateVideoEncoderConfig. | 
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1195                    const char*, |  1199                    const char*, | 
|  1196                    size_t> SignalDataReceived; |  1200                    size_t> SignalDataReceived; | 
|  1197   // Signal when the media channel is ready to send the stream. Arguments are: |  1201   // Signal when the media channel is ready to send the stream. Arguments are: | 
|  1198   //     writable(bool) |  1202   //     writable(bool) | 
|  1199   sigslot::signal1<bool> SignalReadyToSend; |  1203   sigslot::signal1<bool> SignalReadyToSend; | 
|  1200 }; |  1204 }; | 
|  1201  |  1205  | 
|  1202 }  // namespace cricket |  1206 }  // namespace cricket | 
|  1203  |  1207  | 
|  1204 #endif  // WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_ |  1208 #endif  // WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_ | 
| OLD | NEW |