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

Side by Side Diff: webrtc/voice_engine/channel.cc

Issue 2089773002: Add EncodedImageCallback::OnEncodedImage(). (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: . Created 4 years, 4 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 | « webrtc/video_encoder.h ('k') | no next file » | 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 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 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
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 if (_includeAudioLevelIndication) { 353 if (_includeAudioLevelIndication) {
354 // Store current audio level in the RTP/RTCP module. 354 // Store current audio level in the RTP/RTCP module.
355 // The level will be used in combination with voice-activity state 355 // The level will be used in combination with voice-activity state
356 // (frameType) to add an RTP header extension 356 // (frameType) to add an RTP header extension
357 _rtpRtcpModule->SetAudioLevel(rms_level_.RMS()); 357 _rtpRtcpModule->SetAudioLevel(rms_level_.RMS());
358 } 358 }
359 359
360 // Push data from ACM to RTP/RTCP-module to deliver audio frame for 360 // Push data from ACM to RTP/RTCP-module to deliver audio frame for
361 // packetization. 361 // packetization.
362 // This call will trigger Transport::SendPacket() from the RTP/RTCP module. 362 // This call will trigger Transport::SendPacket() from the RTP/RTCP module.
363 if (_rtpRtcpModule->SendOutgoingData( 363 if (!_rtpRtcpModule->SendOutgoingData(
364 (FrameType&)frameType, payloadType, timeStamp, 364 (FrameType&)frameType, payloadType, timeStamp,
365 // Leaving the time when this frame was 365 // Leaving the time when this frame was
366 // received from the capture device as 366 // received from the capture device as
367 // undefined for voice for now. 367 // undefined for voice for now.
368 -1, payloadData, payloadSize, fragmentation) == -1) { 368 -1, payloadData, payloadSize, fragmentation, nullptr, nullptr)) {
369 _engineStatisticsPtr->SetLastError( 369 _engineStatisticsPtr->SetLastError(
370 VE_RTP_RTCP_MODULE_ERROR, kTraceWarning, 370 VE_RTP_RTCP_MODULE_ERROR, kTraceWarning,
371 "Channel::SendData() failed to send data to RTP/RTCP module"); 371 "Channel::SendData() failed to send data to RTP/RTCP module");
372 return -1; 372 return -1;
373 } 373 }
374 374
375 _lastLocalTimeStamp = timeStamp; 375 _lastLocalTimeStamp = timeStamp;
376 _lastPayloadType = payloadType; 376 _lastPayloadType = payloadType;
377 377
378 return 0; 378 return 0;
(...skipping 3212 matching lines...) Expand 10 before | Expand all | Expand 10 after
3591 int64_t min_rtt = 0; 3591 int64_t min_rtt = 0;
3592 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != 3592 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) !=
3593 0) { 3593 0) {
3594 return 0; 3594 return 0;
3595 } 3595 }
3596 return rtt; 3596 return rtt;
3597 } 3597 }
3598 3598
3599 } // namespace voe 3599 } // namespace voe
3600 } // namespace webrtc 3600 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video_encoder.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698