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

Unified Diff: content/renderer/media/webrtc_audio_device_impl.cc

Issue 298433003: Roll webrtc/libjingle to 6189. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « DEPS ('k') | third_party/libjingle/README.chromium » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/webrtc_audio_device_impl.cc
===================================================================
--- content/renderer/media/webrtc_audio_device_impl.cc (revision 271416)
+++ content/renderer/media/webrtc_audio_device_impl.cc (working copy)
@@ -150,6 +150,8 @@
int16* audio_data = &render_buffer_[0];
while (accumulated_audio_frames < audio_bus->frames()) {
// Get 10ms and append output to temporary byte buffer.
+ uint32_t rtp_ts = 0;
+ int64_t ntp_ts = 0;
if (is_audio_track_processing_enabled_) {
// When audio processing is enabled in the audio track, we use
// PullRenderData() instead of NeedMorePlayData() to avoid passing the
@@ -160,7 +162,9 @@
sample_rate,
audio_bus->channels(),
frames_per_10_ms,
- audio_data);
+ audio_data,
+ &rtp_ts,
+ &ntp_ts);
accumulated_audio_frames += frames_per_10_ms;
} else {
// TODO(xians): Remove the following code after the APM in WebRTC is
@@ -170,7 +174,9 @@
audio_bus->channels(),
sample_rate,
audio_data,
- num_audio_frames);
+ num_audio_frames,
+ &rtp_ts,
+ &ntp_ts);
accumulated_audio_frames += num_audio_frames;
}
« no previous file with comments | « DEPS ('k') | third_party/libjingle/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698